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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (294) hide show
  1. tccli/__init__.py +1 -1
  2. tccli/argument.py +1 -1
  3. tccli/plugins/sso/__init__.py +14 -0
  4. tccli/plugins/sso/login.py +23 -6
  5. tccli/plugins/sso/texts.py +4 -0
  6. tccli/services/__init__.py +49 -2
  7. tccli/services/advisor/advisor_client.py +10 -4
  8. tccli/services/ai3d/__init__.py +4 -0
  9. tccli/services/ai3d/ai3d_client.py +266 -0
  10. tccli/services/ai3d/v20250513/api.json +264 -0
  11. tccli/services/ai3d/v20250513/examples.json +20 -0
  12. tccli/services/aiart/aiart_client.py +5 -2
  13. tccli/services/ams/ams_client.py +20 -8
  14. tccli/services/antiddos/antiddos_client.py +350 -140
  15. tccli/services/apigateway/apigateway_client.py +465 -186
  16. tccli/services/apm/apm_client.py +835 -68
  17. tccli/services/apm/v20210622/api.json +3936 -1145
  18. tccli/services/apm/v20210622/examples.json +133 -23
  19. tccli/services/asr/asr_client.py +10 -4
  20. tccli/services/autoscaling/autoscaling_client.py +341 -114
  21. tccli/services/autoscaling/v20180419/api.json +514 -333
  22. tccli/services/autoscaling/v20180419/examples.json +46 -38
  23. tccli/services/batch/batch_client.py +140 -56
  24. tccli/services/bi/__init__.py +4 -0
  25. tccli/services/bi/bi_client.py +1498 -0
  26. tccli/services/bi/v20220105/api.json +5769 -0
  27. tccli/services/bi/v20220105/examples.json +215 -0
  28. tccli/services/billing/billing_client.py +1055 -134
  29. tccli/services/billing/v20180709/api.json +1654 -243
  30. tccli/services/billing/v20180709/examples.json +169 -25
  31. tccli/services/cam/cam_client.py +405 -162
  32. tccli/services/captcha/captcha_client.py +5 -2
  33. tccli/services/captcha/v20190722/api.json +16 -6
  34. tccli/services/captcha/v20190722/examples.json +3 -3
  35. tccli/services/car/car_client.py +165 -66
  36. tccli/services/cbs/cbs_client.py +190 -76
  37. tccli/services/ccc/ccc_client.py +1167 -268
  38. tccli/services/ccc/v20200210/api.json +2263 -202
  39. tccli/services/ccc/v20200210/examples.json +116 -12
  40. tccli/services/cdb/cdb_client.py +665 -266
  41. tccli/services/cdb/v20170320/api.json +426 -173
  42. tccli/services/cdb/v20170320/examples.json +6 -6
  43. tccli/services/cdc/cdc_client.py +100 -40
  44. tccli/services/cdc/v20201214/api.json +2 -2
  45. tccli/services/cdc/v20201214/examples.json +4 -4
  46. tccli/services/cdn/cdn_client.py +220 -88
  47. tccli/services/cdwdoris/cdwdoris_client.py +385 -154
  48. tccli/services/cdwpg/cdwpg_client.py +120 -48
  49. tccli/services/cdz/__init__.py +4 -0
  50. tccli/services/cdz/cdz_client.py +210 -0
  51. tccli/services/cdz/v20221123/api.json +233 -0
  52. tccli/services/cdz/v20221123/examples.json +12 -0
  53. tccli/services/cfg/cfg_client.py +80 -32
  54. tccli/services/cfg/v20210820/api.json +30 -10
  55. tccli/services/cfg/v20210820/examples.json +1 -1
  56. tccli/services/cfs/cfs_client.py +195 -78
  57. tccli/services/cfw/cfw_client.py +330 -132
  58. tccli/services/chdfs/chdfs_client.py +145 -58
  59. tccli/services/ciam/ciam_client.py +80 -32
  60. tccli/services/ckafka/ckafka_client.py +1033 -255
  61. tccli/services/ckafka/v20190819/api.json +3378 -1681
  62. tccli/services/ckafka/v20190819/examples.json +254 -160
  63. tccli/services/clb/clb_client.py +1054 -469
  64. tccli/services/clb/v20180317/api.json +2307 -1024
  65. tccli/services/clb/v20180317/examples.json +186 -126
  66. tccli/services/cloudaudit/cloudaudit_client.py +90 -36
  67. tccli/services/cls/cls_client.py +434 -173
  68. tccli/services/cmq/cmq_client.py +14 -803
  69. tccli/services/cmq/v20190304/api.json +173 -1367
  70. tccli/services/cmq/v20190304/examples.json +0 -120
  71. tccli/services/config/config_client.py +30 -12
  72. tccli/services/controlcenter/controlcenter_client.py +229 -2
  73. tccli/services/controlcenter/v20230110/api.json +528 -5
  74. tccli/services/controlcenter/v20230110/examples.json +32 -0
  75. tccli/services/csip/csip_client.py +339 -78
  76. tccli/services/csip/v20221121/api.json +1011 -38
  77. tccli/services/csip/v20221121/examples.json +24 -0
  78. tccli/services/ctsdb/__init__.py +4 -0
  79. tccli/services/ctsdb/ctsdb_client.py +266 -0
  80. tccli/services/ctsdb/v20230202/api.json +677 -0
  81. tccli/services/ctsdb/v20230202/examples.json +20 -0
  82. tccli/services/cvm/cvm_client.py +706 -189
  83. tccli/services/cvm/v20170312/api.json +1141 -510
  84. tccli/services/cvm/v20170312/examples.json +174 -128
  85. tccli/services/cwp/cwp_client.py +2325 -930
  86. tccli/services/cynosdb/cynosdb_client.py +3051 -575
  87. tccli/services/cynosdb/v20190107/api.json +14074 -7139
  88. tccli/services/cynosdb/v20190107/examples.json +597 -287
  89. tccli/services/dataintegration/dataintegration_client.py +5 -2
  90. tccli/services/dayu/dayu_client.py +515 -206
  91. tccli/services/dbbrain/dbbrain_client.py +210 -84
  92. tccli/services/dc/dc_client.py +90 -36
  93. tccli/services/dcdb/dcdb_client.py +310 -124
  94. tccli/services/dlc/dlc_client.py +859 -214
  95. tccli/services/dlc/v20210125/api.json +637 -13
  96. tccli/services/dlc/v20210125/examples.json +48 -0
  97. tccli/services/dms/dms_client.py +10 -4
  98. tccli/services/dnspod/dnspod_client.py +390 -111
  99. tccli/services/dnspod/v20210323/api.json +196 -0
  100. tccli/services/dnspod/v20210323/examples.json +24 -0
  101. tccli/services/domain/domain_client.py +120 -48
  102. tccli/services/dts/dts_client.py +415 -166
  103. tccli/services/eb/eb_client.py +130 -52
  104. tccli/services/ecdn/ecdn_client.py +75 -30
  105. tccli/services/ecm/ecm_client.py +620 -248
  106. tccli/services/eiam/eiam_client.py +200 -80
  107. tccli/services/emr/emr_client.py +3104 -117
  108. tccli/services/emr/v20190103/api.json +15311 -4361
  109. tccli/services/emr/v20190103/examples.json +452 -42
  110. tccli/services/es/es_client.py +105 -42
  111. tccli/services/facefusion/facefusion_client.py +15 -6
  112. tccli/services/faceid/faceid_client.py +95 -38
  113. tccli/services/faceid/v20180301/api.json +172 -45
  114. tccli/services/faceid/v20180301/examples.json +3 -3
  115. tccli/services/gaap/gaap_client.py +440 -176
  116. tccli/services/gme/gme_client.py +50 -20
  117. tccli/services/gpm/gpm_client.py +90 -36
  118. tccli/services/gse/gse_client.py +110 -44
  119. tccli/services/gwlb/gwlb_client.py +90 -36
  120. tccli/services/hunyuan/__init__.py +4 -0
  121. tccli/services/hunyuan/hunyuan_client.py +266 -0
  122. tccli/services/hunyuan/v20230901/api.json +270 -0
  123. tccli/services/hunyuan/v20230901/examples.json +20 -0
  124. tccli/services/iai/iai_client.py +145 -58
  125. tccli/services/iai/v20200303/api.json +187 -51
  126. tccli/services/iai/v20200303/examples.json +30 -12
  127. tccli/services/iap/iap_client.py +30 -12
  128. tccli/services/ims/ims_client.py +5 -2
  129. tccli/services/ims/v20201229/api.json +133 -141
  130. tccli/services/ims/v20201229/examples.json +3 -3
  131. tccli/services/intlpartnersmgt/intlpartnersmgt_client.py +516 -72
  132. tccli/services/intlpartnersmgt/v20220928/api.json +976 -60
  133. tccli/services/intlpartnersmgt/v20220928/examples.json +50 -2
  134. tccli/services/iotcloud/iotcloud_client.py +100 -40
  135. tccli/services/iotcloud/v20210408/api.json +216 -107
  136. tccli/services/iotcloud/v20210408/examples.json +9 -9
  137. tccli/services/ip/ip_client.py +30 -12
  138. tccli/services/kms/kms_client.py +1226 -227
  139. tccli/services/kms/v20190118/api.json +1562 -144
  140. tccli/services/kms/v20190118/examples.json +204 -78
  141. tccli/services/lcic/lcic_client.py +265 -106
  142. tccli/services/lighthouse/lighthouse_client.py +370 -148
  143. tccli/services/lighthouse/v20200324/api.json +14 -14
  144. tccli/services/lighthouse/v20200324/examples.json +5 -5
  145. tccli/services/live/live_client.py +804 -232
  146. tccli/services/live/v20180801/api.json +272 -0
  147. tccli/services/live/v20180801/examples.json +32 -0
  148. tccli/services/lke/__init__.py +4 -0
  149. tccli/services/lke/lke_client.py +5194 -0
  150. tccli/services/lke/v20231130/api.json +14803 -0
  151. tccli/services/lke/v20231130/examples.json +736 -0
  152. tccli/services/lkeap/__init__.py +4 -0
  153. tccli/services/lkeap/lkeap_client.py +602 -0
  154. tccli/services/lkeap/v20240522/api.json +953 -0
  155. tccli/services/lkeap/v20240522/examples.json +92 -0
  156. tccli/services/mariadb/mariadb_client.py +250 -100
  157. tccli/services/mdc/mdc_client.py +90 -36
  158. tccli/services/mdl/mdl_client.py +402 -82
  159. tccli/services/mdl/v20200326/api.json +1144 -58
  160. tccli/services/mdl/v20200326/examples.json +48 -16
  161. tccli/services/mdp/mdp_client.py +785 -122
  162. tccli/services/mdp/v20200527/api.json +1168 -44
  163. tccli/services/mdp/v20200527/examples.json +151 -79
  164. tccli/services/message/__init__.py +4 -0
  165. tccli/services/message/message_client.py +210 -0
  166. tccli/services/message/v20181225/api.json +72 -0
  167. tccli/services/message/v20181225/examples.json +13 -0
  168. tccli/services/mongodb/mongodb_client.py +1452 -136
  169. tccli/services/mongodb/v20190725/api.json +4393 -1462
  170. tccli/services/mongodb/v20190725/examples.json +265 -71
  171. tccli/services/monitor/monitor_client.py +1008 -296
  172. tccli/services/monitor/v20180724/api.json +660 -11
  173. tccli/services/monitor/v20180724/examples.json +152 -4
  174. tccli/services/mps/mps_client.py +1573 -354
  175. tccli/services/mps/v20190612/api.json +12394 -7243
  176. tccli/services/mps/v20190612/examples.json +244 -84
  177. tccli/services/msp/msp_client.py +35 -14
  178. tccli/services/ocr/ocr_client.py +596 -102
  179. tccli/services/ocr/v20181119/api.json +2271 -181
  180. tccli/services/ocr/v20181119/examples.json +70 -8
  181. tccli/services/omics/omics_client.py +100 -40
  182. tccli/services/organization/organization_client.py +580 -232
  183. tccli/services/postgres/postgres_client.py +455 -182
  184. tccli/services/postgres/v20170312/api.json +134 -109
  185. tccli/services/postgres/v20170312/examples.json +14 -14
  186. tccli/services/privatedns/privatedns_client.py +206 -60
  187. tccli/services/privatedns/v20201028/api.json +179 -0
  188. tccli/services/privatedns/v20201028/examples.json +8 -0
  189. tccli/services/pts/pts_client.py +240 -96
  190. tccli/services/quota/__init__.py +4 -0
  191. tccli/services/quota/quota_client.py +434 -0
  192. tccli/services/quota/v20241204/api.json +548 -0
  193. tccli/services/quota/v20241204/examples.json +51 -0
  194. tccli/services/rce/rce_client.py +5 -2
  195. tccli/services/redis/redis_client.py +698 -212
  196. tccli/services/redis/v20180412/api.json +968 -563
  197. tccli/services/redis/v20180412/examples.json +98 -56
  198. tccli/services/region/__init__.py +4 -0
  199. tccli/services/region/region_client.py +322 -0
  200. tccli/services/region/v20220627/api.json +399 -0
  201. tccli/services/region/v20220627/examples.json +29 -0
  202. tccli/services/rum/rum_client.py +300 -120
  203. tccli/services/scf/scf_client.py +210 -84
  204. tccli/services/ses/ses_client.py +368 -69
  205. tccli/services/ses/v20201002/api.json +240 -0
  206. tccli/services/ses/v20201002/examples.json +32 -0
  207. tccli/services/smh/__init__.py +4 -0
  208. tccli/services/smh/smh_client.py +714 -0
  209. tccli/services/smh/v20210712/api.json +1287 -0
  210. tccli/services/smh/v20210712/examples.json +85 -0
  211. tccli/services/sms/sms_client.py +90 -36
  212. tccli/services/sqlserver/sqlserver_client.py +3855 -470
  213. tccli/services/sqlserver/v20180328/api.json +9757 -3347
  214. tccli/services/sqlserver/v20180328/examples.json +480 -20
  215. tccli/services/ssl/ssl_client.py +504 -72
  216. tccli/services/ssl/v20191205/api.json +789 -21
  217. tccli/services/ssl/v20191205/examples.json +54 -0
  218. tccli/services/ssm/ssm_client.py +120 -48
  219. tccli/services/sts/sts_client.py +25 -10
  220. tccli/services/tag/tag_client.py +150 -60
  221. tccli/services/tat/tat_client.py +95 -38
  222. tccli/services/tbaas/__init__.py +4 -0
  223. tccli/services/tbaas/tbaas_client.py +378 -0
  224. tccli/services/tbaas/v20180416/api.json +551 -0
  225. tccli/services/tbaas/v20180416/examples.json +37 -0
  226. tccli/services/tcaplusdb/tcaplusdb_client.py +260 -104
  227. tccli/services/tcaplusdb/v20190823/api.json +836 -760
  228. tccli/services/tcaplusdb/v20190823/examples.json +3 -3
  229. tccli/services/tchd/tchd_client.py +5 -2
  230. tccli/services/tcmpp/tcmpp_client.py +520 -208
  231. tccli/services/tcr/tcr_client.py +380 -152
  232. tccli/services/tcsas/tcsas_client.py +295 -118
  233. tccli/services/tcsas/v20250106/api.json +155 -79
  234. tccli/services/tcsas/v20250106/examples.json +3 -3
  235. tccli/services/tcss/tcss_client.py +1650 -660
  236. tccli/services/tdid/tdid_client.py +240 -96
  237. tccli/services/tdmq/tdmq_client.py +2876 -466
  238. tccli/services/tdmq/v20200217/api.json +11607 -3958
  239. tccli/services/tdmq/v20200217/examples.json +562 -264
  240. tccli/services/tem/tem_client.py +280 -112
  241. tccli/services/teo/teo_client.py +4507 -966
  242. tccli/services/teo/v20220901/api.json +7341 -1405
  243. tccli/services/teo/v20220901/examples.json +679 -99
  244. tccli/services/tione/__init__.py +4 -0
  245. tccli/services/tione/tione_client.py +210 -0
  246. tccli/services/tione/v20211111/api.json +3074 -0
  247. tccli/services/tione/v20211111/examples.json +12 -0
  248. tccli/services/tiw/tiw_client.py +255 -102
  249. tccli/services/tke/tke_client.py +741 -274
  250. tccli/services/tke/v20180525/api.json +132 -7
  251. tccli/services/tke/v20180525/examples.json +42 -16
  252. tccli/services/tms/tms_client.py +5 -2
  253. tccli/services/tms/v20201229/api.json +91 -100
  254. tccli/services/tmt/tmt_client.py +5 -2
  255. tccli/services/trabbit/__init__.py +4 -0
  256. tccli/services/trabbit/trabbit_client.py +1778 -0
  257. tccli/services/trabbit/v20230418/api.json +4772 -0
  258. tccli/services/trabbit/v20230418/examples.json +237 -0
  259. tccli/services/trocket/__init__.py +4 -0
  260. tccli/services/trocket/trocket_client.py +2450 -0
  261. tccli/services/trocket/v20230308/api.json +6062 -0
  262. tccli/services/trocket/v20230308/examples.json +339 -0
  263. tccli/services/trro/trro_client.py +95 -38
  264. tccli/services/trtc/trtc_client.py +928 -192
  265. tccli/services/trtc/v20190722/api.json +1810 -256
  266. tccli/services/trtc/v20190722/examples.json +100 -6
  267. tccli/services/tts/tts_client.py +5 -2
  268. tccli/services/vclm/vclm_client.py +10 -4
  269. tccli/services/vm/v20210922/api.json +61 -30
  270. tccli/services/vm/v20210922/examples.json +0 -12
  271. tccli/services/vm/vm_client.py +20 -8
  272. tccli/services/vod/v20180717/api.json +332 -52
  273. tccli/services/vod/v20180717/examples.json +9 -1
  274. tccli/services/vod/v20240718/api.json +1105 -0
  275. tccli/services/vod/v20240718/examples.json +97 -0
  276. tccli/services/vod/vod_client.py +1316 -350
  277. tccli/services/vpc/v20170312/api.json +1166 -106
  278. tccli/services/vpc/v20170312/examples.json +197 -23
  279. tccli/services/vpc/vpc_client.py +2413 -739
  280. tccli/services/waf/v20180125/api.json +1372 -194
  281. tccli/services/waf/v20180125/examples.json +89 -1
  282. tccli/services/waf/waf_client.py +1149 -245
  283. tccli/services/wedata/v20210820/api.json +1577 -231
  284. tccli/services/wedata/v20210820/examples.json +74 -12
  285. tccli/services/wedata/v20250806/api.json +13644 -0
  286. tccli/services/wedata/v20250806/examples.json +621 -0
  287. tccli/services/wedata/wedata_client.py +6366 -1191
  288. tccli/services/yunjing/yunjing_client.py +355 -142
  289. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/METADATA +4 -7
  290. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/RECORD +294 -230
  291. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/WHEEL +1 -1
  292. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/entry_points.txt +0 -1
  293. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/LICENSE +0 -0
  294. {tccli_intl_en-3.0.1168.1.dist-info → tccli_intl_en-3.1.16.1.dist-info}/top_level.txt +0 -0
tccli/services/ses/ses_client.py CHANGED
@@ -27,7 +27,10 @@ def doListEmailIdentities(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 doListEmailIdentities(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 doCreateEmailAddress(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 doCreateEmailAddress(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,6 +127,61 @@ def doCreateEmailAddress(args, parsed_globals):
121
127
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
122
128
 
123
129
 
130
+ def doCreateEmailIdentity(args, parsed_globals):
131
+ g_param = parse_global_arg(parsed_globals)
132
+
133
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
134
+ cred = credential.CVMRoleCredential()
135
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
136
+ cred = credential.STSAssumeRoleCredential(
137
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
138
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
139
+ )
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):
144
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
145
+ else:
146
+ cred = credential.Credential(
147
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
148
+ )
149
+ http_profile = HttpProfile(
150
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
151
+ reqMethod="POST",
152
+ endpoint=g_param[OptionsDefine.Endpoint],
153
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
154
+ )
155
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
156
+ if g_param[OptionsDefine.Language]:
157
+ profile.language = g_param[OptionsDefine.Language]
158
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
159
+ client = mod.SesClient(cred, g_param[OptionsDefine.Region], profile)
160
+ client._sdkVersion += ("_CLI_" + __version__)
161
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
162
+ model = models.CreateEmailIdentityRequest()
163
+ model.from_json_string(json.dumps(args))
164
+ start_time = time.time()
165
+ while True:
166
+ rsp = client.CreateEmailIdentity(model)
167
+ result = rsp.to_json_string()
168
+ try:
169
+ json_obj = json.loads(result)
170
+ except TypeError as e:
171
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
172
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
173
+ break
174
+ cur_time = time.time()
175
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
176
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
177
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
178
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
179
+ else:
180
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
181
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
182
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
183
+
184
+
124
185
  def doGetSendEmailStatus(args, parsed_globals):
125
186
  g_param = parse_global_arg(parsed_globals)
126
187
 
@@ -131,7 +192,10 @@ def doGetSendEmailStatus(args, parsed_globals):
131
192
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
132
193
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
133
194
  )
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):
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):
135
199
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
136
200
  else:
137
201
  cred = credential.Credential(
@@ -143,7 +207,7 @@ def doGetSendEmailStatus(args, parsed_globals):
143
207
  endpoint=g_param[OptionsDefine.Endpoint],
144
208
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
145
209
  )
146
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
210
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
147
211
  if g_param[OptionsDefine.Language]:
148
212
  profile.language = g_param[OptionsDefine.Language]
149
213
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -183,7 +247,10 @@ def doCreateReceiver(args, parsed_globals):
183
247
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
184
248
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
185
249
  )
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):
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):
187
254
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
188
255
  else:
189
256
  cred = credential.Credential(
@@ -195,7 +262,7 @@ def doCreateReceiver(args, parsed_globals):
195
262
  endpoint=g_param[OptionsDefine.Endpoint],
196
263
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
197
264
  )
198
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
265
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
199
266
  if g_param[OptionsDefine.Language]:
200
267
  profile.language = g_param[OptionsDefine.Language]
201
268
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -225,7 +292,7 @@ def doCreateReceiver(args, parsed_globals):
225
292
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
226
293
 
227
294
 
228
- def doGetEmailTemplate(args, parsed_globals):
295
+ def doGetEmailIdentity(args, parsed_globals):
229
296
  g_param = parse_global_arg(parsed_globals)
230
297
 
231
298
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -235,7 +302,10 @@ def doGetEmailTemplate(args, parsed_globals):
235
302
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
236
303
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
237
304
  )
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):
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):
239
309
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
240
310
  else:
241
311
  cred = credential.Credential(
@@ -247,18 +317,18 @@ def doGetEmailTemplate(args, parsed_globals):
247
317
  endpoint=g_param[OptionsDefine.Endpoint],
248
318
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
249
319
  )
250
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
320
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
251
321
  if g_param[OptionsDefine.Language]:
252
322
  profile.language = g_param[OptionsDefine.Language]
253
323
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
254
324
  client = mod.SesClient(cred, g_param[OptionsDefine.Region], profile)
255
325
  client._sdkVersion += ("_CLI_" + __version__)
256
326
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
257
- model = models.GetEmailTemplateRequest()
327
+ model = models.GetEmailIdentityRequest()
258
328
  model.from_json_string(json.dumps(args))
259
329
  start_time = time.time()
260
330
  while True:
261
- rsp = client.GetEmailTemplate(model)
331
+ rsp = client.GetEmailIdentity(model)
262
332
  result = rsp.to_json_string()
263
333
  try:
264
334
  json_obj = json.loads(result)
@@ -277,7 +347,7 @@ def doGetEmailTemplate(args, parsed_globals):
277
347
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
278
348
 
279
349
 
280
- def doGetEmailIdentity(args, parsed_globals):
350
+ def doGetEmailTemplate(args, parsed_globals):
281
351
  g_param = parse_global_arg(parsed_globals)
282
352
 
283
353
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -287,7 +357,10 @@ def doGetEmailIdentity(args, parsed_globals):
287
357
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
288
358
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
289
359
  )
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):
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):
291
364
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
292
365
  else:
293
366
  cred = credential.Credential(
@@ -299,18 +372,18 @@ def doGetEmailIdentity(args, parsed_globals):
299
372
  endpoint=g_param[OptionsDefine.Endpoint],
300
373
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
301
374
  )
302
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
375
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
303
376
  if g_param[OptionsDefine.Language]:
304
377
  profile.language = g_param[OptionsDefine.Language]
305
378
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
306
379
  client = mod.SesClient(cred, g_param[OptionsDefine.Region], profile)
307
380
  client._sdkVersion += ("_CLI_" + __version__)
308
381
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
309
- model = models.GetEmailIdentityRequest()
382
+ model = models.GetEmailTemplateRequest()
310
383
  model.from_json_string(json.dumps(args))
311
384
  start_time = time.time()
312
385
  while True:
313
- rsp = client.GetEmailIdentity(model)
386
+ rsp = client.GetEmailTemplate(model)
314
387
  result = rsp.to_json_string()
315
388
  try:
316
389
  json_obj = json.loads(result)
@@ -339,7 +412,10 @@ def doGetStatisticsReport(args, parsed_globals):
339
412
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
340
413
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
341
414
  )
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):
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):
343
419
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
344
420
  else:
345
421
  cred = credential.Credential(
@@ -351,7 +427,7 @@ def doGetStatisticsReport(args, parsed_globals):
351
427
  endpoint=g_param[OptionsDefine.Endpoint],
352
428
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
353
429
  )
354
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
430
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
355
431
  if g_param[OptionsDefine.Language]:
356
432
  profile.language = g_param[OptionsDefine.Language]
357
433
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -381,6 +457,61 @@ def doGetStatisticsReport(args, parsed_globals):
381
457
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
382
458
 
383
459
 
460
+ def doListAddressUnsubscribeConfig(args, parsed_globals):
461
+ g_param = parse_global_arg(parsed_globals)
462
+
463
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
464
+ cred = credential.CVMRoleCredential()
465
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
466
+ cred = credential.STSAssumeRoleCredential(
467
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
468
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
469
+ )
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):
474
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
475
+ else:
476
+ cred = credential.Credential(
477
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
478
+ )
479
+ http_profile = HttpProfile(
480
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
481
+ reqMethod="POST",
482
+ endpoint=g_param[OptionsDefine.Endpoint],
483
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
484
+ )
485
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
486
+ if g_param[OptionsDefine.Language]:
487
+ profile.language = g_param[OptionsDefine.Language]
488
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
489
+ client = mod.SesClient(cred, g_param[OptionsDefine.Region], profile)
490
+ client._sdkVersion += ("_CLI_" + __version__)
491
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
492
+ model = models.ListAddressUnsubscribeConfigRequest()
493
+ model.from_json_string(json.dumps(args))
494
+ start_time = time.time()
495
+ while True:
496
+ rsp = client.ListAddressUnsubscribeConfig(model)
497
+ result = rsp.to_json_string()
498
+ try:
499
+ json_obj = json.loads(result)
500
+ except TypeError as e:
501
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
502
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
503
+ break
504
+ cur_time = time.time()
505
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
506
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
507
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
508
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
509
+ else:
510
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
511
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
512
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
513
+
514
+
384
515
  def doUpdateEmailTemplate(args, parsed_globals):
385
516
  g_param = parse_global_arg(parsed_globals)
386
517
 
@@ -391,7 +522,10 @@ def doUpdateEmailTemplate(args, parsed_globals):
391
522
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
392
523
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
393
524
  )
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):
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):
395
529
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
396
530
  else:
397
531
  cred = credential.Credential(
@@ -403,7 +537,7 @@ def doUpdateEmailTemplate(args, parsed_globals):
403
537
  endpoint=g_param[OptionsDefine.Endpoint],
404
538
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
405
539
  )
406
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
540
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
407
541
  if g_param[OptionsDefine.Language]:
408
542
  profile.language = g_param[OptionsDefine.Language]
409
543
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -443,7 +577,10 @@ def doUpdateEmailIdentity(args, parsed_globals):
443
577
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
444
578
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
445
579
  )
446
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
580
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
581
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
582
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
583
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
447
584
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
448
585
  else:
449
586
  cred = credential.Credential(
@@ -455,7 +592,7 @@ def doUpdateEmailIdentity(args, parsed_globals):
455
592
  endpoint=g_param[OptionsDefine.Endpoint],
456
593
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
457
594
  )
458
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
595
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
459
596
  if g_param[OptionsDefine.Language]:
460
597
  profile.language = g_param[OptionsDefine.Language]
461
598
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -495,7 +632,10 @@ def doDeleteEmailIdentity(args, parsed_globals):
495
632
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
496
633
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
497
634
  )
498
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
635
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
636
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
637
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
638
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
499
639
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
500
640
  else:
501
641
  cred = credential.Credential(
@@ -507,7 +647,7 @@ def doDeleteEmailIdentity(args, parsed_globals):
507
647
  endpoint=g_param[OptionsDefine.Endpoint],
508
648
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
509
649
  )
510
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
650
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
511
651
  if g_param[OptionsDefine.Language]:
512
652
  profile.language = g_param[OptionsDefine.Language]
513
653
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -547,7 +687,10 @@ def doListEmailAddress(args, parsed_globals):
547
687
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
548
688
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
549
689
  )
550
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
690
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
691
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
692
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
693
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
551
694
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
552
695
  else:
553
696
  cred = credential.Credential(
@@ -559,7 +702,7 @@ def doListEmailAddress(args, parsed_globals):
559
702
  endpoint=g_param[OptionsDefine.Endpoint],
560
703
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
561
704
  )
562
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
705
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
563
706
  if g_param[OptionsDefine.Language]:
564
707
  profile.language = g_param[OptionsDefine.Language]
565
708
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -599,7 +742,10 @@ def doDeleteReceiver(args, parsed_globals):
599
742
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
600
743
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
601
744
  )
602
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
745
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
746
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
747
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
748
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
603
749
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
604
750
  else:
605
751
  cred = credential.Credential(
@@ -611,7 +757,7 @@ def doDeleteReceiver(args, parsed_globals):
611
757
  endpoint=g_param[OptionsDefine.Endpoint],
612
758
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
613
759
  )
614
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
760
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
615
761
  if g_param[OptionsDefine.Language]:
616
762
  profile.language = g_param[OptionsDefine.Language]
617
763
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -641,7 +787,7 @@ def doDeleteReceiver(args, parsed_globals):
641
787
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
642
788
 
643
789
 
644
- def doCreateEmailIdentity(args, parsed_globals):
790
+ def doCreateAddressUnsubscribeConfig(args, parsed_globals):
645
791
  g_param = parse_global_arg(parsed_globals)
646
792
 
647
793
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -651,7 +797,10 @@ def doCreateEmailIdentity(args, parsed_globals):
651
797
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
652
798
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
653
799
  )
654
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
800
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
801
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
802
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
803
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
655
804
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
656
805
  else:
657
806
  cred = credential.Credential(
@@ -663,18 +812,18 @@ def doCreateEmailIdentity(args, parsed_globals):
663
812
  endpoint=g_param[OptionsDefine.Endpoint],
664
813
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
665
814
  )
666
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
815
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
667
816
  if g_param[OptionsDefine.Language]:
668
817
  profile.language = g_param[OptionsDefine.Language]
669
818
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
670
819
  client = mod.SesClient(cred, g_param[OptionsDefine.Region], profile)
671
820
  client._sdkVersion += ("_CLI_" + __version__)
672
821
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
673
- model = models.CreateEmailIdentityRequest()
822
+ model = models.CreateAddressUnsubscribeConfigRequest()
674
823
  model.from_json_string(json.dumps(args))
675
824
  start_time = time.time()
676
825
  while True:
677
- rsp = client.CreateEmailIdentity(model)
826
+ rsp = client.CreateAddressUnsubscribeConfig(model)
678
827
  result = rsp.to_json_string()
679
828
  try:
680
829
  json_obj = json.loads(result)
@@ -703,7 +852,10 @@ def doBatchSendEmail(args, parsed_globals):
703
852
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
704
853
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
705
854
  )
706
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
855
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
856
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
857
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
858
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
707
859
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
708
860
  else:
709
861
  cred = credential.Credential(
@@ -715,7 +867,7 @@ def doBatchSendEmail(args, parsed_globals):
715
867
  endpoint=g_param[OptionsDefine.Endpoint],
716
868
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
717
869
  )
718
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
870
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
719
871
  if g_param[OptionsDefine.Language]:
720
872
  profile.language = g_param[OptionsDefine.Language]
721
873
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -755,7 +907,10 @@ def doUpdateEmailSmtpPassWord(args, parsed_globals):
755
907
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
756
908
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
757
909
  )
758
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
910
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
911
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
912
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
913
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
759
914
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
760
915
  else:
761
916
  cred = credential.Credential(
@@ -767,7 +922,7 @@ def doUpdateEmailSmtpPassWord(args, parsed_globals):
767
922
  endpoint=g_param[OptionsDefine.Endpoint],
768
923
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
769
924
  )
770
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
925
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
771
926
  if g_param[OptionsDefine.Language]:
772
927
  profile.language = g_param[OptionsDefine.Language]
773
928
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -797,6 +952,61 @@ def doUpdateEmailSmtpPassWord(args, parsed_globals):
797
952
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
798
953
 
799
954
 
955
+ def doUpdateAddressUnsubscribeConfig(args, parsed_globals):
956
+ g_param = parse_global_arg(parsed_globals)
957
+
958
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
959
+ cred = credential.CVMRoleCredential()
960
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
961
+ cred = credential.STSAssumeRoleCredential(
962
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
963
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
964
+ )
965
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
966
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
967
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
968
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
969
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
970
+ else:
971
+ cred = credential.Credential(
972
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
973
+ )
974
+ http_profile = HttpProfile(
975
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
976
+ reqMethod="POST",
977
+ endpoint=g_param[OptionsDefine.Endpoint],
978
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
979
+ )
980
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
981
+ if g_param[OptionsDefine.Language]:
982
+ profile.language = g_param[OptionsDefine.Language]
983
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
984
+ client = mod.SesClient(cred, g_param[OptionsDefine.Region], profile)
985
+ client._sdkVersion += ("_CLI_" + __version__)
986
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
987
+ model = models.UpdateAddressUnsubscribeConfigRequest()
988
+ model.from_json_string(json.dumps(args))
989
+ start_time = time.time()
990
+ while True:
991
+ rsp = client.UpdateAddressUnsubscribeConfig(model)
992
+ result = rsp.to_json_string()
993
+ try:
994
+ json_obj = json.loads(result)
995
+ except TypeError as e:
996
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
997
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
998
+ break
999
+ cur_time = time.time()
1000
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1001
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1002
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1003
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1004
+ else:
1005
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1006
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1007
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1008
+
1009
+
800
1010
  def doDeleteEmailTemplate(args, parsed_globals):
801
1011
  g_param = parse_global_arg(parsed_globals)
802
1012
 
@@ -807,7 +1017,10 @@ def doDeleteEmailTemplate(args, parsed_globals):
807
1017
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
808
1018
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
809
1019
  )
810
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1020
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1021
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1022
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1023
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
811
1024
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
812
1025
  else:
813
1026
  cred = credential.Credential(
@@ -819,7 +1032,7 @@ def doDeleteEmailTemplate(args, parsed_globals):
819
1032
  endpoint=g_param[OptionsDefine.Endpoint],
820
1033
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
821
1034
  )
822
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1035
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
823
1036
  if g_param[OptionsDefine.Language]:
824
1037
  profile.language = g_param[OptionsDefine.Language]
825
1038
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -849,6 +1062,61 @@ def doDeleteEmailTemplate(args, parsed_globals):
849
1062
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
850
1063
 
851
1064
 
1065
+ def doDeleteAddressUnsubscribeConfig(args, parsed_globals):
1066
+ g_param = parse_global_arg(parsed_globals)
1067
+
1068
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1069
+ cred = credential.CVMRoleCredential()
1070
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1071
+ cred = credential.STSAssumeRoleCredential(
1072
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1073
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1074
+ )
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):
1079
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1080
+ else:
1081
+ cred = credential.Credential(
1082
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1083
+ )
1084
+ http_profile = HttpProfile(
1085
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1086
+ reqMethod="POST",
1087
+ endpoint=g_param[OptionsDefine.Endpoint],
1088
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1089
+ )
1090
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1091
+ if g_param[OptionsDefine.Language]:
1092
+ profile.language = g_param[OptionsDefine.Language]
1093
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1094
+ client = mod.SesClient(cred, g_param[OptionsDefine.Region], profile)
1095
+ client._sdkVersion += ("_CLI_" + __version__)
1096
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1097
+ model = models.DeleteAddressUnsubscribeConfigRequest()
1098
+ model.from_json_string(json.dumps(args))
1099
+ start_time = time.time()
1100
+ while True:
1101
+ rsp = client.DeleteAddressUnsubscribeConfig(model)
1102
+ result = rsp.to_json_string()
1103
+ try:
1104
+ json_obj = json.loads(result)
1105
+ except TypeError as e:
1106
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
1107
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1108
+ break
1109
+ cur_time = time.time()
1110
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1111
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1112
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1113
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1114
+ else:
1115
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1116
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1117
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1118
+
1119
+
852
1120
  def doListEmailTemplates(args, parsed_globals):
853
1121
  g_param = parse_global_arg(parsed_globals)
854
1122
 
@@ -859,7 +1127,10 @@ def doListEmailTemplates(args, parsed_globals):
859
1127
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
860
1128
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
861
1129
  )
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):
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):
863
1134
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
864
1135
  else:
865
1136
  cred = credential.Credential(
@@ -871,7 +1142,7 @@ def doListEmailTemplates(args, parsed_globals):
871
1142
  endpoint=g_param[OptionsDefine.Endpoint],
872
1143
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
873
1144
  )
874
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1145
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
875
1146
  if g_param[OptionsDefine.Language]:
876
1147
  profile.language = g_param[OptionsDefine.Language]
877
1148
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -901,7 +1172,7 @@ def doListEmailTemplates(args, parsed_globals):
901
1172
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
902
1173
 
903
1174
 
904
- def doListSendTasks(args, parsed_globals):
1175
+ def doDeleteBlackList(args, parsed_globals):
905
1176
  g_param = parse_global_arg(parsed_globals)
906
1177
 
907
1178
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -911,7 +1182,10 @@ def doListSendTasks(args, parsed_globals):
911
1182
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
912
1183
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
913
1184
  )
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):
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):
915
1189
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
916
1190
  else:
917
1191
  cred = credential.Credential(
@@ -923,18 +1197,18 @@ def doListSendTasks(args, parsed_globals):
923
1197
  endpoint=g_param[OptionsDefine.Endpoint],
924
1198
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
925
1199
  )
926
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1200
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
927
1201
  if g_param[OptionsDefine.Language]:
928
1202
  profile.language = g_param[OptionsDefine.Language]
929
1203
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
930
1204
  client = mod.SesClient(cred, g_param[OptionsDefine.Region], profile)
931
1205
  client._sdkVersion += ("_CLI_" + __version__)
932
1206
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
933
- model = models.ListSendTasksRequest()
1207
+ model = models.DeleteBlackListRequest()
934
1208
  model.from_json_string(json.dumps(args))
935
1209
  start_time = time.time()
936
1210
  while True:
937
- rsp = client.ListSendTasks(model)
1211
+ rsp = client.DeleteBlackList(model)
938
1212
  result = rsp.to_json_string()
939
1213
  try:
940
1214
  json_obj = json.loads(result)
@@ -963,7 +1237,10 @@ def doCreateEmailTemplate(args, parsed_globals):
963
1237
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
964
1238
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
965
1239
  )
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):
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):
967
1244
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
968
1245
  else:
969
1246
  cred = credential.Credential(
@@ -975,7 +1252,7 @@ def doCreateEmailTemplate(args, parsed_globals):
975
1252
  endpoint=g_param[OptionsDefine.Endpoint],
976
1253
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
977
1254
  )
978
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1255
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
979
1256
  if g_param[OptionsDefine.Language]:
980
1257
  profile.language = g_param[OptionsDefine.Language]
981
1258
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1005,7 +1282,7 @@ def doCreateEmailTemplate(args, parsed_globals):
1005
1282
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1006
1283
 
1007
1284
 
1008
- def doDeleteBlackList(args, parsed_globals):
1285
+ def doListSendTasks(args, parsed_globals):
1009
1286
  g_param = parse_global_arg(parsed_globals)
1010
1287
 
1011
1288
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1015,7 +1292,10 @@ def doDeleteBlackList(args, parsed_globals):
1015
1292
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1016
1293
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1017
1294
  )
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):
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):
1019
1299
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1020
1300
  else:
1021
1301
  cred = credential.Credential(
@@ -1027,18 +1307,18 @@ def doDeleteBlackList(args, parsed_globals):
1027
1307
  endpoint=g_param[OptionsDefine.Endpoint],
1028
1308
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1029
1309
  )
1030
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1310
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1031
1311
  if g_param[OptionsDefine.Language]:
1032
1312
  profile.language = g_param[OptionsDefine.Language]
1033
1313
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1034
1314
  client = mod.SesClient(cred, g_param[OptionsDefine.Region], profile)
1035
1315
  client._sdkVersion += ("_CLI_" + __version__)
1036
1316
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1037
- model = models.DeleteBlackListRequest()
1317
+ model = models.ListSendTasksRequest()
1038
1318
  model.from_json_string(json.dumps(args))
1039
1319
  start_time = time.time()
1040
1320
  while True:
1041
- rsp = client.DeleteBlackList(model)
1321
+ rsp = client.ListSendTasks(model)
1042
1322
  result = rsp.to_json_string()
1043
1323
  try:
1044
1324
  json_obj = json.loads(result)
@@ -1067,7 +1347,10 @@ def doSendEmail(args, parsed_globals):
1067
1347
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1068
1348
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1069
1349
  )
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):
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):
1071
1354
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1072
1355
  else:
1073
1356
  cred = credential.Credential(
@@ -1079,7 +1362,7 @@ def doSendEmail(args, parsed_globals):
1079
1362
  endpoint=g_param[OptionsDefine.Endpoint],
1080
1363
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1081
1364
  )
1082
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1365
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1083
1366
  if g_param[OptionsDefine.Language]:
1084
1367
  profile.language = g_param[OptionsDefine.Language]
1085
1368
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1119,7 +1402,10 @@ def doListBlackEmailAddress(args, parsed_globals):
1119
1402
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1120
1403
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1121
1404
  )
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):
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):
1123
1409
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1124
1410
  else:
1125
1411
  cred = credential.Credential(
@@ -1131,7 +1417,7 @@ def doListBlackEmailAddress(args, parsed_globals):
1131
1417
  endpoint=g_param[OptionsDefine.Endpoint],
1132
1418
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1133
1419
  )
1134
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1420
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1135
1421
  if g_param[OptionsDefine.Language]:
1136
1422
  profile.language = g_param[OptionsDefine.Language]
1137
1423
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1171,7 +1457,10 @@ def doCreateReceiverDetail(args, parsed_globals):
1171
1457
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1172
1458
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1173
1459
  )
1174
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1460
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1461
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1462
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1463
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1175
1464
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1176
1465
  else:
1177
1466
  cred = credential.Credential(
@@ -1183,7 +1472,7 @@ def doCreateReceiverDetail(args, parsed_globals):
1183
1472
  endpoint=g_param[OptionsDefine.Endpoint],
1184
1473
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1185
1474
  )
1186
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1475
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1187
1476
  if g_param[OptionsDefine.Language]:
1188
1477
  profile.language = g_param[OptionsDefine.Language]
1189
1478
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1223,7 +1512,10 @@ def doListReceivers(args, parsed_globals):
1223
1512
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1224
1513
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1225
1514
  )
1226
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1515
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1516
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1517
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1518
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1227
1519
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1228
1520
  else:
1229
1521
  cred = credential.Credential(
@@ -1235,7 +1527,7 @@ def doListReceivers(args, parsed_globals):
1235
1527
  endpoint=g_param[OptionsDefine.Endpoint],
1236
1528
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1237
1529
  )
1238
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1530
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1239
1531
  if g_param[OptionsDefine.Language]:
1240
1532
  profile.language = g_param[OptionsDefine.Language]
1241
1533
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1275,7 +1567,10 @@ def doDeleteEmailAddress(args, parsed_globals):
1275
1567
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1276
1568
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1277
1569
  )
1278
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1570
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1571
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1572
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1573
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1279
1574
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1280
1575
  else:
1281
1576
  cred = credential.Credential(
@@ -1287,7 +1582,7 @@ def doDeleteEmailAddress(args, parsed_globals):
1287
1582
  endpoint=g_param[OptionsDefine.Endpoint],
1288
1583
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1289
1584
  )
1290
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1585
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1291
1586
  if g_param[OptionsDefine.Language]:
1292
1587
  profile.language = g_param[OptionsDefine.Language]
1293
1588
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1330,24 +1625,28 @@ MODELS_MAP = {
1330
1625
  ACTION_MAP = {
1331
1626
  "ListEmailIdentities": doListEmailIdentities,
1332
1627
  "CreateEmailAddress": doCreateEmailAddress,
1628
+ "CreateEmailIdentity": doCreateEmailIdentity,
1333
1629
  "GetSendEmailStatus": doGetSendEmailStatus,
1334
1630
  "CreateReceiver": doCreateReceiver,
1335
- "GetEmailTemplate": doGetEmailTemplate,
1336
1631
  "GetEmailIdentity": doGetEmailIdentity,
1632
+ "GetEmailTemplate": doGetEmailTemplate,
1337
1633
  "GetStatisticsReport": doGetStatisticsReport,
1634
+ "ListAddressUnsubscribeConfig": doListAddressUnsubscribeConfig,
1338
1635
  "UpdateEmailTemplate": doUpdateEmailTemplate,
1339
1636
  "UpdateEmailIdentity": doUpdateEmailIdentity,
1340
1637
  "DeleteEmailIdentity": doDeleteEmailIdentity,
1341
1638
  "ListEmailAddress": doListEmailAddress,
1342
1639
  "DeleteReceiver": doDeleteReceiver,
1343
- "CreateEmailIdentity": doCreateEmailIdentity,
1640
+ "CreateAddressUnsubscribeConfig": doCreateAddressUnsubscribeConfig,
1344
1641
  "BatchSendEmail": doBatchSendEmail,
1345
1642
  "UpdateEmailSmtpPassWord": doUpdateEmailSmtpPassWord,
1643
+ "UpdateAddressUnsubscribeConfig": doUpdateAddressUnsubscribeConfig,
1346
1644
  "DeleteEmailTemplate": doDeleteEmailTemplate,
1645
+ "DeleteAddressUnsubscribeConfig": doDeleteAddressUnsubscribeConfig,
1347
1646
  "ListEmailTemplates": doListEmailTemplates,
1348
- "ListSendTasks": doListSendTasks,
1349
- "CreateEmailTemplate": doCreateEmailTemplate,
1350
1647
  "DeleteBlackList": doDeleteBlackList,
1648
+ "CreateEmailTemplate": doCreateEmailTemplate,
1649
+ "ListSendTasks": doListSendTasks,
1351
1650
  "SendEmail": doSendEmail,
1352
1651
  "ListBlackEmailAddress": doListBlackEmailAddress,
1353
1652
  "CreateReceiverDetail": doCreateReceiverDetail,