Skip to content

Commit c72b552

Browse files
author
BitsAdmin
committed
Merge branch 'kms-Python-2021-02-18-online-953-2025_01_22_13_33_46' into 'integration_2025-01-23_700905551106'
feat: [development task] kms-953-Python (990489) See merge request iaasng/volcengine-python-sdk!494
2 parents fe51ca6 + 57decf8 commit c72b552

28 files changed

+3557
-9
lines changed

meta.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "1.0.121",
3-
"meta_commit": "fafa370010121d733a30f1c6f5951f35ba5cc8c2"
2+
"lasted": "1.0.122",
3+
"meta_commit": "fed66b9de234a6d3a58c55d4568adb6fc4ee5b11"
44
}

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from setuptools import setup, find_packages # noqa: H301
44

55
NAME = "volcengine-python-sdk"
6-
VERSION = "1.0.121"
6+
VERSION = "1.0.122"
77
# To install the library, run the following
88
#
99
# python setup.py install

volcenginesdkcore/api_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
6767
self.default_headers[header_name] = header_value
6868
self.cookie = cookie
6969
# Set default User-Agent.
70-
self.user_agent = 'volcstack-python-sdk/1.0.121'
70+
self.user_agent = 'volcstack-python-sdk/1.0.122'
7171
self.client_side_validation = configuration.client_side_validation
7272

7373
def __del__(self):

volcenginesdkcore/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,5 +221,5 @@ def to_debug_report(self):
221221
"OS: {env}\n"\
222222
"Python Version: {pyversion}\n"\
223223
"Version of the API: 0.1.0\n"\
224-
"SDK Package Version: 1.0.121".\
224+
"SDK Package Version: 1.0.122".\
225225
format(env=sys.platform, pyversion=sys.version)

volcenginesdkkms/__init__.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
from volcenginesdkkms.models.cancel_key_deletion_response import CancelKeyDeletionResponse
4040
from volcenginesdkkms.models.cancel_secret_deletion_request import CancelSecretDeletionRequest
4141
from volcenginesdkkms.models.cancel_secret_deletion_response import CancelSecretDeletionResponse
42+
from volcenginesdkkms.models.convert_replica_key_for_replicate_key_output import ConvertReplicaKeyForReplicateKeyOutput
4243
from volcenginesdkkms.models.create_key_request import CreateKeyRequest
4344
from volcenginesdkkms.models.create_key_response import CreateKeyResponse
4445
from volcenginesdkkms.models.create_keyring_request import CreateKeyringRequest
@@ -93,15 +94,29 @@
9394
from volcenginesdkkms.models.keyring_for_create_keyring_output import KeyringForCreateKeyringOutput
9495
from volcenginesdkkms.models.keyring_for_describe_keyrings_output import KeyringForDescribeKeyringsOutput
9596
from volcenginesdkkms.models.keyring_for_query_keyring_output import KeyringForQueryKeyringOutput
97+
from volcenginesdkkms.models.multi_region_configuration_for_create_key_output import MultiRegionConfigurationForCreateKeyOutput
98+
from volcenginesdkkms.models.multi_region_configuration_for_describe_key_output import MultiRegionConfigurationForDescribeKeyOutput
99+
from volcenginesdkkms.models.multi_region_configuration_for_describe_keys_output import MultiRegionConfigurationForDescribeKeysOutput
100+
from volcenginesdkkms.models.multi_region_configuration_for_replicate_key_output import MultiRegionConfigurationForReplicateKeyOutput
96101
from volcenginesdkkms.models.page_info_for_describe_keyrings_output import PageInfoForDescribeKeyringsOutput
97102
from volcenginesdkkms.models.page_info_for_describe_keys_output import PageInfoForDescribeKeysOutput
98103
from volcenginesdkkms.models.page_info_for_describe_secret_versions_output import PageInfoForDescribeSecretVersionsOutput
99104
from volcenginesdkkms.models.page_info_for_describe_secrets_output import PageInfoForDescribeSecretsOutput
105+
from volcenginesdkkms.models.primary_key_for_create_key_output import PrimaryKeyForCreateKeyOutput
106+
from volcenginesdkkms.models.primary_key_for_describe_key_output import PrimaryKeyForDescribeKeyOutput
107+
from volcenginesdkkms.models.primary_key_for_describe_keys_output import PrimaryKeyForDescribeKeysOutput
108+
from volcenginesdkkms.models.primary_key_for_replicate_key_output import PrimaryKeyForReplicateKeyOutput
100109
from volcenginesdkkms.models.query_keyring_request import QueryKeyringRequest
101110
from volcenginesdkkms.models.query_keyring_response import QueryKeyringResponse
102111
from volcenginesdkkms.models.re_encrypt_request import ReEncryptRequest
103112
from volcenginesdkkms.models.re_encrypt_response import ReEncryptResponse
104113
from volcenginesdkkms.models.region_for_describe_regions_output import RegionForDescribeRegionsOutput
114+
from volcenginesdkkms.models.replica_key_for_create_key_output import ReplicaKeyForCreateKeyOutput
115+
from volcenginesdkkms.models.replica_key_for_describe_key_output import ReplicaKeyForDescribeKeyOutput
116+
from volcenginesdkkms.models.replica_key_for_describe_keys_output import ReplicaKeyForDescribeKeysOutput
117+
from volcenginesdkkms.models.replica_key_for_replicate_key_output import ReplicaKeyForReplicateKeyOutput
118+
from volcenginesdkkms.models.replicate_key_request import ReplicateKeyRequest
119+
from volcenginesdkkms.models.replicate_key_response import ReplicateKeyResponse
105120
from volcenginesdkkms.models.restore_secret_request import RestoreSecretRequest
106121
from volcenginesdkkms.models.restore_secret_response import RestoreSecretResponse
107122
from volcenginesdkkms.models.rotate_secret_request import RotateSecretRequest
@@ -121,6 +136,8 @@
121136
from volcenginesdkkms.models.update_key_response import UpdateKeyResponse
122137
from volcenginesdkkms.models.update_keyring_request import UpdateKeyringRequest
123138
from volcenginesdkkms.models.update_keyring_response import UpdateKeyringResponse
139+
from volcenginesdkkms.models.update_primary_region_request import UpdatePrimaryRegionRequest
140+
from volcenginesdkkms.models.update_primary_region_response import UpdatePrimaryRegionResponse
124141
from volcenginesdkkms.models.update_secret_request import UpdateSecretRequest
125142
from volcenginesdkkms.models.update_secret_response import UpdateSecretResponse
126143
from volcenginesdkkms.models.update_secret_rotation_policy_request import UpdateSecretRotationPolicyRequest

volcenginesdkkms/api/kms_api.py

Lines changed: 194 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3525,6 +3525,103 @@ def re_encrypt_with_http_info(self, body, **kwargs): # noqa: E501
35253525
_request_timeout=params.get('_request_timeout'),
35263526
collection_formats=collection_formats)
35273527

3528+
def replicate_key(self, body, **kwargs): # noqa: E501
3529+
"""replicate_key # noqa: E501
3530+
3531+
This method makes a synchronous HTTP request by default. To make an
3532+
asynchronous HTTP request, please pass async_req=True
3533+
>>> thread = api.replicate_key(body, async_req=True)
3534+
>>> result = thread.get()
3535+
3536+
:param async_req bool
3537+
:param ReplicateKeyRequest body: (required)
3538+
:return: ReplicateKeyResponse
3539+
If the method is called asynchronously,
3540+
returns the request thread.
3541+
"""
3542+
kwargs['_return_http_data_only'] = True
3543+
if kwargs.get('async_req'):
3544+
return self.replicate_key_with_http_info(body, **kwargs) # noqa: E501
3545+
else:
3546+
(data) = self.replicate_key_with_http_info(body, **kwargs) # noqa: E501
3547+
return data
3548+
3549+
def replicate_key_with_http_info(self, body, **kwargs): # noqa: E501
3550+
"""replicate_key # noqa: E501
3551+
3552+
This method makes a synchronous HTTP request by default. To make an
3553+
asynchronous HTTP request, please pass async_req=True
3554+
>>> thread = api.replicate_key_with_http_info(body, async_req=True)
3555+
>>> result = thread.get()
3556+
3557+
:param async_req bool
3558+
:param ReplicateKeyRequest body: (required)
3559+
:return: ReplicateKeyResponse
3560+
If the method is called asynchronously,
3561+
returns the request thread.
3562+
"""
3563+
3564+
all_params = ['body'] # noqa: E501
3565+
all_params.append('async_req')
3566+
all_params.append('_return_http_data_only')
3567+
all_params.append('_preload_content')
3568+
all_params.append('_request_timeout')
3569+
3570+
params = locals()
3571+
for key, val in six.iteritems(params['kwargs']):
3572+
if key not in all_params:
3573+
raise TypeError(
3574+
"Got an unexpected keyword argument '%s'"
3575+
" to method replicate_key" % key
3576+
)
3577+
params[key] = val
3578+
del params['kwargs']
3579+
# verify the required parameter 'body' is set
3580+
if self.api_client.client_side_validation and ('body' not in params or
3581+
params['body'] is None): # noqa: E501
3582+
raise ValueError("Missing the required parameter `body` when calling `replicate_key`") # noqa: E501
3583+
3584+
collection_formats = {}
3585+
3586+
path_params = {}
3587+
3588+
query_params = []
3589+
3590+
header_params = {}
3591+
3592+
form_params = []
3593+
local_var_files = {}
3594+
3595+
body_params = None
3596+
if 'body' in params:
3597+
body_params = params['body']
3598+
# HTTP header `Accept`
3599+
header_params['Accept'] = self.api_client.select_header_accept(
3600+
['application/json']) # noqa: E501
3601+
3602+
# HTTP header `Content-Type`
3603+
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
3604+
['text/plain']) # noqa: E501
3605+
3606+
# Authentication setting
3607+
auth_settings = ['volcengineSign'] # noqa: E501
3608+
3609+
return self.api_client.call_api(
3610+
'/ReplicateKey/2021-02-18/kms/get/text_plain/', 'GET',
3611+
path_params,
3612+
query_params,
3613+
header_params,
3614+
body=body_params,
3615+
post_params=form_params,
3616+
files=local_var_files,
3617+
response_type='ReplicateKeyResponse', # noqa: E501
3618+
auth_settings=auth_settings,
3619+
async_req=params.get('async_req'),
3620+
_return_http_data_only=params.get('_return_http_data_only'),
3621+
_preload_content=params.get('_preload_content', True),
3622+
_request_timeout=params.get('_request_timeout'),
3623+
collection_formats=collection_formats)
3624+
35283625
def restore_secret(self, body, **kwargs): # noqa: E501
35293626
"""restore_secret # noqa: E501
35303627
@@ -4204,6 +4301,103 @@ def update_keyring_with_http_info(self, body, **kwargs): # noqa: E501
42044301
_request_timeout=params.get('_request_timeout'),
42054302
collection_formats=collection_formats)
42064303

4304+
def update_primary_region(self, body, **kwargs): # noqa: E501
4305+
"""update_primary_region # noqa: E501
4306+
4307+
This method makes a synchronous HTTP request by default. To make an
4308+
asynchronous HTTP request, please pass async_req=True
4309+
>>> thread = api.update_primary_region(body, async_req=True)
4310+
>>> result = thread.get()
4311+
4312+
:param async_req bool
4313+
:param UpdatePrimaryRegionRequest body: (required)
4314+
:return: UpdatePrimaryRegionResponse
4315+
If the method is called asynchronously,
4316+
returns the request thread.
4317+
"""
4318+
kwargs['_return_http_data_only'] = True
4319+
if kwargs.get('async_req'):
4320+
return self.update_primary_region_with_http_info(body, **kwargs) # noqa: E501
4321+
else:
4322+
(data) = self.update_primary_region_with_http_info(body, **kwargs) # noqa: E501
4323+
return data
4324+
4325+
def update_primary_region_with_http_info(self, body, **kwargs): # noqa: E501
4326+
"""update_primary_region # noqa: E501
4327+
4328+
This method makes a synchronous HTTP request by default. To make an
4329+
asynchronous HTTP request, please pass async_req=True
4330+
>>> thread = api.update_primary_region_with_http_info(body, async_req=True)
4331+
>>> result = thread.get()
4332+
4333+
:param async_req bool
4334+
:param UpdatePrimaryRegionRequest body: (required)
4335+
:return: UpdatePrimaryRegionResponse
4336+
If the method is called asynchronously,
4337+
returns the request thread.
4338+
"""
4339+
4340+
all_params = ['body'] # noqa: E501
4341+
all_params.append('async_req')
4342+
all_params.append('_return_http_data_only')
4343+
all_params.append('_preload_content')
4344+
all_params.append('_request_timeout')
4345+
4346+
params = locals()
4347+
for key, val in six.iteritems(params['kwargs']):
4348+
if key not in all_params:
4349+
raise TypeError(
4350+
"Got an unexpected keyword argument '%s'"
4351+
" to method update_primary_region" % key
4352+
)
4353+
params[key] = val
4354+
del params['kwargs']
4355+
# verify the required parameter 'body' is set
4356+
if self.api_client.client_side_validation and ('body' not in params or
4357+
params['body'] is None): # noqa: E501
4358+
raise ValueError("Missing the required parameter `body` when calling `update_primary_region`") # noqa: E501
4359+
4360+
collection_formats = {}
4361+
4362+
path_params = {}
4363+
4364+
query_params = []
4365+
4366+
header_params = {}
4367+
4368+
form_params = []
4369+
local_var_files = {}
4370+
4371+
body_params = None
4372+
if 'body' in params:
4373+
body_params = params['body']
4374+
# HTTP header `Accept`
4375+
header_params['Accept'] = self.api_client.select_header_accept(
4376+
['application/json']) # noqa: E501
4377+
4378+
# HTTP header `Content-Type`
4379+
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
4380+
['text/plain']) # noqa: E501
4381+
4382+
# Authentication setting
4383+
auth_settings = ['volcengineSign'] # noqa: E501
4384+
4385+
return self.api_client.call_api(
4386+
'/UpdatePrimaryRegion/2021-02-18/kms/get/text_plain/', 'GET',
4387+
path_params,
4388+
query_params,
4389+
header_params,
4390+
body=body_params,
4391+
post_params=form_params,
4392+
files=local_var_files,
4393+
response_type='UpdatePrimaryRegionResponse', # noqa: E501
4394+
auth_settings=auth_settings,
4395+
async_req=params.get('async_req'),
4396+
_return_http_data_only=params.get('_return_http_data_only'),
4397+
_preload_content=params.get('_preload_content', True),
4398+
_request_timeout=params.get('_request_timeout'),
4399+
collection_formats=collection_formats)
4400+
42074401
def update_secret(self, body, **kwargs): # noqa: E501
42084402
"""update_secret # noqa: E501
42094403

volcenginesdkkms/models/__init__.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
from volcenginesdkkms.models.cancel_key_deletion_response import CancelKeyDeletionResponse
3636
from volcenginesdkkms.models.cancel_secret_deletion_request import CancelSecretDeletionRequest
3737
from volcenginesdkkms.models.cancel_secret_deletion_response import CancelSecretDeletionResponse
38+
from volcenginesdkkms.models.convert_replica_key_for_replicate_key_output import ConvertReplicaKeyForReplicateKeyOutput
3839
from volcenginesdkkms.models.create_key_request import CreateKeyRequest
3940
from volcenginesdkkms.models.create_key_response import CreateKeyResponse
4041
from volcenginesdkkms.models.create_keyring_request import CreateKeyringRequest
@@ -89,15 +90,29 @@
8990
from volcenginesdkkms.models.keyring_for_create_keyring_output import KeyringForCreateKeyringOutput
9091
from volcenginesdkkms.models.keyring_for_describe_keyrings_output import KeyringForDescribeKeyringsOutput
9192
from volcenginesdkkms.models.keyring_for_query_keyring_output import KeyringForQueryKeyringOutput
93+
from volcenginesdkkms.models.multi_region_configuration_for_create_key_output import MultiRegionConfigurationForCreateKeyOutput
94+
from volcenginesdkkms.models.multi_region_configuration_for_describe_key_output import MultiRegionConfigurationForDescribeKeyOutput
95+
from volcenginesdkkms.models.multi_region_configuration_for_describe_keys_output import MultiRegionConfigurationForDescribeKeysOutput
96+
from volcenginesdkkms.models.multi_region_configuration_for_replicate_key_output import MultiRegionConfigurationForReplicateKeyOutput
9297
from volcenginesdkkms.models.page_info_for_describe_keyrings_output import PageInfoForDescribeKeyringsOutput
9398
from volcenginesdkkms.models.page_info_for_describe_keys_output import PageInfoForDescribeKeysOutput
9499
from volcenginesdkkms.models.page_info_for_describe_secret_versions_output import PageInfoForDescribeSecretVersionsOutput
95100
from volcenginesdkkms.models.page_info_for_describe_secrets_output import PageInfoForDescribeSecretsOutput
101+
from volcenginesdkkms.models.primary_key_for_create_key_output import PrimaryKeyForCreateKeyOutput
102+
from volcenginesdkkms.models.primary_key_for_describe_key_output import PrimaryKeyForDescribeKeyOutput
103+
from volcenginesdkkms.models.primary_key_for_describe_keys_output import PrimaryKeyForDescribeKeysOutput
104+
from volcenginesdkkms.models.primary_key_for_replicate_key_output import PrimaryKeyForReplicateKeyOutput
96105
from volcenginesdkkms.models.query_keyring_request import QueryKeyringRequest
97106
from volcenginesdkkms.models.query_keyring_response import QueryKeyringResponse
98107
from volcenginesdkkms.models.re_encrypt_request import ReEncryptRequest
99108
from volcenginesdkkms.models.re_encrypt_response import ReEncryptResponse
100109
from volcenginesdkkms.models.region_for_describe_regions_output import RegionForDescribeRegionsOutput
110+
from volcenginesdkkms.models.replica_key_for_create_key_output import ReplicaKeyForCreateKeyOutput
111+
from volcenginesdkkms.models.replica_key_for_describe_key_output import ReplicaKeyForDescribeKeyOutput
112+
from volcenginesdkkms.models.replica_key_for_describe_keys_output import ReplicaKeyForDescribeKeysOutput
113+
from volcenginesdkkms.models.replica_key_for_replicate_key_output import ReplicaKeyForReplicateKeyOutput
114+
from volcenginesdkkms.models.replicate_key_request import ReplicateKeyRequest
115+
from volcenginesdkkms.models.replicate_key_response import ReplicateKeyResponse
101116
from volcenginesdkkms.models.restore_secret_request import RestoreSecretRequest
102117
from volcenginesdkkms.models.restore_secret_response import RestoreSecretResponse
103118
from volcenginesdkkms.models.rotate_secret_request import RotateSecretRequest
@@ -117,6 +132,8 @@
117132
from volcenginesdkkms.models.update_key_response import UpdateKeyResponse
118133
from volcenginesdkkms.models.update_keyring_request import UpdateKeyringRequest
119134
from volcenginesdkkms.models.update_keyring_response import UpdateKeyringResponse
135+
from volcenginesdkkms.models.update_primary_region_request import UpdatePrimaryRegionRequest
136+
from volcenginesdkkms.models.update_primary_region_response import UpdatePrimaryRegionResponse
120137
from volcenginesdkkms.models.update_secret_request import UpdateSecretRequest
121138
from volcenginesdkkms.models.update_secret_response import UpdateSecretResponse
122139
from volcenginesdkkms.models.update_secret_rotation_policy_request import UpdateSecretRotationPolicyRequest

0 commit comments

Comments
 (0)