tccli-intl-en 3.0.1188.1__py2.py3-none-any.whl → 3.1.28.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 (292) 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 +46 -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 +444 -272
  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 +1007 -139
  29. tccli/services/billing/v20180709/api.json +1707 -429
  30. tccli/services/billing/v20180709/examples.json +161 -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 +463 -208
  42. tccli/services/cdb/v20170320/examples.json +8 -8
  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/cdn/v20180606/api.json +22 -22
  48. tccli/services/cdn/v20180606/examples.json +1 -1
  49. tccli/services/cdwdoris/cdwdoris_client.py +385 -154
  50. tccli/services/cdwpg/cdwpg_client.py +120 -48
  51. tccli/services/cdz/__init__.py +4 -0
  52. tccli/services/cdz/cdz_client.py +210 -0
  53. tccli/services/cdz/v20221123/api.json +233 -0
  54. tccli/services/cdz/v20221123/examples.json +12 -0
  55. tccli/services/cfg/cfg_client.py +80 -32
  56. tccli/services/cfg/v20210820/api.json +30 -10
  57. tccli/services/cfg/v20210820/examples.json +1 -1
  58. tccli/services/cfs/cfs_client.py +195 -78
  59. tccli/services/cfw/cfw_client.py +330 -132
  60. tccli/services/chdfs/chdfs_client.py +145 -58
  61. tccli/services/ciam/ciam_client.py +80 -32
  62. tccli/services/ckafka/ckafka_client.py +1149 -259
  63. tccli/services/ckafka/v20190819/api.json +3738 -1696
  64. tccli/services/ckafka/v20190819/examples.json +266 -162
  65. tccli/services/clb/clb_client.py +1054 -469
  66. tccli/services/clb/v20180317/api.json +2273 -1020
  67. tccli/services/clb/v20180317/examples.json +184 -124
  68. tccli/services/cloudaudit/cloudaudit_client.py +90 -36
  69. tccli/services/cls/cls_client.py +434 -173
  70. tccli/services/cmq/cmq_client.py +14 -803
  71. tccli/services/cmq/v20190304/api.json +173 -1367
  72. tccli/services/cmq/v20190304/examples.json +0 -120
  73. tccli/services/config/config_client.py +30 -12
  74. tccli/services/controlcenter/controlcenter_client.py +229 -2
  75. tccli/services/controlcenter/v20230110/api.json +528 -5
  76. tccli/services/controlcenter/v20230110/examples.json +32 -0
  77. tccli/services/csip/csip_client.py +339 -78
  78. tccli/services/csip/v20221121/api.json +1011 -38
  79. tccli/services/csip/v20221121/examples.json +24 -0
  80. tccli/services/ctsdb/__init__.py +4 -0
  81. tccli/services/ctsdb/ctsdb_client.py +266 -0
  82. tccli/services/ctsdb/v20230202/api.json +677 -0
  83. tccli/services/ctsdb/v20230202/examples.json +20 -0
  84. tccli/services/cvm/cvm_client.py +706 -189
  85. tccli/services/cvm/v20170312/api.json +1003 -453
  86. tccli/services/cvm/v20170312/examples.json +176 -130
  87. tccli/services/cwp/cwp_client.py +2325 -930
  88. tccli/services/cynosdb/cynosdb_client.py +2272 -591
  89. tccli/services/cynosdb/v20190107/api.json +12480 -7740
  90. tccli/services/cynosdb/v20190107/examples.json +193 -9
  91. tccli/services/dataintegration/dataintegration_client.py +5 -2
  92. tccli/services/dayu/dayu_client.py +515 -206
  93. tccli/services/dbbrain/dbbrain_client.py +210 -84
  94. tccli/services/dc/dc_client.py +90 -36
  95. tccli/services/dcdb/dcdb_client.py +310 -124
  96. tccli/services/dlc/dlc_client.py +859 -214
  97. tccli/services/dlc/v20210125/api.json +637 -13
  98. tccli/services/dlc/v20210125/examples.json +48 -0
  99. tccli/services/dms/dms_client.py +10 -4
  100. tccli/services/dnspod/dnspod_client.py +390 -111
  101. tccli/services/dnspod/v20210323/api.json +196 -0
  102. tccli/services/dnspod/v20210323/examples.json +24 -0
  103. tccli/services/domain/domain_client.py +120 -48
  104. tccli/services/dts/dts_client.py +415 -166
  105. tccli/services/eb/eb_client.py +130 -52
  106. tccli/services/ecdn/ecdn_client.py +75 -30
  107. tccli/services/ecm/ecm_client.py +620 -248
  108. tccli/services/eiam/eiam_client.py +200 -80
  109. tccli/services/emr/emr_client.py +3104 -117
  110. tccli/services/emr/v20190103/api.json +15311 -4361
  111. tccli/services/emr/v20190103/examples.json +452 -42
  112. tccli/services/es/es_client.py +105 -42
  113. tccli/services/facefusion/facefusion_client.py +15 -6
  114. tccli/services/faceid/faceid_client.py +95 -38
  115. tccli/services/faceid/v20180301/api.json +172 -45
  116. tccli/services/faceid/v20180301/examples.json +3 -3
  117. tccli/services/gaap/gaap_client.py +440 -176
  118. tccli/services/gme/gme_client.py +50 -20
  119. tccli/services/gpm/gpm_client.py +90 -36
  120. tccli/services/gse/gse_client.py +110 -44
  121. tccli/services/gwlb/gwlb_client.py +90 -36
  122. tccli/services/hunyuan/__init__.py +4 -0
  123. tccli/services/hunyuan/hunyuan_client.py +490 -0
  124. tccli/services/hunyuan/v20230901/api.json +566 -0
  125. tccli/services/hunyuan/v20230901/examples.json +52 -0
  126. tccli/services/iai/iai_client.py +145 -58
  127. tccli/services/iai/v20200303/api.json +187 -51
  128. tccli/services/iai/v20200303/examples.json +30 -12
  129. tccli/services/iap/iap_client.py +30 -12
  130. tccli/services/ims/ims_client.py +5 -2
  131. tccli/services/ims/v20201229/api.json +133 -141
  132. tccli/services/ims/v20201229/examples.json +3 -3
  133. tccli/services/intlpartnersmgt/intlpartnersmgt_client.py +363 -78
  134. tccli/services/intlpartnersmgt/v20220928/api.json +513 -22
  135. tccli/services/intlpartnersmgt/v20220928/examples.json +24 -0
  136. tccli/services/iotcloud/iotcloud_client.py +100 -40
  137. tccli/services/iotcloud/v20210408/api.json +216 -107
  138. tccli/services/iotcloud/v20210408/examples.json +9 -9
  139. tccli/services/ip/ip_client.py +30 -12
  140. tccli/services/kms/kms_client.py +1226 -227
  141. tccli/services/kms/v20190118/api.json +1465 -123
  142. tccli/services/kms/v20190118/examples.json +129 -3
  143. tccli/services/lcic/lcic_client.py +265 -106
  144. tccli/services/lighthouse/lighthouse_client.py +730 -172
  145. tccli/services/lighthouse/v20200324/api.json +502 -14
  146. tccli/services/lighthouse/v20200324/examples.json +59 -5
  147. tccli/services/live/live_client.py +804 -232
  148. tccli/services/live/v20180801/api.json +272 -0
  149. tccli/services/live/v20180801/examples.json +32 -0
  150. tccli/services/lke/__init__.py +4 -0
  151. tccli/services/lke/lke_client.py +5194 -0
  152. tccli/services/lke/v20231130/api.json +14803 -0
  153. tccli/services/lke/v20231130/examples.json +736 -0
  154. tccli/services/lkeap/__init__.py +4 -0
  155. tccli/services/lkeap/lkeap_client.py +602 -0
  156. tccli/services/lkeap/v20240522/api.json +989 -0
  157. tccli/services/lkeap/v20240522/examples.json +92 -0
  158. tccli/services/mariadb/mariadb_client.py +250 -100
  159. tccli/services/mdc/mdc_client.py +90 -36
  160. tccli/services/mdl/mdl_client.py +402 -82
  161. tccli/services/mdl/v20200326/api.json +1437 -100
  162. tccli/services/mdl/v20200326/examples.json +48 -16
  163. tccli/services/mdp/mdp_client.py +785 -122
  164. tccli/services/mdp/v20200527/api.json +1336 -49
  165. tccli/services/mdp/v20200527/examples.json +151 -79
  166. tccli/services/message/__init__.py +4 -0
  167. tccli/services/message/message_client.py +210 -0
  168. tccli/services/message/v20181225/api.json +72 -0
  169. tccli/services/message/v20181225/examples.json +13 -0
  170. tccli/services/mongodb/mongodb_client.py +1452 -136
  171. tccli/services/mongodb/v20190725/api.json +4393 -1462
  172. tccli/services/mongodb/v20190725/examples.json +265 -71
  173. tccli/services/monitor/monitor_client.py +1008 -296
  174. tccli/services/monitor/v20180724/api.json +664 -15
  175. tccli/services/monitor/v20180724/examples.json +152 -4
  176. tccli/services/mps/mps_client.py +1878 -379
  177. tccli/services/mps/v20190612/api.json +7473 -1626
  178. tccli/services/mps/v20190612/examples.json +276 -82
  179. tccli/services/mqtt/__init__.py +4 -0
  180. tccli/services/mqtt/mqtt_client.py +1610 -0
  181. tccli/services/mqtt/v20240516/api.json +3057 -0
  182. tccli/services/mqtt/v20240516/examples.json +213 -0
  183. tccli/services/msp/msp_client.py +35 -14
  184. tccli/services/ocr/ocr_client.py +515 -74
  185. tccli/services/ocr/v20181119/api.json +1991 -168
  186. tccli/services/ocr/v20181119/examples.json +58 -4
  187. tccli/services/omics/omics_client.py +100 -40
  188. tccli/services/organization/organization_client.py +580 -232
  189. tccli/services/postgres/postgres_client.py +455 -182
  190. tccli/services/postgres/v20170312/api.json +134 -109
  191. tccli/services/postgres/v20170312/examples.json +14 -14
  192. tccli/services/privatedns/privatedns_client.py +206 -60
  193. tccli/services/privatedns/v20201028/api.json +179 -0
  194. tccli/services/privatedns/v20201028/examples.json +8 -0
  195. tccli/services/pts/pts_client.py +240 -96
  196. tccli/services/quota/__init__.py +4 -0
  197. tccli/services/quota/quota_client.py +434 -0
  198. tccli/services/quota/v20241204/api.json +548 -0
  199. tccli/services/quota/v20241204/examples.json +51 -0
  200. tccli/services/rce/rce_client.py +5 -2
  201. tccli/services/redis/redis_client.py +698 -212
  202. tccli/services/redis/v20180412/api.json +968 -563
  203. tccli/services/redis/v20180412/examples.json +98 -56
  204. tccli/services/region/__init__.py +4 -0
  205. tccli/services/region/region_client.py +322 -0
  206. tccli/services/region/v20220627/api.json +399 -0
  207. tccli/services/region/v20220627/examples.json +29 -0
  208. tccli/services/rum/rum_client.py +300 -120
  209. tccli/services/scf/scf_client.py +210 -84
  210. tccli/services/ses/ses_client.py +368 -69
  211. tccli/services/ses/v20201002/api.json +240 -0
  212. tccli/services/ses/v20201002/examples.json +32 -0
  213. tccli/services/smh/__init__.py +4 -0
  214. tccli/services/smh/smh_client.py +714 -0
  215. tccli/services/smh/v20210712/api.json +1287 -0
  216. tccli/services/smh/v20210712/examples.json +85 -0
  217. tccli/services/sms/sms_client.py +90 -36
  218. tccli/services/sqlserver/sqlserver_client.py +3855 -470
  219. tccli/services/sqlserver/v20180328/api.json +9757 -3347
  220. tccli/services/sqlserver/v20180328/examples.json +480 -20
  221. tccli/services/ssl/ssl_client.py +504 -72
  222. tccli/services/ssl/v20191205/api.json +789 -21
  223. tccli/services/ssl/v20191205/examples.json +54 -0
  224. tccli/services/ssm/ssm_client.py +120 -48
  225. tccli/services/sts/sts_client.py +25 -10
  226. tccli/services/tag/tag_client.py +150 -60
  227. tccli/services/tat/tat_client.py +95 -38
  228. tccli/services/tbaas/tbaas_client.py +20 -8
  229. tccli/services/tcaplusdb/tcaplusdb_client.py +260 -104
  230. tccli/services/tcaplusdb/v20190823/api.json +836 -760
  231. tccli/services/tcaplusdb/v20190823/examples.json +3 -3
  232. tccli/services/tchd/tchd_client.py +5 -2
  233. tccli/services/tcmpp/tcmpp_client.py +520 -208
  234. tccli/services/tcr/tcr_client.py +380 -152
  235. tccli/services/tcsas/tcsas_client.py +295 -118
  236. tccli/services/tcsas/v20250106/api.json +1084 -980
  237. tccli/services/tcsas/v20250106/examples.json +15 -15
  238. tccli/services/tcss/tcss_client.py +1650 -660
  239. tccli/services/tdid/tdid_client.py +240 -96
  240. tccli/services/tdmq/tdmq_client.py +2876 -466
  241. tccli/services/tdmq/v20200217/api.json +11607 -3958
  242. tccli/services/tdmq/v20200217/examples.json +562 -264
  243. tccli/services/tem/tem_client.py +280 -112
  244. tccli/services/teo/teo_client.py +4507 -966
  245. tccli/services/teo/v20220901/api.json +7341 -1405
  246. tccli/services/teo/v20220901/examples.json +679 -99
  247. tccli/services/tione/__init__.py +4 -0
  248. tccli/services/tione/tione_client.py +210 -0
  249. tccli/services/tione/v20211111/api.json +3074 -0
  250. tccli/services/tione/v20211111/examples.json +12 -0
  251. tccli/services/tiw/tiw_client.py +255 -102
  252. tccli/services/tke/tke_client.py +858 -276
  253. tccli/services/tke/v20180525/api.json +227 -0
  254. tccli/services/tke/v20180525/examples.json +24 -0
  255. tccli/services/tms/tms_client.py +5 -2
  256. tccli/services/tms/v20201229/api.json +91 -100
  257. tccli/services/tmt/tmt_client.py +5 -2
  258. tccli/services/trabbit/trabbit_client.py +145 -58
  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 +531 -54
  273. tccli/services/vod/v20180717/examples.json +25 -7
  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 +1428 -350
  277. tccli/services/vpc/v20170312/api.json +1031 -133
  278. tccli/services/vpc/v20170312/examples.json +119 -23
  279. tccli/services/vpc/vpc_client.py +2159 -644
  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/v20250806/api.json +13644 -0
  284. tccli/services/wedata/v20250806/examples.json +621 -0
  285. tccli/services/wedata/wedata_client.py +6067 -1263
  286. tccli/services/yunjing/yunjing_client.py +355 -142
  287. {tccli_intl_en-3.0.1188.1.dist-info → tccli_intl_en-3.1.28.1.dist-info}/METADATA +4 -7
  288. {tccli_intl_en-3.0.1188.1.dist-info → tccli_intl_en-3.1.28.1.dist-info}/RECORD +292 -232
  289. {tccli_intl_en-3.0.1188.1.dist-info → tccli_intl_en-3.1.28.1.dist-info}/WHEEL +1 -1
  290. {tccli_intl_en-3.0.1188.1.dist-info → tccli_intl_en-3.1.28.1.dist-info}/entry_points.txt +0 -1
  291. {tccli_intl_en-3.0.1188.1.dist-info → tccli_intl_en-3.1.28.1.dist-info}/LICENSE +0 -0
  292. {tccli_intl_en-3.0.1188.1.dist-info → tccli_intl_en-3.1.28.1.dist-info}/top_level.txt +0 -0
@@ -27,7 +27,10 @@ def doDescribeRecordList(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 doDescribeRecordList(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 doDescribeDomainGroupList(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 doDescribeDomainGroupList(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]]
@@ -121,7 +127,7 @@ def doDescribeDomainGroupList(args, parsed_globals):
121
127
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
122
128
 
123
129
 
124
- def doDescribeDomainPurview(args, parsed_globals):
130
+ def doDescribeRecordLineCategoryList(args, parsed_globals):
125
131
  g_param = parse_global_arg(parsed_globals)
126
132
 
127
133
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -131,7 +137,10 @@ def doDescribeDomainPurview(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,18 +152,18 @@ def doDescribeDomainPurview(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]]
150
159
  client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
151
160
  client._sdkVersion += ("_CLI_" + __version__)
152
161
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
153
- model = models.DescribeDomainPurviewRequest()
162
+ model = models.DescribeRecordLineCategoryListRequest()
154
163
  model.from_json_string(json.dumps(args))
155
164
  start_time = time.time()
156
165
  while True:
157
- rsp = client.DescribeDomainPurview(model)
166
+ rsp = client.DescribeRecordLineCategoryList(model)
158
167
  result = rsp.to_json_string()
159
168
  try:
160
169
  json_obj = json.loads(result)
@@ -173,7 +182,7 @@ def doDescribeDomainPurview(args, parsed_globals):
173
182
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
174
183
 
175
184
 
176
- def doDescribeRecordType(args, parsed_globals):
185
+ def doDescribeDomainPurview(args, parsed_globals):
177
186
  g_param = parse_global_arg(parsed_globals)
178
187
 
179
188
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -183,7 +192,10 @@ def doDescribeRecordType(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,18 +207,18 @@ def doDescribeRecordType(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]]
202
214
  client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
203
215
  client._sdkVersion += ("_CLI_" + __version__)
204
216
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
205
- model = models.DescribeRecordTypeRequest()
217
+ model = models.DescribeDomainPurviewRequest()
206
218
  model.from_json_string(json.dumps(args))
207
219
  start_time = time.time()
208
220
  while True:
209
- rsp = client.DescribeRecordType(model)
221
+ rsp = client.DescribeDomainPurview(model)
210
222
  result = rsp.to_json_string()
211
223
  try:
212
224
  json_obj = json.loads(result)
@@ -225,7 +237,7 @@ def doDescribeRecordType(args, parsed_globals):
225
237
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
226
238
 
227
239
 
228
- def doDeleteRecordGroup(args, parsed_globals):
240
+ def doDescribeRecordType(args, parsed_globals):
229
241
  g_param = parse_global_arg(parsed_globals)
230
242
 
231
243
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -235,7 +247,10 @@ def doDeleteRecordGroup(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,18 +262,18 @@ def doDeleteRecordGroup(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]]
254
269
  client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
255
270
  client._sdkVersion += ("_CLI_" + __version__)
256
271
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
257
- model = models.DeleteRecordGroupRequest()
272
+ model = models.DescribeRecordTypeRequest()
258
273
  model.from_json_string(json.dumps(args))
259
274
  start_time = time.time()
260
275
  while True:
261
- rsp = client.DeleteRecordGroup(model)
276
+ rsp = client.DescribeRecordType(model)
262
277
  result = rsp.to_json_string()
263
278
  try:
264
279
  json_obj = json.loads(result)
@@ -277,7 +292,7 @@ def doDeleteRecordGroup(args, parsed_globals):
277
292
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
278
293
 
279
294
 
280
- def doDescribeDomainAliasList(args, parsed_globals):
295
+ def doDeleteRecordGroup(args, parsed_globals):
281
296
  g_param = parse_global_arg(parsed_globals)
282
297
 
283
298
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -287,7 +302,10 @@ def doDescribeDomainAliasList(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,18 +317,18 @@ def doDescribeDomainAliasList(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]]
306
324
  client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
307
325
  client._sdkVersion += ("_CLI_" + __version__)
308
326
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
309
- model = models.DescribeDomainAliasListRequest()
327
+ model = models.DeleteRecordGroupRequest()
310
328
  model.from_json_string(json.dumps(args))
311
329
  start_time = time.time()
312
330
  while True:
313
- rsp = client.DescribeDomainAliasList(model)
331
+ rsp = client.DeleteRecordGroup(model)
314
332
  result = rsp.to_json_string()
315
333
  try:
316
334
  json_obj = json.loads(result)
@@ -329,7 +347,7 @@ def doDescribeDomainAliasList(args, parsed_globals):
329
347
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
330
348
 
331
349
 
332
- def doDescribeSubdomainAnalytics(args, parsed_globals):
350
+ def doDescribeDomainAliasList(args, parsed_globals):
333
351
  g_param = parse_global_arg(parsed_globals)
334
352
 
335
353
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -339,7 +357,10 @@ def doDescribeSubdomainAnalytics(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,18 +372,18 @@ def doDescribeSubdomainAnalytics(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]]
358
379
  client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
359
380
  client._sdkVersion += ("_CLI_" + __version__)
360
381
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
361
- model = models.DescribeSubdomainAnalyticsRequest()
382
+ model = models.DescribeDomainAliasListRequest()
362
383
  model.from_json_string(json.dumps(args))
363
384
  start_time = time.time()
364
385
  while True:
365
- rsp = client.DescribeSubdomainAnalytics(model)
386
+ rsp = client.DescribeDomainAliasList(model)
366
387
  result = rsp.to_json_string()
367
388
  try:
368
389
  json_obj = json.loads(result)
@@ -381,7 +402,7 @@ def doDescribeSubdomainAnalytics(args, parsed_globals):
381
402
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
382
403
 
383
404
 
384
- def doDeleteDomainBatch(args, parsed_globals):
405
+ def doDescribeSubdomainAnalytics(args, parsed_globals):
385
406
  g_param = parse_global_arg(parsed_globals)
386
407
 
387
408
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -391,7 +412,10 @@ def doDeleteDomainBatch(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,18 +427,18 @@ def doDeleteDomainBatch(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]]
410
434
  client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
411
435
  client._sdkVersion += ("_CLI_" + __version__)
412
436
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
413
- model = models.DeleteDomainBatchRequest()
437
+ model = models.DescribeSubdomainAnalyticsRequest()
414
438
  model.from_json_string(json.dumps(args))
415
439
  start_time = time.time()
416
440
  while True:
417
- rsp = client.DeleteDomainBatch(model)
441
+ rsp = client.DescribeSubdomainAnalytics(model)
418
442
  result = rsp.to_json_string()
419
443
  try:
420
444
  json_obj = json.loads(result)
@@ -433,7 +457,7 @@ def doDeleteDomainBatch(args, parsed_globals):
433
457
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
434
458
 
435
459
 
436
- def doModifyRecordStatus(args, parsed_globals):
460
+ def doDeleteDomainBatch(args, parsed_globals):
437
461
  g_param = parse_global_arg(parsed_globals)
438
462
 
439
463
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -443,7 +467,10 @@ def doModifyRecordStatus(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,18 +482,18 @@ def doModifyRecordStatus(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]]
462
489
  client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
463
490
  client._sdkVersion += ("_CLI_" + __version__)
464
491
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
465
- model = models.ModifyRecordStatusRequest()
492
+ model = models.DeleteDomainBatchRequest()
466
493
  model.from_json_string(json.dumps(args))
467
494
  start_time = time.time()
468
495
  while True:
469
- rsp = client.ModifyRecordStatus(model)
496
+ rsp = client.DeleteDomainBatch(model)
470
497
  result = rsp.to_json_string()
471
498
  try:
472
499
  json_obj = json.loads(result)
@@ -485,7 +512,7 @@ def doModifyRecordStatus(args, parsed_globals):
485
512
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
486
513
 
487
514
 
488
- def doDescribeRecordGroupList(args, parsed_globals):
515
+ def doModifyRecordStatus(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 doDescribeRecordGroupList(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 doDescribeRecordGroupList(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.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
515
545
  client._sdkVersion += ("_CLI_" + __version__)
516
546
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
517
- model = models.DescribeRecordGroupListRequest()
547
+ model = models.ModifyRecordStatusRequest()
518
548
  model.from_json_string(json.dumps(args))
519
549
  start_time = time.time()
520
550
  while True:
521
- rsp = client.DescribeRecordGroupList(model)
551
+ rsp = client.ModifyRecordStatus(model)
522
552
  result = rsp.to_json_string()
523
553
  try:
524
554
  json_obj = json.loads(result)
@@ -547,7 +577,10 @@ def doModifyDomainStatus(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 doModifyDomainStatus(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 doModifyDomainUnlock(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 doModifyDomainUnlock(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 doCreateDomainBatch(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 doCreateDomainBatch(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 doDescribeDomainShareInfo(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 doDescribeDomainShareInfo(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 doDeleteShareDomain(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 doDeleteShareDomain(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 doModifyRecordGroup(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 doModifyRecordGroup(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 doDescribeDomain(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 doDescribeDomain(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,7 +952,7 @@ def doDescribeDomain(args, parsed_globals):
901
952
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
902
953
 
903
954
 
904
- def doCreateDomain(args, parsed_globals):
955
+ def doDeletePackageOrder(args, parsed_globals):
905
956
  g_param = parse_global_arg(parsed_globals)
906
957
 
907
958
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -911,7 +962,10 @@ def doCreateDomain(args, parsed_globals):
911
962
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
912
963
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
913
964
  )
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):
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):
915
969
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
916
970
  else:
917
971
  cred = credential.Credential(
@@ -923,18 +977,73 @@ def doCreateDomain(args, parsed_globals):
923
977
  endpoint=g_param[OptionsDefine.Endpoint],
924
978
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
925
979
  )
926
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
980
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
927
981
  if g_param[OptionsDefine.Language]:
928
982
  profile.language = g_param[OptionsDefine.Language]
929
983
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
930
984
  client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
931
985
  client._sdkVersion += ("_CLI_" + __version__)
932
986
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
933
- model = models.CreateDomainRequest()
987
+ model = models.DeletePackageOrderRequest()
934
988
  model.from_json_string(json.dumps(args))
935
989
  start_time = time.time()
936
990
  while True:
937
- rsp = client.CreateDomain(model)
991
+ rsp = client.DeletePackageOrder(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
+
1010
+ def doCreateRecordBatch(args, parsed_globals):
1011
+ g_param = parse_global_arg(parsed_globals)
1012
+
1013
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1014
+ cred = credential.CVMRoleCredential()
1015
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1016
+ cred = credential.STSAssumeRoleCredential(
1017
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1018
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1019
+ )
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):
1024
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1025
+ else:
1026
+ cred = credential.Credential(
1027
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1028
+ )
1029
+ http_profile = HttpProfile(
1030
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1031
+ reqMethod="POST",
1032
+ endpoint=g_param[OptionsDefine.Endpoint],
1033
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1034
+ )
1035
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1036
+ if g_param[OptionsDefine.Language]:
1037
+ profile.language = g_param[OptionsDefine.Language]
1038
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1039
+ client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
1040
+ client._sdkVersion += ("_CLI_" + __version__)
1041
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1042
+ model = models.CreateRecordBatchRequest()
1043
+ model.from_json_string(json.dumps(args))
1044
+ start_time = time.time()
1045
+ while True:
1046
+ rsp = client.CreateRecordBatch(model)
938
1047
  result = rsp.to_json_string()
939
1048
  try:
940
1049
  json_obj = json.loads(result)
@@ -963,7 +1072,10 @@ def doModifyDomainLock(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 doModifyDomainLock(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 doDeleteRecord(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 doDeleteRecord(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 doDeleteRecord(args, parsed_globals):
1057
1172
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1058
1173
 
1059
1174
 
1060
- def doDescribeRecord(args, parsed_globals):
1175
+ def doDescribeRecordGroupList(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 doDescribeRecord(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 doDescribeRecord(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.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
1087
1205
  client._sdkVersion += ("_CLI_" + __version__)
1088
1206
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1089
- model = models.DescribeRecordRequest()
1207
+ model = models.DescribeRecordGroupListRequest()
1090
1208
  model.from_json_string(json.dumps(args))
1091
1209
  start_time = time.time()
1092
1210
  while True:
1093
- rsp = client.DescribeRecord(model)
1211
+ rsp = client.DescribeRecordGroupList(model)
1094
1212
  result = rsp.to_json_string()
1095
1213
  try:
1096
1214
  json_obj = json.loads(result)
@@ -1119,7 +1237,10 @@ def doDescribeRecordLineList(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 doDescribeRecordLineList(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]]
@@ -1171,7 +1292,10 @@ def doModifyRecordRemark(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,7 +1307,7 @@ def doModifyRecordRemark(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]]
@@ -1223,7 +1347,10 @@ def doCreateDomainAlias(args, parsed_globals):
1223
1347
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1224
1348
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1225
1349
  )
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):
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):
1227
1354
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1228
1355
  else:
1229
1356
  cred = credential.Credential(
@@ -1235,7 +1362,7 @@ def doCreateDomainAlias(args, parsed_globals):
1235
1362
  endpoint=g_param[OptionsDefine.Endpoint],
1236
1363
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1237
1364
  )
1238
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1365
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1239
1366
  if g_param[OptionsDefine.Language]:
1240
1367
  profile.language = g_param[OptionsDefine.Language]
1241
1368
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1275,7 +1402,10 @@ def doCreateRecord(args, parsed_globals):
1275
1402
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1276
1403
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1277
1404
  )
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):
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):
1279
1409
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1280
1410
  else:
1281
1411
  cred = credential.Credential(
@@ -1287,7 +1417,7 @@ def doCreateRecord(args, parsed_globals):
1287
1417
  endpoint=g_param[OptionsDefine.Endpoint],
1288
1418
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1289
1419
  )
1290
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1420
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1291
1421
  if g_param[OptionsDefine.Language]:
1292
1422
  profile.language = g_param[OptionsDefine.Language]
1293
1423
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1317,6 +1447,61 @@ def doCreateRecord(args, parsed_globals):
1317
1447
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1318
1448
 
1319
1449
 
1450
+ def doDescribeRecord(args, parsed_globals):
1451
+ g_param = parse_global_arg(parsed_globals)
1452
+
1453
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1454
+ cred = credential.CVMRoleCredential()
1455
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1456
+ cred = credential.STSAssumeRoleCredential(
1457
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1458
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1459
+ )
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):
1464
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1465
+ else:
1466
+ cred = credential.Credential(
1467
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1468
+ )
1469
+ http_profile = HttpProfile(
1470
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1471
+ reqMethod="POST",
1472
+ endpoint=g_param[OptionsDefine.Endpoint],
1473
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1474
+ )
1475
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1476
+ if g_param[OptionsDefine.Language]:
1477
+ profile.language = g_param[OptionsDefine.Language]
1478
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1479
+ client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
1480
+ client._sdkVersion += ("_CLI_" + __version__)
1481
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1482
+ model = models.DescribeRecordRequest()
1483
+ model.from_json_string(json.dumps(args))
1484
+ start_time = time.time()
1485
+ while True:
1486
+ rsp = client.DescribeRecord(model)
1487
+ result = rsp.to_json_string()
1488
+ try:
1489
+ json_obj = json.loads(result)
1490
+ except TypeError as e:
1491
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
1492
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1493
+ break
1494
+ cur_time = time.time()
1495
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1496
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1497
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1498
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1499
+ else:
1500
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1501
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1502
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1503
+
1504
+
1320
1505
  def doModifyDomainRemark(args, parsed_globals):
1321
1506
  g_param = parse_global_arg(parsed_globals)
1322
1507
 
@@ -1327,7 +1512,10 @@ def doModifyDomainRemark(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 doModifyDomainRemark(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 doModifyDomainOwner(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 doModifyDomainOwner(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 doCreateDomainGroup(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 doCreateDomainGroup(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]]
@@ -1483,7 +1677,10 @@ def doCreateRecordGroup(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,7 +1692,7 @@ def doCreateRecordGroup(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]]
@@ -1535,7 +1732,10 @@ def doDeleteDomainAlias(args, parsed_globals):
1535
1732
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1536
1733
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1537
1734
  )
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):
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):
1539
1739
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1540
1740
  else:
1541
1741
  cred = credential.Credential(
@@ -1547,7 +1747,7 @@ def doDeleteDomainAlias(args, parsed_globals):
1547
1747
  endpoint=g_param[OptionsDefine.Endpoint],
1548
1748
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1549
1749
  )
1550
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1750
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1551
1751
  if g_param[OptionsDefine.Language]:
1552
1752
  profile.language = g_param[OptionsDefine.Language]
1553
1753
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1577,7 +1777,7 @@ def doDeleteDomainAlias(args, parsed_globals):
1577
1777
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1578
1778
 
1579
1779
 
1580
- def doCreateRecordBatch(args, parsed_globals):
1780
+ def doCreateDomain(args, parsed_globals):
1581
1781
  g_param = parse_global_arg(parsed_globals)
1582
1782
 
1583
1783
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1587,7 +1787,10 @@ def doCreateRecordBatch(args, parsed_globals):
1587
1787
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1588
1788
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1589
1789
  )
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):
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):
1591
1794
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1592
1795
  else:
1593
1796
  cred = credential.Credential(
@@ -1599,18 +1802,73 @@ def doCreateRecordBatch(args, parsed_globals):
1599
1802
  endpoint=g_param[OptionsDefine.Endpoint],
1600
1803
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1601
1804
  )
1602
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1805
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1603
1806
  if g_param[OptionsDefine.Language]:
1604
1807
  profile.language = g_param[OptionsDefine.Language]
1605
1808
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1606
1809
  client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
1607
1810
  client._sdkVersion += ("_CLI_" + __version__)
1608
1811
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1609
- model = models.CreateRecordBatchRequest()
1812
+ model = models.CreateDomainRequest()
1610
1813
  model.from_json_string(json.dumps(args))
1611
1814
  start_time = time.time()
1612
1815
  while True:
1613
- rsp = client.CreateRecordBatch(model)
1816
+ rsp = client.CreateDomain(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
+
1835
+ def doCreatePackageOrder(args, parsed_globals):
1836
+ g_param = parse_global_arg(parsed_globals)
1837
+
1838
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1839
+ cred = credential.CVMRoleCredential()
1840
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1841
+ cred = credential.STSAssumeRoleCredential(
1842
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1843
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1844
+ )
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):
1849
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1850
+ else:
1851
+ cred = credential.Credential(
1852
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1853
+ )
1854
+ http_profile = HttpProfile(
1855
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1856
+ reqMethod="POST",
1857
+ endpoint=g_param[OptionsDefine.Endpoint],
1858
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1859
+ )
1860
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1861
+ if g_param[OptionsDefine.Language]:
1862
+ profile.language = g_param[OptionsDefine.Language]
1863
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1864
+ client = mod.DnspodClient(cred, g_param[OptionsDefine.Region], profile)
1865
+ client._sdkVersion += ("_CLI_" + __version__)
1866
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1867
+ model = models.CreatePackageOrderRequest()
1868
+ model.from_json_string(json.dumps(args))
1869
+ start_time = time.time()
1870
+ while True:
1871
+ rsp = client.CreatePackageOrder(model)
1614
1872
  result = rsp.to_json_string()
1615
1873
  try:
1616
1874
  json_obj = json.loads(result)
@@ -1639,7 +1897,10 @@ def doModifyRecordToGroup(args, parsed_globals):
1639
1897
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1640
1898
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1641
1899
  )
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):
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):
1643
1904
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1644
1905
  else:
1645
1906
  cred = credential.Credential(
@@ -1651,7 +1912,7 @@ def doModifyRecordToGroup(args, parsed_globals):
1651
1912
  endpoint=g_param[OptionsDefine.Endpoint],
1652
1913
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1653
1914
  )
1654
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1915
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1655
1916
  if g_param[OptionsDefine.Language]:
1656
1917
  profile.language = g_param[OptionsDefine.Language]
1657
1918
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1691,7 +1952,10 @@ def doDescribeDomainList(args, parsed_globals):
1691
1952
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1692
1953
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1693
1954
  )
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):
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):
1695
1959
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1696
1960
  else:
1697
1961
  cred = credential.Credential(
@@ -1703,7 +1967,7 @@ def doDescribeDomainList(args, parsed_globals):
1703
1967
  endpoint=g_param[OptionsDefine.Endpoint],
1704
1968
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1705
1969
  )
1706
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1970
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1707
1971
  if g_param[OptionsDefine.Language]:
1708
1972
  profile.language = g_param[OptionsDefine.Language]
1709
1973
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1743,7 +2007,10 @@ def doDeleteDomain(args, parsed_globals):
1743
2007
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1744
2008
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1745
2009
  )
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):
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):
1747
2014
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1748
2015
  else:
1749
2016
  cred = credential.Credential(
@@ -1755,7 +2022,7 @@ def doDeleteDomain(args, parsed_globals):
1755
2022
  endpoint=g_param[OptionsDefine.Endpoint],
1756
2023
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1757
2024
  )
1758
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2025
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1759
2026
  if g_param[OptionsDefine.Language]:
1760
2027
  profile.language = g_param[OptionsDefine.Language]
1761
2028
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1795,7 +2062,10 @@ def doDescribeDomainLogList(args, parsed_globals):
1795
2062
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1796
2063
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1797
2064
  )
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):
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):
1799
2069
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1800
2070
  else:
1801
2071
  cred = credential.Credential(
@@ -1807,7 +2077,7 @@ def doDescribeDomainLogList(args, parsed_globals):
1807
2077
  endpoint=g_param[OptionsDefine.Endpoint],
1808
2078
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1809
2079
  )
1810
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2080
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1811
2081
  if g_param[OptionsDefine.Language]:
1812
2082
  profile.language = g_param[OptionsDefine.Language]
1813
2083
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1847,7 +2117,10 @@ def doModifyRecordBatch(args, parsed_globals):
1847
2117
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1848
2118
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1849
2119
  )
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):
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):
1851
2124
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1852
2125
  else:
1853
2126
  cred = credential.Credential(
@@ -1859,7 +2132,7 @@ def doModifyRecordBatch(args, parsed_globals):
1859
2132
  endpoint=g_param[OptionsDefine.Endpoint],
1860
2133
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1861
2134
  )
1862
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2135
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1863
2136
  if g_param[OptionsDefine.Language]:
1864
2137
  profile.language = g_param[OptionsDefine.Language]
1865
2138
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1899,7 +2172,10 @@ def doModifyRecord(args, parsed_globals):
1899
2172
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1900
2173
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1901
2174
  )
1902
- 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):
1903
2179
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1904
2180
  else:
1905
2181
  cred = credential.Credential(
@@ -1911,7 +2187,7 @@ def doModifyRecord(args, parsed_globals):
1911
2187
  endpoint=g_param[OptionsDefine.Endpoint],
1912
2188
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1913
2189
  )
1914
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2190
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1915
2191
  if g_param[OptionsDefine.Language]:
1916
2192
  profile.language = g_param[OptionsDefine.Language]
1917
2193
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1954,6 +2230,7 @@ MODELS_MAP = {
1954
2230
  ACTION_MAP = {
1955
2231
  "DescribeRecordList": doDescribeRecordList,
1956
2232
  "DescribeDomainGroupList": doDescribeDomainGroupList,
2233
+ "DescribeRecordLineCategoryList": doDescribeRecordLineCategoryList,
1957
2234
  "DescribeDomainPurview": doDescribeDomainPurview,
1958
2235
  "DescribeRecordType": doDescribeRecordType,
1959
2236
  "DeleteRecordGroup": doDeleteRecordGroup,
@@ -1961,7 +2238,6 @@ ACTION_MAP = {
1961
2238
  "DescribeSubdomainAnalytics": doDescribeSubdomainAnalytics,
1962
2239
  "DeleteDomainBatch": doDeleteDomainBatch,
1963
2240
  "ModifyRecordStatus": doModifyRecordStatus,
1964
- "DescribeRecordGroupList": doDescribeRecordGroupList,
1965
2241
  "ModifyDomainStatus": doModifyDomainStatus,
1966
2242
  "ModifyDomainUnlock": doModifyDomainUnlock,
1967
2243
  "CreateDomainBatch": doCreateDomainBatch,
@@ -1969,20 +2245,23 @@ ACTION_MAP = {
1969
2245
  "DeleteShareDomain": doDeleteShareDomain,
1970
2246
  "ModifyRecordGroup": doModifyRecordGroup,
1971
2247
  "DescribeDomain": doDescribeDomain,
1972
- "CreateDomain": doCreateDomain,
2248
+ "DeletePackageOrder": doDeletePackageOrder,
2249
+ "CreateRecordBatch": doCreateRecordBatch,
1973
2250
  "ModifyDomainLock": doModifyDomainLock,
1974
2251
  "DeleteRecord": doDeleteRecord,
1975
- "DescribeRecord": doDescribeRecord,
2252
+ "DescribeRecordGroupList": doDescribeRecordGroupList,
1976
2253
  "DescribeRecordLineList": doDescribeRecordLineList,
1977
2254
  "ModifyRecordRemark": doModifyRecordRemark,
1978
2255
  "CreateDomainAlias": doCreateDomainAlias,
1979
2256
  "CreateRecord": doCreateRecord,
2257
+ "DescribeRecord": doDescribeRecord,
1980
2258
  "ModifyDomainRemark": doModifyDomainRemark,
1981
2259
  "ModifyDomainOwner": doModifyDomainOwner,
1982
2260
  "CreateDomainGroup": doCreateDomainGroup,
1983
2261
  "CreateRecordGroup": doCreateRecordGroup,
1984
2262
  "DeleteDomainAlias": doDeleteDomainAlias,
1985
- "CreateRecordBatch": doCreateRecordBatch,
2263
+ "CreateDomain": doCreateDomain,
2264
+ "CreatePackageOrder": doCreatePackageOrder,
1986
2265
  "ModifyRecordToGroup": doModifyRecordToGroup,
1987
2266
  "DescribeDomainList": doDescribeDomainList,
1988
2267
  "DeleteDomain": doDeleteDomain,