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
@@ -27,7 +27,10 @@ def doQueryVoucherListByUin(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 doQueryVoucherListByUin(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 doAllocateCustomerCredit(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 doAllocateCustomerCredit(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 doQueryPendingClientsV2(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 doQueryPendingClientsV2(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 doGetCountryCodes(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 doGetCountryCodes(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 doModifyClientRemark(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 doModifyClientRemark(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 doQueryPartnerCredit(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 doQueryPartnerCredit(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 doDescribeRebateDownloadUrl(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 doDescribeRebateDownloadUrl(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]]
@@ -381,6 +402,61 @@ def doDescribeRebateDownloadUrl(args, parsed_globals):
381
402
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
382
403
 
383
404
 
405
+ def doQueryPendingSubAgentsV2(args, parsed_globals):
406
+ g_param = parse_global_arg(parsed_globals)
407
+
408
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
409
+ cred = credential.CVMRoleCredential()
410
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
411
+ cred = credential.STSAssumeRoleCredential(
412
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
413
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
414
+ )
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):
419
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
420
+ else:
421
+ cred = credential.Credential(
422
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
423
+ )
424
+ http_profile = HttpProfile(
425
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
426
+ reqMethod="POST",
427
+ endpoint=g_param[OptionsDefine.Endpoint],
428
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
429
+ )
430
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
431
+ if g_param[OptionsDefine.Language]:
432
+ profile.language = g_param[OptionsDefine.Language]
433
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
434
+ client = mod.IntlpartnersmgtClient(cred, g_param[OptionsDefine.Region], profile)
435
+ client._sdkVersion += ("_CLI_" + __version__)
436
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
437
+ model = models.QueryPendingSubAgentsV2Request()
438
+ model.from_json_string(json.dumps(args))
439
+ start_time = time.time()
440
+ while True:
441
+ rsp = client.QueryPendingSubAgentsV2(model)
442
+ result = rsp.to_json_string()
443
+ try:
444
+ json_obj = json.loads(result)
445
+ except TypeError as e:
446
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
447
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
448
+ break
449
+ cur_time = time.time()
450
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
451
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
452
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
453
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
454
+ else:
455
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
456
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
457
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
458
+
459
+
384
460
  def doCreateAccount(args, parsed_globals):
385
461
  g_param = parse_global_arg(parsed_globals)
386
462
 
@@ -391,7 +467,10 @@ def doCreateAccount(args, parsed_globals):
391
467
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
392
468
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
393
469
  )
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):
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):
395
474
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
396
475
  else:
397
476
  cred = credential.Credential(
@@ -403,7 +482,7 @@ def doCreateAccount(args, parsed_globals):
403
482
  endpoint=g_param[OptionsDefine.Endpoint],
404
483
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
405
484
  )
406
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
485
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
407
486
  if g_param[OptionsDefine.Language]:
408
487
  profile.language = g_param[OptionsDefine.Language]
409
488
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -433,6 +512,61 @@ def doCreateAccount(args, parsed_globals):
433
512
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
434
513
 
435
514
 
515
+ def doQuerySubAgentsDetailV2(args, parsed_globals):
516
+ g_param = parse_global_arg(parsed_globals)
517
+
518
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
519
+ cred = credential.CVMRoleCredential()
520
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
521
+ cred = credential.STSAssumeRoleCredential(
522
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
523
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
524
+ )
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):
529
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
530
+ else:
531
+ cred = credential.Credential(
532
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
533
+ )
534
+ http_profile = HttpProfile(
535
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
536
+ reqMethod="POST",
537
+ endpoint=g_param[OptionsDefine.Endpoint],
538
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
539
+ )
540
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
541
+ if g_param[OptionsDefine.Language]:
542
+ profile.language = g_param[OptionsDefine.Language]
543
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
544
+ client = mod.IntlpartnersmgtClient(cred, g_param[OptionsDefine.Region], profile)
545
+ client._sdkVersion += ("_CLI_" + __version__)
546
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
547
+ model = models.QuerySubAgentsDetailV2Request()
548
+ model.from_json_string(json.dumps(args))
549
+ start_time = time.time()
550
+ while True:
551
+ rsp = client.QuerySubAgentsDetailV2(model)
552
+ result = rsp.to_json_string()
553
+ try:
554
+ json_obj = json.loads(result)
555
+ except TypeError as e:
556
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
557
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
558
+ break
559
+ cur_time = time.time()
560
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
561
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
562
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
563
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
564
+ else:
565
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
566
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
567
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
568
+
569
+
436
570
  def doDescribeCustomerInfo(args, parsed_globals):
437
571
  g_param = parse_global_arg(parsed_globals)
438
572
 
@@ -443,7 +577,10 @@ def doDescribeCustomerInfo(args, parsed_globals):
443
577
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
444
578
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
445
579
  )
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):
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):
447
584
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
448
585
  else:
449
586
  cred = credential.Credential(
@@ -455,7 +592,7 @@ def doDescribeCustomerInfo(args, parsed_globals):
455
592
  endpoint=g_param[OptionsDefine.Endpoint],
456
593
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
457
594
  )
458
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
595
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
459
596
  if g_param[OptionsDefine.Language]:
460
597
  profile.language = g_param[OptionsDefine.Language]
461
598
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -495,7 +632,10 @@ def doSendVerifyCode(args, parsed_globals):
495
632
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
496
633
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
497
634
  )
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):
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):
499
639
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
500
640
  else:
501
641
  cred = credential.Credential(
@@ -507,7 +647,7 @@ def doSendVerifyCode(args, parsed_globals):
507
647
  endpoint=g_param[OptionsDefine.Endpoint],
508
648
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
509
649
  )
510
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
650
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
511
651
  if g_param[OptionsDefine.Language]:
512
652
  profile.language = g_param[OptionsDefine.Language]
513
653
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -547,7 +687,10 @@ def doDescribeCustomerUin(args, parsed_globals):
547
687
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
548
688
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
549
689
  )
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):
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):
551
694
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
552
695
  else:
553
696
  cred = credential.Credential(
@@ -559,7 +702,7 @@ def doDescribeCustomerUin(args, parsed_globals):
559
702
  endpoint=g_param[OptionsDefine.Endpoint],
560
703
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
561
704
  )
562
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
705
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
563
706
  if g_param[OptionsDefine.Language]:
564
707
  profile.language = g_param[OptionsDefine.Language]
565
708
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -599,7 +742,10 @@ def doAllocateCreditPool(args, parsed_globals):
599
742
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
600
743
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
601
744
  )
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):
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):
603
749
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
604
750
  else:
605
751
  cred = credential.Credential(
@@ -611,7 +757,7 @@ def doAllocateCreditPool(args, parsed_globals):
611
757
  endpoint=g_param[OptionsDefine.Endpoint],
612
758
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
613
759
  )
614
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
760
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
615
761
  if g_param[OptionsDefine.Language]:
616
762
  profile.language = g_param[OptionsDefine.Language]
617
763
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -651,7 +797,10 @@ def doQueryT1IndirectCustomersDetail(args, parsed_globals):
651
797
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
652
798
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
653
799
  )
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):
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):
655
804
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
656
805
  else:
657
806
  cred = credential.Credential(
@@ -663,7 +812,7 @@ def doQueryT1IndirectCustomersDetail(args, parsed_globals):
663
812
  endpoint=g_param[OptionsDefine.Endpoint],
664
813
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
665
814
  )
666
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
815
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
667
816
  if g_param[OptionsDefine.Language]:
668
817
  profile.language = g_param[OptionsDefine.Language]
669
818
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -703,7 +852,10 @@ def doDescribeBillDetail(args, parsed_globals):
703
852
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
704
853
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
705
854
  )
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):
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):
707
859
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
708
860
  else:
709
861
  cred = credential.Credential(
@@ -715,7 +867,7 @@ def doDescribeBillDetail(args, parsed_globals):
715
867
  endpoint=g_param[OptionsDefine.Endpoint],
716
868
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
717
869
  )
718
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
870
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
719
871
  if g_param[OptionsDefine.Language]:
720
872
  profile.language = g_param[OptionsDefine.Language]
721
873
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -755,7 +907,10 @@ def doDescribeBillSummary(args, parsed_globals):
755
907
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
756
908
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
757
909
  )
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):
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):
759
914
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
760
915
  else:
761
916
  cred = credential.Credential(
@@ -767,7 +922,7 @@ def doDescribeBillSummary(args, parsed_globals):
767
922
  endpoint=g_param[OptionsDefine.Endpoint],
768
923
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
769
924
  )
770
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
925
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
771
926
  if g_param[OptionsDefine.Language]:
772
927
  profile.language = g_param[OptionsDefine.Language]
773
928
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -797,6 +952,61 @@ def doDescribeBillSummary(args, parsed_globals):
797
952
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
798
953
 
799
954
 
955
+ def doDescribeCustomerVoucherList(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.IntlpartnersmgtClient(cred, g_param[OptionsDefine.Region], profile)
985
+ client._sdkVersion += ("_CLI_" + __version__)
986
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
987
+ model = models.DescribeCustomerVoucherListRequest()
988
+ model.from_json_string(json.dumps(args))
989
+ start_time = time.time()
990
+ while True:
991
+ rsp = client.DescribeCustomerVoucherList(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
+
800
1010
  def doDescribeBillSummaryByPayMode(args, parsed_globals):
801
1011
  g_param = parse_global_arg(parsed_globals)
802
1012
 
@@ -807,7 +1017,10 @@ def doDescribeBillSummaryByPayMode(args, parsed_globals):
807
1017
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
808
1018
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
809
1019
  )
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):
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):
811
1024
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
812
1025
  else:
813
1026
  cred = credential.Credential(
@@ -819,7 +1032,7 @@ def doDescribeBillSummaryByPayMode(args, parsed_globals):
819
1032
  endpoint=g_param[OptionsDefine.Endpoint],
820
1033
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
821
1034
  )
822
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1035
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
823
1036
  if g_param[OptionsDefine.Language]:
824
1037
  profile.language = g_param[OptionsDefine.Language]
825
1038
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -859,7 +1072,10 @@ def doCreateAndSendClientInvitationMail(args, parsed_globals):
859
1072
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
860
1073
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
861
1074
  )
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):
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):
863
1079
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
864
1080
  else:
865
1081
  cred = credential.Credential(
@@ -871,7 +1087,7 @@ def doCreateAndSendClientInvitationMail(args, parsed_globals):
871
1087
  endpoint=g_param[OptionsDefine.Endpoint],
872
1088
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
873
1089
  )
874
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1090
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
875
1091
  if g_param[OptionsDefine.Language]:
876
1092
  profile.language = g_param[OptionsDefine.Language]
877
1093
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -911,7 +1127,10 @@ def doDescribeBillDownloadUrl(args, parsed_globals):
911
1127
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
912
1128
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
913
1129
  )
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):
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):
915
1134
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
916
1135
  else:
917
1136
  cred = credential.Credential(
@@ -923,7 +1142,7 @@ def doDescribeBillDownloadUrl(args, parsed_globals):
923
1142
  endpoint=g_param[OptionsDefine.Endpoint],
924
1143
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
925
1144
  )
926
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1145
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
927
1146
  if g_param[OptionsDefine.Language]:
928
1147
  profile.language = g_param[OptionsDefine.Language]
929
1148
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -963,7 +1182,10 @@ def doQueryCreditByUinList(args, parsed_globals):
963
1182
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
964
1183
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
965
1184
  )
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):
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):
967
1189
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
968
1190
  else:
969
1191
  cred = credential.Credential(
@@ -975,7 +1197,7 @@ def doQueryCreditByUinList(args, parsed_globals):
975
1197
  endpoint=g_param[OptionsDefine.Endpoint],
976
1198
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
977
1199
  )
978
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1200
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
979
1201
  if g_param[OptionsDefine.Language]:
980
1202
  profile.language = g_param[OptionsDefine.Language]
981
1203
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1015,7 +1237,10 @@ def doQueryDirectCustomersCredit(args, parsed_globals):
1015
1237
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1016
1238
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1017
1239
  )
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):
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):
1019
1244
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1020
1245
  else:
1021
1246
  cred = credential.Credential(
@@ -1027,7 +1252,7 @@ def doQueryDirectCustomersCredit(args, parsed_globals):
1027
1252
  endpoint=g_param[OptionsDefine.Endpoint],
1028
1253
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1029
1254
  )
1030
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1255
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1031
1256
  if g_param[OptionsDefine.Language]:
1032
1257
  profile.language = g_param[OptionsDefine.Language]
1033
1258
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1067,7 +1292,10 @@ def doApproveClientApply(args, parsed_globals):
1067
1292
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1068
1293
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1069
1294
  )
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):
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):
1071
1299
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1072
1300
  else:
1073
1301
  cred = credential.Credential(
@@ -1079,7 +1307,7 @@ def doApproveClientApply(args, parsed_globals):
1079
1307
  endpoint=g_param[OptionsDefine.Endpoint],
1080
1308
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1081
1309
  )
1082
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1310
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1083
1311
  if g_param[OptionsDefine.Language]:
1084
1312
  profile.language = g_param[OptionsDefine.Language]
1085
1313
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1119,7 +1347,10 @@ def doGetTradeConfigList(args, parsed_globals):
1119
1347
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1120
1348
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1121
1349
  )
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):
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):
1123
1354
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1124
1355
  else:
1125
1356
  cred = credential.Credential(
@@ -1131,7 +1362,7 @@ def doGetTradeConfigList(args, parsed_globals):
1131
1362
  endpoint=g_param[OptionsDefine.Endpoint],
1132
1363
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1133
1364
  )
1134
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1365
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1135
1366
  if g_param[OptionsDefine.Language]:
1136
1367
  profile.language = g_param[OptionsDefine.Language]
1137
1368
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1161,6 +1392,61 @@ def doGetTradeConfigList(args, parsed_globals):
1161
1392
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1162
1393
 
1163
1394
 
1395
+ def doDescribeCustomerOwnVoucherList(args, parsed_globals):
1396
+ g_param = parse_global_arg(parsed_globals)
1397
+
1398
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1399
+ cred = credential.CVMRoleCredential()
1400
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1401
+ cred = credential.STSAssumeRoleCredential(
1402
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1403
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1404
+ )
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):
1409
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1410
+ else:
1411
+ cred = credential.Credential(
1412
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1413
+ )
1414
+ http_profile = HttpProfile(
1415
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1416
+ reqMethod="POST",
1417
+ endpoint=g_param[OptionsDefine.Endpoint],
1418
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1419
+ )
1420
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1421
+ if g_param[OptionsDefine.Language]:
1422
+ profile.language = g_param[OptionsDefine.Language]
1423
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1424
+ client = mod.IntlpartnersmgtClient(cred, g_param[OptionsDefine.Region], profile)
1425
+ client._sdkVersion += ("_CLI_" + __version__)
1426
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1427
+ model = models.DescribeCustomerOwnVoucherListRequest()
1428
+ model.from_json_string(json.dumps(args))
1429
+ start_time = time.time()
1430
+ while True:
1431
+ rsp = client.DescribeCustomerOwnVoucherList(model)
1432
+ result = rsp.to_json_string()
1433
+ try:
1434
+ json_obj = json.loads(result)
1435
+ except TypeError as e:
1436
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
1437
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1438
+ break
1439
+ cur_time = time.time()
1440
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1441
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1442
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1443
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1444
+ else:
1445
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1446
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1447
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1448
+
1449
+
1164
1450
  def doDescribeCustomerBillDownloadUrl(args, parsed_globals):
1165
1451
  g_param = parse_global_arg(parsed_globals)
1166
1452
 
@@ -1171,7 +1457,10 @@ def doDescribeCustomerBillDownloadUrl(args, parsed_globals):
1171
1457
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1172
1458
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1173
1459
  )
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):
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):
1175
1464
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1176
1465
  else:
1177
1466
  cred = credential.Credential(
@@ -1183,7 +1472,7 @@ def doDescribeCustomerBillDownloadUrl(args, parsed_globals):
1183
1472
  endpoint=g_param[OptionsDefine.Endpoint],
1184
1473
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1185
1474
  )
1186
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1475
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1187
1476
  if g_param[OptionsDefine.Language]:
1188
1477
  profile.language = g_param[OptionsDefine.Language]
1189
1478
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1223,7 +1512,10 @@ def doDescribeBillSummaryByProduct(args, parsed_globals):
1223
1512
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1224
1513
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1225
1514
  )
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):
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):
1227
1519
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1228
1520
  else:
1229
1521
  cred = credential.Credential(
@@ -1235,7 +1527,7 @@ def doDescribeBillSummaryByProduct(args, parsed_globals):
1235
1527
  endpoint=g_param[OptionsDefine.Endpoint],
1236
1528
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1237
1529
  )
1238
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1530
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1239
1531
  if g_param[OptionsDefine.Language]:
1240
1532
  profile.language = g_param[OptionsDefine.Language]
1241
1533
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1275,7 +1567,10 @@ def doDescribeBillSummaryByRegion(args, parsed_globals):
1275
1567
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1276
1568
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1277
1569
  )
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):
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):
1279
1574
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1280
1575
  else:
1281
1576
  cred = credential.Credential(
@@ -1287,7 +1582,7 @@ def doDescribeBillSummaryByRegion(args, parsed_globals):
1287
1582
  endpoint=g_param[OptionsDefine.Endpoint],
1288
1583
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1289
1584
  )
1290
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1585
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1291
1586
  if g_param[OptionsDefine.Language]:
1292
1587
  profile.language = g_param[OptionsDefine.Language]
1293
1588
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1327,7 +1622,10 @@ def doDescribeCustomerBillDetail(args, parsed_globals):
1327
1622
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1328
1623
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1329
1624
  )
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):
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):
1331
1629
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1332
1630
  else:
1333
1631
  cred = credential.Credential(
@@ -1339,7 +1637,7 @@ def doDescribeCustomerBillDetail(args, parsed_globals):
1339
1637
  endpoint=g_param[OptionsDefine.Endpoint],
1340
1638
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1341
1639
  )
1342
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1640
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1343
1641
  if g_param[OptionsDefine.Language]:
1344
1642
  profile.language = g_param[OptionsDefine.Language]
1345
1643
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1379,7 +1677,10 @@ def doDescribeCustomerBillSummary(args, parsed_globals):
1379
1677
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1380
1678
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1381
1679
  )
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):
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):
1383
1684
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1384
1685
  else:
1385
1686
  cred = credential.Credential(
@@ -1391,7 +1692,7 @@ def doDescribeCustomerBillSummary(args, parsed_globals):
1391
1692
  endpoint=g_param[OptionsDefine.Endpoint],
1392
1693
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1393
1694
  )
1394
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1695
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1395
1696
  if g_param[OptionsDefine.Language]:
1396
1697
  profile.language = g_param[OptionsDefine.Language]
1397
1698
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1431,7 +1732,10 @@ def doQueryAccountVerificationStatus(args, parsed_globals):
1431
1732
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1432
1733
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1433
1734
  )
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):
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):
1435
1739
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1436
1740
  else:
1437
1741
  cred = credential.Credential(
@@ -1443,7 +1747,7 @@ def doQueryAccountVerificationStatus(args, parsed_globals):
1443
1747
  endpoint=g_param[OptionsDefine.Endpoint],
1444
1748
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1445
1749
  )
1446
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1750
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1447
1751
  if g_param[OptionsDefine.Language]:
1448
1752
  profile.language = g_param[OptionsDefine.Language]
1449
1753
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1473,6 +1777,61 @@ def doQueryAccountVerificationStatus(args, parsed_globals):
1473
1777
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1474
1778
 
1475
1779
 
1780
+ def doDescribeCustomerBillDetailByDay(args, parsed_globals):
1781
+ g_param = parse_global_arg(parsed_globals)
1782
+
1783
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1784
+ cred = credential.CVMRoleCredential()
1785
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1786
+ cred = credential.STSAssumeRoleCredential(
1787
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1788
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1789
+ )
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):
1794
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1795
+ else:
1796
+ cred = credential.Credential(
1797
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1798
+ )
1799
+ http_profile = HttpProfile(
1800
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1801
+ reqMethod="POST",
1802
+ endpoint=g_param[OptionsDefine.Endpoint],
1803
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1804
+ )
1805
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1806
+ if g_param[OptionsDefine.Language]:
1807
+ profile.language = g_param[OptionsDefine.Language]
1808
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1809
+ client = mod.IntlpartnersmgtClient(cred, g_param[OptionsDefine.Region], profile)
1810
+ client._sdkVersion += ("_CLI_" + __version__)
1811
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1812
+ model = models.DescribeCustomerBillDetailByDayRequest()
1813
+ model.from_json_string(json.dumps(args))
1814
+ start_time = time.time()
1815
+ while True:
1816
+ rsp = client.DescribeCustomerBillDetailByDay(model)
1817
+ result = rsp.to_json_string()
1818
+ try:
1819
+ json_obj = json.loads(result)
1820
+ except TypeError as e:
1821
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
1822
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1823
+ break
1824
+ cur_time = time.time()
1825
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1826
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1827
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1828
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1829
+ else:
1830
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1831
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1832
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1833
+
1834
+
1476
1835
  def doForceQN(args, parsed_globals):
1477
1836
  g_param = parse_global_arg(parsed_globals)
1478
1837
 
@@ -1483,7 +1842,10 @@ def doForceQN(args, parsed_globals):
1483
1842
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1484
1843
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1485
1844
  )
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):
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):
1487
1849
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1488
1850
  else:
1489
1851
  cred = credential.Credential(
@@ -1495,7 +1857,7 @@ def doForceQN(args, parsed_globals):
1495
1857
  endpoint=g_param[OptionsDefine.Endpoint],
1496
1858
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1497
1859
  )
1498
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1860
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1499
1861
  if g_param[OptionsDefine.Language]:
1500
1862
  profile.language = g_param[OptionsDefine.Language]
1501
1863
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1535,7 +1897,10 @@ def doQueryVoucherPool(args, parsed_globals):
1535
1897
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1536
1898
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1537
1899
  )
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):
1900
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1901
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1902
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1903
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1539
1904
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1540
1905
  else:
1541
1906
  cred = credential.Credential(
@@ -1547,7 +1912,7 @@ def doQueryVoucherPool(args, parsed_globals):
1547
1912
  endpoint=g_param[OptionsDefine.Endpoint],
1548
1913
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1549
1914
  )
1550
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1915
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1551
1916
  if g_param[OptionsDefine.Language]:
1552
1917
  profile.language = g_param[OptionsDefine.Language]
1553
1918
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1587,7 +1952,10 @@ def doQueryVoucherAmountByUin(args, parsed_globals):
1587
1952
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1588
1953
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1589
1954
  )
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):
1955
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1956
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1957
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1958
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1591
1959
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1592
1960
  else:
1593
1961
  cred = credential.Credential(
@@ -1599,7 +1967,7 @@ def doQueryVoucherAmountByUin(args, parsed_globals):
1599
1967
  endpoint=g_param[OptionsDefine.Endpoint],
1600
1968
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1601
1969
  )
1602
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1970
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1603
1971
  if g_param[OptionsDefine.Language]:
1604
1972
  profile.language = g_param[OptionsDefine.Language]
1605
1973
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1639,7 +2007,10 @@ def doQueryPolicyProductListByCode(args, parsed_globals):
1639
2007
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1640
2008
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1641
2009
  )
1642
- 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):
2010
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2011
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2012
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2013
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1643
2014
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1644
2015
  else:
1645
2016
  cred = credential.Credential(
@@ -1651,7 +2022,7 @@ def doQueryPolicyProductListByCode(args, parsed_globals):
1651
2022
  endpoint=g_param[OptionsDefine.Endpoint],
1652
2023
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1653
2024
  )
1654
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2025
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1655
2026
  if g_param[OptionsDefine.Language]:
1656
2027
  profile.language = g_param[OptionsDefine.Language]
1657
2028
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1681,6 +2052,61 @@ def doQueryPolicyProductListByCode(args, parsed_globals):
1681
2052
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1682
2053
 
1683
2054
 
2055
+ def doApproveSubAgentApply(args, parsed_globals):
2056
+ g_param = parse_global_arg(parsed_globals)
2057
+
2058
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
2059
+ cred = credential.CVMRoleCredential()
2060
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
2061
+ cred = credential.STSAssumeRoleCredential(
2062
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2063
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2064
+ )
2065
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2066
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2067
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2068
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2069
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2070
+ else:
2071
+ cred = credential.Credential(
2072
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
2073
+ )
2074
+ http_profile = HttpProfile(
2075
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
2076
+ reqMethod="POST",
2077
+ endpoint=g_param[OptionsDefine.Endpoint],
2078
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2079
+ )
2080
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2081
+ if g_param[OptionsDefine.Language]:
2082
+ profile.language = g_param[OptionsDefine.Language]
2083
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
2084
+ client = mod.IntlpartnersmgtClient(cred, g_param[OptionsDefine.Region], profile)
2085
+ client._sdkVersion += ("_CLI_" + __version__)
2086
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
2087
+ model = models.ApproveSubAgentApplyRequest()
2088
+ model.from_json_string(json.dumps(args))
2089
+ start_time = time.time()
2090
+ while True:
2091
+ rsp = client.ApproveSubAgentApply(model)
2092
+ result = rsp.to_json_string()
2093
+ try:
2094
+ json_obj = json.loads(result)
2095
+ except TypeError as e:
2096
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
2097
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
2098
+ break
2099
+ cur_time = time.time()
2100
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
2101
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
2102
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
2103
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
2104
+ else:
2105
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
2106
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
2107
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
2108
+
2109
+
1684
2110
  def doQueryCreditAllocationHistory(args, parsed_globals):
1685
2111
  g_param = parse_global_arg(parsed_globals)
1686
2112
 
@@ -1691,7 +2117,10 @@ def doQueryCreditAllocationHistory(args, parsed_globals):
1691
2117
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1692
2118
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1693
2119
  )
1694
- 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):
2120
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2121
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2122
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2123
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1695
2124
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1696
2125
  else:
1697
2126
  cred = credential.Credential(
@@ -1703,7 +2132,7 @@ def doQueryCreditAllocationHistory(args, parsed_globals):
1703
2132
  endpoint=g_param[OptionsDefine.Endpoint],
1704
2133
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1705
2134
  )
1706
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2135
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1707
2136
  if g_param[OptionsDefine.Language]:
1708
2137
  profile.language = g_param[OptionsDefine.Language]
1709
2138
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1743,7 +2172,10 @@ def doQueryInvitationInfo(args, parsed_globals):
1743
2172
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1744
2173
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1745
2174
  )
1746
- 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):
2175
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2176
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2177
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2178
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1747
2179
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1748
2180
  else:
1749
2181
  cred = credential.Credential(
@@ -1755,7 +2187,7 @@ def doQueryInvitationInfo(args, parsed_globals):
1755
2187
  endpoint=g_param[OptionsDefine.Endpoint],
1756
2188
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1757
2189
  )
1758
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2190
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1759
2191
  if g_param[OptionsDefine.Language]:
1760
2192
  profile.language = g_param[OptionsDefine.Language]
1761
2193
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1795,7 +2227,10 @@ def doQueryCustomersCredit(args, parsed_globals):
1795
2227
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1796
2228
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1797
2229
  )
1798
- 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):
2230
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2231
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2232
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2233
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1799
2234
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1800
2235
  else:
1801
2236
  cred = credential.Credential(
@@ -1807,7 +2242,7 @@ def doQueryCustomersCredit(args, parsed_globals):
1807
2242
  endpoint=g_param[OptionsDefine.Endpoint],
1808
2243
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1809
2244
  )
1810
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2245
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1811
2246
  if g_param[OptionsDefine.Language]:
1812
2247
  profile.language = g_param[OptionsDefine.Language]
1813
2248
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1847,7 +2282,10 @@ def doQueryCustomerBillingQuota(args, parsed_globals):
1847
2282
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1848
2283
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1849
2284
  )
1850
- 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):
2285
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2286
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2287
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2288
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1851
2289
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1852
2290
  else:
1853
2291
  cred = credential.Credential(
@@ -1859,7 +2297,7 @@ def doQueryCustomerBillingQuota(args, parsed_globals):
1859
2297
  endpoint=g_param[OptionsDefine.Endpoint],
1860
2298
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1861
2299
  )
1862
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2300
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1863
2301
  if g_param[OptionsDefine.Language]:
1864
2302
  profile.language = g_param[OptionsDefine.Language]
1865
2303
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1907,7 +2345,9 @@ ACTION_MAP = {
1907
2345
  "ModifyClientRemark": doModifyClientRemark,
1908
2346
  "QueryPartnerCredit": doQueryPartnerCredit,
1909
2347
  "DescribeRebateDownloadUrl": doDescribeRebateDownloadUrl,
2348
+ "QueryPendingSubAgentsV2": doQueryPendingSubAgentsV2,
1910
2349
  "CreateAccount": doCreateAccount,
2350
+ "QuerySubAgentsDetailV2": doQuerySubAgentsDetailV2,
1911
2351
  "DescribeCustomerInfo": doDescribeCustomerInfo,
1912
2352
  "SendVerifyCode": doSendVerifyCode,
1913
2353
  "DescribeCustomerUin": doDescribeCustomerUin,
@@ -1915,6 +2355,7 @@ ACTION_MAP = {
1915
2355
  "QueryT1IndirectCustomersDetail": doQueryT1IndirectCustomersDetail,
1916
2356
  "DescribeBillDetail": doDescribeBillDetail,
1917
2357
  "DescribeBillSummary": doDescribeBillSummary,
2358
+ "DescribeCustomerVoucherList": doDescribeCustomerVoucherList,
1918
2359
  "DescribeBillSummaryByPayMode": doDescribeBillSummaryByPayMode,
1919
2360
  "CreateAndSendClientInvitationMail": doCreateAndSendClientInvitationMail,
1920
2361
  "DescribeBillDownloadUrl": doDescribeBillDownloadUrl,
@@ -1922,16 +2363,19 @@ ACTION_MAP = {
1922
2363
  "QueryDirectCustomersCredit": doQueryDirectCustomersCredit,
1923
2364
  "ApproveClientApply": doApproveClientApply,
1924
2365
  "GetTradeConfigList": doGetTradeConfigList,
2366
+ "DescribeCustomerOwnVoucherList": doDescribeCustomerOwnVoucherList,
1925
2367
  "DescribeCustomerBillDownloadUrl": doDescribeCustomerBillDownloadUrl,
1926
2368
  "DescribeBillSummaryByProduct": doDescribeBillSummaryByProduct,
1927
2369
  "DescribeBillSummaryByRegion": doDescribeBillSummaryByRegion,
1928
2370
  "DescribeCustomerBillDetail": doDescribeCustomerBillDetail,
1929
2371
  "DescribeCustomerBillSummary": doDescribeCustomerBillSummary,
1930
2372
  "QueryAccountVerificationStatus": doQueryAccountVerificationStatus,
2373
+ "DescribeCustomerBillDetailByDay": doDescribeCustomerBillDetailByDay,
1931
2374
  "ForceQN": doForceQN,
1932
2375
  "QueryVoucherPool": doQueryVoucherPool,
1933
2376
  "QueryVoucherAmountByUin": doQueryVoucherAmountByUin,
1934
2377
  "QueryPolicyProductListByCode": doQueryPolicyProductListByCode,
2378
+ "ApproveSubAgentApply": doApproveSubAgentApply,
1935
2379
  "QueryCreditAllocationHistory": doQueryCreditAllocationHistory,
1936
2380
  "QueryInvitationInfo": doQueryInvitationInfo,
1937
2381
  "QueryCustomersCredit": doQueryCustomersCredit,