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/dsgc/dsgc_client.py CHANGED
@@ -7887,7 +7887,13 @@ def action_caller():
7887
7887
 
7888
7888
  def parse_global_arg(parsed_globals):
7889
7889
  g_param = parsed_globals
7890
-
7890
+ cvm_role_flag = True
7891
+ for param in parsed_globals.keys():
7892
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
7893
+ OptionsDefine.RoleSessionName]:
7894
+ if parsed_globals[param] is not None:
7895
+ cvm_role_flag = False
7896
+ break
7891
7897
  is_exist_profile = True
7892
7898
  if not parsed_globals["profile"]:
7893
7899
  is_exist_profile = False
@@ -7918,6 +7924,7 @@ def parse_global_arg(parsed_globals):
7918
7924
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
7919
7925
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
7920
7926
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
7927
+ cvm_role_flag = False
7921
7928
 
7922
7929
  if os.environ.get(OptionsDefine.ENV_REGION):
7923
7930
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -7925,6 +7932,11 @@ def parse_global_arg(parsed_globals):
7925
7932
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
7926
7933
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
7927
7934
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
7935
+ cvm_role_flag = False
7936
+
7937
+ if cvm_role_flag:
7938
+ if "type" in cred and cred["type"] == "cvm-role":
7939
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
7928
7940
 
7929
7941
  for param in g_param.keys():
7930
7942
  if g_param[param] is None:
tccli/services/dtf/dtf_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/dts/dts_client.py CHANGED
@@ -4447,7 +4447,13 @@ def action_caller():
4447
4447
 
4448
4448
  def parse_global_arg(parsed_globals):
4449
4449
  g_param = parsed_globals
4450
-
4450
+ cvm_role_flag = True
4451
+ for param in parsed_globals.keys():
4452
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
4453
+ OptionsDefine.RoleSessionName]:
4454
+ if parsed_globals[param] is not None:
4455
+ cvm_role_flag = False
4456
+ break
4451
4457
  is_exist_profile = True
4452
4458
  if not parsed_globals["profile"]:
4453
4459
  is_exist_profile = False
@@ -4478,6 +4484,7 @@ def parse_global_arg(parsed_globals):
4478
4484
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
4479
4485
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
4480
4486
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
4487
+ cvm_role_flag = False
4481
4488
 
4482
4489
  if os.environ.get(OptionsDefine.ENV_REGION):
4483
4490
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -4485,6 +4492,11 @@ def parse_global_arg(parsed_globals):
4485
4492
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
4486
4493
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
4487
4494
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
4495
+ cvm_role_flag = False
4496
+
4497
+ if cvm_role_flag:
4498
+ if "type" in cred and cred["type"] == "cvm-role":
4499
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
4488
4500
 
4489
4501
  for param in g_param.keys():
4490
4502
  if g_param[param] is None:
tccli/services/eb/eb_client.py CHANGED
@@ -1739,7 +1739,13 @@ def action_caller():
1739
1739
 
1740
1740
  def parse_global_arg(parsed_globals):
1741
1741
  g_param = parsed_globals
1742
-
1742
+ cvm_role_flag = True
1743
+ for param in parsed_globals.keys():
1744
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
1745
+ OptionsDefine.RoleSessionName]:
1746
+ if parsed_globals[param] is not None:
1747
+ cvm_role_flag = False
1748
+ break
1743
1749
  is_exist_profile = True
1744
1750
  if not parsed_globals["profile"]:
1745
1751
  is_exist_profile = False
@@ -1770,6 +1776,7 @@ def parse_global_arg(parsed_globals):
1770
1776
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
1771
1777
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
1772
1778
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
1779
+ cvm_role_flag = False
1773
1780
 
1774
1781
  if os.environ.get(OptionsDefine.ENV_REGION):
1775
1782
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -1777,6 +1784,11 @@ def parse_global_arg(parsed_globals):
1777
1784
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
1778
1785
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
1779
1786
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
1787
+ cvm_role_flag = False
1788
+
1789
+ if cvm_role_flag:
1790
+ if "type" in cred and cred["type"] == "cvm-role":
1791
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
1780
1792
 
1781
1793
  for param in g_param.keys():
1782
1794
  if g_param[param] is None:
tccli/services/ecc/ecc_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/ecdn/ecdn_client.py CHANGED
@@ -891,7 +891,13 @@ def action_caller():
891
891
 
892
892
  def parse_global_arg(parsed_globals):
893
893
  g_param = parsed_globals
894
-
894
+ cvm_role_flag = True
895
+ for param in parsed_globals.keys():
896
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
897
+ OptionsDefine.RoleSessionName]:
898
+ if parsed_globals[param] is not None:
899
+ cvm_role_flag = False
900
+ break
895
901
  is_exist_profile = True
896
902
  if not parsed_globals["profile"]:
897
903
  is_exist_profile = False
@@ -922,6 +928,7 @@ def parse_global_arg(parsed_globals):
922
928
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
923
929
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
924
930
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
931
+ cvm_role_flag = False
925
932
 
926
933
  if os.environ.get(OptionsDefine.ENV_REGION):
927
934
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -929,6 +936,11 @@ def parse_global_arg(parsed_globals):
929
936
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
930
937
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
931
938
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
939
+ cvm_role_flag = False
940
+
941
+ if cvm_role_flag:
942
+ if "type" in cred and cred["type"] == "cvm-role":
943
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
932
944
 
933
945
  for param in g_param.keys():
934
946
  if g_param[param] is None:
tccli/services/ecm/ecm_client.py CHANGED
@@ -7410,7 +7410,13 @@ def action_caller():
7410
7410
 
7411
7411
  def parse_global_arg(parsed_globals):
7412
7412
  g_param = parsed_globals
7413
-
7413
+ cvm_role_flag = True
7414
+ for param in parsed_globals.keys():
7415
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
7416
+ OptionsDefine.RoleSessionName]:
7417
+ if parsed_globals[param] is not None:
7418
+ cvm_role_flag = False
7419
+ break
7414
7420
  is_exist_profile = True
7415
7421
  if not parsed_globals["profile"]:
7416
7422
  is_exist_profile = False
@@ -7441,6 +7447,7 @@ def parse_global_arg(parsed_globals):
7441
7447
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
7442
7448
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
7443
7449
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
7450
+ cvm_role_flag = False
7444
7451
 
7445
7452
  if os.environ.get(OptionsDefine.ENV_REGION):
7446
7453
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -7448,6 +7455,11 @@ def parse_global_arg(parsed_globals):
7448
7455
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
7449
7456
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
7450
7457
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
7458
+ cvm_role_flag = False
7459
+
7460
+ if cvm_role_flag:
7461
+ if "type" in cred and cred["type"] == "cvm-role":
7462
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
7451
7463
 
7452
7464
  for param in g_param.keys():
7453
7465
  if g_param[param] is None:
tccli/services/eiam/eiam_client.py CHANGED
@@ -2269,7 +2269,13 @@ def action_caller():
2269
2269
 
2270
2270
  def parse_global_arg(parsed_globals):
2271
2271
  g_param = parsed_globals
2272
-
2272
+ cvm_role_flag = True
2273
+ for param in parsed_globals.keys():
2274
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2275
+ OptionsDefine.RoleSessionName]:
2276
+ if parsed_globals[param] is not None:
2277
+ cvm_role_flag = False
2278
+ break
2273
2279
  is_exist_profile = True
2274
2280
  if not parsed_globals["profile"]:
2275
2281
  is_exist_profile = False
@@ -2300,6 +2306,7 @@ def parse_global_arg(parsed_globals):
2300
2306
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2301
2307
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2302
2308
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2309
+ cvm_role_flag = False
2303
2310
 
2304
2311
  if os.environ.get(OptionsDefine.ENV_REGION):
2305
2312
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2307,6 +2314,11 @@ def parse_global_arg(parsed_globals):
2307
2314
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2308
2315
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2309
2316
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
2317
+ cvm_role_flag = False
2318
+
2319
+ if cvm_role_flag:
2320
+ if "type" in cred and cred["type"] == "cvm-role":
2321
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2310
2322
 
2311
2323
  for param in g_param.keys():
2312
2324
  if g_param[param] is None:
tccli/services/eis/eis_client.py CHANGED
@@ -472,7 +472,13 @@ def action_caller():
472
472
 
473
473
  def parse_global_arg(parsed_globals):
474
474
  g_param = parsed_globals
475
-
475
+ cvm_role_flag = True
476
+ for param in parsed_globals.keys():
477
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
478
+ OptionsDefine.RoleSessionName]:
479
+ if parsed_globals[param] is not None:
480
+ cvm_role_flag = False
481
+ break
476
482
  is_exist_profile = True
477
483
  if not parsed_globals["profile"]:
478
484
  is_exist_profile = False
@@ -503,6 +509,7 @@ def parse_global_arg(parsed_globals):
503
509
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
504
510
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
505
511
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
512
+ cvm_role_flag = False
506
513
 
507
514
  if os.environ.get(OptionsDefine.ENV_REGION):
508
515
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -510,6 +517,11 @@ def parse_global_arg(parsed_globals):
510
517
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
511
518
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
512
519
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
520
+ cvm_role_flag = False
521
+
522
+ if cvm_role_flag:
523
+ if "type" in cred and cred["type"] == "cvm-role":
524
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
513
525
 
514
526
  for param in g_param.keys():
515
527
  if g_param[param] is None:
tccli/services/emr/emr_client.py CHANGED
@@ -3488,7 +3488,13 @@ def action_caller():
3488
3488
 
3489
3489
  def parse_global_arg(parsed_globals):
3490
3490
  g_param = parsed_globals
3491
-
3491
+ cvm_role_flag = True
3492
+ for param in parsed_globals.keys():
3493
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
3494
+ OptionsDefine.RoleSessionName]:
3495
+ if parsed_globals[param] is not None:
3496
+ cvm_role_flag = False
3497
+ break
3492
3498
  is_exist_profile = True
3493
3499
  if not parsed_globals["profile"]:
3494
3500
  is_exist_profile = False
@@ -3519,6 +3525,7 @@ def parse_global_arg(parsed_globals):
3519
3525
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
3520
3526
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
3521
3527
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
3528
+ cvm_role_flag = False
3522
3529
 
3523
3530
  if os.environ.get(OptionsDefine.ENV_REGION):
3524
3531
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -3526,6 +3533,11 @@ def parse_global_arg(parsed_globals):
3526
3533
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
3527
3534
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
3528
3535
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
3536
+ cvm_role_flag = False
3537
+
3538
+ if cvm_role_flag:
3539
+ if "type" in cred and cred["type"] == "cvm-role":
3540
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
3529
3541
 
3530
3542
  for param in g_param.keys():
3531
3543
  if g_param[param] is None:
tccli/services/es/es_client.py CHANGED
@@ -3276,7 +3276,13 @@ def action_caller():
3276
3276
 
3277
3277
  def parse_global_arg(parsed_globals):
3278
3278
  g_param = parsed_globals
3279
-
3279
+ cvm_role_flag = True
3280
+ for param in parsed_globals.keys():
3281
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
3282
+ OptionsDefine.RoleSessionName]:
3283
+ if parsed_globals[param] is not None:
3284
+ cvm_role_flag = False
3285
+ break
3280
3286
  is_exist_profile = True
3281
3287
  if not parsed_globals["profile"]:
3282
3288
  is_exist_profile = False
@@ -3307,6 +3313,7 @@ def parse_global_arg(parsed_globals):
3307
3313
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
3308
3314
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
3309
3315
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
3316
+ cvm_role_flag = False
3310
3317
 
3311
3318
  if os.environ.get(OptionsDefine.ENV_REGION):
3312
3319
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -3314,6 +3321,11 @@ def parse_global_arg(parsed_globals):
3314
3321
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
3315
3322
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
3316
3323
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
3324
+ cvm_role_flag = False
3325
+
3326
+ if cvm_role_flag:
3327
+ if "type" in cred and cred["type"] == "cvm-role":
3328
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
3317
3329
 
3318
3330
  for param in g_param.keys():
3319
3331
  if g_param[param] is None:
tccli/services/ess/ess_client.py CHANGED
@@ -5025,7 +5025,13 @@ def action_caller():
5025
5025
 
5026
5026
  def parse_global_arg(parsed_globals):
5027
5027
  g_param = parsed_globals
5028
-
5028
+ cvm_role_flag = True
5029
+ for param in parsed_globals.keys():
5030
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
5031
+ OptionsDefine.RoleSessionName]:
5032
+ if parsed_globals[param] is not None:
5033
+ cvm_role_flag = False
5034
+ break
5029
5035
  is_exist_profile = True
5030
5036
  if not parsed_globals["profile"]:
5031
5037
  is_exist_profile = False
@@ -5056,6 +5062,7 @@ def parse_global_arg(parsed_globals):
5056
5062
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
5057
5063
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
5058
5064
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
5065
+ cvm_role_flag = False
5059
5066
 
5060
5067
  if os.environ.get(OptionsDefine.ENV_REGION):
5061
5068
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -5063,6 +5070,11 @@ def parse_global_arg(parsed_globals):
5063
5070
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
5064
5071
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
5065
5072
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
5073
+ cvm_role_flag = False
5074
+
5075
+ if cvm_role_flag:
5076
+ if "type" in cred and cred["type"] == "cvm-role":
5077
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
5066
5078
 
5067
5079
  for param in g_param.keys():
5068
5080
  if g_param[param] is None:
tccli/services/essbasic/essbasic_client.py CHANGED
@@ -7150,7 +7150,13 @@ def action_caller():
7150
7150
 
7151
7151
  def parse_global_arg(parsed_globals):
7152
7152
  g_param = parsed_globals
7153
-
7153
+ cvm_role_flag = True
7154
+ for param in parsed_globals.keys():
7155
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
7156
+ OptionsDefine.RoleSessionName]:
7157
+ if parsed_globals[param] is not None:
7158
+ cvm_role_flag = False
7159
+ break
7154
7160
  is_exist_profile = True
7155
7161
  if not parsed_globals["profile"]:
7156
7162
  is_exist_profile = False
@@ -7181,6 +7187,7 @@ def parse_global_arg(parsed_globals):
7181
7187
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
7182
7188
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
7183
7189
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
7190
+ cvm_role_flag = False
7184
7191
 
7185
7192
  if os.environ.get(OptionsDefine.ENV_REGION):
7186
7193
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -7188,6 +7195,11 @@ def parse_global_arg(parsed_globals):
7188
7195
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
7189
7196
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
7190
7197
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
7198
+ cvm_role_flag = False
7199
+
7200
+ if cvm_role_flag:
7201
+ if "type" in cred and cred["type"] == "cvm-role":
7202
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
7191
7203
 
7192
7204
  for param in g_param.keys():
7193
7205
  if g_param[param] is None:
tccli/services/facefusion/facefusion_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/faceid/faceid_client.py CHANGED
@@ -2004,7 +2004,13 @@ def action_caller():
2004
2004
 
2005
2005
  def parse_global_arg(parsed_globals):
2006
2006
  g_param = parsed_globals
2007
-
2007
+ cvm_role_flag = True
2008
+ for param in parsed_globals.keys():
2009
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2010
+ OptionsDefine.RoleSessionName]:
2011
+ if parsed_globals[param] is not None:
2012
+ cvm_role_flag = False
2013
+ break
2008
2014
  is_exist_profile = True
2009
2015
  if not parsed_globals["profile"]:
2010
2016
  is_exist_profile = False
@@ -2035,6 +2041,7 @@ def parse_global_arg(parsed_globals):
2035
2041
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2036
2042
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2037
2043
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2044
+ cvm_role_flag = False
2038
2045
 
2039
2046
  if os.environ.get(OptionsDefine.ENV_REGION):
2040
2047
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2042,6 +2049,11 @@ def parse_global_arg(parsed_globals):
2042
2049
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2043
2050
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2044
2051
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
2052
+ cvm_role_flag = False
2053
+
2054
+ if cvm_role_flag:
2055
+ if "type" in cred and cred["type"] == "cvm-role":
2056
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2045
2057
 
2046
2058
  for param in g_param.keys():
2047
2059
  if g_param[param] is None:
tccli/services/fmu/fmu_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/ft/ft_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/gaap/gaap_client.py CHANGED
@@ -5608,7 +5608,13 @@ def action_caller():
5608
5608
 
5609
5609
  def parse_global_arg(parsed_globals):
5610
5610
  g_param = parsed_globals
5611
-
5611
+ cvm_role_flag = True
5612
+ for param in parsed_globals.keys():
5613
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
5614
+ OptionsDefine.RoleSessionName]:
5615
+ if parsed_globals[param] is not None:
5616
+ cvm_role_flag = False
5617
+ break
5612
5618
  is_exist_profile = True
5613
5619
  if not parsed_globals["profile"]:
5614
5620
  is_exist_profile = False
@@ -5639,6 +5645,7 @@ def parse_global_arg(parsed_globals):
5639
5645
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
5640
5646
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
5641
5647
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
5648
+ cvm_role_flag = False
5642
5649
 
5643
5650
  if os.environ.get(OptionsDefine.ENV_REGION):
5644
5651
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -5646,6 +5653,11 @@ def parse_global_arg(parsed_globals):
5646
5653
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
5647
5654
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
5648
5655
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
5656
+ cvm_role_flag = False
5657
+
5658
+ if cvm_role_flag:
5659
+ if "type" in cred and cred["type"] == "cvm-role":
5660
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
5649
5661
 
5650
5662
  for param in g_param.keys():
5651
5663
  if g_param[param] is None: