Skip to content

Commit 369e6ea

Browse files
author
BitsAdmin
committed
Merge 'emr-Python-2023-08-15-online-2036-2026_01_14_16_17_55' into 'integration_2026-02-05_1111496369922'
feat: [development task] emr-2036-Python (2098143) See merge request: !1044
2 parents bdbd6c5 + abd3ec0 commit 369e6ea

18 files changed

Lines changed: 2016 additions & 33 deletions

‎volcenginesdkemr/__init__.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@
9191
from volcenginesdkemr.models.list_nodes_response import ListNodesResponse
9292
from volcenginesdkemr.models.list_operations_request import ListOperationsRequest
9393
from volcenginesdkemr.models.list_operations_response import ListOperationsResponse
94+
from volcenginesdkemr.models.list_tags_for_resources_request import ListTagsForResourcesRequest
95+
from volcenginesdkemr.models.list_tags_for_resources_response import ListTagsForResourcesResponse
9496
from volcenginesdkemr.models.node_attribute_for_create_cluster_input import NodeAttributeForCreateClusterInput
9597
from volcenginesdkemr.models.node_attribute_for_get_cluster_output import NodeAttributeForGetClusterOutput
9698
from volcenginesdkemr.models.node_attribute_for_list_clusters_output import NodeAttributeForListClustersOutput
@@ -120,10 +122,18 @@
120122
from volcenginesdkemr.models.system_disk_for_create_cluster_input import SystemDiskForCreateClusterInput
121123
from volcenginesdkemr.models.system_disk_for_create_node_group_input import SystemDiskForCreateNodeGroupInput
122124
from volcenginesdkemr.models.system_disk_for_list_node_groups_output import SystemDiskForListNodeGroupsOutput
125+
from volcenginesdkemr.models.tag_filter_for_list_tags_for_resources_input import TagFilterForListTagsForResourcesInput
126+
from volcenginesdkemr.models.tag_for_create_cluster_input import TagForCreateClusterInput
123127
from volcenginesdkemr.models.tag_for_get_cluster_output import TagForGetClusterOutput
124128
from volcenginesdkemr.models.tag_for_list_clusters_input import TagForListClustersInput
125129
from volcenginesdkemr.models.tag_for_list_clusters_output import TagForListClustersOutput
126130
from volcenginesdkemr.models.tag_for_list_operations_input import TagForListOperationsInput
131+
from volcenginesdkemr.models.tag_for_tag_resources_input import TagForTagResourcesInput
132+
from volcenginesdkemr.models.tag_resource_for_list_tags_for_resources_output import TagResourceForListTagsForResourcesOutput
133+
from volcenginesdkemr.models.tag_resources_request import TagResourcesRequest
134+
from volcenginesdkemr.models.tag_resources_response import TagResourcesResponse
135+
from volcenginesdkemr.models.untag_resources_request import UntagResourcesRequest
136+
from volcenginesdkemr.models.untag_resources_response import UntagResourcesResponse
127137
from volcenginesdkemr.models.update_application_config_request import UpdateApplicationConfigRequest
128138
from volcenginesdkemr.models.update_application_config_response import UpdateApplicationConfigResponse
129139
from volcenginesdkemr.models.update_cluster_attribute_request import UpdateClusterAttributeRequest

‎volcenginesdkemr/api/emr_api.py‎

Lines changed: 291 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2167,6 +2167,103 @@ def list_operations_with_http_info(self, body, **kwargs): # noqa: E501
21672167
_request_timeout=params.get('_request_timeout'),
21682168
collection_formats=collection_formats)
21692169

2170+
def list_tags_for_resources(self, body, **kwargs): # noqa: E501
2171+
"""list_tags_for_resources # noqa: E501
2172+
2173+
This method makes a synchronous HTTP request by default. To make an
2174+
asynchronous HTTP request, please pass async_req=True
2175+
>>> thread = api.list_tags_for_resources(body, async_req=True)
2176+
>>> result = thread.get()
2177+
2178+
:param async_req bool
2179+
:param ListTagsForResourcesRequest body: (required)
2180+
:return: ListTagsForResourcesResponse
2181+
If the method is called asynchronously,
2182+
returns the request thread.
2183+
"""
2184+
kwargs['_return_http_data_only'] = True
2185+
if kwargs.get('async_req'):
2186+
return self.list_tags_for_resources_with_http_info(body, **kwargs) # noqa: E501
2187+
else:
2188+
(data) = self.list_tags_for_resources_with_http_info(body, **kwargs) # noqa: E501
2189+
return data
2190+
2191+
def list_tags_for_resources_with_http_info(self, body, **kwargs): # noqa: E501
2192+
"""list_tags_for_resources # noqa: E501
2193+
2194+
This method makes a synchronous HTTP request by default. To make an
2195+
asynchronous HTTP request, please pass async_req=True
2196+
>>> thread = api.list_tags_for_resources_with_http_info(body, async_req=True)
2197+
>>> result = thread.get()
2198+
2199+
:param async_req bool
2200+
:param ListTagsForResourcesRequest body: (required)
2201+
:return: ListTagsForResourcesResponse
2202+
If the method is called asynchronously,
2203+
returns the request thread.
2204+
"""
2205+
2206+
all_params = ['body'] # noqa: E501
2207+
all_params.append('async_req')
2208+
all_params.append('_return_http_data_only')
2209+
all_params.append('_preload_content')
2210+
all_params.append('_request_timeout')
2211+
2212+
params = locals()
2213+
for key, val in six.iteritems(params['kwargs']):
2214+
if key not in all_params:
2215+
raise TypeError(
2216+
"Got an unexpected keyword argument '%s'"
2217+
" to method list_tags_for_resources" % key
2218+
)
2219+
params[key] = val
2220+
del params['kwargs']
2221+
# verify the required parameter 'body' is set
2222+
if self.api_client.client_side_validation and ('body' not in params or
2223+
params['body'] is None): # noqa: E501
2224+
raise ValueError("Missing the required parameter `body` when calling `list_tags_for_resources`") # noqa: E501
2225+
2226+
collection_formats = {}
2227+
2228+
path_params = {}
2229+
2230+
query_params = []
2231+
2232+
header_params = {}
2233+
2234+
form_params = []
2235+
local_var_files = {}
2236+
2237+
body_params = None
2238+
if 'body' in params:
2239+
body_params = params['body']
2240+
# HTTP header `Accept`
2241+
header_params['Accept'] = self.api_client.select_header_accept(
2242+
['application/json']) # noqa: E501
2243+
2244+
# HTTP header `Content-Type`
2245+
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
2246+
['application/json']) # noqa: E501
2247+
2248+
# Authentication setting
2249+
auth_settings = ['volcengineSign'] # noqa: E501
2250+
2251+
return self.api_client.call_api(
2252+
'/ListTagsForResources/2023-08-15/emr/post/application_json/', 'POST',
2253+
path_params,
2254+
query_params,
2255+
header_params,
2256+
body=body_params,
2257+
post_params=form_params,
2258+
files=local_var_files,
2259+
response_type='ListTagsForResourcesResponse', # noqa: E501
2260+
auth_settings=auth_settings,
2261+
async_req=params.get('async_req'),
2262+
_return_http_data_only=params.get('_return_http_data_only'),
2263+
_preload_content=params.get('_preload_content', True),
2264+
_request_timeout=params.get('_request_timeout'),
2265+
collection_formats=collection_formats)
2266+
21702267
def release_cluster(self, body, **kwargs): # noqa: E501
21712268
"""release_cluster # noqa: E501
21722269
@@ -2652,6 +2749,200 @@ def scale_up_node_group_disk_with_http_info(self, body, **kwargs): # noqa: E501
26522749
_request_timeout=params.get('_request_timeout'),
26532750
collection_formats=collection_formats)
26542751

2752+
def tag_resources(self, body, **kwargs): # noqa: E501
2753+
"""tag_resources # noqa: E501
2754+
2755+
This method makes a synchronous HTTP request by default. To make an
2756+
asynchronous HTTP request, please pass async_req=True
2757+
>>> thread = api.tag_resources(body, async_req=True)
2758+
>>> result = thread.get()
2759+
2760+
:param async_req bool
2761+
:param TagResourcesRequest body: (required)
2762+
:return: TagResourcesResponse
2763+
If the method is called asynchronously,
2764+
returns the request thread.
2765+
"""
2766+
kwargs['_return_http_data_only'] = True
2767+
if kwargs.get('async_req'):
2768+
return self.tag_resources_with_http_info(body, **kwargs) # noqa: E501
2769+
else:
2770+
(data) = self.tag_resources_with_http_info(body, **kwargs) # noqa: E501
2771+
return data
2772+
2773+
def tag_resources_with_http_info(self, body, **kwargs): # noqa: E501
2774+
"""tag_resources # noqa: E501
2775+
2776+
This method makes a synchronous HTTP request by default. To make an
2777+
asynchronous HTTP request, please pass async_req=True
2778+
>>> thread = api.tag_resources_with_http_info(body, async_req=True)
2779+
>>> result = thread.get()
2780+
2781+
:param async_req bool
2782+
:param TagResourcesRequest body: (required)
2783+
:return: TagResourcesResponse
2784+
If the method is called asynchronously,
2785+
returns the request thread.
2786+
"""
2787+
2788+
all_params = ['body'] # noqa: E501
2789+
all_params.append('async_req')
2790+
all_params.append('_return_http_data_only')
2791+
all_params.append('_preload_content')
2792+
all_params.append('_request_timeout')
2793+
2794+
params = locals()
2795+
for key, val in six.iteritems(params['kwargs']):
2796+
if key not in all_params:
2797+
raise TypeError(
2798+
"Got an unexpected keyword argument '%s'"
2799+
" to method tag_resources" % key
2800+
)
2801+
params[key] = val
2802+
del params['kwargs']
2803+
# verify the required parameter 'body' is set
2804+
if self.api_client.client_side_validation and ('body' not in params or
2805+
params['body'] is None): # noqa: E501
2806+
raise ValueError("Missing the required parameter `body` when calling `tag_resources`") # noqa: E501
2807+
2808+
collection_formats = {}
2809+
2810+
path_params = {}
2811+
2812+
query_params = []
2813+
2814+
header_params = {}
2815+
2816+
form_params = []
2817+
local_var_files = {}
2818+
2819+
body_params = None
2820+
if 'body' in params:
2821+
body_params = params['body']
2822+
# HTTP header `Accept`
2823+
header_params['Accept'] = self.api_client.select_header_accept(
2824+
['application/json']) # noqa: E501
2825+
2826+
# HTTP header `Content-Type`
2827+
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
2828+
['application/json']) # noqa: E501
2829+
2830+
# Authentication setting
2831+
auth_settings = ['volcengineSign'] # noqa: E501
2832+
2833+
return self.api_client.call_api(
2834+
'/TagResources/2023-08-15/emr/post/application_json/', 'POST',
2835+
path_params,
2836+
query_params,
2837+
header_params,
2838+
body=body_params,
2839+
post_params=form_params,
2840+
files=local_var_files,
2841+
response_type='TagResourcesResponse', # noqa: E501
2842+
auth_settings=auth_settings,
2843+
async_req=params.get('async_req'),
2844+
_return_http_data_only=params.get('_return_http_data_only'),
2845+
_preload_content=params.get('_preload_content', True),
2846+
_request_timeout=params.get('_request_timeout'),
2847+
collection_formats=collection_formats)
2848+
2849+
def untag_resources(self, body, **kwargs): # noqa: E501
2850+
"""untag_resources # noqa: E501
2851+
2852+
This method makes a synchronous HTTP request by default. To make an
2853+
asynchronous HTTP request, please pass async_req=True
2854+
>>> thread = api.untag_resources(body, async_req=True)
2855+
>>> result = thread.get()
2856+
2857+
:param async_req bool
2858+
:param UntagResourcesRequest body: (required)
2859+
:return: UntagResourcesResponse
2860+
If the method is called asynchronously,
2861+
returns the request thread.
2862+
"""
2863+
kwargs['_return_http_data_only'] = True
2864+
if kwargs.get('async_req'):
2865+
return self.untag_resources_with_http_info(body, **kwargs) # noqa: E501
2866+
else:
2867+
(data) = self.untag_resources_with_http_info(body, **kwargs) # noqa: E501
2868+
return data
2869+
2870+
def untag_resources_with_http_info(self, body, **kwargs): # noqa: E501
2871+
"""untag_resources # noqa: E501
2872+
2873+
This method makes a synchronous HTTP request by default. To make an
2874+
asynchronous HTTP request, please pass async_req=True
2875+
>>> thread = api.untag_resources_with_http_info(body, async_req=True)
2876+
>>> result = thread.get()
2877+
2878+
:param async_req bool
2879+
:param UntagResourcesRequest body: (required)
2880+
:return: UntagResourcesResponse
2881+
If the method is called asynchronously,
2882+
returns the request thread.
2883+
"""
2884+
2885+
all_params = ['body'] # noqa: E501
2886+
all_params.append('async_req')
2887+
all_params.append('_return_http_data_only')
2888+
all_params.append('_preload_content')
2889+
all_params.append('_request_timeout')
2890+
2891+
params = locals()
2892+
for key, val in six.iteritems(params['kwargs']):
2893+
if key not in all_params:
2894+
raise TypeError(
2895+
"Got an unexpected keyword argument '%s'"
2896+
" to method untag_resources" % key
2897+
)
2898+
params[key] = val
2899+
del params['kwargs']
2900+
# verify the required parameter 'body' is set
2901+
if self.api_client.client_side_validation and ('body' not in params or
2902+
params['body'] is None): # noqa: E501
2903+
raise ValueError("Missing the required parameter `body` when calling `untag_resources`") # noqa: E501
2904+
2905+
collection_formats = {}
2906+
2907+
path_params = {}
2908+
2909+
query_params = []
2910+
2911+
header_params = {}
2912+
2913+
form_params = []
2914+
local_var_files = {}
2915+
2916+
body_params = None
2917+
if 'body' in params:
2918+
body_params = params['body']
2919+
# HTTP header `Accept`
2920+
header_params['Accept'] = self.api_client.select_header_accept(
2921+
['application/json']) # noqa: E501
2922+
2923+
# HTTP header `Content-Type`
2924+
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
2925+
['application/json']) # noqa: E501
2926+
2927+
# Authentication setting
2928+
auth_settings = ['volcengineSign'] # noqa: E501
2929+
2930+
return self.api_client.call_api(
2931+
'/UntagResources/2023-08-15/emr/post/application_json/', 'POST',
2932+
path_params,
2933+
query_params,
2934+
header_params,
2935+
body=body_params,
2936+
post_params=form_params,
2937+
files=local_var_files,
2938+
response_type='UntagResourcesResponse', # noqa: E501
2939+
auth_settings=auth_settings,
2940+
async_req=params.get('async_req'),
2941+
_return_http_data_only=params.get('_return_http_data_only'),
2942+
_preload_content=params.get('_preload_content', True),
2943+
_request_timeout=params.get('_request_timeout'),
2944+
collection_formats=collection_formats)
2945+
26552946
def update_application_config(self, body, **kwargs): # noqa: E501
26562947
"""update_application_config # noqa: E501
26572948

‎volcenginesdkemr/models/__init__.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787
from volcenginesdkemr.models.list_nodes_response import ListNodesResponse
8888
from volcenginesdkemr.models.list_operations_request import ListOperationsRequest
8989
from volcenginesdkemr.models.list_operations_response import ListOperationsResponse
90+
from volcenginesdkemr.models.list_tags_for_resources_request import ListTagsForResourcesRequest
91+
from volcenginesdkemr.models.list_tags_for_resources_response import ListTagsForResourcesResponse
9092
from volcenginesdkemr.models.node_attribute_for_create_cluster_input import NodeAttributeForCreateClusterInput
9193
from volcenginesdkemr.models.node_attribute_for_get_cluster_output import NodeAttributeForGetClusterOutput
9294
from volcenginesdkemr.models.node_attribute_for_list_clusters_output import NodeAttributeForListClustersOutput
@@ -116,10 +118,18 @@
116118
from volcenginesdkemr.models.system_disk_for_create_cluster_input import SystemDiskForCreateClusterInput
117119
from volcenginesdkemr.models.system_disk_for_create_node_group_input import SystemDiskForCreateNodeGroupInput
118120
from volcenginesdkemr.models.system_disk_for_list_node_groups_output import SystemDiskForListNodeGroupsOutput
121+
from volcenginesdkemr.models.tag_filter_for_list_tags_for_resources_input import TagFilterForListTagsForResourcesInput
122+
from volcenginesdkemr.models.tag_for_create_cluster_input import TagForCreateClusterInput
119123
from volcenginesdkemr.models.tag_for_get_cluster_output import TagForGetClusterOutput
120124
from volcenginesdkemr.models.tag_for_list_clusters_input import TagForListClustersInput
121125
from volcenginesdkemr.models.tag_for_list_clusters_output import TagForListClustersOutput
122126
from volcenginesdkemr.models.tag_for_list_operations_input import TagForListOperationsInput
127+
from volcenginesdkemr.models.tag_for_tag_resources_input import TagForTagResourcesInput
128+
from volcenginesdkemr.models.tag_resource_for_list_tags_for_resources_output import TagResourceForListTagsForResourcesOutput
129+
from volcenginesdkemr.models.tag_resources_request import TagResourcesRequest
130+
from volcenginesdkemr.models.tag_resources_response import TagResourcesResponse
131+
from volcenginesdkemr.models.untag_resources_request import UntagResourcesRequest
132+
from volcenginesdkemr.models.untag_resources_response import UntagResourcesResponse
123133
from volcenginesdkemr.models.update_application_config_request import UpdateApplicationConfigRequest
124134
from volcenginesdkemr.models.update_application_config_response import UpdateApplicationConfigResponse
125135
from volcenginesdkemr.models.update_cluster_attribute_request import UpdateClusterAttributeRequest

‎volcenginesdkemr/models/create_cluster_request.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class CreateClusterRequest(object):
4848
'release_version': 'str',
4949
'security_group_id': 'str',
5050
'security_mode': 'str',
51-
'tags': 'list[str]',
51+
'tags': 'list[TagForCreateClusterInput]',
5252
'vpc_id': 'str'
5353
}
5454

@@ -457,7 +457,7 @@ def tags(self):
457457
458458
459459
:return: The tags of this CreateClusterRequest. # noqa: E501
460-
:rtype: list[str]
460+
:rtype: list[TagForCreateClusterInput]
461461
"""
462462
return self._tags
463463

@@ -467,7 +467,7 @@ def tags(self, tags):
467467
468468
469469
:param tags: The tags of this CreateClusterRequest. # noqa: E501
470-
:type: list[str]
470+
:type: list[TagForCreateClusterInput]
471471
"""
472472

473473
self._tags = tags

0 commit comments

Comments
 (0)