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/asw/asw_client.py CHANGED
@@ -520,7 +520,13 @@ def action_caller():
520
520
 
521
521
  def parse_global_arg(parsed_globals):
522
522
  g_param = parsed_globals
523
-
523
+ cvm_role_flag = True
524
+ for param in parsed_globals.keys():
525
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
526
+ OptionsDefine.RoleSessionName]:
527
+ if parsed_globals[param] is not None:
528
+ cvm_role_flag = False
529
+ break
524
530
  is_exist_profile = True
525
531
  if not parsed_globals["profile"]:
526
532
  is_exist_profile = False
@@ -551,6 +557,7 @@ def parse_global_arg(parsed_globals):
551
557
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
552
558
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
553
559
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
560
+ cvm_role_flag = False
554
561
 
555
562
  if os.environ.get(OptionsDefine.ENV_REGION):
556
563
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -558,6 +565,11 @@ def parse_global_arg(parsed_globals):
558
565
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
559
566
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
560
567
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
568
+ cvm_role_flag = False
569
+
570
+ if cvm_role_flag:
571
+ if "type" in cred and cred["type"] == "cvm-role":
572
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
561
573
 
562
574
  for param in g_param.keys():
563
575
  if g_param[param] is None:
tccli/services/autoscaling/autoscaling_client.py CHANGED
@@ -3064,7 +3064,13 @@ def action_caller():
3064
3064
 
3065
3065
  def parse_global_arg(parsed_globals):
3066
3066
  g_param = parsed_globals
3067
-
3067
+ cvm_role_flag = True
3068
+ for param in parsed_globals.keys():
3069
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
3070
+ OptionsDefine.RoleSessionName]:
3071
+ if parsed_globals[param] is not None:
3072
+ cvm_role_flag = False
3073
+ break
3068
3074
  is_exist_profile = True
3069
3075
  if not parsed_globals["profile"]:
3070
3076
  is_exist_profile = False
@@ -3095,6 +3101,7 @@ def parse_global_arg(parsed_globals):
3095
3101
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
3096
3102
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
3097
3103
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
3104
+ cvm_role_flag = False
3098
3105
 
3099
3106
  if os.environ.get(OptionsDefine.ENV_REGION):
3100
3107
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -3102,6 +3109,11 @@ def parse_global_arg(parsed_globals):
3102
3109
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
3103
3110
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
3104
3111
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
3112
+ cvm_role_flag = False
3113
+
3114
+ if cvm_role_flag:
3115
+ if "type" in cred and cred["type"] == "cvm-role":
3116
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
3105
3117
 
3106
3118
  for param in g_param.keys():
3107
3119
  if g_param[param] is None:
tccli/services/ba/ba_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/batch/batch_client.py CHANGED
@@ -1686,7 +1686,13 @@ def action_caller():
1686
1686
 
1687
1687
  def parse_global_arg(parsed_globals):
1688
1688
  g_param = parsed_globals
1689
-
1689
+ cvm_role_flag = True
1690
+ for param in parsed_globals.keys():
1691
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
1692
+ OptionsDefine.RoleSessionName]:
1693
+ if parsed_globals[param] is not None:
1694
+ cvm_role_flag = False
1695
+ break
1690
1696
  is_exist_profile = True
1691
1697
  if not parsed_globals["profile"]:
1692
1698
  is_exist_profile = False
@@ -1717,6 +1723,7 @@ def parse_global_arg(parsed_globals):
1717
1723
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
1718
1724
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
1719
1725
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
1726
+ cvm_role_flag = False
1720
1727
 
1721
1728
  if os.environ.get(OptionsDefine.ENV_REGION):
1722
1729
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -1724,6 +1731,11 @@ def parse_global_arg(parsed_globals):
1724
1731
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
1725
1732
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
1726
1733
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
1734
+ cvm_role_flag = False
1735
+
1736
+ if cvm_role_flag:
1737
+ if "type" in cred and cred["type"] == "cvm-role":
1738
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
1727
1739
 
1728
1740
  for param in g_param.keys():
1729
1741
  if g_param[param] is None:
tccli/services/bda/bda_client.py CHANGED
@@ -997,7 +997,13 @@ def action_caller():
997
997
 
998
998
  def parse_global_arg(parsed_globals):
999
999
  g_param = parsed_globals
1000
-
1000
+ cvm_role_flag = True
1001
+ for param in parsed_globals.keys():
1002
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
1003
+ OptionsDefine.RoleSessionName]:
1004
+ if parsed_globals[param] is not None:
1005
+ cvm_role_flag = False
1006
+ break
1001
1007
  is_exist_profile = True
1002
1008
  if not parsed_globals["profile"]:
1003
1009
  is_exist_profile = False
@@ -1028,6 +1034,7 @@ def parse_global_arg(parsed_globals):
1028
1034
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
1029
1035
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
1030
1036
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
1037
+ cvm_role_flag = False
1031
1038
 
1032
1039
  if os.environ.get(OptionsDefine.ENV_REGION):
1033
1040
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -1035,6 +1042,11 @@ def parse_global_arg(parsed_globals):
1035
1042
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
1036
1043
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
1037
1044
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
1045
+ cvm_role_flag = False
1046
+
1047
+ if cvm_role_flag:
1048
+ if "type" in cred and cred["type"] == "cvm-role":
1049
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
1038
1050
 
1039
1051
  for param in g_param.keys():
1040
1052
  if g_param[param] is None:
tccli/services/bh/bh_client.py CHANGED
@@ -3329,7 +3329,13 @@ def action_caller():
3329
3329
 
3330
3330
  def parse_global_arg(parsed_globals):
3331
3331
  g_param = parsed_globals
3332
-
3332
+ cvm_role_flag = True
3333
+ for param in parsed_globals.keys():
3334
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
3335
+ OptionsDefine.RoleSessionName]:
3336
+ if parsed_globals[param] is not None:
3337
+ cvm_role_flag = False
3338
+ break
3333
3339
  is_exist_profile = True
3334
3340
  if not parsed_globals["profile"]:
3335
3341
  is_exist_profile = False
@@ -3360,6 +3366,7 @@ def parse_global_arg(parsed_globals):
3360
3366
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
3361
3367
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
3362
3368
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
3369
+ cvm_role_flag = False
3363
3370
 
3364
3371
  if os.environ.get(OptionsDefine.ENV_REGION):
3365
3372
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -3367,6 +3374,11 @@ def parse_global_arg(parsed_globals):
3367
3374
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
3368
3375
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
3369
3376
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
3377
+ cvm_role_flag = False
3378
+
3379
+ if cvm_role_flag:
3380
+ if "type" in cred and cred["type"] == "cvm-role":
3381
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
3370
3382
 
3371
3383
  for param in g_param.keys():
3372
3384
  if g_param[param] is None:
tccli/services/bi/bi_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/billing/billing_client.py CHANGED
@@ -2481,7 +2481,13 @@ def action_caller():
2481
2481
 
2482
2482
  def parse_global_arg(parsed_globals):
2483
2483
  g_param = parsed_globals
2484
-
2484
+ cvm_role_flag = True
2485
+ for param in parsed_globals.keys():
2486
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2487
+ OptionsDefine.RoleSessionName]:
2488
+ if parsed_globals[param] is not None:
2489
+ cvm_role_flag = False
2490
+ break
2485
2491
  is_exist_profile = True
2486
2492
  if not parsed_globals["profile"]:
2487
2493
  is_exist_profile = False
@@ -2512,6 +2518,7 @@ def parse_global_arg(parsed_globals):
2512
2518
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2513
2519
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2514
2520
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2521
+ cvm_role_flag = False
2515
2522
 
2516
2523
  if os.environ.get(OptionsDefine.ENV_REGION):
2517
2524
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2519,6 +2526,11 @@ def parse_global_arg(parsed_globals):
2519
2526
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2520
2527
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2521
2528
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
2529
+ cvm_role_flag = False
2530
+
2531
+ if cvm_role_flag:
2532
+ if "type" in cred and cred["type"] == "cvm-role":
2533
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2522
2534
 
2523
2535
  for param in g_param.keys():
2524
2536
  if g_param[param] is None:
tccli/services/bizlive/bizlive_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/bm/bm_client.py CHANGED
@@ -2852,7 +2852,13 @@ def action_caller():
2852
2852
 
2853
2853
  def parse_global_arg(parsed_globals):
2854
2854
  g_param = parsed_globals
2855
-
2855
+ cvm_role_flag = True
2856
+ for param in parsed_globals.keys():
2857
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2858
+ OptionsDefine.RoleSessionName]:
2859
+ if parsed_globals[param] is not None:
2860
+ cvm_role_flag = False
2861
+ break
2856
2862
  is_exist_profile = True
2857
2863
  if not parsed_globals["profile"]:
2858
2864
  is_exist_profile = False
@@ -2883,6 +2889,7 @@ def parse_global_arg(parsed_globals):
2883
2889
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2884
2890
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2885
2891
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2892
+ cvm_role_flag = False
2886
2893
 
2887
2894
  if os.environ.get(OptionsDefine.ENV_REGION):
2888
2895
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2890,6 +2897,11 @@ def parse_global_arg(parsed_globals):
2890
2897
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2891
2898
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2892
2899
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
2900
+ cvm_role_flag = False
2901
+
2902
+ if cvm_role_flag:
2903
+ if "type" in cred and cred["type"] == "cvm-role":
2904
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2893
2905
 
2894
2906
  for param in g_param.keys():
2895
2907
  if g_param[param] is None:
tccli/services/bma/bma_client.py CHANGED
@@ -2009,7 +2009,13 @@ def action_caller():
2009
2009
 
2010
2010
  def parse_global_arg(parsed_globals):
2011
2011
  g_param = parsed_globals
2012
-
2012
+ cvm_role_flag = True
2013
+ for param in parsed_globals.keys():
2014
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2015
+ OptionsDefine.RoleSessionName]:
2016
+ if parsed_globals[param] is not None:
2017
+ cvm_role_flag = False
2018
+ break
2013
2019
  is_exist_profile = True
2014
2020
  if not parsed_globals["profile"]:
2015
2021
  is_exist_profile = False
@@ -2040,6 +2046,7 @@ def parse_global_arg(parsed_globals):
2040
2046
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2041
2047
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2042
2048
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2049
+ cvm_role_flag = False
2043
2050
 
2044
2051
  if os.environ.get(OptionsDefine.ENV_REGION):
2045
2052
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2047,6 +2054,11 @@ def parse_global_arg(parsed_globals):
2047
2054
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2048
2055
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2049
2056
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
2057
+ cvm_role_flag = False
2058
+
2059
+ if cvm_role_flag:
2060
+ if "type" in cred and cred["type"] == "cvm-role":
2061
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2050
2062
 
2051
2063
  for param in g_param.keys():
2052
2064
  if g_param[param] is None:
tccli/services/bmeip/bmeip_client.py CHANGED
@@ -1103,7 +1103,13 @@ def action_caller():
1103
1103
 
1104
1104
  def parse_global_arg(parsed_globals):
1105
1105
  g_param = parsed_globals
1106
-
1106
+ cvm_role_flag = True
1107
+ for param in parsed_globals.keys():
1108
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
1109
+ OptionsDefine.RoleSessionName]:
1110
+ if parsed_globals[param] is not None:
1111
+ cvm_role_flag = False
1112
+ break
1107
1113
  is_exist_profile = True
1108
1114
  if not parsed_globals["profile"]:
1109
1115
  is_exist_profile = False
@@ -1134,6 +1140,7 @@ def parse_global_arg(parsed_globals):
1134
1140
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
1135
1141
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
1136
1142
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
1143
+ cvm_role_flag = False
1137
1144
 
1138
1145
  if os.environ.get(OptionsDefine.ENV_REGION):
1139
1146
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -1141,6 +1148,11 @@ def parse_global_arg(parsed_globals):
1141
1148
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
1142
1149
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
1143
1150
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
1151
+ cvm_role_flag = False
1152
+
1153
+ if cvm_role_flag:
1154
+ if "type" in cred and cred["type"] == "cvm-role":
1155
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
1144
1156
 
1145
1157
  for param in g_param.keys():
1146
1158
  if g_param[param] is None:
tccli/services/bmlb/bmlb_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/bmvpc/bmvpc_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/bpaas/bpaas_client.py CHANGED
@@ -149,7 +149,13 @@ def action_caller():
149
149
 
150
150
  def parse_global_arg(parsed_globals):
151
151
  g_param = parsed_globals
152
-
152
+ cvm_role_flag = True
153
+ for param in parsed_globals.keys():
154
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
155
+ OptionsDefine.RoleSessionName]:
156
+ if parsed_globals[param] is not None:
157
+ cvm_role_flag = False
158
+ break
153
159
  is_exist_profile = True
154
160
  if not parsed_globals["profile"]:
155
161
  is_exist_profile = False
@@ -180,6 +186,7 @@ def parse_global_arg(parsed_globals):
180
186
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
181
187
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
182
188
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
189
+ cvm_role_flag = False
183
190
 
184
191
  if os.environ.get(OptionsDefine.ENV_REGION):
185
192
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -187,6 +194,11 @@ def parse_global_arg(parsed_globals):
187
194
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
188
195
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
189
196
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
197
+ cvm_role_flag = False
198
+
199
+ if cvm_role_flag:
200
+ if "type" in cred and cred["type"] == "cvm-role":
201
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
190
202
 
191
203
  for param in g_param.keys():
192
204
  if g_param[param] is None:
tccli/services/bri/bri_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/bsca/bsca_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/btoe/btoe_client.py CHANGED
@@ -790,7 +790,13 @@ def action_caller():
790
790
 
791
791
  def parse_global_arg(parsed_globals):
792
792
  g_param = parsed_globals
793
-
793
+ cvm_role_flag = True
794
+ for param in parsed_globals.keys():
795
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
796
+ OptionsDefine.RoleSessionName]:
797
+ if parsed_globals[param] is not None:
798
+ cvm_role_flag = False
799
+ break
794
800
  is_exist_profile = True
795
801
  if not parsed_globals["profile"]:
796
802
  is_exist_profile = False
@@ -821,6 +827,7 @@ def parse_global_arg(parsed_globals):
821
827
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
822
828
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
823
829
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
830
+ cvm_role_flag = False
824
831
 
825
832
  if os.environ.get(OptionsDefine.ENV_REGION):
826
833
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -828,6 +835,11 @@ def parse_global_arg(parsed_globals):
828
835
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
829
836
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
830
837
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
838
+ cvm_role_flag = False
839
+
840
+ if cvm_role_flag:
841
+ if "type" in cred and cred["type"] == "cvm-role":
842
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
831
843
 
832
844
  for param in g_param.keys():
833
845
  if g_param[param] is None: