Merge branch 'mainrelease' into 'master'

Mainrelease

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

Author: 李严

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "1.0.63",
-	"meta_commit": "01d95b7b2d76d4a6f810a9c2e45c6f05afa7aa84"
+	"lasted": "1.0.64",
+	"meta_commit": "9deec6ee0f1ae3e7ee7786204733b3d8a32c2800"
 }

setup.py

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

volcenginesdkbilling/models/list_for_list_bill_output.py

@@ -34,6 +34,7 @@ class ListForListBillOutput(object):
     """
     swagger_types = {
         'bill_category_parent': 'str',
+        'bill_detail_num': 'str',
         'bill_id': 'str',
         'bill_period': 'str',
         'billing_mode': 'str',
@@ -70,6 +71,7 @@ class ListForListBillOutput(object):
 
     attribute_map = {
         'bill_category_parent': 'BillCategoryParent',
+        'bill_detail_num': 'BillDetailNum',
         'bill_id': 'BillID',
         'bill_period': 'BillPeriod',
         'billing_mode': 'BillingMode',
@@ -104,13 +106,14 @@ class ListForListBillOutput(object):
         'unpaid_amount': 'UnpaidAmount'
     }
 
-    def __init__(self, bill_category_parent=None, bill_id=None, bill_period=None, billing_mode=None, busi_period=None, business_mode=None, coupon_amount=None, credit_carried_amount=None, currency=None, discount_bill_amount=None, expense_begin_time=None, expense_end_time=None, original_bill_amount=None, owner_customer_name=None, owner_id=None, owner_user_name=None, paid_amount=None, pay_status=None, payable_amount=None, payer_customer_name=None, payer_id=None, payer_user_name=None, preferential_bill_amount=None, product=None, product_zh=None, round_bill_amount=None, seller_customer_name=None, seller_id=None, seller_user_name=None, settlement_type=None, subject_name=None, trade_time=None, unpaid_amount=None, _configuration=None):  # noqa: E501
+    def __init__(self, bill_category_parent=None, bill_detail_num=None, bill_id=None, bill_period=None, billing_mode=None, busi_period=None, business_mode=None, coupon_amount=None, credit_carried_amount=None, currency=None, discount_bill_amount=None, expense_begin_time=None, expense_end_time=None, original_bill_amount=None, owner_customer_name=None, owner_id=None, owner_user_name=None, paid_amount=None, pay_status=None, payable_amount=None, payer_customer_name=None, payer_id=None, payer_user_name=None, preferential_bill_amount=None, product=None, product_zh=None, round_bill_amount=None, seller_customer_name=None, seller_id=None, seller_user_name=None, settlement_type=None, subject_name=None, trade_time=None, unpaid_amount=None, _configuration=None):  # noqa: E501
         """ListForListBillOutput - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._bill_category_parent = None
+        self._bill_detail_num = None
         self._bill_id = None
         self._bill_period = None
         self._billing_mode = None
@@ -147,6 +150,8 @@ def __init__(self, bill_category_parent=None, bill_id=None, bill_period=None, bi
 
         if bill_category_parent is not None:
             self.bill_category_parent = bill_category_parent
+        if bill_detail_num is not None:
+            self.bill_detail_num = bill_detail_num
         if bill_id is not None:
             self.bill_id = bill_id
         if bill_period is not None:
@@ -233,6 +238,27 @@ def bill_category_parent(self, bill_category_parent):
 
         self._bill_category_parent = bill_category_parent
 
+    @property
+    def bill_detail_num(self):
+        """Gets the bill_detail_num of this ListForListBillOutput.  # noqa: E501
+
+
+        :return: The bill_detail_num of this ListForListBillOutput.  # noqa: E501
+        :rtype: str
+        """
+        return self._bill_detail_num
+
+    @bill_detail_num.setter
+    def bill_detail_num(self, bill_detail_num):
+        """Sets the bill_detail_num of this ListForListBillOutput.
+
+
+        :param bill_detail_num: The bill_detail_num of this ListForListBillOutput.  # noqa: E501
+        :type: str
+        """
+
+        self._bill_detail_num = bill_detail_num
+
     @property
     def bill_id(self):
         """Gets the bill_id of this ListForListBillOutput.  # noqa: E501

volcenginesdkcore/api_client.py

@@ -67,7 +67,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'volcstack-python-sdk/1.0.63'
+        self.user_agent = 'volcstack-python-sdk/1.0.64'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):

volcenginesdkcore/configuration.py

@@ -221,5 +221,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 0.1.0\n"\
-               "SDK Package Version: 1.0.63".\
+               "SDK Package Version: 1.0.64".\
                format(env=sys.platform, pyversion=sys.version)

volcenginesdkwaf/__init__.py

@@ -0,0 +1,137 @@
+# coding: utf-8
+
+# flake8: noqa
+
+"""
+    waf
+
+    No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)  # noqa: E501
+
+    OpenAPI spec version: common-version
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+from __future__ import absolute_import
+
+# import apis into sdk package
+from volcenginesdkwaf.api.waf_api import WAFApi
+
+# import models into sdk package
+from volcenginesdkwaf.models.accurate_for_create_allow_rule_input import AccurateForCreateAllowRuleInput
+from volcenginesdkwaf.models.accurate_for_create_block_rule_input import AccurateForCreateBlockRuleInput
+from volcenginesdkwaf.models.accurate_for_create_custom_page_input import AccurateForCreateCustomPageInput
+from volcenginesdkwaf.models.accurate_for_list_custom_page_output import AccurateForListCustomPageOutput
+from volcenginesdkwaf.models.accurate_for_update_allow_rule_input import AccurateForUpdateAllowRuleInput
+from volcenginesdkwaf.models.accurate_for_update_block_rule_input import AccurateForUpdateBlockRuleInput
+from volcenginesdkwaf.models.accurate_for_update_custom_page_input import AccurateForUpdateCustomPageInput
+from volcenginesdkwaf.models.accurate_rule_for_create_allow_rule_input import AccurateRuleForCreateAllowRuleInput
+from volcenginesdkwaf.models.accurate_rule_for_create_block_rule_input import AccurateRuleForCreateBlockRuleInput
+from volcenginesdkwaf.models.accurate_rule_for_create_custom_page_input import AccurateRuleForCreateCustomPageInput
+from volcenginesdkwaf.models.accurate_rule_for_list_custom_page_output import AccurateRuleForListCustomPageOutput
+from volcenginesdkwaf.models.accurate_rule_for_update_allow_rule_input import AccurateRuleForUpdateAllowRuleInput
+from volcenginesdkwaf.models.accurate_rule_for_update_block_rule_input import AccurateRuleForUpdateBlockRuleInput
+from volcenginesdkwaf.models.accurate_rule_for_update_custom_page_input import AccurateRuleForUpdateCustomPageInput
+from volcenginesdkwaf.models.add_ip_group_request import AddIpGroupRequest
+from volcenginesdkwaf.models.add_ip_group_response import AddIpGroupResponse
+from volcenginesdkwaf.models.advance_config_for_get_vulnerability_config_output import AdvanceConfigForGetVulnerabilityConfigOutput
+from volcenginesdkwaf.models.advance_config_for_update_vulnerability_config_input import AdvanceConfigForUpdateVulnerabilityConfigInput
+from volcenginesdkwaf.models.auto_traversal_for_get_vulnerability_config_output import AutoTraversalForGetVulnerabilityConfigOutput
+from volcenginesdkwaf.models.auto_traversal_for_update_vulnerability_config_input import AutoTraversalForUpdateVulnerabilityConfigInput
+from volcenginesdkwaf.models.backend_for_create_domain_input import BackendForCreateDomainInput
+from volcenginesdkwaf.models.backend_for_list_domain_output import BackendForListDomainOutput
+from volcenginesdkwaf.models.backend_for_update_domain_input import BackendForUpdateDomainInput
+from volcenginesdkwaf.models.backend_group_for_create_domain_input import BackendGroupForCreateDomainInput
+from volcenginesdkwaf.models.backend_group_for_list_domain_output import BackendGroupForListDomainOutput
+from volcenginesdkwaf.models.backend_group_for_update_domain_input import BackendGroupForUpdateDomainInput
+from volcenginesdkwaf.models.cloud_access_config_for_create_domain_input import CloudAccessConfigForCreateDomainInput
+from volcenginesdkwaf.models.cloud_access_config_for_list_domain_output import CloudAccessConfigForListDomainOutput
+from volcenginesdkwaf.models.cloud_access_config_for_update_domain_input import CloudAccessConfigForUpdateDomainInput
+from volcenginesdkwaf.models.common_detection_for_get_vulnerability_config_output import CommonDetectionForGetVulnerabilityConfigOutput
+from volcenginesdkwaf.models.create_allow_rule_request import CreateAllowRuleRequest
+from volcenginesdkwaf.models.create_allow_rule_response import CreateAllowRuleResponse
+from volcenginesdkwaf.models.create_block_rule_request import CreateBlockRuleRequest
+from volcenginesdkwaf.models.create_block_rule_response import CreateBlockRuleResponse
+from volcenginesdkwaf.models.create_custom_page_request import CreateCustomPageRequest
+from volcenginesdkwaf.models.create_custom_page_response import CreateCustomPageResponse
+from volcenginesdkwaf.models.create_domain_request import CreateDomainRequest
+from volcenginesdkwaf.models.create_domain_response import CreateDomainResponse
+from volcenginesdkwaf.models.datum_for_list_allow_rule_output import DatumForListAllowRuleOutput
+from volcenginesdkwaf.models.datum_for_list_block_rule_output import DatumForListBlockRuleOutput
+from volcenginesdkwaf.models.datum_for_list_custom_page_output import DatumForListCustomPageOutput
+from volcenginesdkwaf.models.datum_for_list_domain_output import DatumForListDomainOutput
+from volcenginesdkwaf.models.datum_for_list_load_balancer_output import DatumForListLoadBalancerOutput
+from volcenginesdkwaf.models.datum_for_list_waf_service_certificate_output import DatumForListWafServiceCertificateOutput
+from volcenginesdkwaf.models.delete_allow_rule_request import DeleteAllowRuleRequest
+from volcenginesdkwaf.models.delete_allow_rule_response import DeleteAllowRuleResponse
+from volcenginesdkwaf.models.delete_block_rule_request import DeleteBlockRuleRequest
+from volcenginesdkwaf.models.delete_block_rule_response import DeleteBlockRuleResponse
+from volcenginesdkwaf.models.delete_custom_page_request import DeleteCustomPageRequest
+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_ip_group_request import DeleteIpGroupRequest
+from volcenginesdkwaf.models.delete_ip_group_response import DeleteIpGroupResponse
+from volcenginesdkwaf.models.delete_waf_service_certificate_request import DeleteWafServiceCertificateRequest
+from volcenginesdkwaf.models.delete_waf_service_certificate_response import DeleteWafServiceCertificateResponse
+from volcenginesdkwaf.models.freq_scan_for_get_vulnerability_config_output import FreqScanForGetVulnerabilityConfigOutput
+from volcenginesdkwaf.models.freq_scan_for_update_vulnerability_config_input import FreqScanForUpdateVulnerabilityConfigInput
+from volcenginesdkwaf.models.get_vulnerability_config_request import GetVulnerabilityConfigRequest
+from volcenginesdkwaf.models.get_vulnerability_config_response import GetVulnerabilityConfigResponse
+from volcenginesdkwaf.models.ip_group_list_for_list_all_ip_groups_output import IpGroupListForListAllIpGroupsOutput
+from volcenginesdkwaf.models.list_all_ip_groups_request import ListAllIpGroupsRequest
+from volcenginesdkwaf.models.list_all_ip_groups_response import ListAllIpGroupsResponse
+from volcenginesdkwaf.models.list_allow_rule_request import ListAllowRuleRequest
+from volcenginesdkwaf.models.list_allow_rule_response import ListAllowRuleResponse
+from volcenginesdkwaf.models.list_area_block_rule_request import ListAreaBlockRuleRequest
+from volcenginesdkwaf.models.list_area_block_rule_response import ListAreaBlockRuleResponse
+from volcenginesdkwaf.models.list_block_rule_request import ListBlockRuleRequest
+from volcenginesdkwaf.models.list_block_rule_response import ListBlockRuleResponse
+from volcenginesdkwaf.models.list_certificate_services_request import ListCertificateServicesRequest
+from volcenginesdkwaf.models.list_certificate_services_response import ListCertificateServicesResponse
+from volcenginesdkwaf.models.list_custom_page_request import ListCustomPageRequest
+from volcenginesdkwaf.models.list_custom_page_response import ListCustomPageResponse
+from volcenginesdkwaf.models.list_domain_request import ListDomainRequest
+from volcenginesdkwaf.models.list_domain_response import ListDomainResponse
+from volcenginesdkwaf.models.list_ip_group_request import ListIpGroupRequest
+from volcenginesdkwaf.models.list_ip_group_response import ListIpGroupResponse
+from volcenginesdkwaf.models.list_load_balancer_request import ListLoadBalancerRequest
+from volcenginesdkwaf.models.list_load_balancer_response import ListLoadBalancerResponse
+from volcenginesdkwaf.models.list_vulnerability_rule_request import ListVulnerabilityRuleRequest
+from volcenginesdkwaf.models.list_vulnerability_rule_response import ListVulnerabilityRuleResponse
+from volcenginesdkwaf.models.list_waf_service_certificate_request import ListWafServiceCertificateRequest
+from volcenginesdkwaf.models.list_waf_service_certificate_response import ListWafServiceCertificateResponse
+from volcenginesdkwaf.models.logical_vulnerability_for_get_vulnerability_config_output import LogicalVulnerabilityForGetVulnerabilityConfigOutput
+from volcenginesdkwaf.models.protocol_ports_for_create_domain_input import ProtocolPortsForCreateDomainInput
+from volcenginesdkwaf.models.protocol_ports_for_list_domain_output import ProtocolPortsForListDomainOutput
+from volcenginesdkwaf.models.protocol_ports_for_update_domain_input import ProtocolPortsForUpdateDomainInput
+from volcenginesdkwaf.models.query_certificate_if_replace_request import QueryCertificateIfReplaceRequest
+from volcenginesdkwaf.models.query_certificate_if_replace_response import QueryCertificateIfReplaceResponse
+from volcenginesdkwaf.models.related_rule_for_list_all_ip_groups_output import RelatedRuleForListAllIpGroupsOutput
+from volcenginesdkwaf.models.rule_detail_for_list_vulnerability_rule_output import RuleDetailForListVulnerabilityRuleOutput
+from volcenginesdkwaf.models.rule_set_detail_for_get_vulnerability_config_output import RuleSetDetailForGetVulnerabilityConfigOutput
+from volcenginesdkwaf.models.rule_set_info_for_get_vulnerability_config_output import RuleSetInfoForGetVulnerabilityConfigOutput
+from volcenginesdkwaf.models.system_rule_switch_for_update_custom_system_vul_rule_input import SystemRuleSwitchForUpdateCustomSystemVulRuleInput
+from volcenginesdkwaf.models.tcp_listener_config_for_list_domain_output import TCPListenerConfigForListDomainOutput
+from volcenginesdkwaf.models.update_allow_rule_request import UpdateAllowRuleRequest
+from volcenginesdkwaf.models.update_allow_rule_response import UpdateAllowRuleResponse
+from volcenginesdkwaf.models.update_area_block_rule_request import UpdateAreaBlockRuleRequest
+from volcenginesdkwaf.models.update_area_block_rule_response import UpdateAreaBlockRuleResponse
+from volcenginesdkwaf.models.update_block_rule_request import UpdateBlockRuleRequest
+from volcenginesdkwaf.models.update_block_rule_response import UpdateBlockRuleResponse
+from volcenginesdkwaf.models.update_custom_page_request import UpdateCustomPageRequest
+from volcenginesdkwaf.models.update_custom_page_response import UpdateCustomPageResponse
+from volcenginesdkwaf.models.update_custom_system_vul_rule_request import UpdateCustomSystemVulRuleRequest
+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_ip_group_request import UpdateIpGroupRequest
+from volcenginesdkwaf.models.update_ip_group_response import UpdateIpGroupResponse
+from volcenginesdkwaf.models.update_vulnerability_config_request import UpdateVulnerabilityConfigRequest
+from volcenginesdkwaf.models.update_vulnerability_config_response import UpdateVulnerabilityConfigResponse
+from volcenginesdkwaf.models.update_waf_service_control_request import UpdateWafServiceControlRequest
+from volcenginesdkwaf.models.update_waf_service_control_response import UpdateWafServiceControlResponse
+from volcenginesdkwaf.models.upload_waf_service_certificate_request import UploadWafServiceCertificateRequest
+from volcenginesdkwaf.models.upload_waf_service_certificate_response import UploadWafServiceCertificateResponse
+from volcenginesdkwaf.models.web_backdoor_for_get_vulnerability_config_output import WebBackdoorForGetVulnerabilityConfigOutput

volcenginesdkwaf/api/__init__.py

@@ -0,0 +1,6 @@
+from __future__ import absolute_import
+
+# flake8: noqa
+
+# import apis into api package
+from volcenginesdkwaf.api.waf_api import WAFApi