Skip to content

Commit 2068ee2

Browse files
committed
Merge branch 'integration_2024-05-23_255603124994' into 'master'
Integration 2024 05 23 255603124994 See merge request iaasng/volcengine-python-sdk!308
2 parents d2cc38e + 8a2336c commit 2068ee2

36 files changed

+5064
-43
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.82",
2+
"lasted": "1.0.83",
33
"meta_commit": "dbced919d27fc04b92b10148f0771d171e63cf37"
4-
}
4+
}

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.82"
6+
VERSION = "1.0.83"
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.82'
70+
self.user_agent = 'volcstack-python-sdk/1.0.83'
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.82".\
224+
"SDK Package Version: 1.0.83".\
225225
format(env=sys.platform, pyversion=sys.version)

volcenginesdkmongodb/models/remove_tags_from_resource_request.py

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,29 @@ class RemoveTagsFromResourceRequest(object):
3434
"""
3535
swagger_types = {
3636
'all': 'bool',
37-
'instance_id': 'str',
3837
'instance_ids': 'list[str]',
3938
'tag_keys': 'list[str]'
4039
}
4140

4241
attribute_map = {
4342
'all': 'All',
44-
'instance_id': 'InstanceId',
4543
'instance_ids': 'InstanceIds',
4644
'tag_keys': 'TagKeys'
4745
}
4846

49-
def __init__(self, all=None, instance_id=None, instance_ids=None, tag_keys=None, _configuration=None): # noqa: E501
47+
def __init__(self, all=None, instance_ids=None, tag_keys=None, _configuration=None): # noqa: E501
5048
"""RemoveTagsFromResourceRequest - a model defined in Swagger""" # noqa: E501
5149
if _configuration is None:
5250
_configuration = Configuration()
5351
self._configuration = _configuration
5452

5553
self._all = None
56-
self._instance_id = None
5754
self._instance_ids = None
5855
self._tag_keys = None
5956
self.discriminator = None
6057

6158
if all is not None:
6259
self.all = all
63-
self.instance_id = instance_id
6460
if instance_ids is not None:
6561
self.instance_ids = instance_ids
6662
if tag_keys is not None:
@@ -87,29 +83,6 @@ def all(self, all):
8783

8884
self._all = all
8985

90-
@property
91-
def instance_id(self):
92-
"""Gets the instance_id of this RemoveTagsFromResourceRequest. # noqa: E501
93-
94-
95-
:return: The instance_id of this RemoveTagsFromResourceRequest. # noqa: E501
96-
:rtype: str
97-
"""
98-
return self._instance_id
99-
100-
@instance_id.setter
101-
def instance_id(self, instance_id):
102-
"""Sets the instance_id of this RemoveTagsFromResourceRequest.
103-
104-
105-
:param instance_id: The instance_id of this RemoveTagsFromResourceRequest. # noqa: E501
106-
:type: str
107-
"""
108-
if self._configuration.client_side_validation and instance_id is None:
109-
raise ValueError("Invalid value for `instance_id`, must not be `None`") # noqa: E501
110-
111-
self._instance_id = instance_id
112-
11386
@property
11487
def instance_ids(self):
11588
"""Gets the instance_ids of this RemoveTagsFromResourceRequest. # noqa: E501

volcenginesdkrdsmysqlv2/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
from volcenginesdkrdsmysqlv2.models.charge_detail_for_describe_db_instance_detail_output import ChargeDetailForDescribeDBInstanceDetailOutput
3939
from volcenginesdkrdsmysqlv2.models.charge_detail_for_describe_db_instances_output import ChargeDetailForDescribeDBInstancesOutput
4040
from volcenginesdkrdsmysqlv2.models.charge_info_for_create_db_instance_input import ChargeInfoForCreateDBInstanceInput
41+
from volcenginesdkrdsmysqlv2.models.charge_info_for_restore_to_cross_region_instance_input import ChargeInfoForRestoreToCrossRegionInstanceInput
4142
from volcenginesdkrdsmysqlv2.models.charge_info_for_restore_to_new_instance_input import ChargeInfoForRestoreToNewInstanceInput
4243
from volcenginesdkrdsmysqlv2.models.charge_item_price_for_describe_db_instance_price_detail_output import ChargeItemPriceForDescribeDBInstancePriceDetailOutput
4344
from volcenginesdkrdsmysqlv2.models.check_modify_db_proxy_allowed_for_describe_db_proxy_config_output import CheckModifyDBProxyAllowedForDescribeDBProxyConfigOutput
@@ -158,6 +159,7 @@
158159
from volcenginesdkrdsmysqlv2.models.instance_for_describe_db_instances_output import InstanceForDescribeDBInstancesOutput
159160
from volcenginesdkrdsmysqlv2.models.instance_specs_info_for_describe_db_instance_specs_output import InstanceSpecsInfoForDescribeDBInstanceSpecsOutput
160161
from volcenginesdkrdsmysqlv2.models.instance_tag_for_create_db_instance_input import InstanceTagForCreateDBInstanceInput
162+
from volcenginesdkrdsmysqlv2.models.instance_tag_for_restore_to_cross_region_instance_input import InstanceTagForRestoreToCrossRegionInstanceInput
161163
from volcenginesdkrdsmysqlv2.models.instance_tag_for_restore_to_new_instance_input import InstanceTagForRestoreToNewInstanceInput
162164
from volcenginesdkrdsmysqlv2.models.list_parameter_templates_request import ListParameterTemplatesRequest
163165
from volcenginesdkrdsmysqlv2.models.list_parameter_templates_response import ListParameterTemplatesResponse
@@ -213,6 +215,7 @@
213215
from volcenginesdkrdsmysqlv2.models.node_info_for_describe_db_instance_price_detail_input import NodeInfoForDescribeDBInstancePriceDetailInput
214216
from volcenginesdkrdsmysqlv2.models.node_info_for_migrate_to_other_zone_input import NodeInfoForMigrateToOtherZoneInput
215217
from volcenginesdkrdsmysqlv2.models.node_info_for_modify_db_instance_spec_input import NodeInfoForModifyDBInstanceSpecInput
218+
from volcenginesdkrdsmysqlv2.models.node_info_for_restore_to_cross_region_instance_input import NodeInfoForRestoreToCrossRegionInstanceInput
216219
from volcenginesdkrdsmysqlv2.models.node_info_for_restore_to_new_instance_input import NodeInfoForRestoreToNewInstanceInput
217220
from volcenginesdkrdsmysqlv2.models.parameter_change_log_for_describe_db_instance_parameters_log_output import ParameterChangeLogForDescribeDBInstanceParametersLogOutput
218221
from volcenginesdkrdsmysqlv2.models.parameter_for_describe_apply_parameter_template_output import ParameterForDescribeApplyParameterTemplateOutput
@@ -232,6 +235,8 @@
232235
from volcenginesdkrdsmysqlv2.models.reset_db_account_response import ResetDBAccountResponse
233236
from volcenginesdkrdsmysqlv2.models.restart_db_instance_request import RestartDBInstanceRequest
234237
from volcenginesdkrdsmysqlv2.models.restart_db_instance_response import RestartDBInstanceResponse
238+
from volcenginesdkrdsmysqlv2.models.restore_to_cross_region_instance_request import RestoreToCrossRegionInstanceRequest
239+
from volcenginesdkrdsmysqlv2.models.restore_to_cross_region_instance_response import RestoreToCrossRegionInstanceResponse
235240
from volcenginesdkrdsmysqlv2.models.restore_to_existed_instance_request import RestoreToExistedInstanceRequest
236241
from volcenginesdkrdsmysqlv2.models.restore_to_existed_instance_response import RestoreToExistedInstanceResponse
237242
from volcenginesdkrdsmysqlv2.models.restore_to_new_instance_request import RestoreToNewInstanceRequest

volcenginesdkrdsmysqlv2/api/rds_mysql_v2_api.py

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7987,6 +7987,103 @@ def restart_db_instance_with_http_info(self, body, **kwargs): # noqa: E501
79877987
_request_timeout=params.get('_request_timeout'),
79887988
collection_formats=collection_formats)
79897989

7990+
def restore_to_cross_region_instance(self, body, **kwargs): # noqa: E501
7991+
"""restore_to_cross_region_instance # noqa: E501
7992+
7993+
This method makes a synchronous HTTP request by default. To make an
7994+
asynchronous HTTP request, please pass async_req=True
7995+
>>> thread = api.restore_to_cross_region_instance(body, async_req=True)
7996+
>>> result = thread.get()
7997+
7998+
:param async_req bool
7999+
:param RestoreToCrossRegionInstanceRequest body: (required)
8000+
:return: RestoreToCrossRegionInstanceResponse
8001+
If the method is called asynchronously,
8002+
returns the request thread.
8003+
"""
8004+
kwargs['_return_http_data_only'] = True
8005+
if kwargs.get('async_req'):
8006+
return self.restore_to_cross_region_instance_with_http_info(body, **kwargs) # noqa: E501
8007+
else:
8008+
(data) = self.restore_to_cross_region_instance_with_http_info(body, **kwargs) # noqa: E501
8009+
return data
8010+
8011+
def restore_to_cross_region_instance_with_http_info(self, body, **kwargs): # noqa: E501
8012+
"""restore_to_cross_region_instance # noqa: E501
8013+
8014+
This method makes a synchronous HTTP request by default. To make an
8015+
asynchronous HTTP request, please pass async_req=True
8016+
>>> thread = api.restore_to_cross_region_instance_with_http_info(body, async_req=True)
8017+
>>> result = thread.get()
8018+
8019+
:param async_req bool
8020+
:param RestoreToCrossRegionInstanceRequest body: (required)
8021+
:return: RestoreToCrossRegionInstanceResponse
8022+
If the method is called asynchronously,
8023+
returns the request thread.
8024+
"""
8025+
8026+
all_params = ['body'] # noqa: E501
8027+
all_params.append('async_req')
8028+
all_params.append('_return_http_data_only')
8029+
all_params.append('_preload_content')
8030+
all_params.append('_request_timeout')
8031+
8032+
params = locals()
8033+
for key, val in six.iteritems(params['kwargs']):
8034+
if key not in all_params:
8035+
raise TypeError(
8036+
"Got an unexpected keyword argument '%s'"
8037+
" to method restore_to_cross_region_instance" % key
8038+
)
8039+
params[key] = val
8040+
del params['kwargs']
8041+
# verify the required parameter 'body' is set
8042+
if self.api_client.client_side_validation and ('body' not in params or
8043+
params['body'] is None): # noqa: E501
8044+
raise ValueError("Missing the required parameter `body` when calling `restore_to_cross_region_instance`") # noqa: E501
8045+
8046+
collection_formats = {}
8047+
8048+
path_params = {}
8049+
8050+
query_params = []
8051+
8052+
header_params = {}
8053+
8054+
form_params = []
8055+
local_var_files = {}
8056+
8057+
body_params = None
8058+
if 'body' in params:
8059+
body_params = params['body']
8060+
# HTTP header `Accept`
8061+
header_params['Accept'] = self.api_client.select_header_accept(
8062+
['application/json']) # noqa: E501
8063+
8064+
# HTTP header `Content-Type`
8065+
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
8066+
['application/json']) # noqa: E501
8067+
8068+
# Authentication setting
8069+
auth_settings = ['volcengineSign'] # noqa: E501
8070+
8071+
return self.api_client.call_api(
8072+
'/RestoreToCrossRegionInstance/2022-01-01/rds_mysql/post/application_json/', 'POST',
8073+
path_params,
8074+
query_params,
8075+
header_params,
8076+
body=body_params,
8077+
post_params=form_params,
8078+
files=local_var_files,
8079+
response_type='RestoreToCrossRegionInstanceResponse', # noqa: E501
8080+
auth_settings=auth_settings,
8081+
async_req=params.get('async_req'),
8082+
_return_http_data_only=params.get('_return_http_data_only'),
8083+
_preload_content=params.get('_preload_content', True),
8084+
_request_timeout=params.get('_request_timeout'),
8085+
collection_formats=collection_formats)
8086+
79908087
def restore_to_existed_instance(self, body, **kwargs): # noqa: E501
79918088
"""restore_to_existed_instance # noqa: E501
79928089

volcenginesdkrdsmysqlv2/models/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
from volcenginesdkrdsmysqlv2.models.charge_detail_for_describe_db_instance_detail_output import ChargeDetailForDescribeDBInstanceDetailOutput
3535
from volcenginesdkrdsmysqlv2.models.charge_detail_for_describe_db_instances_output import ChargeDetailForDescribeDBInstancesOutput
3636
from volcenginesdkrdsmysqlv2.models.charge_info_for_create_db_instance_input import ChargeInfoForCreateDBInstanceInput
37+
from volcenginesdkrdsmysqlv2.models.charge_info_for_restore_to_cross_region_instance_input import ChargeInfoForRestoreToCrossRegionInstanceInput
3738
from volcenginesdkrdsmysqlv2.models.charge_info_for_restore_to_new_instance_input import ChargeInfoForRestoreToNewInstanceInput
3839
from volcenginesdkrdsmysqlv2.models.charge_item_price_for_describe_db_instance_price_detail_output import ChargeItemPriceForDescribeDBInstancePriceDetailOutput
3940
from volcenginesdkrdsmysqlv2.models.check_modify_db_proxy_allowed_for_describe_db_proxy_config_output import CheckModifyDBProxyAllowedForDescribeDBProxyConfigOutput
@@ -154,6 +155,7 @@
154155
from volcenginesdkrdsmysqlv2.models.instance_for_describe_db_instances_output import InstanceForDescribeDBInstancesOutput
155156
from volcenginesdkrdsmysqlv2.models.instance_specs_info_for_describe_db_instance_specs_output import InstanceSpecsInfoForDescribeDBInstanceSpecsOutput
156157
from volcenginesdkrdsmysqlv2.models.instance_tag_for_create_db_instance_input import InstanceTagForCreateDBInstanceInput
158+
from volcenginesdkrdsmysqlv2.models.instance_tag_for_restore_to_cross_region_instance_input import InstanceTagForRestoreToCrossRegionInstanceInput
157159
from volcenginesdkrdsmysqlv2.models.instance_tag_for_restore_to_new_instance_input import InstanceTagForRestoreToNewInstanceInput
158160
from volcenginesdkrdsmysqlv2.models.list_parameter_templates_request import ListParameterTemplatesRequest
159161
from volcenginesdkrdsmysqlv2.models.list_parameter_templates_response import ListParameterTemplatesResponse
@@ -209,6 +211,7 @@
209211
from volcenginesdkrdsmysqlv2.models.node_info_for_describe_db_instance_price_detail_input import NodeInfoForDescribeDBInstancePriceDetailInput
210212
from volcenginesdkrdsmysqlv2.models.node_info_for_migrate_to_other_zone_input import NodeInfoForMigrateToOtherZoneInput
211213
from volcenginesdkrdsmysqlv2.models.node_info_for_modify_db_instance_spec_input import NodeInfoForModifyDBInstanceSpecInput
214+
from volcenginesdkrdsmysqlv2.models.node_info_for_restore_to_cross_region_instance_input import NodeInfoForRestoreToCrossRegionInstanceInput
212215
from volcenginesdkrdsmysqlv2.models.node_info_for_restore_to_new_instance_input import NodeInfoForRestoreToNewInstanceInput
213216
from volcenginesdkrdsmysqlv2.models.parameter_change_log_for_describe_db_instance_parameters_log_output import ParameterChangeLogForDescribeDBInstanceParametersLogOutput
214217
from volcenginesdkrdsmysqlv2.models.parameter_for_describe_apply_parameter_template_output import ParameterForDescribeApplyParameterTemplateOutput
@@ -228,6 +231,8 @@
228231
from volcenginesdkrdsmysqlv2.models.reset_db_account_response import ResetDBAccountResponse
229232
from volcenginesdkrdsmysqlv2.models.restart_db_instance_request import RestartDBInstanceRequest
230233
from volcenginesdkrdsmysqlv2.models.restart_db_instance_response import RestartDBInstanceResponse
234+
from volcenginesdkrdsmysqlv2.models.restore_to_cross_region_instance_request import RestoreToCrossRegionInstanceRequest
235+
from volcenginesdkrdsmysqlv2.models.restore_to_cross_region_instance_response import RestoreToCrossRegionInstanceResponse
231236
from volcenginesdkrdsmysqlv2.models.restore_to_existed_instance_request import RestoreToExistedInstanceRequest
232237
from volcenginesdkrdsmysqlv2.models.restore_to_existed_instance_response import RestoreToExistedInstanceResponse
233238
from volcenginesdkrdsmysqlv2.models.restore_to_new_instance_request import RestoreToNewInstanceRequest

volcenginesdkrdsmysqlv2/models/binlog_file_for_describe_binlog_files_output.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class BinlogFileForDescribeBinlogFilesOutput(object):
3838
'download_status': 'str',
3939
'file_name': 'str',
4040
'file_size': 'int',
41+
'node_id': 'str',
4142
'update_time': 'str'
4243
}
4344

@@ -47,10 +48,11 @@ class BinlogFileForDescribeBinlogFilesOutput(object):
4748
'download_status': 'DownloadStatus',
4849
'file_name': 'FileName',
4950
'file_size': 'FileSize',
51+
'node_id': 'NodeId',
5052
'update_time': 'UpdateTime'
5153
}
5254

53-
def __init__(self, backup_region=None, backup_status=None, download_status=None, file_name=None, file_size=None, update_time=None, _configuration=None): # noqa: E501
55+
def __init__(self, backup_region=None, backup_status=None, download_status=None, file_name=None, file_size=None, node_id=None, update_time=None, _configuration=None): # noqa: E501
5456
"""BinlogFileForDescribeBinlogFilesOutput - a model defined in Swagger""" # noqa: E501
5557
if _configuration is None:
5658
_configuration = Configuration()
@@ -61,6 +63,7 @@ def __init__(self, backup_region=None, backup_status=None, download_status=None,
6163
self._download_status = None
6264
self._file_name = None
6365
self._file_size = None
66+
self._node_id = None
6467
self._update_time = None
6568
self.discriminator = None
6669

@@ -74,6 +77,8 @@ def __init__(self, backup_region=None, backup_status=None, download_status=None,
7477
self.file_name = file_name
7578
if file_size is not None:
7679
self.file_size = file_size
80+
if node_id is not None:
81+
self.node_id = node_id
7782
if update_time is not None:
7883
self.update_time = update_time
7984

@@ -182,6 +187,27 @@ def file_size(self, file_size):
182187

183188
self._file_size = file_size
184189

190+
@property
191+
def node_id(self):
192+
"""Gets the node_id of this BinlogFileForDescribeBinlogFilesOutput. # noqa: E501
193+
194+
195+
:return: The node_id of this BinlogFileForDescribeBinlogFilesOutput. # noqa: E501
196+
:rtype: str
197+
"""
198+
return self._node_id
199+
200+
@node_id.setter
201+
def node_id(self, node_id):
202+
"""Sets the node_id of this BinlogFileForDescribeBinlogFilesOutput.
203+
204+
205+
:param node_id: The node_id of this BinlogFileForDescribeBinlogFilesOutput. # noqa: E501
206+
:type: str
207+
"""
208+
209+
self._node_id = node_id
210+
185211
@property
186212
def update_time(self):
187213
"""Gets the update_time of this BinlogFileForDescribeBinlogFilesOutput. # noqa: E501

0 commit comments

Comments
 (0)