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/tia/tia_client.py CHANGED
@@ -573,7 +573,13 @@ def action_caller():
573
573
 
574
574
  def parse_global_arg(parsed_globals):
575
575
  g_param = parsed_globals
576
-
576
+ cvm_role_flag = True
577
+ for param in parsed_globals.keys():
578
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
579
+ OptionsDefine.RoleSessionName]:
580
+ if parsed_globals[param] is not None:
581
+ cvm_role_flag = False
582
+ break
577
583
  is_exist_profile = True
578
584
  if not parsed_globals["profile"]:
579
585
  is_exist_profile = False
@@ -604,6 +610,7 @@ def parse_global_arg(parsed_globals):
604
610
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
605
611
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
606
612
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
613
+ cvm_role_flag = False
607
614
 
608
615
  if os.environ.get(OptionsDefine.ENV_REGION):
609
616
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -611,6 +618,11 @@ def parse_global_arg(parsed_globals):
611
618
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
612
619
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
613
620
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
621
+ cvm_role_flag = False
622
+
623
+ if cvm_role_flag:
624
+ if "type" in cred and cred["type"] == "cvm-role":
625
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
614
626
 
615
627
  for param in g_param.keys():
616
628
  if g_param[param] is None:
tccli/services/tic/tic_client.py CHANGED
@@ -732,7 +732,13 @@ def action_caller():
732
732
 
733
733
  def parse_global_arg(parsed_globals):
734
734
  g_param = parsed_globals
735
-
735
+ cvm_role_flag = True
736
+ for param in parsed_globals.keys():
737
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
738
+ OptionsDefine.RoleSessionName]:
739
+ if parsed_globals[param] is not None:
740
+ cvm_role_flag = False
741
+ break
736
742
  is_exist_profile = True
737
743
  if not parsed_globals["profile"]:
738
744
  is_exist_profile = False
@@ -763,6 +769,7 @@ def parse_global_arg(parsed_globals):
763
769
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
764
770
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
765
771
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
772
+ cvm_role_flag = False
766
773
 
767
774
  if os.environ.get(OptionsDefine.ENV_REGION):
768
775
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -770,6 +777,11 @@ def parse_global_arg(parsed_globals):
770
777
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
771
778
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
772
779
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
780
+ cvm_role_flag = False
781
+
782
+ if cvm_role_flag:
783
+ if "type" in cred and cred["type"] == "cvm-role":
784
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
773
785
 
774
786
  for param in g_param.keys():
775
787
  if g_param[param] is None:
tccli/services/ticm/ticm_client.py CHANGED
@@ -202,7 +202,13 @@ def action_caller():
202
202
 
203
203
  def parse_global_arg(parsed_globals):
204
204
  g_param = parsed_globals
205
-
205
+ cvm_role_flag = True
206
+ for param in parsed_globals.keys():
207
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
208
+ OptionsDefine.RoleSessionName]:
209
+ if parsed_globals[param] is not None:
210
+ cvm_role_flag = False
211
+ break
206
212
  is_exist_profile = True
207
213
  if not parsed_globals["profile"]:
208
214
  is_exist_profile = False
@@ -233,6 +239,7 @@ def parse_global_arg(parsed_globals):
233
239
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
234
240
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
235
241
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
242
+ cvm_role_flag = False
236
243
 
237
244
  if os.environ.get(OptionsDefine.ENV_REGION):
238
245
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -240,6 +247,11 @@ def parse_global_arg(parsed_globals):
240
247
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
241
248
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
242
249
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
250
+ cvm_role_flag = False
251
+
252
+ if cvm_role_flag:
253
+ if "type" in cred and cred["type"] == "cvm-role":
254
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
243
255
 
244
256
  for param in g_param.keys():
245
257
  if g_param[param] is None:
tccli/services/tics/tics_client.py CHANGED
@@ -255,7 +255,13 @@ def action_caller():
255
255
 
256
256
  def parse_global_arg(parsed_globals):
257
257
  g_param = parsed_globals
258
-
258
+ cvm_role_flag = True
259
+ for param in parsed_globals.keys():
260
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
261
+ OptionsDefine.RoleSessionName]:
262
+ if parsed_globals[param] is not None:
263
+ cvm_role_flag = False
264
+ break
259
265
  is_exist_profile = True
260
266
  if not parsed_globals["profile"]:
261
267
  is_exist_profile = False
@@ -286,6 +292,7 @@ def parse_global_arg(parsed_globals):
286
292
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
287
293
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
288
294
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
295
+ cvm_role_flag = False
289
296
 
290
297
  if os.environ.get(OptionsDefine.ENV_REGION):
291
298
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -293,6 +300,11 @@ def parse_global_arg(parsed_globals):
293
300
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
294
301
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
295
302
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
303
+ cvm_role_flag = False
304
+
305
+ if cvm_role_flag:
306
+ if "type" in cred and cred["type"] == "cvm-role":
307
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
296
308
 
297
309
  for param in g_param.keys():
298
310
  if g_param[param] is None:
tccli/services/tiems/tiems_client.py CHANGED
@@ -1368,7 +1368,13 @@ def action_caller():
1368
1368
 
1369
1369
  def parse_global_arg(parsed_globals):
1370
1370
  g_param = parsed_globals
1371
-
1371
+ cvm_role_flag = True
1372
+ for param in parsed_globals.keys():
1373
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
1374
+ OptionsDefine.RoleSessionName]:
1375
+ if parsed_globals[param] is not None:
1376
+ cvm_role_flag = False
1377
+ break
1372
1378
  is_exist_profile = True
1373
1379
  if not parsed_globals["profile"]:
1374
1380
  is_exist_profile = False
@@ -1399,6 +1405,7 @@ def parse_global_arg(parsed_globals):
1399
1405
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
1400
1406
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
1401
1407
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
1408
+ cvm_role_flag = False
1402
1409
 
1403
1410
  if os.environ.get(OptionsDefine.ENV_REGION):
1404
1411
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -1406,6 +1413,11 @@ def parse_global_arg(parsed_globals):
1406
1413
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
1407
1414
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
1408
1415
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
1416
+ cvm_role_flag = False
1417
+
1418
+ if cvm_role_flag:
1419
+ if "type" in cred and cred["type"] == "cvm-role":
1420
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
1409
1421
 
1410
1422
  for param in g_param.keys():
1411
1423
  if g_param[param] is None:
tccli/services/tiia/tiia_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/tione/tione_client.py CHANGED
@@ -3228,7 +3228,13 @@ def action_caller():
3228
3228
 
3229
3229
  def parse_global_arg(parsed_globals):
3230
3230
  g_param = parsed_globals
3231
-
3231
+ cvm_role_flag = True
3232
+ for param in parsed_globals.keys():
3233
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
3234
+ OptionsDefine.RoleSessionName]:
3235
+ if parsed_globals[param] is not None:
3236
+ cvm_role_flag = False
3237
+ break
3232
3238
  is_exist_profile = True
3233
3239
  if not parsed_globals["profile"]:
3234
3240
  is_exist_profile = False
@@ -3259,6 +3265,7 @@ def parse_global_arg(parsed_globals):
3259
3265
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
3260
3266
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
3261
3267
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
3268
+ cvm_role_flag = False
3262
3269
 
3263
3270
  if os.environ.get(OptionsDefine.ENV_REGION):
3264
3271
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -3266,6 +3273,11 @@ def parse_global_arg(parsed_globals):
3266
3273
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
3267
3274
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
3268
3275
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
3276
+ cvm_role_flag = False
3277
+
3278
+ if cvm_role_flag:
3279
+ if "type" in cred and cred["type"] == "cvm-role":
3280
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
3269
3281
 
3270
3282
  for param in g_param.keys():
3271
3283
  if g_param[param] is None:
tccli/services/tiw/tiw_client.py CHANGED
@@ -3223,7 +3223,13 @@ def action_caller():
3223
3223
 
3224
3224
  def parse_global_arg(parsed_globals):
3225
3225
  g_param = parsed_globals
3226
-
3226
+ cvm_role_flag = True
3227
+ for param in parsed_globals.keys():
3228
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
3229
+ OptionsDefine.RoleSessionName]:
3230
+ if parsed_globals[param] is not None:
3231
+ cvm_role_flag = False
3232
+ break
3227
3233
  is_exist_profile = True
3228
3234
  if not parsed_globals["profile"]:
3229
3235
  is_exist_profile = False
@@ -3254,6 +3260,7 @@ def parse_global_arg(parsed_globals):
3254
3260
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
3255
3261
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
3256
3262
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
3263
+ cvm_role_flag = False
3257
3264
 
3258
3265
  if os.environ.get(OptionsDefine.ENV_REGION):
3259
3266
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -3261,6 +3268,11 @@ def parse_global_arg(parsed_globals):
3261
3268
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
3262
3269
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
3263
3270
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
3271
+ cvm_role_flag = False
3272
+
3273
+ if cvm_role_flag:
3274
+ if "type" in cred and cred["type"] == "cvm-role":
3275
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
3264
3276
 
3265
3277
  for param in g_param.keys():
3266
3278
  if g_param[param] is None:
tccli/services/tke/tke_client.py CHANGED
@@ -12821,7 +12821,13 @@ def action_caller():
12821
12821
 
12822
12822
  def parse_global_arg(parsed_globals):
12823
12823
  g_param = parsed_globals
12824
-
12824
+ cvm_role_flag = True
12825
+ for param in parsed_globals.keys():
12826
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
12827
+ OptionsDefine.RoleSessionName]:
12828
+ if parsed_globals[param] is not None:
12829
+ cvm_role_flag = False
12830
+ break
12825
12831
  is_exist_profile = True
12826
12832
  if not parsed_globals["profile"]:
12827
12833
  is_exist_profile = False
@@ -12852,6 +12858,7 @@ def parse_global_arg(parsed_globals):
12852
12858
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
12853
12859
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
12854
12860
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
12861
+ cvm_role_flag = False
12855
12862
 
12856
12863
  if os.environ.get(OptionsDefine.ENV_REGION):
12857
12864
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -12859,6 +12866,11 @@ def parse_global_arg(parsed_globals):
12859
12866
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
12860
12867
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
12861
12868
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
12869
+ cvm_role_flag = False
12870
+
12871
+ if cvm_role_flag:
12872
+ if "type" in cred and cred["type"] == "cvm-role":
12873
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
12862
12874
 
12863
12875
  for param in g_param.keys():
12864
12876
  if g_param[param] is None:
tccli/services/tkgdq/tkgdq_client.py CHANGED
@@ -202,7 +202,13 @@ def action_caller():
202
202
 
203
203
  def parse_global_arg(parsed_globals):
204
204
  g_param = parsed_globals
205
-
205
+ cvm_role_flag = True
206
+ for param in parsed_globals.keys():
207
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
208
+ OptionsDefine.RoleSessionName]:
209
+ if parsed_globals[param] is not None:
210
+ cvm_role_flag = False
211
+ break
206
212
  is_exist_profile = True
207
213
  if not parsed_globals["profile"]:
208
214
  is_exist_profile = False
@@ -233,6 +239,7 @@ def parse_global_arg(parsed_globals):
233
239
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
234
240
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
235
241
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
242
+ cvm_role_flag = False
236
243
 
237
244
  if os.environ.get(OptionsDefine.ENV_REGION):
238
245
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -240,6 +247,11 @@ def parse_global_arg(parsed_globals):
240
247
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
241
248
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
242
249
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
250
+ cvm_role_flag = False
251
+
252
+ if cvm_role_flag:
253
+ if "type" in cred and cred["type"] == "cvm-role":
254
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
243
255
 
244
256
  for param in g_param.keys():
245
257
  if g_param[param] is None:
tccli/services/tms/tms_client.py CHANGED
@@ -260,7 +260,13 @@ def action_caller():
260
260
 
261
261
  def parse_global_arg(parsed_globals):
262
262
  g_param = parsed_globals
263
-
263
+ cvm_role_flag = True
264
+ for param in parsed_globals.keys():
265
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
266
+ OptionsDefine.RoleSessionName]:
267
+ if parsed_globals[param] is not None:
268
+ cvm_role_flag = False
269
+ break
264
270
  is_exist_profile = True
265
271
  if not parsed_globals["profile"]:
266
272
  is_exist_profile = False
@@ -291,6 +297,7 @@ def parse_global_arg(parsed_globals):
291
297
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
292
298
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
293
299
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
300
+ cvm_role_flag = False
294
301
 
295
302
  if os.environ.get(OptionsDefine.ENV_REGION):
296
303
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -298,6 +305,11 @@ def parse_global_arg(parsed_globals):
298
305
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
299
306
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
300
307
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
308
+ cvm_role_flag = False
309
+
310
+ if cvm_role_flag:
311
+ if "type" in cred and cred["type"] == "cvm-role":
312
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
301
313
 
302
314
  for param in g_param.keys():
303
315
  if g_param[param] is None:
tccli/services/tmt/tmt_client.py CHANGED
@@ -414,7 +414,13 @@ def action_caller():
414
414
 
415
415
  def parse_global_arg(parsed_globals):
416
416
  g_param = parsed_globals
417
-
417
+ cvm_role_flag = True
418
+ for param in parsed_globals.keys():
419
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
420
+ OptionsDefine.RoleSessionName]:
421
+ if parsed_globals[param] is not None:
422
+ cvm_role_flag = False
423
+ break
418
424
  is_exist_profile = True
419
425
  if not parsed_globals["profile"]:
420
426
  is_exist_profile = False
@@ -445,6 +451,7 @@ def parse_global_arg(parsed_globals):
445
451
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
446
452
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
447
453
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
454
+ cvm_role_flag = False
448
455
 
449
456
  if os.environ.get(OptionsDefine.ENV_REGION):
450
457
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -452,6 +459,11 @@ def parse_global_arg(parsed_globals):
452
459
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
453
460
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
454
461
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
462
+ cvm_role_flag = False
463
+
464
+ if cvm_role_flag:
465
+ if "type" in cred and cred["type"] == "cvm-role":
466
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
455
467
 
456
468
  for param in g_param.keys():
457
469
  if g_param[param] is None:
tccli/services/tourism/tourism_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/trdp/trdp_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/trocket/trocket_client.py CHANGED
@@ -2640,7 +2640,13 @@ def action_caller():
2640
2640
 
2641
2641
  def parse_global_arg(parsed_globals):
2642
2642
  g_param = parsed_globals
2643
-
2643
+ cvm_role_flag = True
2644
+ for param in parsed_globals.keys():
2645
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2646
+ OptionsDefine.RoleSessionName]:
2647
+ if parsed_globals[param] is not None:
2648
+ cvm_role_flag = False
2649
+ break
2644
2650
  is_exist_profile = True
2645
2651
  if not parsed_globals["profile"]:
2646
2652
  is_exist_profile = False
@@ -2671,6 +2677,7 @@ def parse_global_arg(parsed_globals):
2671
2677
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2672
2678
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2673
2679
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2680
+ cvm_role_flag = False
2674
2681
 
2675
2682
  if os.environ.get(OptionsDefine.ENV_REGION):
2676
2683
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2678,6 +2685,11 @@ def parse_global_arg(parsed_globals):
2678
2685
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2679
2686
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2680
2687
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
2688
+ cvm_role_flag = False
2689
+
2690
+ if cvm_role_flag:
2691
+ if "type" in cred and cred["type"] == "cvm-role":
2692
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2681
2693
 
2682
2694
  for param in g_param.keys():
2683
2695
  if g_param[param] is None:
tccli/services/trp/trp_client.py CHANGED
@@ -2905,7 +2905,13 @@ def action_caller():
2905
2905
 
2906
2906
  def parse_global_arg(parsed_globals):
2907
2907
  g_param = parsed_globals
2908
-
2908
+ cvm_role_flag = True
2909
+ for param in parsed_globals.keys():
2910
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2911
+ OptionsDefine.RoleSessionName]:
2912
+ if parsed_globals[param] is not None:
2913
+ cvm_role_flag = False
2914
+ break
2909
2915
  is_exist_profile = True
2910
2916
  if not parsed_globals["profile"]:
2911
2917
  is_exist_profile = False
@@ -2936,6 +2942,7 @@ def parse_global_arg(parsed_globals):
2936
2942
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2937
2943
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2938
2944
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2945
+ cvm_role_flag = False
2939
2946
 
2940
2947
  if os.environ.get(OptionsDefine.ENV_REGION):
2941
2948
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2943,6 +2950,11 @@ def parse_global_arg(parsed_globals):
2943
2950
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2944
2951
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2945
2952
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
2953
+ cvm_role_flag = False
2954
+
2955
+ if cvm_role_flag:
2956
+ if "type" in cred and cred["type"] == "cvm-role":
2957
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2946
2958
 
2947
2959
  for param in g_param.keys():
2948
2960
  if g_param[param] is None:
tccli/services/trro/trro_client.py CHANGED
@@ -1262,7 +1262,13 @@ def action_caller():
1262
1262
 
1263
1263
  def parse_global_arg(parsed_globals):
1264
1264
  g_param = parsed_globals
1265
-
1265
+ cvm_role_flag = True
1266
+ for param in parsed_globals.keys():
1267
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
1268
+ OptionsDefine.RoleSessionName]:
1269
+ if parsed_globals[param] is not None:
1270
+ cvm_role_flag = False
1271
+ break
1266
1272
  is_exist_profile = True
1267
1273
  if not parsed_globals["profile"]:
1268
1274
  is_exist_profile = False
@@ -1293,6 +1299,7 @@ def parse_global_arg(parsed_globals):
1293
1299
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
1294
1300
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
1295
1301
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
1302
+ cvm_role_flag = False
1296
1303
 
1297
1304
  if os.environ.get(OptionsDefine.ENV_REGION):
1298
1305
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -1300,6 +1307,11 @@ def parse_global_arg(parsed_globals):
1300
1307
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
1301
1308
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
1302
1309
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
1310
+ cvm_role_flag = False
1311
+
1312
+ if cvm_role_flag:
1313
+ if "type" in cred and cred["type"] == "cvm-role":
1314
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
1303
1315
 
1304
1316
  for param in g_param.keys():
1305
1317
  if g_param[param] is None:
tccli/services/trtc/trtc_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: