tccli-intl-en 3.0.1168.1__py2.py3-none-any.whl → 3.1.16.1__py2.py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (294) hide show
  1. tccli/__init__.py +1 -1
  2. tccli/argument.py +1 -1
  3. tccli/plugins/sso/__init__.py +14 -0
  4. tccli/plugins/sso/login.py +23 -6
  5. tccli/plugins/sso/texts.py +4 -0
  6. tccli/services/__init__.py +49 -2
  7. tccli/services/advisor/advisor_client.py +10 -4
  8. tccli/services/ai3d/__init__.py +4 -0
  9. tccli/services/ai3d/ai3d_client.py +266 -0
  10. tccli/services/ai3d/v20250513/api.json +264 -0
  11. tccli/services/ai3d/v20250513/examples.json +20 -0
  12. tccli/services/aiart/aiart_client.py +5 -2
  13. tccli/services/ams/ams_client.py +20 -8
  14. tccli/services/antiddos/antiddos_client.py +350 -140
  15. tccli/services/apigateway/apigateway_client.py +465 -186
  16. tccli/services/apm/apm_client.py +835 -68
  17. tccli/services/apm/v20210622/api.json +3936 -1145
  18. tccli/services/apm/v20210622/examples.json +133 -23
  19. tccli/services/asr/asr_client.py +10 -4
  20. tccli/services/autoscaling/autoscaling_client.py +341 -114
  21. tccli/services/autoscaling/v20180419/api.json +514 -333
  22. tccli/services/autoscaling/v20180419/examples.json +46 -38
  23. tccli/services/batch/batch_client.py +140 -56
  24. tccli/services/bi/__init__.py +4 -0
  25. tccli/services/bi/bi_client.py +1498 -0
  26. tccli/services/bi/v20220105/api.json +5769 -0
  27. tccli/services/bi/v20220105/examples.json +215 -0
  28. tccli/services/billing/billing_client.py +1055 -134
  29. tccli/services/billing/v20180709/api.json +1654 -243
  30. tccli/services/billing/v20180709/examples.json +169 -25
  31. tccli/services/cam/cam_client.py +405 -162
  32. tccli/services/captcha/captcha_client.py +5 -2
  33. tccli/services/captcha/v20190722/api.json +16 -6
  34. tccli/services/captcha/v20190722/examples.json +3 -3
  35. tccli/services/car/car_client.py +165 -66
  36. tccli/services/cbs/cbs_client.py +190 -76
  37. tccli/services/ccc/ccc_client.py +1167 -268
  38. tccli/services/ccc/v20200210/api.json +2263 -202
  39. tccli/services/ccc/v20200210/examples.json +116 -12
  40. tccli/services/cdb/cdb_client.py +665 -266
  41. tccli/services/cdb/v20170320/api.json +426 -173
  42. tccli/services/cdb/v20170320/examples.json +6 -6
  43. tccli/services/cdc/cdc_client.py +100 -40
  44. tccli/services/cdc/v20201214/api.json +2 -2
  45. tccli/services/cdc/v20201214/examples.json +4 -4
  46. tccli/services/cdn/cdn_client.py +220 -88
  47. tccli/services/cdwdoris/cdwdoris_client.py +385 -154
  48. tccli/services/cdwpg/cdwpg_client.py +120 -48
  49. tccli/services/cdz/__init__.py +4 -0
  50. tccli/services/cdz/cdz_client.py +210 -0
  51. tccli/services/cdz/v20221123/api.json +233 -0
  52. tccli/services/cdz/v20221123/examples.json +12 -0
  53. tccli/services/cfg/cfg_client.py +80 -32
  54. tccli/services/cfg/v20210820/api.json +30 -10
  55. tccli/services/cfg/v20210820/examples.json +1 -1
  56. tccli/services/cfs/cfs_client.py +195 -78
  57. tccli/services/cfw/cfw_client.py +330 -132
  58. tccli/services/chdfs/chdfs_client.py +145 -58
  59. tccli/services/ciam/ciam_client.py +80 -32
  60. tccli/services/ckafka/ckafka_client.py +1033 -255
  61. tccli/services/ckafka/v20190819/api.json +3378 -1681
  62. tccli/services/ckafka/v20190819/examples.json +254 -160
  63. tccli/services/clb/clb_client.py +1054 -469
  64. tccli/services/clb/v20180317/api.json +2307 -1024
  65. tccli/services/clb/v20180317/examples.json +186 -126
  66. tccli/services/cloudaudit/cloudaudit_client.py +90 -36
  67. tccli/services/cls/cls_client.py +434 -173
  68. tccli/services/cmq/cmq_client.py +14 -803
  69. tccli/services/cmq/v20190304/api.json +173 -1367
  70. tccli/services/cmq/v20190304/examples.json +0 -120
  71. tccli/services/config/config_client.py +30 -12
  72. tccli/services/controlcenter/controlcenter_client.py +229 -2
  73. tccli/services/controlcenter/v20230110/api.json +528 -5
  74. tccli/services/controlcenter/v20230110/examples.json +32 -0
  75. tccli/services/csip/csip_client.py +339 -78
  76. tccli/services/csip/v20221121/api.json +1011 -38
  77. tccli/services/csip/v20221121/examples.json +24 -0
  78. tccli/services/ctsdb/__init__.py +4 -0
  79. tccli/services/ctsdb/ctsdb_client.py +266 -0
  80. tccli/services/ctsdb/v20230202/api.json +677 -0
  81. tccli/services/ctsdb/v20230202/examples.json +20 -0
  82. tccli/services/cvm/cvm_client.py +706 -189
  83. tccli/services/cvm/v20170312/api.json +1141 -510
  84. tccli/services/cvm/v20170312/examples.json +174 -128
  85. tccli/services/cwp/cwp_client.py +2325 -930
  86. tccli/services/cynosdb/cynosdb_client.py +3051 -575
  87. tccli/services/cynosdb/v20190107/api.json +14074 -7139
  88. tccli/services/cynosdb/v20190107/examples.json +597 -287
  89. tccli/services/dataintegration/dataintegration_client.py +5 -2
  90. tccli/services/dayu/dayu_client.py +515 -206
  91. tccli/services/dbbrain/dbbrain_client.py +210 -84
  92. tccli/services/dc/dc_client.py +90 -36
  93. tccli/services/dcdb/dcdb_client.py +310 -124
  94. tccli/services/dlc/dlc_client.py +859 -214
  95. tccli/services/dlc/v20210125/api.json +637 -13
  96. tccli/services/dlc/v20210125/examples.json +48 -0
  97. tccli/services/dms/dms_client.py +10 -4
  98. tccli/services/dnspod/dnspod_client.py +390 -111
  99. tccli/services/dnspod/v20210323/api.json +196 -0
  100. tccli/services/dnspod/v20210323/examples.json +24 -0
  101. tccli/services/domain/domain_client.py +120 -48
  102. tccli/services/dts/dts_client.py +415 -166
  103. tccli/services/eb/eb_client.py +130 -52
  104. tccli/services/ecdn/ecdn_client.py +75 -30
  105. tccli/services/ecm/ecm_client.py +620 -248
  106. tccli/services/eiam/eiam_client.py +200 -80
  107. tccli/services/emr/emr_client.py +3104 -117
  108. tccli/services/emr/v20190103/api.json +15311 -4361
  109. tccli/services/emr/v20190103/examples.json +452 -42
  110. tccli/services/es/es_client.py +105 -42
  111. tccli/services/facefusion/facefusion_client.py +15 -6
  112. tccli/services/faceid/faceid_client.py +95 -38
  113. tccli/services/faceid/v20180301/api.json +172 -45
  114. tccli/services/faceid/v20180301/examples.json +3 -3
  115. tccli/services/gaap/gaap_client.py +440 -176
  116. tccli/services/gme/gme_client.py +50 -20
  117. tccli/services/gpm/gpm_client.py +90 -36
  118. tccli/services/gse/gse_client.py +110 -44
  119. tccli/services/gwlb/gwlb_client.py +90 -36
  120. tccli/services/hunyuan/__init__.py +4 -0
  121. tccli/services/hunyuan/hunyuan_client.py +266 -0
  122. tccli/services/hunyuan/v20230901/api.json +270 -0
  123. tccli/services/hunyuan/v20230901/examples.json +20 -0
  124. tccli/services/iai/iai_client.py +145 -58
  125. tccli/services/iai/v20200303/api.json +187 -51
  126. tccli/services/iai/v20200303/examples.json +30 -12
  127. tccli/services/iap/iap_client.py +30 -12
  128. tccli/services/ims/ims_client.py +5 -2
  129. tccli/services/ims/v20201229/api.json +133 -141
  130. tccli/services/ims/v20201229/examples.json +3 -3
  131. tccli/services/intlpartnersmgt/intlpartnersmgt_client.py +516 -72
  132. tccli/services/intlpartnersmgt/v20220928/api.json +976 -60
  133. tccli/services/intlpartnersmgt/v20220928/examples.json +50 -2
  134. tccli/services/iotcloud/iotcloud_client.py +100 -40
  135. tccli/services/iotcloud/v20210408/api.json +216 -107
  136. tccli/services/iotcloud/v20210408/examples.json +9 -9
  137. tccli/services/ip/ip_client.py +30 -12
  138. tccli/services/kms/kms_client.py +1226 -227
  139. tccli/services/kms/v20190118/api.json +1562 -144
  140. tccli/services/kms/v20190118/examples.json +204 -78
  141. tccli/services/lcic/lcic_client.py +265 -106
  142. tccli/services/lighthouse/lighthouse_client.py +370 -148
  143. tccli/services/lighthouse/v20200324/api.json +14 -14
  144. tccli/services/lighthouse/v20200324/examples.json +5 -5
  145. tccli/services/live/live_client.py +804 -232
  146. tccli/services/live/v20180801/api.json +272 -0
  147. tccli/services/live/v20180801/examples.json +32 -0
  148. tccli/services/lke/__init__.py +4 -0
  149. tccli/services/lke/lke_client.py +5194 -0
  150. tccli/services/lke/v20231130/api.json +14803 -0
  151. tccli/services/lke/v20231130/examples.json +736 -0
  152. tccli/services/lkeap/__init__.py +4 -0
  153. tccli/services/lkeap/lkeap_client.py +602 -0
  154. tccli/services/lkeap/v20240522/api.json +953 -0
  155. tccli/services/lkeap/v20240522/examples.json +92 -0
  156. tccli/services/mariadb/mariadb_client.py +250 -100
  157. tccli/services/mdc/mdc_client.py +90 -36
  158. tccli/services/mdl/mdl_client.py +402 -82
  159. tccli/services/mdl/v20200326/api.json +1144 -58
  160. tccli/services/mdl/v20200326/examples.json +48 -16
  161. tccli/services/mdp/mdp_client.py +785 -122
  162. tccli/services/mdp/v20200527/api.json +1168 -44
  163. tccli/services/mdp/v20200527/examples.json +151 -79
  164. tccli/services/message/__init__.py +4 -0
  165. tccli/services/message/message_client.py +210 -0
  166. tccli/services/message/v20181225/api.json +72 -0
  167. tccli/services/message/v20181225/examples.json +13 -0
  168. tccli/services/mongodb/mongodb_client.py +1452 -136
  169. tccli/services/mongodb/v20190725/api.json +4393 -1462
  170. tccli/services/mongodb/v20190725/examples.json +265 -71
  171. tccli/services/monitor/monitor_client.py +1008 -296
  172. tccli/services/monitor/v20180724/api.json +660 -11
  173. tccli/services/monitor/v20180724/examples.json +152 -4
  174. tccli/services/mps/mps_client.py +1573 -354
  175. tccli/services/mps/v20190612/api.json +12394 -7243
  176. tccli/services/mps/v20190612/examples.json +244 -84
  177. tccli/services/msp/msp_client.py +35 -14
  178. tccli/services/ocr/ocr_client.py +596 -102
  179. tccli/services/ocr/v20181119/api.json +2271 -181
  180. tccli/services/ocr/v20181119/examples.json +70 -8
  181. tccli/services/omics/omics_client.py +100 -40
  182. tccli/services/organization/organization_client.py +580 -232
  183. tccli/services/postgres/postgres_client.py +455 -182
  184. tccli/services/postgres/v20170312/api.json +134 -109
  185. tccli/services/postgres/v20170312/examples.json +14 -14
  186. tccli/services/privatedns/privatedns_client.py +206 -60
  187. tccli/services/privatedns/v20201028/api.json +179 -0
  188. tccli/services/privatedns/v20201028/examples.json +8 -0
  189. tccli/services/pts/pts_client.py +240 -96
  190. tccli/services/quota/__init__.py +4 -0
  191. tccli/services/quota/quota_client.py +434 -0
  192. tccli/services/quota/v20241204/api.json +548 -0
  193. tccli/services/quota/v20241204/examples.json +51 -0
  194. tccli/services/rce/rce_client.py +5 -2
  195. tccli/services/redis/redis_client.py +698 -212
  196. tccli/services/redis/v20180412/api.json +968 -563
  197. tccli/services/redis/v20180412/examples.json +98 -56
  198. tccli/services/region/__init__.py +4 -0
  199. tccli/services/region/region_client.py +322 -0
  200. tccli/services/region/v20220627/api.json +399 -0
  201. tccli/services/region/v20220627/examples.json +29 -0
  202. tccli/services/rum/rum_client.py +300 -120
  203. tccli/services/scf/scf_client.py +210 -84
  204. tccli/services/ses/ses_client.py +368 -69
  205. tccli/services/ses/v20201002/api.json +240 -0
  206. tccli/services/ses/v20201002/examples.json +32 -0
  207. tccli/services/smh/__init__.py +4 -0
  208. tccli/services/smh/smh_client.py +714 -0
  209. tccli/services/smh/v20210712/api.json +1287 -0
  210. tccli/services/smh/v20210712/examples.json +85 -0
  211. tccli/services/sms/sms_client.py +90 -36
  212. tccli/services/sqlserver/sqlserver_client.py +3855 -470
  213. tccli/services/sqlserver/v20180328/api.json +9757 -3347
  214. tccli/services/sqlserver/v20180328/examples.json +480 -20
  215. tccli/services/ssl/ssl_client.py +504 -72
  216. tccli/services/ssl/v20191205/api.json +789 -21
  217. tccli/services/ssl/v20191205/examples.json +54 -0
  218. tccli/services/ssm/ssm_client.py +120 -48
  219. tccli/services/sts/sts_client.py +25 -10
  220. tccli/services/tag/tag_client.py +150 -60
  221. tccli/services/tat/tat_client.py +95 -38
  222. tccli/services/tbaas/__init__.py +4 -0
  223. tccli/services/tbaas/tbaas_client.py +378 -0
  224. tccli/services/tbaas/v20180416/api.json +551 -0
  225. tccli/services/tbaas/v20180416/examples.json +37 -0
  226. tccli/services/tcaplusdb/tcaplusdb_client.py +260 -104
  227. tccli/services/tcaplusdb/v20190823/api.json +836 -760
  228. tccli/services/tcaplusdb/v20190823/examples.json +3 -3
  229. tccli/services/tchd/tchd_client.py +5 -2
  230. tccli/services/tcmpp/tcmpp_client.py +520 -208
  231. tccli/services/tcr/tcr_client.py +380 -152
  232. tccli/services/tcsas/tcsas_client.py +295 -118
  233. tccli/services/tcsas/v20250106/api.json +155 -79
  234. tccli/services/tcsas/v20250106/examples.json +3 -3
  235. tccli/services/tcss/tcss_client.py +1650 -660
  236. tccli/services/tdid/tdid_client.py +240 -96
  237. tccli/services/tdmq/tdmq_client.py +2876 -466
  238. tccli/services/tdmq/v20200217/api.json +11607 -3958
  239. tccli/services/tdmq/v20200217/examples.json +562 -264
  240. tccli/services/tem/tem_client.py +280 -112
  241. tccli/services/teo/teo_client.py +4507 -966
  242. tccli/services/teo/v20220901/api.json +7341 -1405
  243. tccli/services/teo/v20220901/examples.json +679 -99
  244. tccli/services/tione/__init__.py +4 -0
  245. tccli/services/tione/tione_client.py +210 -0
  246. tccli/services/tione/v20211111/api.json +3074 -0
  247. tccli/services/tione/v20211111/examples.json +12 -0
  248. tccli/services/tiw/tiw_client.py +255 -102
  249. tccli/services/tke/tke_client.py +741 -274
  250. tccli/services/tke/v20180525/api.json +132 -7
  251. tccli/services/tke/v20180525/examples.json +42 -16
  252. tccli/services/tms/tms_client.py +5 -2
  253. tccli/services/tms/v20201229/api.json +91 -100
  254. tccli/services/tmt/tmt_client.py +5 -2
  255. tccli/services/trabbit/__init__.py +4 -0
  256. tccli/services/trabbit/trabbit_client.py +1778 -0
  257. tccli/services/trabbit/v20230418/api.json +4772 -0
  258. tccli/services/trabbit/v20230418/examples.json +237 -0
  259. tccli/services/trocket/__init__.py +4 -0
  260. tccli/services/trocket/trocket_client.py +2450 -0
  261. tccli/services/trocket/v20230308/api.json +6062 -0
  262. tccli/services/trocket/v20230308/examples.json +339 -0
  263. tccli/services/trro/trro_client.py +95 -38
  264. tccli/services/trtc/trtc_client.py +928 -192
  265. tccli/services/trtc/v20190722/api.json +1810 -256
  266. tccli/services/trtc/v20190722/examples.json +100 -6
  267. tccli/services/tts/tts_client.py +5 -2
  268. tccli/services/vclm/vclm_client.py +10 -4
  269. tccli/services/vm/v20210922/api.json +61 -30
  270. tccli/services/vm/v20210922/examples.json +0 -12
  271. tccli/services/vm/vm_client.py +20 -8
  272. tccli/services/vod/v20180717/api.json +332 -52
  273. tccli/services/vod/v20180717/examples.json +9 -1
  274. tccli/services/vod/v20240718/api.json +1105 -0
  275. tccli/services/vod/v20240718/examples.json +97 -0
  276. tccli/services/vod/vod_client.py +1316 -350
  277. tccli/services/vpc/v20170312/api.json +1166 -106
  278. tccli/services/vpc/v20170312/examples.json +197 -23
  279. tccli/services/vpc/vpc_client.py +2413 -739
  280. tccli/services/waf/v20180125/api.json +1372 -194
  281. tccli/services/waf/v20180125/examples.json +89 -1
  282. tccli/services/waf/waf_client.py +1149 -245
  283. tccli/services/wedata/v20210820/api.json +1577 -231
  284. tccli/services/wedata/v20210820/examples.json +74 -12
  285. tccli/services/wedata/v20250806/api.json +13644 -0
  286. tccli/services/wedata/v20250806/examples.json +621 -0
  287. tccli/services/wedata/wedata_client.py +6366 -1191
  288. tccli/services/yunjing/yunjing_client.py +355 -142
  289. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/METADATA +4 -7
  290. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/RECORD +294 -230
  291. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/WHEEL +1 -1
  292. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/entry_points.txt +0 -1
  293. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/LICENSE +0 -0
  294. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/top_level.txt +0 -0
tccli/services/csip/csip_client.py CHANGED
@@ -27,7 +27,10 @@ def doDeleteDomainAndIp(args, parsed_globals):
27
27
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
28
28
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
29
29
  )
30
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
30
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
31
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
32
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
33
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
31
34
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
32
35
  else:
33
36
  cred = credential.Credential(
@@ -39,7 +42,7 @@ def doDeleteDomainAndIp(args, parsed_globals):
39
42
  endpoint=g_param[OptionsDefine.Endpoint],
40
43
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
41
44
  )
42
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
45
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
43
46
  if g_param[OptionsDefine.Language]:
44
47
  profile.language = g_param[OptionsDefine.Language]
45
48
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -79,7 +82,10 @@ def doDescribeDbAssetInfo(args, parsed_globals):
79
82
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
80
83
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
81
84
  )
82
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
85
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
86
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
87
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
88
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
83
89
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
84
90
  else:
85
91
  cred = credential.Credential(
@@ -91,7 +97,7 @@ def doDescribeDbAssetInfo(args, parsed_globals):
91
97
  endpoint=g_param[OptionsDefine.Endpoint],
92
98
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
93
99
  )
94
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
100
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
95
101
  if g_param[OptionsDefine.Language]:
96
102
  profile.language = g_param[OptionsDefine.Language]
97
103
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -131,7 +137,10 @@ def doDescribeRiskCenterVULViewVULRiskList(args, parsed_globals):
131
137
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
132
138
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
133
139
  )
134
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
140
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
141
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
142
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
143
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
135
144
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
136
145
  else:
137
146
  cred = credential.Credential(
@@ -143,7 +152,7 @@ def doDescribeRiskCenterVULViewVULRiskList(args, parsed_globals):
143
152
  endpoint=g_param[OptionsDefine.Endpoint],
144
153
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
145
154
  )
146
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
155
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
147
156
  if g_param[OptionsDefine.Language]:
148
157
  profile.language = g_param[OptionsDefine.Language]
149
158
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -183,7 +192,10 @@ def doDescribeDomainAssets(args, parsed_globals):
183
192
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
184
193
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
185
194
  )
186
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
195
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
196
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
197
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
198
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
187
199
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
188
200
  else:
189
201
  cred = credential.Credential(
@@ -195,7 +207,7 @@ def doDescribeDomainAssets(args, parsed_globals):
195
207
  endpoint=g_param[OptionsDefine.Endpoint],
196
208
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
197
209
  )
198
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
210
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
199
211
  if g_param[OptionsDefine.Language]:
200
212
  profile.language = g_param[OptionsDefine.Language]
201
213
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -235,7 +247,10 @@ def doDescribePublicIpAssets(args, parsed_globals):
235
247
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
236
248
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
237
249
  )
238
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
250
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
251
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
252
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
253
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
239
254
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
240
255
  else:
241
256
  cred = credential.Credential(
@@ -247,7 +262,7 @@ def doDescribePublicIpAssets(args, parsed_globals):
247
262
  endpoint=g_param[OptionsDefine.Endpoint],
248
263
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
249
264
  )
250
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
265
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
251
266
  if g_param[OptionsDefine.Language]:
252
267
  profile.language = g_param[OptionsDefine.Language]
253
268
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -287,7 +302,10 @@ def doAddNewBindRoleUser(args, parsed_globals):
287
302
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
288
303
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
289
304
  )
290
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
305
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
306
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
307
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
308
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
291
309
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
292
310
  else:
293
311
  cred = credential.Credential(
@@ -299,7 +317,7 @@ def doAddNewBindRoleUser(args, parsed_globals):
299
317
  endpoint=g_param[OptionsDefine.Endpoint],
300
318
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
301
319
  )
302
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
320
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
303
321
  if g_param[OptionsDefine.Language]:
304
322
  profile.language = g_param[OptionsDefine.Language]
305
323
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -339,7 +357,10 @@ def doDescribeSubnetAssets(args, parsed_globals):
339
357
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
340
358
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
341
359
  )
342
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
360
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
361
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
362
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
363
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
343
364
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
344
365
  else:
345
366
  cred = credential.Credential(
@@ -351,7 +372,7 @@ def doDescribeSubnetAssets(args, parsed_globals):
351
372
  endpoint=g_param[OptionsDefine.Endpoint],
352
373
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
353
374
  )
354
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
375
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
355
376
  if g_param[OptionsDefine.Language]:
356
377
  profile.language = g_param[OptionsDefine.Language]
357
378
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -391,7 +412,10 @@ def doDescribeListenerList(args, parsed_globals):
391
412
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
392
413
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
393
414
  )
394
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
415
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
416
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
417
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
418
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
395
419
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
396
420
  else:
397
421
  cred = credential.Credential(
@@ -403,7 +427,7 @@ def doDescribeListenerList(args, parsed_globals):
403
427
  endpoint=g_param[OptionsDefine.Endpoint],
404
428
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
405
429
  )
406
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
430
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
407
431
  if g_param[OptionsDefine.Language]:
408
432
  profile.language = g_param[OptionsDefine.Language]
409
433
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -443,7 +467,10 @@ def doDeleteRiskScanTask(args, parsed_globals):
443
467
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
444
468
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
445
469
  )
446
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
470
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
471
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
472
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
473
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
447
474
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
448
475
  else:
449
476
  cred = credential.Credential(
@@ -455,7 +482,7 @@ def doDeleteRiskScanTask(args, parsed_globals):
455
482
  endpoint=g_param[OptionsDefine.Endpoint],
456
483
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
457
484
  )
458
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
485
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
459
486
  if g_param[OptionsDefine.Language]:
460
487
  profile.language = g_param[OptionsDefine.Language]
461
488
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -485,7 +512,7 @@ def doDeleteRiskScanTask(args, parsed_globals):
485
512
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
486
513
 
487
514
 
488
- def doDescribeRiskCenterAssetViewWeakPasswordRiskList(args, parsed_globals):
515
+ def doDescribeTaskLogList(args, parsed_globals):
489
516
  g_param = parse_global_arg(parsed_globals)
490
517
 
491
518
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -495,7 +522,10 @@ def doDescribeRiskCenterAssetViewWeakPasswordRiskList(args, parsed_globals):
495
522
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
496
523
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
497
524
  )
498
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
525
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
526
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
527
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
528
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
499
529
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
500
530
  else:
501
531
  cred = credential.Credential(
@@ -507,18 +537,18 @@ def doDescribeRiskCenterAssetViewWeakPasswordRiskList(args, parsed_globals):
507
537
  endpoint=g_param[OptionsDefine.Endpoint],
508
538
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
509
539
  )
510
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
540
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
511
541
  if g_param[OptionsDefine.Language]:
512
542
  profile.language = g_param[OptionsDefine.Language]
513
543
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
514
544
  client = mod.CsipClient(cred, g_param[OptionsDefine.Region], profile)
515
545
  client._sdkVersion += ("_CLI_" + __version__)
516
546
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
517
- model = models.DescribeRiskCenterAssetViewWeakPasswordRiskListRequest()
547
+ model = models.DescribeTaskLogListRequest()
518
548
  model.from_json_string(json.dumps(args))
519
549
  start_time = time.time()
520
550
  while True:
521
- rsp = client.DescribeRiskCenterAssetViewWeakPasswordRiskList(model)
551
+ rsp = client.DescribeTaskLogList(model)
522
552
  result = rsp.to_json_string()
523
553
  try:
524
554
  json_obj = json.loads(result)
@@ -547,7 +577,10 @@ def doDescribeRiskCenterAssetViewVULRiskList(args, parsed_globals):
547
577
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
548
578
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
549
579
  )
550
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
580
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
581
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
582
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
583
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
551
584
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
552
585
  else:
553
586
  cred = credential.Credential(
@@ -559,7 +592,7 @@ def doDescribeRiskCenterAssetViewVULRiskList(args, parsed_globals):
559
592
  endpoint=g_param[OptionsDefine.Endpoint],
560
593
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
561
594
  )
562
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
595
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
563
596
  if g_param[OptionsDefine.Language]:
564
597
  profile.language = g_param[OptionsDefine.Language]
565
598
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -599,7 +632,10 @@ def doDescribeClusterPodAssets(args, parsed_globals):
599
632
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
600
633
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
601
634
  )
602
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
635
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
636
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
637
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
638
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
603
639
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
604
640
  else:
605
641
  cred = credential.Credential(
@@ -611,7 +647,7 @@ def doDescribeClusterPodAssets(args, parsed_globals):
611
647
  endpoint=g_param[OptionsDefine.Endpoint],
612
648
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
613
649
  )
614
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
650
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
615
651
  if g_param[OptionsDefine.Language]:
616
652
  profile.language = g_param[OptionsDefine.Language]
617
653
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -651,7 +687,10 @@ def doDescribeRiskCenterAssetViewCFGRiskList(args, parsed_globals):
651
687
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
652
688
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
653
689
  )
654
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
690
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
691
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
692
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
693
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
655
694
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
656
695
  else:
657
696
  cred = credential.Credential(
@@ -663,7 +702,7 @@ def doDescribeRiskCenterAssetViewCFGRiskList(args, parsed_globals):
663
702
  endpoint=g_param[OptionsDefine.Endpoint],
664
703
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
665
704
  )
666
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
705
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
667
706
  if g_param[OptionsDefine.Language]:
668
707
  profile.language = g_param[OptionsDefine.Language]
669
708
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -703,7 +742,10 @@ def doDescribeVpcAssets(args, parsed_globals):
703
742
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
704
743
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
705
744
  )
706
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
745
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
746
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
747
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
748
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
707
749
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
708
750
  else:
709
751
  cred = credential.Credential(
@@ -715,7 +757,7 @@ def doDescribeVpcAssets(args, parsed_globals):
715
757
  endpoint=g_param[OptionsDefine.Endpoint],
716
758
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
717
759
  )
718
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
760
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
719
761
  if g_param[OptionsDefine.Language]:
720
762
  profile.language = g_param[OptionsDefine.Language]
721
763
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -755,7 +797,10 @@ def doDescribeRiskCenterServerRiskList(args, parsed_globals):
755
797
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
756
798
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
757
799
  )
758
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
800
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
801
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
802
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
803
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
759
804
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
760
805
  else:
761
806
  cred = credential.Credential(
@@ -767,7 +812,7 @@ def doDescribeRiskCenterServerRiskList(args, parsed_globals):
767
812
  endpoint=g_param[OptionsDefine.Endpoint],
768
813
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
769
814
  )
770
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
815
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
771
816
  if g_param[OptionsDefine.Language]:
772
817
  profile.language = g_param[OptionsDefine.Language]
773
818
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -807,7 +852,10 @@ def doDescribeCVMAssets(args, parsed_globals):
807
852
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
808
853
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
809
854
  )
810
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
855
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
856
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
857
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
858
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
811
859
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
812
860
  else:
813
861
  cred = credential.Credential(
@@ -819,7 +867,7 @@ def doDescribeCVMAssets(args, parsed_globals):
819
867
  endpoint=g_param[OptionsDefine.Endpoint],
820
868
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
821
869
  )
822
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
870
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
823
871
  if g_param[OptionsDefine.Language]:
824
872
  profile.language = g_param[OptionsDefine.Language]
825
873
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -859,7 +907,10 @@ def doDescribeRiskCenterWebsiteRiskList(args, parsed_globals):
859
907
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
860
908
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
861
909
  )
862
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
910
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
911
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
912
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
913
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
863
914
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
864
915
  else:
865
916
  cred = credential.Credential(
@@ -871,7 +922,7 @@ def doDescribeRiskCenterWebsiteRiskList(args, parsed_globals):
871
922
  endpoint=g_param[OptionsDefine.Endpoint],
872
923
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
873
924
  )
874
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
925
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
875
926
  if g_param[OptionsDefine.Language]:
876
927
  profile.language = g_param[OptionsDefine.Language]
877
928
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -901,6 +952,61 @@ def doDescribeRiskCenterWebsiteRiskList(args, parsed_globals):
901
952
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
902
953
 
903
954
 
955
+ def doDescribeOrganizationInfo(args, parsed_globals):
956
+ g_param = parse_global_arg(parsed_globals)
957
+
958
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
959
+ cred = credential.CVMRoleCredential()
960
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
961
+ cred = credential.STSAssumeRoleCredential(
962
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
963
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
964
+ )
965
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
966
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
967
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
968
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
969
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
970
+ else:
971
+ cred = credential.Credential(
972
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
973
+ )
974
+ http_profile = HttpProfile(
975
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
976
+ reqMethod="POST",
977
+ endpoint=g_param[OptionsDefine.Endpoint],
978
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
979
+ )
980
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
981
+ if g_param[OptionsDefine.Language]:
982
+ profile.language = g_param[OptionsDefine.Language]
983
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
984
+ client = mod.CsipClient(cred, g_param[OptionsDefine.Region], profile)
985
+ client._sdkVersion += ("_CLI_" + __version__)
986
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
987
+ model = models.DescribeOrganizationInfoRequest()
988
+ model.from_json_string(json.dumps(args))
989
+ start_time = time.time()
990
+ while True:
991
+ rsp = client.DescribeOrganizationInfo(model)
992
+ result = rsp.to_json_string()
993
+ try:
994
+ json_obj = json.loads(result)
995
+ except TypeError as e:
996
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
997
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
998
+ break
999
+ cur_time = time.time()
1000
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1001
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1002
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1003
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1004
+ else:
1005
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1006
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1007
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1008
+
1009
+
904
1010
  def doStopRiskCenterTask(args, parsed_globals):
905
1011
  g_param = parse_global_arg(parsed_globals)
906
1012
 
@@ -911,7 +1017,10 @@ def doStopRiskCenterTask(args, parsed_globals):
911
1017
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
912
1018
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
913
1019
  )
914
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1020
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1021
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1022
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1023
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
915
1024
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
916
1025
  else:
917
1026
  cred = credential.Credential(
@@ -923,7 +1032,7 @@ def doStopRiskCenterTask(args, parsed_globals):
923
1032
  endpoint=g_param[OptionsDefine.Endpoint],
924
1033
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
925
1034
  )
926
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1035
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
927
1036
  if g_param[OptionsDefine.Language]:
928
1037
  profile.language = g_param[OptionsDefine.Language]
929
1038
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -963,7 +1072,10 @@ def doCreateRiskCenterScanTask(args, parsed_globals):
963
1072
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
964
1073
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
965
1074
  )
966
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1075
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1076
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1077
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1078
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
967
1079
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
968
1080
  else:
969
1081
  cred = credential.Credential(
@@ -975,7 +1087,7 @@ def doCreateRiskCenterScanTask(args, parsed_globals):
975
1087
  endpoint=g_param[OptionsDefine.Endpoint],
976
1088
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
977
1089
  )
978
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1090
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
979
1091
  if g_param[OptionsDefine.Language]:
980
1092
  profile.language = g_param[OptionsDefine.Language]
981
1093
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1015,7 +1127,10 @@ def doDescribeSearchBugInfo(args, parsed_globals):
1015
1127
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1016
1128
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1017
1129
  )
1018
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1130
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1131
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1132
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1133
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1019
1134
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1020
1135
  else:
1021
1136
  cred = credential.Credential(
@@ -1027,7 +1142,7 @@ def doDescribeSearchBugInfo(args, parsed_globals):
1027
1142
  endpoint=g_param[OptionsDefine.Endpoint],
1028
1143
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1029
1144
  )
1030
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1145
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1031
1146
  if g_param[OptionsDefine.Language]:
1032
1147
  profile.language = g_param[OptionsDefine.Language]
1033
1148
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1057,7 +1172,7 @@ def doDescribeSearchBugInfo(args, parsed_globals):
1057
1172
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1058
1173
 
1059
1174
 
1060
- def doDescribeTaskLogList(args, parsed_globals):
1175
+ def doDescribeRiskCenterAssetViewWeakPasswordRiskList(args, parsed_globals):
1061
1176
  g_param = parse_global_arg(parsed_globals)
1062
1177
 
1063
1178
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1067,7 +1182,10 @@ def doDescribeTaskLogList(args, parsed_globals):
1067
1182
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1068
1183
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1069
1184
  )
1070
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1185
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1186
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1187
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1188
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1071
1189
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1072
1190
  else:
1073
1191
  cred = credential.Credential(
@@ -1079,18 +1197,18 @@ def doDescribeTaskLogList(args, parsed_globals):
1079
1197
  endpoint=g_param[OptionsDefine.Endpoint],
1080
1198
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1081
1199
  )
1082
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1200
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1083
1201
  if g_param[OptionsDefine.Language]:
1084
1202
  profile.language = g_param[OptionsDefine.Language]
1085
1203
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1086
1204
  client = mod.CsipClient(cred, g_param[OptionsDefine.Region], profile)
1087
1205
  client._sdkVersion += ("_CLI_" + __version__)
1088
1206
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1089
- model = models.DescribeTaskLogListRequest()
1207
+ model = models.DescribeRiskCenterAssetViewWeakPasswordRiskListRequest()
1090
1208
  model.from_json_string(json.dumps(args))
1091
1209
  start_time = time.time()
1092
1210
  while True:
1093
- rsp = client.DescribeTaskLogList(model)
1211
+ rsp = client.DescribeRiskCenterAssetViewWeakPasswordRiskList(model)
1094
1212
  result = rsp.to_json_string()
1095
1213
  try:
1096
1214
  json_obj = json.loads(result)
@@ -1119,7 +1237,10 @@ def doDescribeScanReportList(args, parsed_globals):
1119
1237
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1120
1238
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1121
1239
  )
1122
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1240
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1241
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1242
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1243
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1123
1244
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1124
1245
  else:
1125
1246
  cred = credential.Credential(
@@ -1131,7 +1252,7 @@ def doDescribeScanReportList(args, parsed_globals):
1131
1252
  endpoint=g_param[OptionsDefine.Endpoint],
1132
1253
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1133
1254
  )
1134
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1255
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1135
1256
  if g_param[OptionsDefine.Language]:
1136
1257
  profile.language = g_param[OptionsDefine.Language]
1137
1258
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1161,7 +1282,7 @@ def doDescribeScanReportList(args, parsed_globals):
1161
1282
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1162
1283
 
1163
1284
 
1164
- def doCreateDomainAndIp(args, parsed_globals):
1285
+ def doDescribeSubUserInfo(args, parsed_globals):
1165
1286
  g_param = parse_global_arg(parsed_globals)
1166
1287
 
1167
1288
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1171,7 +1292,10 @@ def doCreateDomainAndIp(args, parsed_globals):
1171
1292
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1172
1293
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1173
1294
  )
1174
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1295
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1296
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1297
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1298
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1175
1299
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1176
1300
  else:
1177
1301
  cred = credential.Credential(
@@ -1183,18 +1307,73 @@ def doCreateDomainAndIp(args, parsed_globals):
1183
1307
  endpoint=g_param[OptionsDefine.Endpoint],
1184
1308
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1185
1309
  )
1186
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1310
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1187
1311
  if g_param[OptionsDefine.Language]:
1188
1312
  profile.language = g_param[OptionsDefine.Language]
1189
1313
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1190
1314
  client = mod.CsipClient(cred, g_param[OptionsDefine.Region], profile)
1191
1315
  client._sdkVersion += ("_CLI_" + __version__)
1192
1316
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1193
- model = models.CreateDomainAndIpRequest()
1317
+ model = models.DescribeSubUserInfoRequest()
1194
1318
  model.from_json_string(json.dumps(args))
1195
1319
  start_time = time.time()
1196
1320
  while True:
1197
- rsp = client.CreateDomainAndIp(model)
1321
+ rsp = client.DescribeSubUserInfo(model)
1322
+ result = rsp.to_json_string()
1323
+ try:
1324
+ json_obj = json.loads(result)
1325
+ except TypeError as e:
1326
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
1327
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1328
+ break
1329
+ cur_time = time.time()
1330
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1331
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1332
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1333
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1334
+ else:
1335
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1336
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1337
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1338
+
1339
+
1340
+ def doModifyRiskCenterRiskStatus(args, parsed_globals):
1341
+ g_param = parse_global_arg(parsed_globals)
1342
+
1343
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1344
+ cred = credential.CVMRoleCredential()
1345
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1346
+ cred = credential.STSAssumeRoleCredential(
1347
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1348
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1349
+ )
1350
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1351
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1352
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1353
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1354
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1355
+ else:
1356
+ cred = credential.Credential(
1357
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1358
+ )
1359
+ http_profile = HttpProfile(
1360
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1361
+ reqMethod="POST",
1362
+ endpoint=g_param[OptionsDefine.Endpoint],
1363
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1364
+ )
1365
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1366
+ if g_param[OptionsDefine.Language]:
1367
+ profile.language = g_param[OptionsDefine.Language]
1368
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1369
+ client = mod.CsipClient(cred, g_param[OptionsDefine.Region], profile)
1370
+ client._sdkVersion += ("_CLI_" + __version__)
1371
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1372
+ model = models.ModifyRiskCenterRiskStatusRequest()
1373
+ model.from_json_string(json.dumps(args))
1374
+ start_time = time.time()
1375
+ while True:
1376
+ rsp = client.ModifyRiskCenterRiskStatus(model)
1198
1377
  result = rsp.to_json_string()
1199
1378
  try:
1200
1379
  json_obj = json.loads(result)
@@ -1223,7 +1402,10 @@ def doDescribeScanTaskList(args, parsed_globals):
1223
1402
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1224
1403
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1225
1404
  )
1226
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1405
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1406
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1407
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1408
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1227
1409
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1228
1410
  else:
1229
1411
  cred = credential.Credential(
@@ -1235,7 +1417,7 @@ def doDescribeScanTaskList(args, parsed_globals):
1235
1417
  endpoint=g_param[OptionsDefine.Endpoint],
1236
1418
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1237
1419
  )
1238
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1420
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1239
1421
  if g_param[OptionsDefine.Language]:
1240
1422
  profile.language = g_param[OptionsDefine.Language]
1241
1423
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1275,7 +1457,10 @@ def doDescribeDbAssets(args, parsed_globals):
1275
1457
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1276
1458
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1277
1459
  )
1278
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1460
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1461
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1462
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1463
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1279
1464
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1280
1465
  else:
1281
1466
  cred = credential.Credential(
@@ -1287,7 +1472,7 @@ def doDescribeDbAssets(args, parsed_globals):
1287
1472
  endpoint=g_param[OptionsDefine.Endpoint],
1288
1473
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1289
1474
  )
1290
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1475
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1291
1476
  if g_param[OptionsDefine.Language]:
1292
1477
  profile.language = g_param[OptionsDefine.Language]
1293
1478
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1327,7 +1512,10 @@ def doDescribeRiskCenterPortViewPortRiskList(args, parsed_globals):
1327
1512
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1328
1513
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1329
1514
  )
1330
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1515
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1516
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1517
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1518
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1331
1519
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1332
1520
  else:
1333
1521
  cred = credential.Credential(
@@ -1339,7 +1527,7 @@ def doDescribeRiskCenterPortViewPortRiskList(args, parsed_globals):
1339
1527
  endpoint=g_param[OptionsDefine.Endpoint],
1340
1528
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1341
1529
  )
1342
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1530
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1343
1531
  if g_param[OptionsDefine.Language]:
1344
1532
  profile.language = g_param[OptionsDefine.Language]
1345
1533
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1379,7 +1567,10 @@ def doDescribeRiskCenterAssetViewPortRiskList(args, parsed_globals):
1379
1567
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1380
1568
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1381
1569
  )
1382
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1570
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1571
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1572
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1573
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1383
1574
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1384
1575
  else:
1385
1576
  cred = credential.Credential(
@@ -1391,7 +1582,7 @@ def doDescribeRiskCenterAssetViewPortRiskList(args, parsed_globals):
1391
1582
  endpoint=g_param[OptionsDefine.Endpoint],
1392
1583
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1393
1584
  )
1394
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1585
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1395
1586
  if g_param[OptionsDefine.Language]:
1396
1587
  profile.language = g_param[OptionsDefine.Language]
1397
1588
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1431,7 +1622,10 @@ def doDescribeVULRiskAdvanceCFGList(args, parsed_globals):
1431
1622
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1432
1623
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1433
1624
  )
1434
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1625
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1626
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1627
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1628
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1435
1629
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1436
1630
  else:
1437
1631
  cred = credential.Credential(
@@ -1443,7 +1637,7 @@ def doDescribeVULRiskAdvanceCFGList(args, parsed_globals):
1443
1637
  endpoint=g_param[OptionsDefine.Endpoint],
1444
1638
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1445
1639
  )
1446
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1640
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1447
1641
  if g_param[OptionsDefine.Language]:
1448
1642
  profile.language = g_param[OptionsDefine.Language]
1449
1643
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1473,7 +1667,7 @@ def doDescribeVULRiskAdvanceCFGList(args, parsed_globals):
1473
1667
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1474
1668
 
1475
1669
 
1476
- def doModifyRiskCenterRiskStatus(args, parsed_globals):
1670
+ def doCreateDomainAndIp(args, parsed_globals):
1477
1671
  g_param = parse_global_arg(parsed_globals)
1478
1672
 
1479
1673
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1483,7 +1677,10 @@ def doModifyRiskCenterRiskStatus(args, parsed_globals):
1483
1677
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1484
1678
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1485
1679
  )
1486
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1680
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1681
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1682
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1683
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1487
1684
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1488
1685
  else:
1489
1686
  cred = credential.Credential(
@@ -1495,18 +1692,73 @@ def doModifyRiskCenterRiskStatus(args, parsed_globals):
1495
1692
  endpoint=g_param[OptionsDefine.Endpoint],
1496
1693
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1497
1694
  )
1498
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1695
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1499
1696
  if g_param[OptionsDefine.Language]:
1500
1697
  profile.language = g_param[OptionsDefine.Language]
1501
1698
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1502
1699
  client = mod.CsipClient(cred, g_param[OptionsDefine.Region], profile)
1503
1700
  client._sdkVersion += ("_CLI_" + __version__)
1504
1701
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1505
- model = models.ModifyRiskCenterRiskStatusRequest()
1702
+ model = models.CreateDomainAndIpRequest()
1506
1703
  model.from_json_string(json.dumps(args))
1507
1704
  start_time = time.time()
1508
1705
  while True:
1509
- rsp = client.ModifyRiskCenterRiskStatus(model)
1706
+ rsp = client.CreateDomainAndIp(model)
1707
+ result = rsp.to_json_string()
1708
+ try:
1709
+ json_obj = json.loads(result)
1710
+ except TypeError as e:
1711
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
1712
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1713
+ break
1714
+ cur_time = time.time()
1715
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1716
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1717
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1718
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1719
+ else:
1720
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1721
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1722
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1723
+
1724
+
1725
+ def doDescribeOrganizationUserInfo(args, parsed_globals):
1726
+ g_param = parse_global_arg(parsed_globals)
1727
+
1728
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1729
+ cred = credential.CVMRoleCredential()
1730
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1731
+ cred = credential.STSAssumeRoleCredential(
1732
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1733
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1734
+ )
1735
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1736
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1737
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1738
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1739
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1740
+ else:
1741
+ cred = credential.Credential(
1742
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1743
+ )
1744
+ http_profile = HttpProfile(
1745
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1746
+ reqMethod="POST",
1747
+ endpoint=g_param[OptionsDefine.Endpoint],
1748
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1749
+ )
1750
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1751
+ if g_param[OptionsDefine.Language]:
1752
+ profile.language = g_param[OptionsDefine.Language]
1753
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1754
+ client = mod.CsipClient(cred, g_param[OptionsDefine.Region], profile)
1755
+ client._sdkVersion += ("_CLI_" + __version__)
1756
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1757
+ model = models.DescribeOrganizationUserInfoRequest()
1758
+ model.from_json_string(json.dumps(args))
1759
+ start_time = time.time()
1760
+ while True:
1761
+ rsp = client.DescribeOrganizationUserInfo(model)
1510
1762
  result = rsp.to_json_string()
1511
1763
  try:
1512
1764
  json_obj = json.loads(result)
@@ -1535,7 +1787,10 @@ def doDescribeTaskLogURL(args, parsed_globals):
1535
1787
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1536
1788
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1537
1789
  )
1538
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1790
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1791
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1792
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1793
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1539
1794
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1540
1795
  else:
1541
1796
  cred = credential.Credential(
@@ -1547,7 +1802,7 @@ def doDescribeTaskLogURL(args, parsed_globals):
1547
1802
  endpoint=g_param[OptionsDefine.Endpoint],
1548
1803
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1549
1804
  )
1550
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1805
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1551
1806
  if g_param[OptionsDefine.Language]:
1552
1807
  profile.language = g_param[OptionsDefine.Language]
1553
1808
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1587,7 +1842,10 @@ def doDescribeCVMAssetInfo(args, parsed_globals):
1587
1842
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1588
1843
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1589
1844
  )
1590
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1845
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1846
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1847
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1848
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1591
1849
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1592
1850
  else:
1593
1851
  cred = credential.Credential(
@@ -1599,7 +1857,7 @@ def doDescribeCVMAssetInfo(args, parsed_globals):
1599
1857
  endpoint=g_param[OptionsDefine.Endpoint],
1600
1858
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1601
1859
  )
1602
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1860
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1603
1861
  if g_param[OptionsDefine.Language]:
1604
1862
  profile.language = g_param[OptionsDefine.Language]
1605
1863
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1649,7 +1907,7 @@ ACTION_MAP = {
1649
1907
  "DescribeSubnetAssets": doDescribeSubnetAssets,
1650
1908
  "DescribeListenerList": doDescribeListenerList,
1651
1909
  "DeleteRiskScanTask": doDeleteRiskScanTask,
1652
- "DescribeRiskCenterAssetViewWeakPasswordRiskList": doDescribeRiskCenterAssetViewWeakPasswordRiskList,
1910
+ "DescribeTaskLogList": doDescribeTaskLogList,
1653
1911
  "DescribeRiskCenterAssetViewVULRiskList": doDescribeRiskCenterAssetViewVULRiskList,
1654
1912
  "DescribeClusterPodAssets": doDescribeClusterPodAssets,
1655
1913
  "DescribeRiskCenterAssetViewCFGRiskList": doDescribeRiskCenterAssetViewCFGRiskList,
@@ -1657,18 +1915,21 @@ ACTION_MAP = {
1657
1915
  "DescribeRiskCenterServerRiskList": doDescribeRiskCenterServerRiskList,
1658
1916
  "DescribeCVMAssets": doDescribeCVMAssets,
1659
1917
  "DescribeRiskCenterWebsiteRiskList": doDescribeRiskCenterWebsiteRiskList,
1918
+ "DescribeOrganizationInfo": doDescribeOrganizationInfo,
1660
1919
  "StopRiskCenterTask": doStopRiskCenterTask,
1661
1920
  "CreateRiskCenterScanTask": doCreateRiskCenterScanTask,
1662
1921
  "DescribeSearchBugInfo": doDescribeSearchBugInfo,
1663
- "DescribeTaskLogList": doDescribeTaskLogList,
1922
+ "DescribeRiskCenterAssetViewWeakPasswordRiskList": doDescribeRiskCenterAssetViewWeakPasswordRiskList,
1664
1923
  "DescribeScanReportList": doDescribeScanReportList,
1665
- "CreateDomainAndIp": doCreateDomainAndIp,
1924
+ "DescribeSubUserInfo": doDescribeSubUserInfo,
1925
+ "ModifyRiskCenterRiskStatus": doModifyRiskCenterRiskStatus,
1666
1926
  "DescribeScanTaskList": doDescribeScanTaskList,
1667
1927
  "DescribeDbAssets": doDescribeDbAssets,
1668
1928
  "DescribeRiskCenterPortViewPortRiskList": doDescribeRiskCenterPortViewPortRiskList,
1669
1929
  "DescribeRiskCenterAssetViewPortRiskList": doDescribeRiskCenterAssetViewPortRiskList,
1670
1930
  "DescribeVULRiskAdvanceCFGList": doDescribeVULRiskAdvanceCFGList,
1671
- "ModifyRiskCenterRiskStatus": doModifyRiskCenterRiskStatus,
1931
+ "CreateDomainAndIp": doCreateDomainAndIp,
1932
+ "DescribeOrganizationUserInfo": doDescribeOrganizationUserInfo,
1672
1933
  "DescribeTaskLogURL": doDescribeTaskLogURL,
1673
1934
  "DescribeCVMAssetInfo": doDescribeCVMAssetInfo,
1674
1935