Merge branch 'waf-Python-2023-12-25-online-904-2024_12_31_16_26_32' into 'integration_2025-01-02_663619381762'

feat: [development task] waf-904-Python (950992)

See merge request iaasng/volcengine-python-sdk!473

Author: BitsAdmin

volcenginesdkwaf/__init__.py

@@ -131,6 +131,8 @@
 from volcenginesdkwaf.models.delete_custom_page_response import DeleteCustomPageResponse
 from volcenginesdkwaf.models.delete_domain_request import DeleteDomainRequest
 from volcenginesdkwaf.models.delete_domain_response import DeleteDomainResponse
+from volcenginesdkwaf.models.delete_host_group_request import DeleteHostGroupRequest
+from volcenginesdkwaf.models.delete_host_group_response import DeleteHostGroupResponse
 from volcenginesdkwaf.models.delete_ip_group_request import DeleteIpGroupRequest
 from volcenginesdkwaf.models.delete_ip_group_response import DeleteIpGroupResponse
 from volcenginesdkwaf.models.delete_prohibition_black_request import DeleteProhibitionBlackRequest
@@ -163,6 +165,7 @@
 from volcenginesdkwaf.models.ip_failed_for_add_prohibition_white_output import IpFailedForAddProhibitionWhiteOutput
 from volcenginesdkwaf.models.ip_failed_for_delete_prohibition_black_output import IpFailedForDeleteProhibitionBlackOutput
 from volcenginesdkwaf.models.ip_failed_for_delete_prohibition_white_output import IpFailedForDeleteProhibitionWhiteOutput
+from volcenginesdkwaf.models.ip_group_for_list_acl_rule_output import IpGroupForListAclRuleOutput
 from volcenginesdkwaf.models.ip_group_for_list_allow_rule_output import IpGroupForListAllowRuleOutput
 from volcenginesdkwaf.models.ip_group_for_list_block_rule_output import IpGroupForListBlockRuleOutput
 from volcenginesdkwaf.models.ip_group_list_for_list_all_ip_groups_output import IpGroupListForListAllIpGroupsOutput
@@ -269,6 +272,8 @@
 from volcenginesdkwaf.models.update_custom_system_vul_rule_response import UpdateCustomSystemVulRuleResponse
 from volcenginesdkwaf.models.update_domain_request import UpdateDomainRequest
 from volcenginesdkwaf.models.update_domain_response import UpdateDomainResponse
+from volcenginesdkwaf.models.update_host_group_request import UpdateHostGroupRequest
+from volcenginesdkwaf.models.update_host_group_response import UpdateHostGroupResponse
 from volcenginesdkwaf.models.update_instance_ctl_request import UpdateInstanceCtlRequest
 from volcenginesdkwaf.models.update_instance_ctl_response import UpdateInstanceCtlResponse
 from volcenginesdkwaf.models.update_ip_group_request import UpdateIpGroupRequest

volcenginesdkwaf/api/waf_api.py

@@ -2167,6 +2167,103 @@ def delete_domain_with_http_info(self, body, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def delete_host_group(self, body, **kwargs):  # noqa: E501
+        """delete_host_group  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_host_group(body, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param DeleteHostGroupRequest body: (required)
+        :return: DeleteHostGroupResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.delete_host_group_with_http_info(body, **kwargs)  # noqa: E501
+        else:
+            (data) = self.delete_host_group_with_http_info(body, **kwargs)  # noqa: E501
+            return data
+
+    def delete_host_group_with_http_info(self, body, **kwargs):  # noqa: E501
+        """delete_host_group  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.delete_host_group_with_http_info(body, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param DeleteHostGroupRequest body: (required)
+        :return: DeleteHostGroupResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method delete_host_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'body' is set
+        if self.api_client.client_side_validation and ('body' not in params or
+                                                       params['body'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `body` when calling `delete_host_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['volcengineSign']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/DeleteHostGroup/2023-12-25/waf/post/application_json/', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='DeleteHostGroupResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def delete_ip_group(self, body, **kwargs):  # noqa: E501
         """delete_ip_group  # noqa: E501
 
@@ -6726,6 +6823,103 @@ def update_domain_with_http_info(self, body, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def update_host_group(self, body, **kwargs):  # noqa: E501
+        """update_host_group  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_host_group(body, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param UpdateHostGroupRequest body: (required)
+        :return: UpdateHostGroupResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.update_host_group_with_http_info(body, **kwargs)  # noqa: E501
+        else:
+            (data) = self.update_host_group_with_http_info(body, **kwargs)  # noqa: E501
+            return data
+
+    def update_host_group_with_http_info(self, body, **kwargs):  # noqa: E501
+        """update_host_group  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.update_host_group_with_http_info(body, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param UpdateHostGroupRequest body: (required)
+        :return: UpdateHostGroupResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method update_host_group" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'body' is set
+        if self.api_client.client_side_validation and ('body' not in params or
+                                                       params['body'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `body` when calling `update_host_group`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['volcengineSign']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/UpdateHostGroup/2023-12-25/waf/post/application_json/', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='UpdateHostGroupResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def update_instance_ctl(self, body, **kwargs):  # noqa: E501
         """update_instance_ctl  # noqa: E501
 

volcenginesdkwaf/models/__init__.py

@@ -127,6 +127,8 @@
 from volcenginesdkwaf.models.delete_custom_page_response import DeleteCustomPageResponse
 from volcenginesdkwaf.models.delete_domain_request import DeleteDomainRequest
 from volcenginesdkwaf.models.delete_domain_response import DeleteDomainResponse
+from volcenginesdkwaf.models.delete_host_group_request import DeleteHostGroupRequest
+from volcenginesdkwaf.models.delete_host_group_response import DeleteHostGroupResponse
 from volcenginesdkwaf.models.delete_ip_group_request import DeleteIpGroupRequest
 from volcenginesdkwaf.models.delete_ip_group_response import DeleteIpGroupResponse
 from volcenginesdkwaf.models.delete_prohibition_black_request import DeleteProhibitionBlackRequest
@@ -159,6 +161,7 @@
 from volcenginesdkwaf.models.ip_failed_for_add_prohibition_white_output import IpFailedForAddProhibitionWhiteOutput
 from volcenginesdkwaf.models.ip_failed_for_delete_prohibition_black_output import IpFailedForDeleteProhibitionBlackOutput
 from volcenginesdkwaf.models.ip_failed_for_delete_prohibition_white_output import IpFailedForDeleteProhibitionWhiteOutput
+from volcenginesdkwaf.models.ip_group_for_list_acl_rule_output import IpGroupForListAclRuleOutput
 from volcenginesdkwaf.models.ip_group_for_list_allow_rule_output import IpGroupForListAllowRuleOutput
 from volcenginesdkwaf.models.ip_group_for_list_block_rule_output import IpGroupForListBlockRuleOutput
 from volcenginesdkwaf.models.ip_group_list_for_list_all_ip_groups_output import IpGroupListForListAllIpGroupsOutput
@@ -265,6 +268,8 @@
 from volcenginesdkwaf.models.update_custom_system_vul_rule_response import UpdateCustomSystemVulRuleResponse
 from volcenginesdkwaf.models.update_domain_request import UpdateDomainRequest
 from volcenginesdkwaf.models.update_domain_response import UpdateDomainResponse
+from volcenginesdkwaf.models.update_host_group_request import UpdateHostGroupRequest
+from volcenginesdkwaf.models.update_host_group_response import UpdateHostGroupResponse
 from volcenginesdkwaf.models.update_instance_ctl_request import UpdateInstanceCtlRequest
 from volcenginesdkwaf.models.update_instance_ctl_response import UpdateInstanceCtlResponse
 from volcenginesdkwaf.models.update_ip_group_request import UpdateIpGroupRequest

volcenginesdkwaf/models/create_acl_rule_request.py

@@ -49,6 +49,7 @@ class CreateAclRuleRequest(object):
         'ip_location_subregion': 'list[str]',
         'name': 'str',
         'prefix_switch': 'int',
+        'project_name': 'str',
         'url': 'str'
     }
 
@@ -69,10 +70,11 @@ class CreateAclRuleRequest(object):
         'ip_location_subregion': 'IpLocationSubregion',
         'name': 'Name',
         'prefix_switch': 'PrefixSwitch',
+        'project_name': 'ProjectName',
         'url': 'Url'
     }
 
-    def __init__(self, accurate_group=None, acl_type=None, action=None, advanced=None, description=None, enable=None, host_add_type=None, host_group_id=None, host_list=None, ip_add_type=None, ip_group_id=None, ip_list=None, ip_location_country=None, ip_location_subregion=None, name=None, prefix_switch=None, url=None, _configuration=None):  # noqa: E501
+    def __init__(self, accurate_group=None, acl_type=None, action=None, advanced=None, description=None, enable=None, host_add_type=None, host_group_id=None, host_list=None, ip_add_type=None, ip_group_id=None, ip_list=None, ip_location_country=None, ip_location_subregion=None, name=None, prefix_switch=None, project_name=None, url=None, _configuration=None):  # noqa: E501
         """CreateAclRuleRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -94,6 +96,7 @@ def __init__(self, accurate_group=None, acl_type=None, action=None, advanced=Non
         self._ip_location_subregion = None
         self._name = None
         self._prefix_switch = None
+        self._project_name = None
         self._url = None
         self.discriminator = None
 
@@ -124,6 +127,8 @@ def __init__(self, accurate_group=None, acl_type=None, action=None, advanced=Non
         self.name = name
         if prefix_switch is not None:
             self.prefix_switch = prefix_switch
+        if project_name is not None:
+            self.project_name = project_name
         self.url = url
 
     @property
@@ -472,6 +477,27 @@ def prefix_switch(self, prefix_switch):
 
         self._prefix_switch = prefix_switch
 
+    @property
+    def project_name(self):
+        """Gets the project_name of this CreateAclRuleRequest.  # noqa: E501
+
+
+        :return: The project_name of this CreateAclRuleRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._project_name
+
+    @project_name.setter
+    def project_name(self, project_name):
+        """Sets the project_name of this CreateAclRuleRequest.
+
+
+        :param project_name: The project_name of this CreateAclRuleRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._project_name = project_name
+
     @property
     def url(self):
         """Gets the url of this CreateAclRuleRequest.  # noqa: E501

volcenginesdkwaf/models/delete_acl_rule_request.py

@@ -34,26 +34,31 @@ class DeleteAclRuleRequest(object):
     """
     swagger_types = {
         'acl_type': 'str',
-        'id': 'int'
+        'id': 'int',
+        'project_name': 'str'
     }
 
     attribute_map = {
         'acl_type': 'AclType',
-        'id': 'ID'
+        'id': 'ID',
+        'project_name': 'ProjectName'
     }
 
-    def __init__(self, acl_type=None, id=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl_type=None, id=None, project_name=None, _configuration=None):  # noqa: E501
         """DeleteAclRuleRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._acl_type = None
         self._id = None
+        self._project_name = None
         self.discriminator = None
 
         self.acl_type = acl_type
         self.id = id
+        if project_name is not None:
+            self.project_name = project_name
 
     @property
     def acl_type(self):
@@ -101,6 +106,27 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def project_name(self):
+        """Gets the project_name of this DeleteAclRuleRequest.  # noqa: E501
+
+
+        :return: The project_name of this DeleteAclRuleRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._project_name
+
+    @project_name.setter
+    def project_name(self, project_name):
+        """Sets the project_name of this DeleteAclRuleRequest.
+
+
+        :param project_name: The project_name of this DeleteAclRuleRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._project_name = project_name
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}