tccli 3.0.1217.1__py2.py3-none-any.whl → 3.0.1219.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 (303) hide show
  1. tccli/__init__.py +1 -1
  2. tccli/command.py +0 -1
  3. tccli/configure.py +11 -1
  4. tccli/services/__init__.py +3 -0
  5. tccli/services/aa/aa_client.py +13 -1
  6. tccli/services/aai/aai_client.py +13 -1
  7. tccli/services/acp/acp_client.py +13 -1
  8. tccli/services/advisor/advisor_client.py +13 -1
  9. tccli/services/af/af_client.py +13 -1
  10. tccli/services/af/v20200226/api.json +2 -2
  11. tccli/services/afc/afc_client.py +13 -1
  12. tccli/services/aiart/aiart_client.py +13 -1
  13. tccli/services/ame/ame_client.py +13 -1
  14. tccli/services/ams/ams_client.py +13 -1
  15. tccli/services/anicloud/anicloud_client.py +13 -1
  16. tccli/services/antiddos/antiddos_client.py +13 -1
  17. tccli/services/apcas/apcas_client.py +13 -1
  18. tccli/services/ape/ape_client.py +13 -1
  19. tccli/services/api/api_client.py +13 -1
  20. tccli/services/apigateway/apigateway_client.py +13 -1
  21. tccli/services/apm/apm_client.py +13 -1
  22. tccli/services/asr/asr_client.py +13 -1
  23. tccli/services/asw/asw_client.py +13 -1
  24. tccli/services/autoscaling/autoscaling_client.py +13 -1
  25. tccli/services/ba/ba_client.py +13 -1
  26. tccli/services/batch/batch_client.py +13 -1
  27. tccli/services/bda/bda_client.py +13 -1
  28. tccli/services/bh/bh_client.py +13 -1
  29. tccli/services/bi/bi_client.py +13 -1
  30. tccli/services/billing/billing_client.py +13 -1
  31. tccli/services/billing/v20180709/api.json +176 -181
  32. tccli/services/billing/v20180709/examples.json +7 -7
  33. tccli/services/bizlive/bizlive_client.py +13 -1
  34. tccli/services/bm/bm_client.py +13 -1
  35. tccli/services/bma/bma_client.py +13 -1
  36. tccli/services/bmeip/bmeip_client.py +13 -1
  37. tccli/services/bmlb/bmlb_client.py +13 -1
  38. tccli/services/bmvpc/bmvpc_client.py +13 -1
  39. tccli/services/bpaas/bpaas_client.py +13 -1
  40. tccli/services/bri/bri_client.py +13 -1
  41. tccli/services/bsca/bsca_client.py +13 -1
  42. tccli/services/btoe/btoe_client.py +13 -1
  43. tccli/services/ca/ca_client.py +13 -1
  44. tccli/services/cam/cam_client.py +13 -1
  45. tccli/services/captcha/captcha_client.py +13 -1
  46. tccli/services/car/car_client.py +13 -1
  47. tccli/services/cat/cat_client.py +13 -1
  48. tccli/services/cbs/cbs_client.py +13 -1
  49. tccli/services/ccc/ccc_client.py +13 -1
  50. tccli/services/cdb/cdb_client.py +13 -1
  51. tccli/services/cdc/cdc_client.py +13 -1
  52. tccli/services/cdn/cdn_client.py +13 -1
  53. tccli/services/cds/cds_client.py +13 -1
  54. tccli/services/cdwch/cdwch_client.py +13 -1
  55. tccli/services/cdwdoris/cdwdoris_client.py +13 -1
  56. tccli/services/cdwpg/cdwpg_client.py +13 -1
  57. tccli/services/cdz/cdz_client.py +13 -1
  58. tccli/services/cfg/cfg_client.py +13 -1
  59. tccli/services/cfs/cfs_client.py +13 -1
  60. tccli/services/cfw/cfw_client.py +13 -1
  61. tccli/services/chdfs/chdfs_client.py +13 -1
  62. tccli/services/ciam/ciam_client.py +13 -1
  63. tccli/services/cii/cii_client.py +13 -1
  64. tccli/services/cim/cim_client.py +13 -1
  65. tccli/services/cis/cis_client.py +13 -1
  66. tccli/services/ckafka/ckafka_client.py +13 -1
  67. tccli/services/ckafka/v20190819/api.json +7 -7
  68. tccli/services/clb/clb_client.py +13 -1
  69. tccli/services/clb/v20180317/api.json +12 -12
  70. tccli/services/cloudapp/cloudapp_client.py +13 -1
  71. tccli/services/cloudaudit/cloudaudit_client.py +13 -1
  72. tccli/services/cloudhsm/cloudhsm_client.py +13 -1
  73. tccli/services/cloudstudio/cloudstudio_client.py +13 -1
  74. tccli/services/cls/cls_client.py +13 -1
  75. tccli/services/cme/cme_client.py +13 -1
  76. tccli/services/cmq/cmq_client.py +13 -1
  77. tccli/services/cms/cms_client.py +13 -1
  78. tccli/services/config/config_client.py +13 -1
  79. tccli/services/controlcenter/controlcenter_client.py +13 -1
  80. tccli/services/cpdp/cpdp_client.py +13 -1
  81. tccli/services/csip/csip_client.py +13 -1
  82. tccli/services/csxg/csxg_client.py +13 -1
  83. tccli/services/cvm/cvm_client.py +13 -1
  84. tccli/services/cwp/cwp_client.py +13 -1
  85. tccli/services/cwp/v20180228/api.json +1 -1
  86. tccli/services/cws/cws_client.py +13 -1
  87. tccli/services/cynosdb/cynosdb_client.py +13 -1
  88. tccli/services/dasb/dasb_client.py +13 -1
  89. tccli/services/dataintegration/dataintegration_client.py +13 -1
  90. tccli/services/dayu/dayu_client.py +13 -1
  91. tccli/services/dbbrain/dbbrain_client.py +13 -1
  92. tccli/services/dbdc/dbdc_client.py +13 -1
  93. tccli/services/dc/dc_client.py +13 -1
  94. tccli/services/dcdb/dcdb_client.py +13 -1
  95. tccli/services/dlc/dlc_client.py +13 -1
  96. tccli/services/dnspod/dnspod_client.py +13 -1
  97. tccli/services/domain/domain_client.py +13 -1
  98. tccli/services/drm/drm_client.py +13 -1
  99. tccli/services/ds/ds_client.py +13 -1
  100. tccli/services/dsgc/dsgc_client.py +13 -1
  101. tccli/services/dtf/dtf_client.py +13 -1
  102. tccli/services/dts/dts_client.py +13 -1
  103. tccli/services/eb/eb_client.py +13 -1
  104. tccli/services/ecc/ecc_client.py +13 -1
  105. tccli/services/ecdn/ecdn_client.py +13 -1
  106. tccli/services/ecm/ecm_client.py +13 -1
  107. tccli/services/eiam/eiam_client.py +13 -1
  108. tccli/services/eis/eis_client.py +13 -1
  109. tccli/services/emr/emr_client.py +13 -1
  110. tccli/services/es/es_client.py +13 -1
  111. tccli/services/es/v20180416/examples.json +2 -2
  112. tccli/services/ess/ess_client.py +13 -1
  113. tccli/services/ess/v20201111/api.json +9 -0
  114. tccli/services/essbasic/essbasic_client.py +13 -1
  115. tccli/services/essbasic/v20210526/api.json +9 -0
  116. tccli/services/facefusion/facefusion_client.py +13 -1
  117. tccli/services/faceid/faceid_client.py +13 -1
  118. tccli/services/faceid/v20180301/api.json +2 -2
  119. tccli/services/fmu/fmu_client.py +13 -1
  120. tccli/services/ft/ft_client.py +13 -1
  121. tccli/services/gaap/gaap_client.py +13 -1
  122. tccli/services/gme/gme_client.py +13 -1
  123. tccli/services/goosefs/goosefs_client.py +13 -1
  124. tccli/services/gpm/gpm_client.py +13 -1
  125. tccli/services/gs/gs_client.py +13 -1
  126. tccli/services/gse/gse_client.py +13 -1
  127. tccli/services/gwlb/gwlb_client.py +13 -1
  128. tccli/services/habo/habo_client.py +13 -1
  129. tccli/services/hai/hai_client.py +13 -1
  130. tccli/services/hasim/hasim_client.py +13 -1
  131. tccli/services/hcm/hcm_client.py +13 -1
  132. tccli/services/hunyuan/hunyuan_client.py +13 -1
  133. tccli/services/iai/iai_client.py +13 -1
  134. tccli/services/iai/v20180301/api.json +17 -13
  135. tccli/services/iai/v20200303/examples.json +200 -200
  136. tccli/services/iap/__init__.py +4 -0
  137. tccli/services/iap/iap_client.py +472 -0
  138. tccli/services/iap/v20240713/api.json +471 -0
  139. tccli/services/iap/v20240713/examples.json +59 -0
  140. tccli/services/ic/ic_client.py +13 -1
  141. tccli/services/icr/icr_client.py +13 -1
  142. tccli/services/ie/ie_client.py +13 -1
  143. tccli/services/iecp/iecp_client.py +13 -1
  144. tccli/services/ig/ig_client.py +13 -1
  145. tccli/services/iir/iir_client.py +13 -1
  146. tccli/services/ims/ims_client.py +13 -1
  147. tccli/services/ioa/ioa_client.py +13 -1
  148. tccli/services/iot/iot_client.py +13 -1
  149. tccli/services/iotcloud/iotcloud_client.py +13 -1
  150. tccli/services/iotexplorer/iotexplorer_client.py +13 -1
  151. tccli/services/iottid/iottid_client.py +13 -1
  152. tccli/services/iotvideo/iotvideo_client.py +13 -1
  153. tccli/services/iotvideoindustry/iotvideoindustry_client.py +13 -1
  154. tccli/services/irp/irp_client.py +13 -1
  155. tccli/services/iss/iss_client.py +13 -1
  156. tccli/services/ivld/ivld_client.py +13 -1
  157. tccli/services/keewidb/keewidb_client.py +13 -1
  158. tccli/services/kms/kms_client.py +13 -1
  159. tccli/services/lcic/lcic_client.py +13 -1
  160. tccli/services/lcic/v20220817/api.json +3 -3
  161. tccli/services/lighthouse/lighthouse_client.py +13 -1
  162. tccli/services/live/live_client.py +441 -5
  163. tccli/services/live/v20180801/api.json +1070 -68
  164. tccli/services/live/v20180801/examples.json +64 -0
  165. tccli/services/lke/lke_client.py +13 -1
  166. tccli/services/lowcode/lowcode_client.py +13 -1
  167. tccli/services/lp/lp_client.py +13 -1
  168. tccli/services/mall/mall_client.py +13 -1
  169. tccli/services/mariadb/mariadb_client.py +13 -1
  170. tccli/services/market/market_client.py +13 -1
  171. tccli/services/market/v20191010/api.json +4 -4
  172. tccli/services/market/v20191010/examples.json +2 -2
  173. tccli/services/memcached/memcached_client.py +13 -1
  174. tccli/services/mgobe/mgobe_client.py +13 -1
  175. tccli/services/mmps/mmps_client.py +13 -1
  176. tccli/services/mna/mna_client.py +13 -1
  177. tccli/services/mongodb/mongodb_client.py +13 -1
  178. tccli/services/monitor/monitor_client.py +13 -1
  179. tccli/services/mps/mps_client.py +13 -1
  180. tccli/services/mps/v20190612/api.json +20 -0
  181. tccli/services/mqtt/mqtt_client.py +13 -1
  182. tccli/services/mrs/mrs_client.py +13 -1
  183. tccli/services/ms/ms_client.py +13 -1
  184. tccli/services/msp/msp_client.py +13 -1
  185. tccli/services/mvj/mvj_client.py +13 -1
  186. tccli/services/nlp/nlp_client.py +13 -1
  187. tccli/services/npp/npp_client.py +13 -1
  188. tccli/services/oceanus/oceanus_client.py +13 -1
  189. tccli/services/ocr/ocr_client.py +13 -1
  190. tccli/services/omics/omics_client.py +13 -1
  191. tccli/services/organization/organization_client.py +13 -1
  192. tccli/services/partners/partners_client.py +13 -1
  193. tccli/services/partners/v20180321/api.json +4 -4
  194. tccli/services/pds/pds_client.py +13 -1
  195. tccli/services/postgres/postgres_client.py +13 -1
  196. tccli/services/privatedns/privatedns_client.py +13 -1
  197. tccli/services/pts/pts_client.py +13 -1
  198. tccli/services/pts/v20210728/api.json +3 -0
  199. tccli/services/rce/rce_client.py +13 -1
  200. tccli/services/redis/redis_client.py +13 -1
  201. tccli/services/redis/v20180412/api.json +169 -163
  202. tccli/services/redis/v20180412/examples.json +3 -3
  203. tccli/services/region/region_client.py +13 -1
  204. tccli/services/rkp/rkp_client.py +13 -1
  205. tccli/services/rp/rp_client.py +13 -1
  206. tccli/services/rum/rum_client.py +13 -1
  207. tccli/services/scf/scf_client.py +13 -1
  208. tccli/services/ses/ses_client.py +13 -1
  209. tccli/services/smh/smh_client.py +13 -1
  210. tccli/services/smop/smop_client.py +13 -1
  211. tccli/services/smpn/smpn_client.py +13 -1
  212. tccli/services/sms/sms_client.py +13 -1
  213. tccli/services/soe/soe_client.py +13 -1
  214. tccli/services/solar/solar_client.py +13 -1
  215. tccli/services/sqlserver/sqlserver_client.py +13 -1
  216. tccli/services/ssa/ssa_client.py +13 -1
  217. tccli/services/ssl/ssl_client.py +13 -1
  218. tccli/services/sslpod/sslpod_client.py +13 -1
  219. tccli/services/ssm/ssm_client.py +13 -1
  220. tccli/services/sts/sts_client.py +13 -1
  221. tccli/services/svp/svp_client.py +13 -1
  222. tccli/services/svp/v20240125/api.json +27 -27
  223. tccli/services/svp/v20240125/examples.json +1 -1
  224. tccli/services/taf/taf_client.py +13 -1
  225. tccli/services/tag/tag_client.py +13 -1
  226. tccli/services/tan/tan_client.py +13 -1
  227. tccli/services/tat/tat_client.py +13 -1
  228. tccli/services/tat/v20201028/api.json +5 -5
  229. tccli/services/tav/tav_client.py +13 -1
  230. tccli/services/tbaas/tbaas_client.py +13 -1
  231. tccli/services/tbm/tbm_client.py +13 -1
  232. tccli/services/tbp/tbp_client.py +13 -1
  233. tccli/services/tcaplusdb/tcaplusdb_client.py +13 -1
  234. tccli/services/tcb/tcb_client.py +13 -1
  235. tccli/services/tcbr/tcbr_client.py +13 -1
  236. tccli/services/tcex/tcex_client.py +13 -1
  237. tccli/services/tchd/tchd_client.py +13 -1
  238. tccli/services/tci/tci_client.py +13 -1
  239. tccli/services/tcm/tcm_client.py +13 -1
  240. tccli/services/tcr/tcr_client.py +13 -1
  241. tccli/services/tcss/tcss_client.py +13 -1
  242. tccli/services/tdcpg/tdcpg_client.py +13 -1
  243. tccli/services/tdid/tdid_client.py +13 -1
  244. tccli/services/tdmq/tdmq_client.py +13 -1
  245. tccli/services/tdmq/v20200217/api.json +1 -1
  246. tccli/services/tds/tds_client.py +13 -1
  247. tccli/services/tem/tem_client.py +13 -1
  248. tccli/services/teo/teo_client.py +13 -1
  249. tccli/services/thpc/thpc_client.py +13 -1
  250. tccli/services/tia/tia_client.py +13 -1
  251. tccli/services/tic/tic_client.py +13 -1
  252. tccli/services/ticm/ticm_client.py +13 -1
  253. tccli/services/tics/tics_client.py +13 -1
  254. tccli/services/tiems/tiems_client.py +13 -1
  255. tccli/services/tiia/tiia_client.py +13 -1
  256. tccli/services/tione/tione_client.py +13 -1
  257. tccli/services/tiw/tiw_client.py +13 -1
  258. tccli/services/tke/tke_client.py +13 -1
  259. tccli/services/tke/v20220501/api.json +2 -2
  260. tccli/services/tkgdq/tkgdq_client.py +13 -1
  261. tccli/services/tms/tms_client.py +13 -1
  262. tccli/services/tmt/tmt_client.py +13 -1
  263. tccli/services/tourism/tourism_client.py +13 -1
  264. tccli/services/trdp/trdp_client.py +13 -1
  265. tccli/services/trocket/trocket_client.py +13 -1
  266. tccli/services/trp/trp_client.py +13 -1
  267. tccli/services/trro/trro_client.py +13 -1
  268. tccli/services/trtc/trtc_client.py +13 -1
  269. tccli/services/tse/tse_client.py +13 -1
  270. tccli/services/tse/v20201207/api.json +199 -12
  271. tccli/services/tsf/tsf_client.py +13 -1
  272. tccli/services/tsi/tsi_client.py +13 -1
  273. tccli/services/tsw/tsw_client.py +13 -1
  274. tccli/services/tts/tts_client.py +13 -1
  275. tccli/services/ump/ump_client.py +13 -1
  276. tccli/services/vcg/v20240404/api.json +1 -1
  277. tccli/services/vcg/v20240404/examples.json +4 -4
  278. tccli/services/vcg/vcg_client.py +13 -1
  279. tccli/services/vclm/vclm_client.py +13 -1
  280. tccli/services/vdb/vdb_client.py +13 -1
  281. tccli/services/vm/vm_client.py +13 -1
  282. tccli/services/vms/vms_client.py +13 -1
  283. tccli/services/vod/vod_client.py +13 -1
  284. tccli/services/vpc/v20170312/api.json +492 -66
  285. tccli/services/vpc/v20170312/examples.json +59 -21
  286. tccli/services/vpc/vpc_client.py +225 -1
  287. tccli/services/vrs/vrs_client.py +13 -1
  288. tccli/services/vtc/vtc_client.py +13 -1
  289. tccli/services/waf/waf_client.py +13 -1
  290. tccli/services/wav/wav_client.py +13 -1
  291. tccli/services/wedata/wedata_client.py +13 -1
  292. tccli/services/weilingwith/weilingwith_client.py +13 -1
  293. tccli/services/wss/wss_client.py +13 -1
  294. tccli/services/yinsuda/yinsuda_client.py +13 -1
  295. tccli/services/youmall/youmall_client.py +13 -1
  296. tccli/services/yunjing/yunjing_client.py +13 -1
  297. tccli/services/yunsou/yunsou_client.py +13 -1
  298. tccli/utils.py +8 -0
  299. {tccli-3.0.1217.1.dist-info → tccli-3.0.1219.1.dist-info}/METADATA +2 -2
  300. {tccli-3.0.1217.1.dist-info → tccli-3.0.1219.1.dist-info}/RECORD +303 -299
  301. {tccli-3.0.1217.1.dist-info → tccli-3.0.1219.1.dist-info}/WHEEL +0 -0
  302. {tccli-3.0.1217.1.dist-info → tccli-3.0.1219.1.dist-info}/entry_points.txt +0 -0
  303. {tccli-3.0.1217.1.dist-info → tccli-3.0.1219.1.dist-info}/license_files/LICENSE +0 -0
tccli/services/mqtt/mqtt_client.py CHANGED
@@ -1050,7 +1050,13 @@ def action_caller():
1050
1050
 
1051
1051
  def parse_global_arg(parsed_globals):
1052
1052
  g_param = parsed_globals
1053
-
1053
+ cvm_role_flag = True
1054
+ for param in parsed_globals.keys():
1055
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
1056
+ OptionsDefine.RoleSessionName]:
1057
+ if parsed_globals[param] is not None:
1058
+ cvm_role_flag = False
1059
+ break
1054
1060
  is_exist_profile = True
1055
1061
  if not parsed_globals["profile"]:
1056
1062
  is_exist_profile = False
@@ -1081,6 +1087,7 @@ def parse_global_arg(parsed_globals):
1081
1087
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
1082
1088
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
1083
1089
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
1090
+ cvm_role_flag = False
1084
1091
 
1085
1092
  if os.environ.get(OptionsDefine.ENV_REGION):
1086
1093
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -1088,6 +1095,11 @@ def parse_global_arg(parsed_globals):
1088
1095
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
1089
1096
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
1090
1097
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
1098
+ cvm_role_flag = False
1099
+
1100
+ if cvm_role_flag:
1101
+ if "type" in cred and cred["type"] == "cvm-role":
1102
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
1091
1103
 
1092
1104
  for param in g_param.keys():
1093
1105
  if g_param[param] is None:
tccli/services/mrs/mrs_client.py CHANGED
@@ -626,7 +626,13 @@ def action_caller():
626
626
 
627
627
  def parse_global_arg(parsed_globals):
628
628
  g_param = parsed_globals
629
-
629
+ cvm_role_flag = True
630
+ for param in parsed_globals.keys():
631
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
632
+ OptionsDefine.RoleSessionName]:
633
+ if parsed_globals[param] is not None:
634
+ cvm_role_flag = False
635
+ break
630
636
  is_exist_profile = True
631
637
  if not parsed_globals["profile"]:
632
638
  is_exist_profile = False
@@ -657,6 +663,7 @@ def parse_global_arg(parsed_globals):
657
663
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
658
664
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
659
665
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
666
+ cvm_role_flag = False
660
667
 
661
668
  if os.environ.get(OptionsDefine.ENV_REGION):
662
669
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -664,6 +671,11 @@ def parse_global_arg(parsed_globals):
664
671
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
665
672
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
666
673
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
674
+ cvm_role_flag = False
675
+
676
+ if cvm_role_flag:
677
+ if "type" in cred and cred["type"] == "cvm-role":
678
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
667
679
 
668
680
  for param in g_param.keys():
669
681
  if g_param[param] is None:
tccli/services/ms/ms_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/msp/msp_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/mvj/mvj_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/nlp/nlp_client.py CHANGED
@@ -679,7 +679,13 @@ def action_caller():
679
679
 
680
680
  def parse_global_arg(parsed_globals):
681
681
  g_param = parsed_globals
682
-
682
+ cvm_role_flag = True
683
+ for param in parsed_globals.keys():
684
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
685
+ OptionsDefine.RoleSessionName]:
686
+ if parsed_globals[param] is not None:
687
+ cvm_role_flag = False
688
+ break
683
689
  is_exist_profile = True
684
690
  if not parsed_globals["profile"]:
685
691
  is_exist_profile = False
@@ -710,6 +716,7 @@ def parse_global_arg(parsed_globals):
710
716
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
711
717
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
712
718
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
719
+ cvm_role_flag = False
713
720
 
714
721
  if os.environ.get(OptionsDefine.ENV_REGION):
715
722
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -717,6 +724,11 @@ def parse_global_arg(parsed_globals):
717
724
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
718
725
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
719
726
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
727
+ cvm_role_flag = False
728
+
729
+ if cvm_role_flag:
730
+ if "type" in cred and cred["type"] == "cvm-role":
731
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
720
732
 
721
733
  for param in g_param.keys():
722
734
  if g_param[param] is None:
tccli/services/npp/npp_client.py CHANGED
@@ -467,7 +467,13 @@ def action_caller():
467
467
 
468
468
  def parse_global_arg(parsed_globals):
469
469
  g_param = parsed_globals
470
-
470
+ cvm_role_flag = True
471
+ for param in parsed_globals.keys():
472
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
473
+ OptionsDefine.RoleSessionName]:
474
+ if parsed_globals[param] is not None:
475
+ cvm_role_flag = False
476
+ break
471
477
  is_exist_profile = True
472
478
  if not parsed_globals["profile"]:
473
479
  is_exist_profile = False
@@ -498,6 +504,7 @@ def parse_global_arg(parsed_globals):
498
504
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
499
505
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
500
506
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
507
+ cvm_role_flag = False
501
508
 
502
509
  if os.environ.get(OptionsDefine.ENV_REGION):
503
510
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -505,6 +512,11 @@ def parse_global_arg(parsed_globals):
505
512
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
506
513
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
507
514
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
515
+ cvm_role_flag = False
516
+
517
+ if cvm_role_flag:
518
+ if "type" in cred and cred["type"] == "cvm-role":
519
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
508
520
 
509
521
  for param in g_param.keys():
510
522
  if g_param[param] is None:
tccli/services/oceanus/oceanus_client.py CHANGED
@@ -2110,7 +2110,13 @@ def action_caller():
2110
2110
 
2111
2111
  def parse_global_arg(parsed_globals):
2112
2112
  g_param = parsed_globals
2113
-
2113
+ cvm_role_flag = True
2114
+ for param in parsed_globals.keys():
2115
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2116
+ OptionsDefine.RoleSessionName]:
2117
+ if parsed_globals[param] is not None:
2118
+ cvm_role_flag = False
2119
+ break
2114
2120
  is_exist_profile = True
2115
2121
  if not parsed_globals["profile"]:
2116
2122
  is_exist_profile = False
@@ -2141,6 +2147,7 @@ def parse_global_arg(parsed_globals):
2141
2147
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2142
2148
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2143
2149
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2150
+ cvm_role_flag = False
2144
2151
 
2145
2152
  if os.environ.get(OptionsDefine.ENV_REGION):
2146
2153
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2148,6 +2155,11 @@ def parse_global_arg(parsed_globals):
2148
2155
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2149
2156
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2150
2157
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
2158
+ cvm_role_flag = False
2159
+
2160
+ if cvm_role_flag:
2161
+ if "type" in cred and cred["type"] == "cvm-role":
2162
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2151
2163
 
2152
2164
  for param in g_param.keys():
2153
2165
  if g_param[param] is None:
tccli/services/ocr/ocr_client.py CHANGED
@@ -4866,7 +4866,13 @@ def action_caller():
4866
4866
 
4867
4867
  def parse_global_arg(parsed_globals):
4868
4868
  g_param = parsed_globals
4869
-
4869
+ cvm_role_flag = True
4870
+ for param in parsed_globals.keys():
4871
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
4872
+ OptionsDefine.RoleSessionName]:
4873
+ if parsed_globals[param] is not None:
4874
+ cvm_role_flag = False
4875
+ break
4870
4876
  is_exist_profile = True
4871
4877
  if not parsed_globals["profile"]:
4872
4878
  is_exist_profile = False
@@ -4897,6 +4903,7 @@ def parse_global_arg(parsed_globals):
4897
4903
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
4898
4904
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
4899
4905
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
4906
+ cvm_role_flag = False
4900
4907
 
4901
4908
  if os.environ.get(OptionsDefine.ENV_REGION):
4902
4909
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -4904,6 +4911,11 @@ def parse_global_arg(parsed_globals):
4904
4911
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
4905
4912
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
4906
4913
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
4914
+ cvm_role_flag = False
4915
+
4916
+ if cvm_role_flag:
4917
+ if "type" in cred and cred["type"] == "cvm-role":
4918
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
4907
4919
 
4908
4920
  for param in g_param.keys():
4909
4921
  if g_param[param] is None:
tccli/services/omics/omics_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/organization/organization_client.py CHANGED
@@ -7256,7 +7256,13 @@ def action_caller():
7256
7256
 
7257
7257
  def parse_global_arg(parsed_globals):
7258
7258
  g_param = parsed_globals
7259
-
7259
+ cvm_role_flag = True
7260
+ for param in parsed_globals.keys():
7261
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
7262
+ OptionsDefine.RoleSessionName]:
7263
+ if parsed_globals[param] is not None:
7264
+ cvm_role_flag = False
7265
+ break
7260
7266
  is_exist_profile = True
7261
7267
  if not parsed_globals["profile"]:
7262
7268
  is_exist_profile = False
@@ -7287,6 +7293,7 @@ def parse_global_arg(parsed_globals):
7287
7293
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
7288
7294
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
7289
7295
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
7296
+ cvm_role_flag = False
7290
7297
 
7291
7298
  if os.environ.get(OptionsDefine.ENV_REGION):
7292
7299
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -7294,6 +7301,11 @@ def parse_global_arg(parsed_globals):
7294
7301
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
7295
7302
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
7296
7303
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
7304
+ cvm_role_flag = False
7305
+
7306
+ if cvm_role_flag:
7307
+ if "type" in cred and cred["type"] == "cvm-role":
7308
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
7297
7309
 
7298
7310
  for param in g_param.keys():
7299
7311
  if g_param[param] is None:
tccli/services/partners/partners_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/partners/v20180321/api.json CHANGED
@@ -582,7 +582,7 @@
582
582
  {
583
583
  "disabled": false,
584
584
  "document": "订单自增 ID【请勿依赖该字段作为唯一标识】",
585
- "example": "202008124664564",
585
+ "example": "20200812123456",
586
586
  "member": "string",
587
587
  "name": "DealId",
588
588
  "output_required": true,
@@ -592,7 +592,7 @@
592
592
  {
593
593
  "disabled": false,
594
594
  "document": "订单号【订单唯一键】",
595
- "example": "202008124664564",
595
+ "example": "20200812123456",
596
596
  "member": "string",
597
597
  "name": "DealName",
598
598
  "output_required": true,
@@ -762,7 +762,7 @@
762
762
  {
763
763
  "disabled": false,
764
764
  "document": "大订单号",
765
- "example": "202008124664564",
765
+ "example": "20200812123456",
766
766
  "member": "string",
767
767
  "name": "BigDealId",
768
768
  "output_required": true,
@@ -872,7 +872,7 @@
872
872
  {
873
873
  "disabled": false,
874
874
  "document": "退款单的原订单信息。当前仅 DescribeClientDealsByCache 接口会返回该字段",
875
- "example": "[{\"DealName\":\"test\",\"RefundAmount\":10001}]",
875
+ "example": "[{\"DealName\":\"demo\",\"RefundAmount\":10001}]",
876
876
  "member": "RefundMap",
877
877
  "name": "RefundMap",
878
878
  "output_required": false,
tccli/services/pds/pds_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/postgres/postgres_client.py CHANGED
@@ -5396,7 +5396,13 @@ def action_caller():
5396
5396
 
5397
5397
  def parse_global_arg(parsed_globals):
5398
5398
  g_param = parsed_globals
5399
-
5399
+ cvm_role_flag = True
5400
+ for param in parsed_globals.keys():
5401
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
5402
+ OptionsDefine.RoleSessionName]:
5403
+ if parsed_globals[param] is not None:
5404
+ cvm_role_flag = False
5405
+ break
5400
5406
  is_exist_profile = True
5401
5407
  if not parsed_globals["profile"]:
5402
5408
  is_exist_profile = False
@@ -5427,6 +5433,7 @@ def parse_global_arg(parsed_globals):
5427
5433
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
5428
5434
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
5429
5435
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
5436
+ cvm_role_flag = False
5430
5437
 
5431
5438
  if os.environ.get(OptionsDefine.ENV_REGION):
5432
5439
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -5434,6 +5441,11 @@ def parse_global_arg(parsed_globals):
5434
5441
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
5435
5442
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
5436
5443
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
5444
+ cvm_role_flag = False
5445
+
5446
+ if cvm_role_flag:
5447
+ if "type" in cred and cred["type"] == "cvm-role":
5448
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
5437
5449
 
5438
5450
  for param in g_param.keys():
5439
5451
  if g_param[param] is None:
tccli/services/privatedns/privatedns_client.py CHANGED
@@ -1845,7 +1845,13 @@ def action_caller():
1845
1845
 
1846
1846
  def parse_global_arg(parsed_globals):
1847
1847
  g_param = parsed_globals
1848
-
1848
+ cvm_role_flag = True
1849
+ for param in parsed_globals.keys():
1850
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
1851
+ OptionsDefine.RoleSessionName]:
1852
+ if parsed_globals[param] is not None:
1853
+ cvm_role_flag = False
1854
+ break
1849
1855
  is_exist_profile = True
1850
1856
  if not parsed_globals["profile"]:
1851
1857
  is_exist_profile = False
@@ -1876,6 +1882,7 @@ def parse_global_arg(parsed_globals):
1876
1882
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
1877
1883
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
1878
1884
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
1885
+ cvm_role_flag = False
1879
1886
 
1880
1887
  if os.environ.get(OptionsDefine.ENV_REGION):
1881
1888
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -1883,6 +1890,11 @@ def parse_global_arg(parsed_globals):
1883
1890
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
1884
1891
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
1885
1892
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
1893
+ cvm_role_flag = False
1894
+
1895
+ if cvm_role_flag:
1896
+ if "type" in cred and cred["type"] == "cvm-role":
1897
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
1886
1898
 
1887
1899
  for param in g_param.keys():
1888
1900
  if g_param[param] is None:
tccli/services/pts/pts_client.py CHANGED
@@ -2587,7 +2587,13 @@ def action_caller():
2587
2587
 
2588
2588
  def parse_global_arg(parsed_globals):
2589
2589
  g_param = parsed_globals
2590
-
2590
+ cvm_role_flag = True
2591
+ for param in parsed_globals.keys():
2592
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
2593
+ OptionsDefine.RoleSessionName]:
2594
+ if parsed_globals[param] is not None:
2595
+ cvm_role_flag = False
2596
+ break
2591
2597
  is_exist_profile = True
2592
2598
  if not parsed_globals["profile"]:
2593
2599
  is_exist_profile = False
@@ -2618,6 +2624,7 @@ def parse_global_arg(parsed_globals):
2618
2624
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
2619
2625
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
2620
2626
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
2627
+ cvm_role_flag = False
2621
2628
 
2622
2629
  if os.environ.get(OptionsDefine.ENV_REGION):
2623
2630
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -2625,6 +2632,11 @@ def parse_global_arg(parsed_globals):
2625
2632
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
2626
2633
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
2627
2634
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
2635
+ cvm_role_flag = False
2636
+
2637
+ if cvm_role_flag:
2638
+ if "type" in cred and cred["type"] == "cvm-role":
2639
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
2628
2640
 
2629
2641
  for param in g_param.keys():
2630
2642
  if g_param[param] is None:
tccli/services/pts/v20210728/api.json CHANGED
@@ -5314,6 +5314,7 @@
5314
5314
  "example": "无",
5315
5315
  "member": "Concurrency",
5316
5316
  "name": "Concurrency",
5317
+ "output_required": true,
5317
5318
  "required": false,
5318
5319
  "type": "object",
5319
5320
  "value_allowed_null": true
@@ -5324,6 +5325,7 @@
5324
5325
  "example": "无",
5325
5326
  "member": "RequestsPerSecond",
5326
5327
  "name": "RequestsPerSecond",
5328
+ "output_required": true,
5327
5329
  "required": false,
5328
5330
  "type": "object",
5329
5331
  "value_allowed_null": true
@@ -5334,6 +5336,7 @@
5334
5336
  "example": "无",
5335
5337
  "member": "ScriptOrigin",
5336
5338
  "name": "ScriptOrigin",
5339
+ "output_required": true,
5337
5340
  "required": false,
5338
5341
  "type": "object",
5339
5342
  "value_allowed_null": true
tccli/services/rce/rce_client.py CHANGED
@@ -626,7 +626,13 @@ def action_caller():
626
626
 
627
627
  def parse_global_arg(parsed_globals):
628
628
  g_param = parsed_globals
629
-
629
+ cvm_role_flag = True
630
+ for param in parsed_globals.keys():
631
+ if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.RoleArn,
632
+ OptionsDefine.RoleSessionName]:
633
+ if parsed_globals[param] is not None:
634
+ cvm_role_flag = False
635
+ break
630
636
  is_exist_profile = True
631
637
  if not parsed_globals["profile"]:
632
638
  is_exist_profile = False
@@ -657,6 +663,7 @@ def parse_global_arg(parsed_globals):
657
663
  cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
658
664
  cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
659
665
  cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
666
+ cvm_role_flag = False
660
667
 
661
668
  if os.environ.get(OptionsDefine.ENV_REGION):
662
669
  conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
@@ -664,6 +671,11 @@ def parse_global_arg(parsed_globals):
664
671
  if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
665
672
  cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
666
673
  cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
674
+ cvm_role_flag = False
675
+
676
+ if cvm_role_flag:
677
+ if "type" in cred and cred["type"] == "cvm-role":
678
+ g_param[OptionsDefine.UseCVMRole.replace('-', '_')] = True
667
679
 
668
680
  for param in g_param.keys():
669
681
  if g_param[param] is None: