tccli 3.0.1217.1__py2.py3-none-any.whl → 3.0.1218.1__py2.py3-none-any.whl

Sign up to get free protection for your applications and to get access to all the features.
Files changed (266) hide show
  1. tccli/__init__.py +1 -1
  2. tccli/command.py +0 -1
  3. tccli/configure.py +11 -1
  4. tccli/services/aa/aa_client.py +13 -1
  5. tccli/services/aai/aai_client.py +13 -1
  6. tccli/services/acp/acp_client.py +13 -1
  7. tccli/services/advisor/advisor_client.py +13 -1
  8. tccli/services/af/af_client.py +13 -1
  9. tccli/services/afc/afc_client.py +13 -1
  10. tccli/services/aiart/aiart_client.py +13 -1
  11. tccli/services/ame/ame_client.py +13 -1
  12. tccli/services/ams/ams_client.py +13 -1
  13. tccli/services/anicloud/anicloud_client.py +13 -1
  14. tccli/services/antiddos/antiddos_client.py +13 -1
  15. tccli/services/apcas/apcas_client.py +13 -1
  16. tccli/services/ape/ape_client.py +13 -1
  17. tccli/services/api/api_client.py +13 -1
  18. tccli/services/apigateway/apigateway_client.py +13 -1
  19. tccli/services/apm/apm_client.py +13 -1
  20. tccli/services/asr/asr_client.py +13 -1
  21. tccli/services/asw/asw_client.py +13 -1
  22. tccli/services/autoscaling/autoscaling_client.py +13 -1
  23. tccli/services/ba/ba_client.py +13 -1
  24. tccli/services/batch/batch_client.py +13 -1
  25. tccli/services/bda/bda_client.py +13 -1
  26. tccli/services/bh/bh_client.py +13 -1
  27. tccli/services/bi/bi_client.py +13 -1
  28. tccli/services/billing/billing_client.py +13 -1
  29. tccli/services/bizlive/bizlive_client.py +13 -1
  30. tccli/services/bm/bm_client.py +13 -1
  31. tccli/services/bma/bma_client.py +13 -1
  32. tccli/services/bmeip/bmeip_client.py +13 -1
  33. tccli/services/bmlb/bmlb_client.py +13 -1
  34. tccli/services/bmvpc/bmvpc_client.py +13 -1
  35. tccli/services/bpaas/bpaas_client.py +13 -1
  36. tccli/services/bri/bri_client.py +13 -1
  37. tccli/services/bsca/bsca_client.py +13 -1
  38. tccli/services/btoe/btoe_client.py +13 -1
  39. tccli/services/ca/ca_client.py +13 -1
  40. tccli/services/cam/cam_client.py +13 -1
  41. tccli/services/captcha/captcha_client.py +13 -1
  42. tccli/services/car/car_client.py +13 -1
  43. tccli/services/cat/cat_client.py +13 -1
  44. tccli/services/cbs/cbs_client.py +13 -1
  45. tccli/services/ccc/ccc_client.py +13 -1
  46. tccli/services/cdb/cdb_client.py +13 -1
  47. tccli/services/cdc/cdc_client.py +13 -1
  48. tccli/services/cdn/cdn_client.py +13 -1
  49. tccli/services/cds/cds_client.py +13 -1
  50. tccli/services/cdwch/cdwch_client.py +13 -1
  51. tccli/services/cdwdoris/cdwdoris_client.py +13 -1
  52. tccli/services/cdwpg/cdwpg_client.py +13 -1
  53. tccli/services/cdz/cdz_client.py +13 -1
  54. tccli/services/cfg/cfg_client.py +13 -1
  55. tccli/services/cfs/cfs_client.py +13 -1
  56. tccli/services/cfw/cfw_client.py +13 -1
  57. tccli/services/chdfs/chdfs_client.py +13 -1
  58. tccli/services/ciam/ciam_client.py +13 -1
  59. tccli/services/cii/cii_client.py +13 -1
  60. tccli/services/cim/cim_client.py +13 -1
  61. tccli/services/cis/cis_client.py +13 -1
  62. tccli/services/ckafka/ckafka_client.py +13 -1
  63. tccli/services/clb/clb_client.py +13 -1
  64. tccli/services/cloudapp/cloudapp_client.py +13 -1
  65. tccli/services/cloudaudit/cloudaudit_client.py +13 -1
  66. tccli/services/cloudhsm/cloudhsm_client.py +13 -1
  67. tccli/services/cloudstudio/cloudstudio_client.py +13 -1
  68. tccli/services/cls/cls_client.py +13 -1
  69. tccli/services/cme/cme_client.py +13 -1
  70. tccli/services/cmq/cmq_client.py +13 -1
  71. tccli/services/cms/cms_client.py +13 -1
  72. tccli/services/config/config_client.py +13 -1
  73. tccli/services/controlcenter/controlcenter_client.py +13 -1
  74. tccli/services/cpdp/cpdp_client.py +13 -1
  75. tccli/services/csip/csip_client.py +13 -1
  76. tccli/services/csxg/csxg_client.py +13 -1
  77. tccli/services/cvm/cvm_client.py +13 -1
  78. tccli/services/cwp/cwp_client.py +13 -1
  79. tccli/services/cws/cws_client.py +13 -1
  80. tccli/services/cynosdb/cynosdb_client.py +13 -1
  81. tccli/services/dasb/dasb_client.py +13 -1
  82. tccli/services/dataintegration/dataintegration_client.py +13 -1
  83. tccli/services/dayu/dayu_client.py +13 -1
  84. tccli/services/dbbrain/dbbrain_client.py +13 -1
  85. tccli/services/dbdc/dbdc_client.py +13 -1
  86. tccli/services/dc/dc_client.py +13 -1
  87. tccli/services/dcdb/dcdb_client.py +13 -1
  88. tccli/services/dlc/dlc_client.py +13 -1
  89. tccli/services/dnspod/dnspod_client.py +13 -1
  90. tccli/services/domain/domain_client.py +13 -1
  91. tccli/services/drm/drm_client.py +13 -1
  92. tccli/services/ds/ds_client.py +13 -1
  93. tccli/services/dsgc/dsgc_client.py +13 -1
  94. tccli/services/dtf/dtf_client.py +13 -1
  95. tccli/services/dts/dts_client.py +13 -1
  96. tccli/services/eb/eb_client.py +13 -1
  97. tccli/services/ecc/ecc_client.py +13 -1
  98. tccli/services/ecdn/ecdn_client.py +13 -1
  99. tccli/services/ecm/ecm_client.py +13 -1
  100. tccli/services/eiam/eiam_client.py +13 -1
  101. tccli/services/eis/eis_client.py +13 -1
  102. tccli/services/emr/emr_client.py +13 -1
  103. tccli/services/es/es_client.py +13 -1
  104. tccli/services/ess/ess_client.py +13 -1
  105. tccli/services/essbasic/essbasic_client.py +13 -1
  106. tccli/services/facefusion/facefusion_client.py +13 -1
  107. tccli/services/faceid/faceid_client.py +13 -1
  108. tccli/services/fmu/fmu_client.py +13 -1
  109. tccli/services/ft/ft_client.py +13 -1
  110. tccli/services/gaap/gaap_client.py +13 -1
  111. tccli/services/gme/gme_client.py +13 -1
  112. tccli/services/goosefs/goosefs_client.py +13 -1
  113. tccli/services/gpm/gpm_client.py +13 -1
  114. tccli/services/gs/gs_client.py +13 -1
  115. tccli/services/gse/gse_client.py +13 -1
  116. tccli/services/gwlb/gwlb_client.py +13 -1
  117. tccli/services/habo/habo_client.py +13 -1
  118. tccli/services/hai/hai_client.py +13 -1
  119. tccli/services/hasim/hasim_client.py +13 -1
  120. tccli/services/hcm/hcm_client.py +13 -1
  121. tccli/services/hunyuan/hunyuan_client.py +13 -1
  122. tccli/services/iai/iai_client.py +13 -1
  123. tccli/services/ic/ic_client.py +13 -1
  124. tccli/services/icr/icr_client.py +13 -1
  125. tccli/services/ie/ie_client.py +13 -1
  126. tccli/services/iecp/iecp_client.py +13 -1
  127. tccli/services/ig/ig_client.py +13 -1
  128. tccli/services/iir/iir_client.py +13 -1
  129. tccli/services/ims/ims_client.py +13 -1
  130. tccli/services/ioa/ioa_client.py +13 -1
  131. tccli/services/iot/iot_client.py +13 -1
  132. tccli/services/iotcloud/iotcloud_client.py +13 -1
  133. tccli/services/iotexplorer/iotexplorer_client.py +13 -1
  134. tccli/services/iottid/iottid_client.py +13 -1
  135. tccli/services/iotvideo/iotvideo_client.py +13 -1
  136. tccli/services/iotvideoindustry/iotvideoindustry_client.py +13 -1
  137. tccli/services/irp/irp_client.py +13 -1
  138. tccli/services/iss/iss_client.py +13 -1
  139. tccli/services/ivld/ivld_client.py +13 -1
  140. tccli/services/keewidb/keewidb_client.py +13 -1
  141. tccli/services/kms/kms_client.py +13 -1
  142. tccli/services/lcic/lcic_client.py +13 -1
  143. tccli/services/lighthouse/lighthouse_client.py +13 -1
  144. tccli/services/live/live_client.py +13 -1
  145. tccli/services/lke/lke_client.py +13 -1
  146. tccli/services/lowcode/lowcode_client.py +13 -1
  147. tccli/services/lp/lp_client.py +13 -1
  148. tccli/services/mall/mall_client.py +13 -1
  149. tccli/services/mariadb/mariadb_client.py +13 -1
  150. tccli/services/market/market_client.py +13 -1
  151. tccli/services/memcached/memcached_client.py +13 -1
  152. tccli/services/mgobe/mgobe_client.py +13 -1
  153. tccli/services/mmps/mmps_client.py +13 -1
  154. tccli/services/mna/mna_client.py +13 -1
  155. tccli/services/mongodb/mongodb_client.py +13 -1
  156. tccli/services/monitor/monitor_client.py +13 -1
  157. tccli/services/mps/mps_client.py +13 -1
  158. tccli/services/mqtt/mqtt_client.py +13 -1
  159. tccli/services/mrs/mrs_client.py +13 -1
  160. tccli/services/ms/ms_client.py +13 -1
  161. tccli/services/msp/msp_client.py +13 -1
  162. tccli/services/mvj/mvj_client.py +13 -1
  163. tccli/services/nlp/nlp_client.py +13 -1
  164. tccli/services/npp/npp_client.py +13 -1
  165. tccli/services/oceanus/oceanus_client.py +13 -1
  166. tccli/services/ocr/ocr_client.py +13 -1
  167. tccli/services/omics/omics_client.py +13 -1
  168. tccli/services/organization/organization_client.py +13 -1
  169. tccli/services/partners/partners_client.py +13 -1
  170. tccli/services/pds/pds_client.py +13 -1
  171. tccli/services/postgres/postgres_client.py +13 -1
  172. tccli/services/privatedns/privatedns_client.py +13 -1
  173. tccli/services/pts/pts_client.py +13 -1
  174. tccli/services/rce/rce_client.py +13 -1
  175. tccli/services/redis/redis_client.py +13 -1
  176. tccli/services/region/region_client.py +13 -1
  177. tccli/services/rkp/rkp_client.py +13 -1
  178. tccli/services/rp/rp_client.py +13 -1
  179. tccli/services/rum/rum_client.py +13 -1
  180. tccli/services/scf/scf_client.py +13 -1
  181. tccli/services/ses/ses_client.py +13 -1
  182. tccli/services/smh/smh_client.py +13 -1
  183. tccli/services/smop/smop_client.py +13 -1
  184. tccli/services/smpn/smpn_client.py +13 -1
  185. tccli/services/sms/sms_client.py +13 -1
  186. tccli/services/soe/soe_client.py +13 -1
  187. tccli/services/solar/solar_client.py +13 -1
  188. tccli/services/sqlserver/sqlserver_client.py +13 -1
  189. tccli/services/ssa/ssa_client.py +13 -1
  190. tccli/services/ssl/ssl_client.py +13 -1
  191. tccli/services/sslpod/sslpod_client.py +13 -1
  192. tccli/services/ssm/ssm_client.py +13 -1
  193. tccli/services/sts/sts_client.py +13 -1
  194. tccli/services/svp/svp_client.py +13 -1
  195. tccli/services/taf/taf_client.py +13 -1
  196. tccli/services/tag/tag_client.py +13 -1
  197. tccli/services/tan/tan_client.py +13 -1
  198. tccli/services/tat/tat_client.py +13 -1
  199. tccli/services/tav/tav_client.py +13 -1
  200. tccli/services/tbaas/tbaas_client.py +13 -1
  201. tccli/services/tbm/tbm_client.py +13 -1
  202. tccli/services/tbp/tbp_client.py +13 -1
  203. tccli/services/tcaplusdb/tcaplusdb_client.py +13 -1
  204. tccli/services/tcb/tcb_client.py +13 -1
  205. tccli/services/tcbr/tcbr_client.py +13 -1
  206. tccli/services/tcex/tcex_client.py +13 -1
  207. tccli/services/tchd/tchd_client.py +13 -1
  208. tccli/services/tci/tci_client.py +13 -1
  209. tccli/services/tcm/tcm_client.py +13 -1
  210. tccli/services/tcr/tcr_client.py +13 -1
  211. tccli/services/tcss/tcss_client.py +13 -1
  212. tccli/services/tdcpg/tdcpg_client.py +13 -1
  213. tccli/services/tdid/tdid_client.py +13 -1
  214. tccli/services/tdmq/tdmq_client.py +13 -1
  215. tccli/services/tds/tds_client.py +13 -1
  216. tccli/services/tem/tem_client.py +13 -1
  217. tccli/services/teo/teo_client.py +13 -1
  218. tccli/services/thpc/thpc_client.py +13 -1
  219. tccli/services/tia/tia_client.py +13 -1
  220. tccli/services/tic/tic_client.py +13 -1
  221. tccli/services/ticm/ticm_client.py +13 -1
  222. tccli/services/tics/tics_client.py +13 -1
  223. tccli/services/tiems/tiems_client.py +13 -1
  224. tccli/services/tiia/tiia_client.py +13 -1
  225. tccli/services/tione/tione_client.py +13 -1
  226. tccli/services/tiw/tiw_client.py +13 -1
  227. tccli/services/tke/tke_client.py +13 -1
  228. tccli/services/tkgdq/tkgdq_client.py +13 -1
  229. tccli/services/tms/tms_client.py +13 -1
  230. tccli/services/tmt/tmt_client.py +13 -1
  231. tccli/services/tourism/tourism_client.py +13 -1
  232. tccli/services/trdp/trdp_client.py +13 -1
  233. tccli/services/trocket/trocket_client.py +13 -1
  234. tccli/services/trp/trp_client.py +13 -1
  235. tccli/services/trro/trro_client.py +13 -1
  236. tccli/services/trtc/trtc_client.py +13 -1
  237. tccli/services/tse/tse_client.py +13 -1
  238. tccli/services/tsf/tsf_client.py +13 -1
  239. tccli/services/tsi/tsi_client.py +13 -1
  240. tccli/services/tsw/tsw_client.py +13 -1
  241. tccli/services/tts/tts_client.py +13 -1
  242. tccli/services/ump/ump_client.py +13 -1
  243. tccli/services/vcg/vcg_client.py +13 -1
  244. tccli/services/vclm/vclm_client.py +13 -1
  245. tccli/services/vdb/vdb_client.py +13 -1
  246. tccli/services/vm/vm_client.py +13 -1
  247. tccli/services/vms/vms_client.py +13 -1
  248. tccli/services/vod/vod_client.py +13 -1
  249. tccli/services/vpc/vpc_client.py +13 -1
  250. tccli/services/vrs/vrs_client.py +13 -1
  251. tccli/services/vtc/vtc_client.py +13 -1
  252. tccli/services/waf/waf_client.py +13 -1
  253. tccli/services/wav/wav_client.py +13 -1
  254. tccli/services/wedata/wedata_client.py +13 -1
  255. tccli/services/weilingwith/weilingwith_client.py +13 -1
  256. tccli/services/wss/wss_client.py +13 -1
  257. tccli/services/yinsuda/yinsuda_client.py +13 -1
  258. tccli/services/youmall/youmall_client.py +13 -1
  259. tccli/services/yunjing/yunjing_client.py +13 -1
  260. tccli/services/yunsou/yunsou_client.py +13 -1
  261. tccli/utils.py +8 -0
  262. {tccli-3.0.1217.1.dist-info → tccli-3.0.1218.1.dist-info}/METADATA +2 -2
  263. {tccli-3.0.1217.1.dist-info → tccli-3.0.1218.1.dist-info}/RECORD +266 -266
  264. {tccli-3.0.1217.1.dist-info → tccli-3.0.1218.1.dist-info}/WHEEL +0 -0
  265. {tccli-3.0.1217.1.dist-info → tccli-3.0.1218.1.dist-info}/entry_points.txt +0 -0
  266. {tccli-3.0.1217.1.dist-info → tccli-3.0.1218.1.dist-info}/license_files/LICENSE +0 -0
tccli/services/csip/csip_client.py CHANGED
@@ -2322,7 +2322,13 @@ def action_caller():
2322
2322
 
2323
2323
  def parse_global_arg(parsed_globals):
2324
2324
  g_param = parsed_globals
2325
-
2325
+ cvm_role_flag = True
2326
+ for param in parsed_globals.keys():
2327
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2328
+ OptionsDefine.RoleSessionName]:
2329
+ if parsed_globals[param] is not None:
2330
+ cvm_role_flag = False
2331
+ break
2326
2332
  is_exist_profile = True
2327
2333
  if not parsed_globals["profile"]:
2328
2334
  is_exist_profile = False
@@ -2353,6 +2359,7 @@ def parse_global_arg(parsed_globals):
2353
2359
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2354
2360
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2355
2361
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2362
+ cvm_role_flag = False
2356
2363
 
2357
2364
  if os.environ.get(OptionsDefine.ENV_REGION):
2358
2365
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2360,6 +2367,11 @@ def parse_global_arg(parsed_globals):
2360
2367
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2361
2368
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2362
2369
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
2370
+ cvm_role_flag = False
2371
+
2372
+ if cvm_role_flag:
2373
+ if "type" in cred and cred["type"] == "cvm-role":
2374
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2363
2375
 
2364
2376
  for param in g_param.keys():
2365
2377
  if g_param[param] is None:
tccli/services/csxg/csxg_client.py CHANGED
@@ -308,7 +308,13 @@ def action_caller():
308
308
 
309
309
  def parse_global_arg(parsed_globals):
310
310
  g_param = parsed_globals
311
-
311
+ cvm_role_flag = True
312
+ for param in parsed_globals.keys():
313
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
314
+ OptionsDefine.RoleSessionName]:
315
+ if parsed_globals[param] is not None:
316
+ cvm_role_flag = False
317
+ break
312
318
  is_exist_profile = True
313
319
  if not parsed_globals["profile"]:
314
320
  is_exist_profile = False
@@ -339,6 +345,7 @@ def parse_global_arg(parsed_globals):
339
345
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
340
346
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
341
347
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
348
+ cvm_role_flag = False
342
349
 
343
350
  if os.environ.get(OptionsDefine.ENV_REGION):
344
351
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -346,6 +353,11 @@ def parse_global_arg(parsed_globals):
346
353
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
347
354
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
348
355
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
356
+ cvm_role_flag = False
357
+
358
+ if cvm_role_flag:
359
+ if "type" in cred and cred["type"] == "cvm-role":
360
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
349
361
 
350
362
  for param in g_param.keys():
351
363
  if g_param[param] is None:
tccli/services/cvm/cvm_client.py CHANGED
@@ -5396,7 +5396,13 @@ def action_caller():
5396
5396
 
5397
5397
  def parse_global_arg(parsed_globals):
5398
5398
  g_param = parsed_globals
5399
-
5399
+ cvm_role_flag = True
5400
+ for param in parsed_globals.keys():
5401
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
5402
+ OptionsDefine.RoleSessionName]:
5403
+ if parsed_globals[param] is not None:
5404
+ cvm_role_flag = False
5405
+ break
5400
5406
  is_exist_profile = True
5401
5407
  if not parsed_globals["profile"]:
5402
5408
  is_exist_profile = False
@@ -5427,6 +5433,7 @@ def parse_global_arg(parsed_globals):
5427
5433
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
5428
5434
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
5429
5435
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
5436
+ cvm_role_flag = False
5430
5437
 
5431
5438
  if os.environ.get(OptionsDefine.ENV_REGION):
5432
5439
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -5434,6 +5441,11 @@ def parse_global_arg(parsed_globals):
5434
5441
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
5435
5442
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
5436
5443
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
5444
+ cvm_role_flag = False
5445
+
5446
+ if cvm_role_flag:
5447
+ if "type" in cred and cred["type"] == "cvm-role":
5448
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
5437
5449
 
5438
5450
  for param in g_param.keys():
5439
5451
  if g_param[param] is None:
tccli/services/cwp/cwp_client.py CHANGED
@@ -27285,7 +27285,13 @@ def action_caller():
27285
27285
 
27286
27286
  def parse_global_arg(parsed_globals):
27287
27287
  g_param = parsed_globals
27288
-
27288
+ cvm_role_flag = True
27289
+ for param in parsed_globals.keys():
27290
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
27291
+ OptionsDefine.RoleSessionName]:
27292
+ if parsed_globals[param] is not None:
27293
+ cvm_role_flag = False
27294
+ break
27289
27295
  is_exist_profile = True
27290
27296
  if not parsed_globals["profile"]:
27291
27297
  is_exist_profile = False
@@ -27316,6 +27322,7 @@ def parse_global_arg(parsed_globals):
27316
27322
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
27317
27323
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
27318
27324
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
27325
+ cvm_role_flag = False
27319
27326
 
27320
27327
  if os.environ.get(OptionsDefine.ENV_REGION):
27321
27328
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -27323,6 +27330,11 @@ def parse_global_arg(parsed_globals):
27323
27330
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
27324
27331
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
27325
27332
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
27333
+ cvm_role_flag = False
27334
+
27335
+ if cvm_role_flag:
27336
+ if "type" in cred and cred["type"] == "cvm-role":
27337
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
27326
27338
 
27327
27339
  for param in g_param.keys():
27328
27340
  if g_param[param] is None:
tccli/services/cws/cws_client.py CHANGED
@@ -1050,7 +1050,13 @@ def action_caller():
1050
1050
 
1051
1051
  def parse_global_arg(parsed_globals):
1052
1052
  g_param = parsed_globals
1053
-
1053
+ cvm_role_flag = True
1054
+ for param in parsed_globals.keys():
1055
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
1056
+ OptionsDefine.RoleSessionName]:
1057
+ if parsed_globals[param] is not None:
1058
+ cvm_role_flag = False
1059
+ break
1054
1060
  is_exist_profile = True
1055
1061
  if not parsed_globals["profile"]:
1056
1062
  is_exist_profile = False
@@ -1081,6 +1087,7 @@ def parse_global_arg(parsed_globals):
1081
1087
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
1082
1088
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
1083
1089
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
1090
+ cvm_role_flag = False
1084
1091
 
1085
1092
  if os.environ.get(OptionsDefine.ENV_REGION):
1086
1093
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -1088,6 +1095,11 @@ def parse_global_arg(parsed_globals):
1088
1095
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
1089
1096
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
1090
1097
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
1098
+ cvm_role_flag = False
1099
+
1100
+ if cvm_role_flag:
1101
+ if "type" in cred and cred["type"] == "cvm-role":
1102
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
1091
1103
 
1092
1104
  for param in g_param.keys():
1093
1105
  if g_param[param] is None:
tccli/services/cynosdb/cynosdb_client.py CHANGED
@@ -7940,7 +7940,13 @@ def action_caller():
7940
7940
 
7941
7941
  def parse_global_arg(parsed_globals):
7942
7942
  g_param = parsed_globals
7943
-
7943
+ cvm_role_flag = True
7944
+ for param in parsed_globals.keys():
7945
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
7946
+ OptionsDefine.RoleSessionName]:
7947
+ if parsed_globals[param] is not None:
7948
+ cvm_role_flag = False
7949
+ break
7944
7950
  is_exist_profile = True
7945
7951
  if not parsed_globals["profile"]:
7946
7952
  is_exist_profile = False
@@ -7971,6 +7977,7 @@ def parse_global_arg(parsed_globals):
7971
7977
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
7972
7978
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
7973
7979
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
7980
+ cvm_role_flag = False
7974
7981
 
7975
7982
  if os.environ.get(OptionsDefine.ENV_REGION):
7976
7983
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -7978,6 +7985,11 @@ def parse_global_arg(parsed_globals):
7978
7985
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
7979
7986
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
7980
7987
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
7988
+ cvm_role_flag = False
7989
+
7990
+ if cvm_role_flag:
7991
+ if "type" in cred and cred["type"] == "cvm-role":
7992
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
7981
7993
 
7982
7994
  for param in g_param.keys():
7983
7995
  if g_param[param] is None:
tccli/services/dasb/dasb_client.py CHANGED
@@ -3382,7 +3382,13 @@ def action_caller():
3382
3382
 
3383
3383
  def parse_global_arg(parsed_globals):
3384
3384
  g_param = parsed_globals
3385
-
3385
+ cvm_role_flag = True
3386
+ for param in parsed_globals.keys():
3387
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
3388
+ OptionsDefine.RoleSessionName]:
3389
+ if parsed_globals[param] is not None:
3390
+ cvm_role_flag = False
3391
+ break
3386
3392
  is_exist_profile = True
3387
3393
  if not parsed_globals["profile"]:
3388
3394
  is_exist_profile = False
@@ -3413,6 +3419,7 @@ def parse_global_arg(parsed_globals):
3413
3419
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
3414
3420
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
3415
3421
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
3422
+ cvm_role_flag = False
3416
3423
 
3417
3424
  if os.environ.get(OptionsDefine.ENV_REGION):
3418
3425
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -3420,6 +3427,11 @@ def parse_global_arg(parsed_globals):
3420
3427
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
3421
3428
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
3422
3429
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
3430
+ cvm_role_flag = False
3431
+
3432
+ if cvm_role_flag:
3433
+ if "type" in cred and cred["type"] == "cvm-role":
3434
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
3423
3435
 
3424
3436
  for param in g_param.keys():
3425
3437
  if g_param[param] is None:
tccli/services/dataintegration/dataintegration_client.py CHANGED
@@ -96,7 +96,13 @@ def action_caller():
96
96
 
97
97
  def parse_global_arg(parsed_globals):
98
98
  g_param = parsed_globals
99
-
99
+ cvm_role_flag = True
100
+ for param in parsed_globals.keys():
101
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
102
+ OptionsDefine.RoleSessionName]:
103
+ if parsed_globals[param] is not None:
104
+ cvm_role_flag = False
105
+ break
100
106
  is_exist_profile = True
101
107
  if not parsed_globals["profile"]:
102
108
  is_exist_profile = False
@@ -127,6 +133,7 @@ def parse_global_arg(parsed_globals):
127
133
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
128
134
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
129
135
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
136
+ cvm_role_flag = False
130
137
 
131
138
  if os.environ.get(OptionsDefine.ENV_REGION):
132
139
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -134,6 +141,11 @@ def parse_global_arg(parsed_globals):
134
141
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
135
142
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
136
143
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
144
+ cvm_role_flag = False
145
+
146
+ if cvm_role_flag:
147
+ if "type" in cred and cred["type"] == "cvm-role":
148
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
137
149
 
138
150
  for param in g_param.keys():
139
151
  if g_param[param] is None:
tccli/services/dayu/dayu_client.py CHANGED
@@ -5979,7 +5979,13 @@ def action_caller():
5979
5979
 
5980
5980
  def parse_global_arg(parsed_globals):
5981
5981
  g_param = parsed_globals
5982
-
5982
+ cvm_role_flag = True
5983
+ for param in parsed_globals.keys():
5984
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
5985
+ OptionsDefine.RoleSessionName]:
5986
+ if parsed_globals[param] is not None:
5987
+ cvm_role_flag = False
5988
+ break
5983
5989
  is_exist_profile = True
5984
5990
  if not parsed_globals["profile"]:
5985
5991
  is_exist_profile = False
@@ -6010,6 +6016,7 @@ def parse_global_arg(parsed_globals):
6010
6016
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
6011
6017
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
6012
6018
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
6019
+ cvm_role_flag = False
6013
6020
 
6014
6021
  if os.environ.get(OptionsDefine.ENV_REGION):
6015
6022
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -6017,6 +6024,11 @@ def parse_global_arg(parsed_globals):
6017
6024
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
6018
6025
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
6019
6026
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
6027
+ cvm_role_flag = False
6028
+
6029
+ if cvm_role_flag:
6030
+ if "type" in cred and cred["type"] == "cvm-role":
6031
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
6020
6032
 
6021
6033
  for param in g_param.keys():
6022
6034
  if g_param[param] is None:
tccli/services/dbbrain/dbbrain_client.py CHANGED
@@ -3387,7 +3387,13 @@ def action_caller():
3387
3387
 
3388
3388
  def parse_global_arg(parsed_globals):
3389
3389
  g_param = parsed_globals
3390
-
3390
+ cvm_role_flag = True
3391
+ for param in parsed_globals.keys():
3392
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
3393
+ OptionsDefine.RoleSessionName]:
3394
+ if parsed_globals[param] is not None:
3395
+ cvm_role_flag = False
3396
+ break
3391
3397
  is_exist_profile = True
3392
3398
  if not parsed_globals["profile"]:
3393
3399
  is_exist_profile = False
@@ -3418,6 +3424,7 @@ def parse_global_arg(parsed_globals):
3418
3424
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
3419
3425
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
3420
3426
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
3427
+ cvm_role_flag = False
3421
3428
 
3422
3429
  if os.environ.get(OptionsDefine.ENV_REGION):
3423
3430
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -3425,6 +3432,11 @@ def parse_global_arg(parsed_globals):
3425
3432
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
3426
3433
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
3427
3434
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
3435
+ cvm_role_flag = False
3436
+
3437
+ if cvm_role_flag:
3438
+ if "type" in cred and cred["type"] == "cvm-role":
3439
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
3428
3440
 
3429
3441
  for param in g_param.keys():
3430
3442
  if g_param[param] is None:
tccli/services/dbdc/dbdc_client.py CHANGED
@@ -361,7 +361,13 @@ def action_caller():
361
361
 
362
362
  def parse_global_arg(parsed_globals):
363
363
  g_param = parsed_globals
364
-
364
+ cvm_role_flag = True
365
+ for param in parsed_globals.keys():
366
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
367
+ OptionsDefine.RoleSessionName]:
368
+ if parsed_globals[param] is not None:
369
+ cvm_role_flag = False
370
+ break
365
371
  is_exist_profile = True
366
372
  if not parsed_globals["profile"]:
367
373
  is_exist_profile = False
@@ -392,6 +398,7 @@ def parse_global_arg(parsed_globals):
392
398
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
393
399
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
394
400
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
401
+ cvm_role_flag = False
395
402
 
396
403
  if os.environ.get(OptionsDefine.ENV_REGION):
397
404
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -399,6 +406,11 @@ def parse_global_arg(parsed_globals):
399
406
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
400
407
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
401
408
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
409
+ cvm_role_flag = False
410
+
411
+ if cvm_role_flag:
412
+ if "type" in cred and cred["type"] == "cvm-role":
413
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
402
414
 
403
415
  for param in g_param.keys():
404
416
  if g_param[param] is None:
tccli/services/dc/dc_client.py CHANGED
@@ -1209,7 +1209,13 @@ def action_caller():
1209
1209
 
1210
1210
  def parse_global_arg(parsed_globals):
1211
1211
  g_param = parsed_globals
1212
-
1212
+ cvm_role_flag = True
1213
+ for param in parsed_globals.keys():
1214
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
1215
+ OptionsDefine.RoleSessionName]:
1216
+ if parsed_globals[param] is not None:
1217
+ cvm_role_flag = False
1218
+ break
1213
1219
  is_exist_profile = True
1214
1220
  if not parsed_globals["profile"]:
1215
1221
  is_exist_profile = False
@@ -1240,6 +1246,7 @@ def parse_global_arg(parsed_globals):
1240
1246
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
1241
1247
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
1242
1248
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
1249
+ cvm_role_flag = False
1243
1250
 
1244
1251
  if os.environ.get(OptionsDefine.ENV_REGION):
1245
1252
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -1247,6 +1254,11 @@ def parse_global_arg(parsed_globals):
1247
1254
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
1248
1255
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
1249
1256
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
1257
+ cvm_role_flag = False
1258
+
1259
+ if cvm_role_flag:
1260
+ if "type" in cred and cred["type"] == "cvm-role":
1261
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
1250
1262
 
1251
1263
  for param in g_param.keys():
1252
1264
  if g_param[param] is None:
tccli/services/dcdb/dcdb_client.py CHANGED
@@ -4124,7 +4124,13 @@ def action_caller():
4124
4124
 
4125
4125
  def parse_global_arg(parsed_globals):
4126
4126
  g_param = parsed_globals
4127
-
4127
+ cvm_role_flag = True
4128
+ for param in parsed_globals.keys():
4129
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
4130
+ OptionsDefine.RoleSessionName]:
4131
+ if parsed_globals[param] is not None:
4132
+ cvm_role_flag = False
4133
+ break
4128
4134
  is_exist_profile = True
4129
4135
  if not parsed_globals["profile"]:
4130
4136
  is_exist_profile = False
@@ -4155,6 +4161,7 @@ def parse_global_arg(parsed_globals):
4155
4161
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
4156
4162
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
4157
4163
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
4164
+ cvm_role_flag = False
4158
4165
 
4159
4166
  if os.environ.get(OptionsDefine.ENV_REGION):
4160
4167
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -4162,6 +4169,11 @@ def parse_global_arg(parsed_globals):
4162
4169
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
4163
4170
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
4164
4171
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
4172
+ cvm_role_flag = False
4173
+
4174
+ if cvm_role_flag:
4175
+ if "type" in cred and cred["type"] == "cvm-role":
4176
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
4165
4177
 
4166
4178
  for param in g_param.keys():
4167
4179
  if g_param[param] is None:
tccli/services/dlc/dlc_client.py CHANGED
@@ -7675,7 +7675,13 @@ def action_caller():
7675
7675
 
7676
7676
  def parse_global_arg(parsed_globals):
7677
7677
  g_param = parsed_globals
7678
-
7678
+ cvm_role_flag = True
7679
+ for param in parsed_globals.keys():
7680
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
7681
+ OptionsDefine.RoleSessionName]:
7682
+ if parsed_globals[param] is not None:
7683
+ cvm_role_flag = False
7684
+ break
7679
7685
  is_exist_profile = True
7680
7686
  if not parsed_globals["profile"]:
7681
7687
  is_exist_profile = False
@@ -7706,6 +7712,7 @@ def parse_global_arg(parsed_globals):
7706
7712
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
7707
7713
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
7708
7714
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
7715
+ cvm_role_flag = False
7709
7716
 
7710
7717
  if os.environ.get(OptionsDefine.ENV_REGION):
7711
7718
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -7713,6 +7720,11 @@ def parse_global_arg(parsed_globals):
7713
7720
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
7714
7721
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
7715
7722
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
7723
+ cvm_role_flag = False
7724
+
7725
+ if cvm_role_flag:
7726
+ if "type" in cred and cred["type"] == "cvm-role":
7727
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
7716
7728
 
7717
7729
  for param in g_param.keys():
7718
7730
  if g_param[param] is None:
tccli/services/dnspod/dnspod_client.py CHANGED
@@ -4389,7 +4389,13 @@ def action_caller():
4389
4389
 
4390
4390
  def parse_global_arg(parsed_globals):
4391
4391
  g_param = parsed_globals
4392
-
4392
+ cvm_role_flag = True
4393
+ for param in parsed_globals.keys():
4394
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
4395
+ OptionsDefine.RoleSessionName]:
4396
+ if parsed_globals[param] is not None:
4397
+ cvm_role_flag = False
4398
+ break
4393
4399
  is_exist_profile = True
4394
4400
  if not parsed_globals["profile"]:
4395
4401
  is_exist_profile = False
@@ -4420,6 +4426,7 @@ def parse_global_arg(parsed_globals):
4420
4426
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
4421
4427
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
4422
4428
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
4429
+ cvm_role_flag = False
4423
4430
 
4424
4431
  if os.environ.get(OptionsDefine.ENV_REGION):
4425
4432
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -4427,6 +4434,11 @@ def parse_global_arg(parsed_globals):
4427
4434
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
4428
4435
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
4429
4436
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
4437
+ cvm_role_flag = False
4438
+
4439
+ if cvm_role_flag:
4440
+ if "type" in cred and cred["type"] == "cvm-role":
4441
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
4430
4442
 
4431
4443
  for param in g_param.keys():
4432
4444
  if g_param[param] is None:
tccli/services/domain/domain_client.py CHANGED
@@ -2958,7 +2958,13 @@ def action_caller():
2958
2958
 
2959
2959
  def parse_global_arg(parsed_globals):
2960
2960
  g_param = parsed_globals
2961
-
2961
+ cvm_role_flag = True
2962
+ for param in parsed_globals.keys():
2963
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2964
+ OptionsDefine.RoleSessionName]:
2965
+ if parsed_globals[param] is not None:
2966
+ cvm_role_flag = False
2967
+ break
2962
2968
  is_exist_profile = True
2963
2969
  if not parsed_globals["profile"]:
2964
2970
  is_exist_profile = False
@@ -2989,6 +2995,7 @@ def parse_global_arg(parsed_globals):
2989
2995
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2990
2996
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2991
2997
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2998
+ cvm_role_flag = False
2992
2999
 
2993
3000
  if os.environ.get(OptionsDefine.ENV_REGION):
2994
3001
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2996,6 +3003,11 @@ def parse_global_arg(parsed_globals):
2996
3003
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2997
3004
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2998
3005
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
3006
+ cvm_role_flag = False
3007
+
3008
+ if cvm_role_flag:
3009
+ if "type" in cred and cred["type"] == "cvm-role":
3010
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2999
3011
 
3000
3012
  for param in g_param.keys():
3001
3013
  if g_param[param] is None:
tccli/services/drm/drm_client.py CHANGED
@@ -626,7 +626,13 @@ def action_caller():
626
626
 
627
627
  def parse_global_arg(parsed_globals):
628
628
  g_param = parsed_globals
629
-
629
+ cvm_role_flag = True
630
+ for param in parsed_globals.keys():
631
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
632
+ OptionsDefine.RoleSessionName]:
633
+ if parsed_globals[param] is not None:
634
+ cvm_role_flag = False
635
+ break
630
636
  is_exist_profile = True
631
637
  if not parsed_globals["profile"]:
632
638
  is_exist_profile = False
@@ -657,6 +663,7 @@ def parse_global_arg(parsed_globals):
657
663
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
658
664
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
659
665
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
666
+ cvm_role_flag = False
660
667
 
661
668
  if os.environ.get(OptionsDefine.ENV_REGION):
662
669
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -664,6 +671,11 @@ def parse_global_arg(parsed_globals):
664
671
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
665
672
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
666
673
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
674
+ cvm_role_flag = False
675
+
676
+ if cvm_role_flag:
677
+ if "type" in cred and cred["type"] == "cvm-role":
678
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
667
679
 
668
680
  for param in g_param.keys():
669
681
  if g_param[param] is None:
tccli/services/ds/ds_client.py CHANGED
@@ -679,7 +679,13 @@ def action_caller():
679
679
 
680
680
  def parse_global_arg(parsed_globals):
681
681
  g_param = parsed_globals
682
-
682
+ cvm_role_flag = True
683
+ for param in parsed_globals.keys():
684
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
685
+ OptionsDefine.RoleSessionName]:
686
+ if parsed_globals[param] is not None:
687
+ cvm_role_flag = False
688
+ break
683
689
  is_exist_profile = True
684
690
  if not parsed_globals["profile"]:
685
691
  is_exist_profile = False
@@ -710,6 +716,7 @@ def parse_global_arg(parsed_globals):
710
716
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
711
717
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
712
718
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
719
+ cvm_role_flag = False
713
720
 
714
721
  if os.environ.get(OptionsDefine.ENV_REGION):
715
722
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -717,6 +724,11 @@ def parse_global_arg(parsed_globals):
717
724
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
718
725
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
719
726
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
727
+ cvm_role_flag = False
728
+
729
+ if cvm_role_flag:
730
+ if "type" in cred and cred["type"] == "cvm-role":
731
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
720
732
 
721
733
  for param in g_param.keys():
722
734
  if g_param[param] is None: