Merge branch 'kms-Python-2021-02-18-online-794-2024_11_21_10_33_58' into 'integration_2024-11-21_605224961794'

BitsAdmin · BitsAdmin · commit 142427744239 · 2024-11-21T12:00:37.000Z
feat: [development task] kms-794-Python (867155)

See merge request iaasng/volcengine-python-sdk!431
diff --git a/volcenginesdkkms/models/decrypt_request.py b/volcenginesdkkms/models/decrypt_request.py
@@ -34,7 +34,7 @@ class DecryptRequest(object):
     """
     swagger_types = {
         'ciphertext_blob': 'str',
-        'encryption_context': 'str'
+        'encryption_context': 'dict(str, str)'
     }
 
     attribute_map = {
@@ -88,7 +88,7 @@ def encryption_context(self):
 
 
         :return: The encryption_context of this DecryptRequest.  # noqa: E501
-        :rtype: str
+        :rtype: dict(str, str)
         """
         return self._encryption_context
 
@@ -98,7 +98,7 @@ def encryption_context(self, encryption_context):
 
 
         :param encryption_context: The encryption_context of this DecryptRequest.  # noqa: E501
-        :type: str
+        :type: dict(str, str)
         """
 
         self._encryption_context = encryption_context
diff --git a/volcenginesdkkms/models/describe_keyrings_request.py b/volcenginesdkkms/models/describe_keyrings_request.py
@@ -34,29 +34,34 @@ class DescribeKeyringsRequest(object):
     """
     swagger_types = {
         'current_page': 'int',
+        'filters': 'str',
         'page_size': 'int',
         'project_name': 'str'
     }
 
     attribute_map = {
         'current_page': 'CurrentPage',
+        'filters': 'Filters',
         'page_size': 'PageSize',
         'project_name': 'ProjectName'
     }
 
-    def __init__(self, current_page=None, page_size=None, project_name=None, _configuration=None):  # noqa: E501
+    def __init__(self, current_page=None, filters=None, page_size=None, project_name=None, _configuration=None):  # noqa: E501
         """DescribeKeyringsRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._current_page = None
+        self._filters = None
         self._page_size = None
         self._project_name = None
         self.discriminator = None
 
         if current_page is not None:
             self.current_page = current_page
+        if filters is not None:
+            self.filters = filters
         if page_size is not None:
             self.page_size = page_size
         if project_name is not None:
@@ -86,6 +91,30 @@ def current_page(self, current_page):
 
         self._current_page = current_page
 
+    @property
+    def filters(self):
+        """Gets the filters of this DescribeKeyringsRequest.  # noqa: E501
+
+
+        :return: The filters of this DescribeKeyringsRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._filters
+
+    @filters.setter
+    def filters(self, filters):
+        """Sets the filters of this DescribeKeyringsRequest.
+
+
+        :param filters: The filters of this DescribeKeyringsRequest.  # noqa: E501
+        :type: str
+        """
+        if (self._configuration.client_side_validation and
+                filters is not None and len(filters) > 2048):
+            raise ValueError("Invalid value for `filters`, length must be less than or equal to `2048`")  # noqa: E501
+
+        self._filters = filters
+
     @property
     def page_size(self):
         """Gets the page_size of this DescribeKeyringsRequest.  # noqa: E501
diff --git a/volcenginesdkkms/models/describe_keys_request.py b/volcenginesdkkms/models/describe_keys_request.py
@@ -34,29 +34,34 @@ class DescribeKeysRequest(object):
     """
     swagger_types = {
         'current_page': 'int',
+        'filters': 'str',
         'keyring_name': 'str',
         'page_size': 'int'
     }
 
     attribute_map = {
         'current_page': 'CurrentPage',
+        'filters': 'Filters',
         'keyring_name': 'KeyringName',
         'page_size': 'PageSize'
     }
 
-    def __init__(self, current_page=None, keyring_name=None, page_size=None, _configuration=None):  # noqa: E501
+    def __init__(self, current_page=None, filters=None, keyring_name=None, page_size=None, _configuration=None):  # noqa: E501
         """DescribeKeysRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
         self._current_page = None
+        self._filters = None
         self._keyring_name = None
         self._page_size = None
         self.discriminator = None
 
         if current_page is not None:
             self.current_page = current_page
+        if filters is not None:
+            self.filters = filters
         self.keyring_name = keyring_name
         if page_size is not None:
             self.page_size = page_size
@@ -85,6 +90,30 @@ def current_page(self, current_page):
 
         self._current_page = current_page
 
+    @property
+    def filters(self):
+        """Gets the filters of this DescribeKeysRequest.  # noqa: E501
+
+
+        :return: The filters of this DescribeKeysRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._filters
+
+    @filters.setter
+    def filters(self, filters):
+        """Sets the filters of this DescribeKeysRequest.
+
+
+        :param filters: The filters of this DescribeKeysRequest.  # noqa: E501
+        :type: str
+        """
+        if (self._configuration.client_side_validation and
+                filters is not None and len(filters) > 2048):
+            raise ValueError("Invalid value for `filters`, length must be less than or equal to `2048`")  # noqa: E501
+
+        self._filters = filters
+
     @property
     def keyring_name(self):
         """Gets the keyring_name of this DescribeKeysRequest.  # noqa: E501
diff --git a/volcenginesdkkms/models/encrypt_request.py b/volcenginesdkkms/models/encrypt_request.py
@@ -33,7 +33,7 @@ class EncryptRequest(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'encryption_context': 'str',
+        'encryption_context': 'dict(str, str)',
         'key_id': 'str',
         'key_name': 'str',
         'keyring_name': 'str',
@@ -77,7 +77,7 @@ def encryption_context(self):
 
 
         :return: The encryption_context of this EncryptRequest.  # noqa: E501
-        :rtype: str
+        :rtype: dict(str, str)
         """
         return self._encryption_context
 
@@ -87,7 +87,7 @@ def encryption_context(self, encryption_context):
 
 
         :param encryption_context: The encryption_context of this EncryptRequest.  # noqa: E501
-        :type: str
+        :type: dict(str, str)
         """
 
         self._encryption_context = encryption_context
diff --git a/volcenginesdkkms/models/generate_data_key_request.py b/volcenginesdkkms/models/generate_data_key_request.py
@@ -33,7 +33,7 @@ class GenerateDataKeyRequest(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'encryption_context': 'str',
+        'encryption_context': 'dict(str, str)',
         'key_id': 'str',
         'key_name': 'str',
         'keyring_name': 'str',
@@ -78,7 +78,7 @@ def encryption_context(self):
 
 
         :return: The encryption_context of this GenerateDataKeyRequest.  # noqa: E501
-        :rtype: str
+        :rtype: dict(str, str)
         """
         return self._encryption_context
 
@@ -88,7 +88,7 @@ def encryption_context(self, encryption_context):
 
 
         :param encryption_context: The encryption_context of this GenerateDataKeyRequest.  # noqa: E501
-        :type: str
+        :type: dict(str, str)
         """
 
         self._encryption_context = encryption_context
diff --git a/volcenginesdkkms/models/re_encrypt_request.py b/volcenginesdkkms/models/re_encrypt_request.py
@@ -34,10 +34,10 @@ class ReEncryptRequest(object):
     """
     swagger_types = {
         'ciphertext_blob': 'str',
-        'new_encryption_context': 'str',
+        'new_encryption_context': 'dict(str, str)',
         'new_key_name': 'str',
         'new_keyring_name': 'str',
-        'old_encryption_context': 'str'
+        'old_encryption_context': 'dict(str, str)'
     }
 
     attribute_map = {
@@ -101,7 +101,7 @@ def new_encryption_context(self):
 
 
         :return: The new_encryption_context of this ReEncryptRequest.  # noqa: E501
-        :rtype: str
+        :rtype: dict(str, str)
         """
         return self._new_encryption_context
 
@@ -111,7 +111,7 @@ def new_encryption_context(self, new_encryption_context):
 
 
         :param new_encryption_context: The new_encryption_context of this ReEncryptRequest.  # noqa: E501
-        :type: str
+        :type: dict(str, str)
         """
 
         self._new_encryption_context = new_encryption_context
@@ -180,7 +180,7 @@ def old_encryption_context(self):
 
 
         :return: The old_encryption_context of this ReEncryptRequest.  # noqa: E501
-        :rtype: str
+        :rtype: dict(str, str)
         """
         return self._old_encryption_context
 
@@ -190,7 +190,7 @@ def old_encryption_context(self, old_encryption_context):
 
 
         :param old_encryption_context: The old_encryption_context of this ReEncryptRequest.  # noqa: E501
-        :type: str
+        :type: dict(str, str)
         """
 
         self._old_encryption_context = old_encryption_context
