Merge 'integration_2025-02-20_759006862850' into 'master'

merge branch integration_2025-02-20_759006862850 into master

See merge request: !515

Author: volc-sdk-team

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "1.0.124",
-	"meta_commit": "7345a2c77a3a4c44097909a94821a3f83f2cfa98"
+	"lasted": "1.0.125",
+	"meta_commit": "376d2bb77b72026db8b464b06bd29ee2ce4f95d1"
 }

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "volcengine-python-sdk"
-VERSION = "1.0.124"
+VERSION = "1.0.125"
 # To install the library, run the following
 #
 # python setup.py install

volcenginesdkclb/__init__.py

@@ -140,6 +140,7 @@
 from volcenginesdkclb.models.rule_for_create_rules_input import RuleForCreateRulesInput
 from volcenginesdkclb.models.rule_for_describe_rules_output import RuleForDescribeRulesOutput
 from volcenginesdkclb.models.rule_for_modify_rules_input import RuleForModifyRulesInput
+from volcenginesdkclb.models.rules_tag_for_create_rules_input import RulesTagForCreateRulesInput
 from volcenginesdkclb.models.server_for_add_server_group_backend_servers_input import ServerForAddServerGroupBackendServersInput
 from volcenginesdkclb.models.server_for_create_server_group_input import ServerForCreateServerGroupInput
 from volcenginesdkclb.models.server_for_describe_server_group_attributes_output import ServerForDescribeServerGroupAttributesOutput
@@ -152,6 +153,7 @@
 from volcenginesdkclb.models.tag_filter_for_describe_certificates_input import TagFilterForDescribeCertificatesInput
 from volcenginesdkclb.models.tag_filter_for_describe_listeners_input import TagFilterForDescribeListenersInput
 from volcenginesdkclb.models.tag_filter_for_describe_load_balancers_input import TagFilterForDescribeLoadBalancersInput
+from volcenginesdkclb.models.tag_filter_for_describe_rules_input import TagFilterForDescribeRulesInput
 from volcenginesdkclb.models.tag_filter_for_describe_server_groups_input import TagFilterForDescribeServerGroupsInput
 from volcenginesdkclb.models.tag_filter_for_list_tags_for_resources_input import TagFilterForListTagsForResourcesInput
 from volcenginesdkclb.models.tag_for_create_acl_input import TagForCreateAclInput
@@ -165,6 +167,7 @@
 from volcenginesdkclb.models.tag_for_describe_listeners_output import TagForDescribeListenersOutput
 from volcenginesdkclb.models.tag_for_describe_load_balancer_attributes_output import TagForDescribeLoadBalancerAttributesOutput
 from volcenginesdkclb.models.tag_for_describe_load_balancers_output import TagForDescribeLoadBalancersOutput
+from volcenginesdkclb.models.tag_for_describe_rules_output import TagForDescribeRulesOutput
 from volcenginesdkclb.models.tag_for_describe_server_group_attributes_output import TagForDescribeServerGroupAttributesOutput
 from volcenginesdkclb.models.tag_for_describe_server_groups_output import TagForDescribeServerGroupsOutput
 from volcenginesdkclb.models.tag_for_tag_resources_input import TagForTagResourcesInput

volcenginesdkclb/models/__init__.py

@@ -136,6 +136,7 @@
 from volcenginesdkclb.models.rule_for_create_rules_input import RuleForCreateRulesInput
 from volcenginesdkclb.models.rule_for_describe_rules_output import RuleForDescribeRulesOutput
 from volcenginesdkclb.models.rule_for_modify_rules_input import RuleForModifyRulesInput
+from volcenginesdkclb.models.rules_tag_for_create_rules_input import RulesTagForCreateRulesInput
 from volcenginesdkclb.models.server_for_add_server_group_backend_servers_input import ServerForAddServerGroupBackendServersInput
 from volcenginesdkclb.models.server_for_create_server_group_input import ServerForCreateServerGroupInput
 from volcenginesdkclb.models.server_for_describe_server_group_attributes_output import ServerForDescribeServerGroupAttributesOutput
@@ -148,6 +149,7 @@
 from volcenginesdkclb.models.tag_filter_for_describe_certificates_input import TagFilterForDescribeCertificatesInput
 from volcenginesdkclb.models.tag_filter_for_describe_listeners_input import TagFilterForDescribeListenersInput
 from volcenginesdkclb.models.tag_filter_for_describe_load_balancers_input import TagFilterForDescribeLoadBalancersInput
+from volcenginesdkclb.models.tag_filter_for_describe_rules_input import TagFilterForDescribeRulesInput
 from volcenginesdkclb.models.tag_filter_for_describe_server_groups_input import TagFilterForDescribeServerGroupsInput
 from volcenginesdkclb.models.tag_filter_for_list_tags_for_resources_input import TagFilterForListTagsForResourcesInput
 from volcenginesdkclb.models.tag_for_create_acl_input import TagForCreateAclInput
@@ -161,6 +163,7 @@
 from volcenginesdkclb.models.tag_for_describe_listeners_output import TagForDescribeListenersOutput
 from volcenginesdkclb.models.tag_for_describe_load_balancer_attributes_output import TagForDescribeLoadBalancerAttributesOutput
 from volcenginesdkclb.models.tag_for_describe_load_balancers_output import TagForDescribeLoadBalancersOutput
+from volcenginesdkclb.models.tag_for_describe_rules_output import TagForDescribeRulesOutput
 from volcenginesdkclb.models.tag_for_describe_server_group_attributes_output import TagForDescribeServerGroupAttributesOutput
 from volcenginesdkclb.models.tag_for_describe_server_groups_output import TagForDescribeServerGroupsOutput
 from volcenginesdkclb.models.tag_for_tag_resources_input import TagForTagResourcesInput

volcenginesdkclb/models/create_listener_request.py

@@ -37,6 +37,8 @@ class CreateListenerRequest(object):
         'acl_status': 'str',
         'acl_type': 'str',
         'bandwidth': 'int',
+        'ca_certificate_id': 'str',
+        'ca_enabled': 'str',
         'cert_center_certificate_id': 'str',
         'certificate_id': 'str',
         'certificate_source': 'str',
@@ -75,6 +77,8 @@ class CreateListenerRequest(object):
         'acl_status': 'AclStatus',
         'acl_type': 'AclType',
         'bandwidth': 'Bandwidth',
+        'ca_certificate_id': 'CACertificateId',
+        'ca_enabled': 'CAEnabled',
         'cert_center_certificate_id': 'CertCenterCertificateId',
         'certificate_id': 'CertificateId',
         'certificate_source': 'CertificateSource',
@@ -108,7 +112,7 @@ class CreateListenerRequest(object):
         'tags': 'Tags'
     }
 
-    def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None, cert_center_certificate_id=None, certificate_id=None, certificate_source=None, client_body_timeout=None, client_header_timeout=None, connection_drain_enabled=None, connection_drain_timeout=None, cookie=None, description=None, enabled=None, end_port=None, established_timeout=None, health_check=None, http2_enabled=None, keepalive_timeout=None, listener_name=None, load_balancer_id=None, persistence_timeout=None, persistence_type=None, port=None, protocol=None, proxy_connect_timeout=None, proxy_protocol_type=None, proxy_read_timeout=None, proxy_send_timeout=None, scheduler=None, security_policy_id=None, send_timeout=None, server_group_id=None, start_port=None, tags=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None, ca_certificate_id=None, ca_enabled=None, cert_center_certificate_id=None, certificate_id=None, certificate_source=None, client_body_timeout=None, client_header_timeout=None, connection_drain_enabled=None, connection_drain_timeout=None, cookie=None, description=None, enabled=None, end_port=None, established_timeout=None, health_check=None, http2_enabled=None, keepalive_timeout=None, listener_name=None, load_balancer_id=None, persistence_timeout=None, persistence_type=None, port=None, protocol=None, proxy_connect_timeout=None, proxy_protocol_type=None, proxy_read_timeout=None, proxy_send_timeout=None, scheduler=None, security_policy_id=None, send_timeout=None, server_group_id=None, start_port=None, tags=None, _configuration=None):  # noqa: E501
         """CreateListenerRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -118,6 +122,8 @@ def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None,
         self._acl_status = None
         self._acl_type = None
         self._bandwidth = None
+        self._ca_certificate_id = None
+        self._ca_enabled = None
         self._cert_center_certificate_id = None
         self._certificate_id = None
         self._certificate_source = None
@@ -159,6 +165,10 @@ def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None,
             self.acl_type = acl_type
         if bandwidth is not None:
             self.bandwidth = bandwidth
+        if ca_certificate_id is not None:
+            self.ca_certificate_id = ca_certificate_id
+        if ca_enabled is not None:
+            self.ca_enabled = ca_enabled
         if cert_center_certificate_id is not None:
             self.cert_center_certificate_id = cert_center_certificate_id
         if certificate_id is not None:
@@ -302,6 +312,48 @@ def bandwidth(self, bandwidth):
 
         self._bandwidth = bandwidth
 
+    @property
+    def ca_certificate_id(self):
+        """Gets the ca_certificate_id of this CreateListenerRequest.  # noqa: E501
+
+
+        :return: The ca_certificate_id of this CreateListenerRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._ca_certificate_id
+
+    @ca_certificate_id.setter
+    def ca_certificate_id(self, ca_certificate_id):
+        """Sets the ca_certificate_id of this CreateListenerRequest.
+
+
+        :param ca_certificate_id: The ca_certificate_id of this CreateListenerRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._ca_certificate_id = ca_certificate_id
+
+    @property
+    def ca_enabled(self):
+        """Gets the ca_enabled of this CreateListenerRequest.  # noqa: E501
+
+
+        :return: The ca_enabled of this CreateListenerRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._ca_enabled
+
+    @ca_enabled.setter
+    def ca_enabled(self, ca_enabled):
+        """Sets the ca_enabled of this CreateListenerRequest.
+
+
+        :param ca_enabled: The ca_enabled of this CreateListenerRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._ca_enabled = ca_enabled
+
     @property
     def cert_center_certificate_id(self):
         """Gets the cert_center_certificate_id of this CreateListenerRequest.  # noqa: E501

volcenginesdkclb/models/delete_load_balancer_request.py

@@ -33,24 +33,50 @@ class DeleteLoadBalancerRequest(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'force_delete': 'bool',
         'load_balancer_id': 'str'
     }
 
     attribute_map = {
+        'force_delete': 'ForceDelete',
         'load_balancer_id': 'LoadBalancerId'
     }
 
-    def __init__(self, load_balancer_id=None, _configuration=None):  # noqa: E501
+    def __init__(self, force_delete=None, load_balancer_id=None, _configuration=None):  # noqa: E501
         """DeleteLoadBalancerRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._force_delete = None
         self._load_balancer_id = None
         self.discriminator = None
 
+        if force_delete is not None:
+            self.force_delete = force_delete
         self.load_balancer_id = load_balancer_id
 
+    @property
+    def force_delete(self):
+        """Gets the force_delete of this DeleteLoadBalancerRequest.  # noqa: E501
+
+
+        :return: The force_delete of this DeleteLoadBalancerRequest.  # noqa: E501
+        :rtype: bool
+        """
+        return self._force_delete
+
+    @force_delete.setter
+    def force_delete(self, force_delete):
+        """Sets the force_delete of this DeleteLoadBalancerRequest.
+
+
+        :param force_delete: The force_delete of this DeleteLoadBalancerRequest.  # noqa: E501
+        :type: bool
+        """
+
+        self._force_delete = force_delete
+
     @property
     def load_balancer_id(self):
         """Gets the load_balancer_id of this DeleteLoadBalancerRequest.  # noqa: E501

volcenginesdkclb/models/describe_listener_attributes_response.py

@@ -37,6 +37,8 @@ class DescribeListenerAttributesResponse(object):
         'acl_status': 'str',
         'acl_type': 'str',
         'bandwidth': 'int',
+        'ca_certificate_id': 'str',
+        'ca_enabled': 'str',
         'cert_center_certificate_id': 'str',
         'certificate_id': 'str',
         'certificate_source': 'str',
@@ -73,14 +75,17 @@ class DescribeListenerAttributesResponse(object):
         'start_port': 'int',
         'status': 'str',
         'tags': 'list[TagForDescribeListenerAttributesOutput]',
-        'update_time': 'str'
+        'update_time': 'str',
+        'waf_protection_enabled': 'str'
     }
 
     attribute_map = {
         'acl_ids': 'AclIds',
         'acl_status': 'AclStatus',
         'acl_type': 'AclType',
         'bandwidth': 'Bandwidth',
+        'ca_certificate_id': 'CACertificateId',
+        'ca_enabled': 'CAEnabled',
         'cert_center_certificate_id': 'CertCenterCertificateId',
         'certificate_id': 'CertificateId',
         'certificate_source': 'CertificateSource',
@@ -117,10 +122,11 @@ class DescribeListenerAttributesResponse(object):
         'start_port': 'StartPort',
         'status': 'Status',
         'tags': 'Tags',
-        'update_time': 'UpdateTime'
+        'update_time': 'UpdateTime',
+        'waf_protection_enabled': 'WafProtectionEnabled'
     }
 
-    def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None, cert_center_certificate_id=None, certificate_id=None, certificate_source=None, client_body_timeout=None, client_header_timeout=None, connection_drain_enabled=None, connection_drain_timeout=None, cookie=None, create_time=None, description=None, enabled=None, end_port=None, established_timeout=None, health_check=None, http2_enabled=None, keepalive_timeout=None, listener_id=None, listener_name=None, load_balancer_id=None, persistence_timeout=None, persistence_type=None, port=None, protocol=None, proxy_connect_timeout=None, proxy_protocol_type=None, proxy_read_timeout=None, proxy_send_timeout=None, request_id=None, response_check_enabled=None, scheduler=None, security_policy_id=None, send_timeout=None, server_group_id=None, start_port=None, status=None, tags=None, update_time=None, _configuration=None):  # noqa: E501
+    def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None, ca_certificate_id=None, ca_enabled=None, cert_center_certificate_id=None, certificate_id=None, certificate_source=None, client_body_timeout=None, client_header_timeout=None, connection_drain_enabled=None, connection_drain_timeout=None, cookie=None, create_time=None, description=None, enabled=None, end_port=None, established_timeout=None, health_check=None, http2_enabled=None, keepalive_timeout=None, listener_id=None, listener_name=None, load_balancer_id=None, persistence_timeout=None, persistence_type=None, port=None, protocol=None, proxy_connect_timeout=None, proxy_protocol_type=None, proxy_read_timeout=None, proxy_send_timeout=None, request_id=None, response_check_enabled=None, scheduler=None, security_policy_id=None, send_timeout=None, server_group_id=None, start_port=None, status=None, tags=None, update_time=None, waf_protection_enabled=None, _configuration=None):  # noqa: E501
         """DescribeListenerAttributesResponse - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -130,6 +136,8 @@ def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None,
         self._acl_status = None
         self._acl_type = None
         self._bandwidth = None
+        self._ca_certificate_id = None
+        self._ca_enabled = None
         self._cert_center_certificate_id = None
         self._certificate_id = None
         self._certificate_source = None
@@ -167,6 +175,7 @@ def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None,
         self._status = None
         self._tags = None
         self._update_time = None
+        self._waf_protection_enabled = None
         self.discriminator = None
 
         if acl_ids is not None:
@@ -177,6 +186,10 @@ def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None,
             self.acl_type = acl_type
         if bandwidth is not None:
             self.bandwidth = bandwidth
+        if ca_certificate_id is not None:
+            self.ca_certificate_id = ca_certificate_id
+        if ca_enabled is not None:
+            self.ca_enabled = ca_enabled
         if cert_center_certificate_id is not None:
             self.cert_center_certificate_id = cert_center_certificate_id
         if certificate_id is not None:
@@ -251,6 +264,8 @@ def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None,
             self.tags = tags
         if update_time is not None:
             self.update_time = update_time
+        if waf_protection_enabled is not None:
+            self.waf_protection_enabled = waf_protection_enabled
 
     @property
     def acl_ids(self):
@@ -336,6 +351,48 @@ def bandwidth(self, bandwidth):
 
         self._bandwidth = bandwidth
 
+    @property
+    def ca_certificate_id(self):
+        """Gets the ca_certificate_id of this DescribeListenerAttributesResponse.  # noqa: E501
+
+
+        :return: The ca_certificate_id of this DescribeListenerAttributesResponse.  # noqa: E501
+        :rtype: str
+        """
+        return self._ca_certificate_id
+
+    @ca_certificate_id.setter
+    def ca_certificate_id(self, ca_certificate_id):
+        """Sets the ca_certificate_id of this DescribeListenerAttributesResponse.
+
+
+        :param ca_certificate_id: The ca_certificate_id of this DescribeListenerAttributesResponse.  # noqa: E501
+        :type: str
+        """
+
+        self._ca_certificate_id = ca_certificate_id
+
+    @property
+    def ca_enabled(self):
+        """Gets the ca_enabled of this DescribeListenerAttributesResponse.  # noqa: E501
+
+
+        :return: The ca_enabled of this DescribeListenerAttributesResponse.  # noqa: E501
+        :rtype: str
+        """
+        return self._ca_enabled
+
+    @ca_enabled.setter
+    def ca_enabled(self, ca_enabled):
+        """Sets the ca_enabled of this DescribeListenerAttributesResponse.
+
+
+        :param ca_enabled: The ca_enabled of this DescribeListenerAttributesResponse.  # noqa: E501
+        :type: str
+        """
+
+        self._ca_enabled = ca_enabled
+
     @property
     def cert_center_certificate_id(self):
         """Gets the cert_center_certificate_id of this DescribeListenerAttributesResponse.  # noqa: E501
@@ -1113,6 +1170,27 @@ def update_time(self, update_time):
 
         self._update_time = update_time
 
+    @property
+    def waf_protection_enabled(self):
+        """Gets the waf_protection_enabled of this DescribeListenerAttributesResponse.  # noqa: E501
+
+
+        :return: The waf_protection_enabled of this DescribeListenerAttributesResponse.  # noqa: E501
+        :rtype: str
+        """
+        return self._waf_protection_enabled
+
+    @waf_protection_enabled.setter
+    def waf_protection_enabled(self, waf_protection_enabled):
+        """Sets the waf_protection_enabled of this DescribeListenerAttributesResponse.
+
+
+        :param waf_protection_enabled: The waf_protection_enabled of this DescribeListenerAttributesResponse.  # noqa: E501
+        :type: str
+        """
+
+        self._waf_protection_enabled = waf_protection_enabled
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}