tccli-intl-en 3.0.1265.1__py2.py3-none-any.whl → 3.1.1.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 (186) hide show
  1. tccli/__init__.py +1 -1
  2. tccli/argument.py +1 -1
  3. tccli/services/__init__.py +5 -1
  4. tccli/services/advisor/advisor_client.py +10 -4
  5. tccli/services/aiart/aiart_client.py +5 -2
  6. tccli/services/ams/ams_client.py +20 -8
  7. tccli/services/antiddos/antiddos_client.py +350 -140
  8. tccli/services/apigateway/apigateway_client.py +465 -186
  9. tccli/services/apm/apm_client.py +835 -68
  10. tccli/services/apm/v20210622/api.json +3936 -1145
  11. tccli/services/apm/v20210622/examples.json +133 -23
  12. tccli/services/asr/asr_client.py +10 -4
  13. tccli/services/autoscaling/autoscaling_client.py +290 -116
  14. tccli/services/autoscaling/v20180419/api.json +1 -1
  15. tccli/services/batch/batch_client.py +140 -56
  16. tccli/services/bi/bi_client.py +120 -48
  17. tccli/services/billing/billing_client.py +210 -84
  18. tccli/services/cam/cam_client.py +405 -162
  19. tccli/services/captcha/captcha_client.py +5 -2
  20. tccli/services/car/car_client.py +165 -66
  21. tccli/services/cbs/cbs_client.py +190 -76
  22. tccli/services/ccc/ccc_client.py +515 -146
  23. tccli/services/ccc/v20200210/api.json +511 -27
  24. tccli/services/ccc/v20200210/examples.json +24 -0
  25. tccli/services/cdb/cdb_client.py +665 -266
  26. tccli/services/cdc/cdc_client.py +100 -40
  27. tccli/services/cdn/cdn_client.py +220 -88
  28. tccli/services/cdwdoris/cdwdoris_client.py +385 -154
  29. tccli/services/cdwpg/cdwpg_client.py +120 -48
  30. tccli/services/cdz/cdz_client.py +5 -2
  31. tccli/services/cfg/cfg_client.py +80 -32
  32. tccli/services/cfs/cfs_client.py +195 -78
  33. tccli/services/cfw/cfw_client.py +330 -132
  34. tccli/services/chdfs/chdfs_client.py +145 -58
  35. tccli/services/ciam/ciam_client.py +80 -32
  36. tccli/services/ckafka/ckafka_client.py +629 -131
  37. tccli/services/ckafka/v20190819/api.json +2749 -1470
  38. tccli/services/ckafka/v20190819/examples.json +209 -155
  39. tccli/services/clb/clb_client.py +415 -166
  40. tccli/services/clb/v20180317/api.json +1022 -647
  41. tccli/services/clb/v20180317/examples.json +19 -19
  42. tccli/services/cloudaudit/cloudaudit_client.py +90 -36
  43. tccli/services/cls/cls_client.py +434 -173
  44. tccli/services/cmq/cmq_client.py +10 -4
  45. tccli/services/config/config_client.py +30 -12
  46. tccli/services/controlcenter/controlcenter_client.py +5 -2
  47. tccli/services/csip/csip_client.py +170 -68
  48. tccli/services/ctsdb/ctsdb_client.py +10 -4
  49. tccli/services/cvm/cvm_client.py +420 -168
  50. tccli/services/cvm/v20170312/api.json +280 -174
  51. tccli/services/cvm/v20170312/examples.json +116 -116
  52. tccli/services/cwp/cwp_client.py +2325 -930
  53. tccli/services/cynosdb/cynosdb_client.py +1887 -577
  54. tccli/services/cynosdb/v20190107/api.json +11763 -7697
  55. tccli/services/cynosdb/v20190107/examples.json +132 -4
  56. tccli/services/dataintegration/dataintegration_client.py +5 -2
  57. tccli/services/dayu/dayu_client.py +515 -206
  58. tccli/services/dbbrain/dbbrain_client.py +210 -84
  59. tccli/services/dc/dc_client.py +90 -36
  60. tccli/services/dcdb/dcdb_client.py +310 -124
  61. tccli/services/dlc/dlc_client.py +808 -216
  62. tccli/services/dlc/v20210125/api.json +534 -13
  63. tccli/services/dlc/v20210125/examples.json +40 -0
  64. tccli/services/dms/dms_client.py +10 -4
  65. tccli/services/dnspod/dnspod_client.py +200 -80
  66. tccli/services/domain/domain_client.py +120 -48
  67. tccli/services/dts/dts_client.py +415 -166
  68. tccli/services/eb/eb_client.py +130 -52
  69. tccli/services/ecdn/ecdn_client.py +75 -30
  70. tccli/services/ecm/ecm_client.py +620 -248
  71. tccli/services/eiam/eiam_client.py +200 -80
  72. tccli/services/emr/emr_client.py +385 -154
  73. tccli/services/es/es_client.py +105 -42
  74. tccli/services/facefusion/facefusion_client.py +15 -6
  75. tccli/services/faceid/faceid_client.py +95 -38
  76. tccli/services/faceid/v20180301/examples.json +2 -2
  77. tccli/services/gaap/gaap_client.py +440 -176
  78. tccli/services/gme/gme_client.py +50 -20
  79. tccli/services/gpm/gpm_client.py +90 -36
  80. tccli/services/gse/gse_client.py +110 -44
  81. tccli/services/gwlb/gwlb_client.py +90 -36
  82. tccli/services/iai/iai_client.py +145 -58
  83. tccli/services/iap/iap_client.py +30 -12
  84. tccli/services/ims/ims_client.py +5 -2
  85. tccli/services/intlpartnersmgt/intlpartnersmgt_client.py +210 -84
  86. tccli/services/iotcloud/iotcloud_client.py +100 -40
  87. tccli/services/ip/ip_client.py +30 -12
  88. tccli/services/kms/kms_client.py +340 -136
  89. tccli/services/lcic/lcic_client.py +265 -106
  90. tccli/services/lighthouse/lighthouse_client.py +370 -148
  91. tccli/services/live/live_client.py +600 -240
  92. tccli/services/lke/lke_client.py +450 -180
  93. tccli/services/lkeap/lkeap_client.py +142 -12
  94. tccli/services/lkeap/v20240522/api.json +263 -0
  95. tccli/services/lkeap/v20240522/examples.json +35 -1
  96. tccli/services/mariadb/mariadb_client.py +250 -100
  97. tccli/services/mdc/mdc_client.py +90 -36
  98. tccli/services/mdl/mdl_client.py +165 -66
  99. tccli/services/mdl/v20200326/api.json +186 -12
  100. tccli/services/mdl/v20200326/examples.json +16 -16
  101. tccli/services/mdp/mdp_client.py +416 -124
  102. tccli/services/mdp/v20200527/api.json +146 -14
  103. tccli/services/mdp/v20200527/examples.json +95 -79
  104. tccli/services/message/__init__.py +4 -0
  105. tccli/services/message/message_client.py +210 -0
  106. tccli/services/message/v20181225/api.json +72 -0
  107. tccli/services/message/v20181225/examples.json +13 -0
  108. tccli/services/mongodb/mongodb_client.py +369 -58
  109. tccli/services/mongodb/v20190725/api.json +811 -226
  110. tccli/services/mongodb/v20190725/examples.json +54 -22
  111. tccli/services/monitor/monitor_client.py +1008 -296
  112. tccli/services/monitor/v20180724/api.json +657 -8
  113. tccli/services/monitor/v20180724/examples.json +152 -4
  114. tccli/services/mps/mps_client.py +684 -184
  115. tccli/services/mps/v20190612/api.json +1656 -222
  116. tccli/services/mps/v20190612/examples.json +60 -10
  117. tccli/services/msp/msp_client.py +35 -14
  118. tccli/services/ocr/ocr_client.py +246 -76
  119. tccli/services/ocr/v20181119/api.json +119 -10
  120. tccli/services/ocr/v20181119/examples.json +8 -0
  121. tccli/services/omics/omics_client.py +100 -40
  122. tccli/services/organization/organization_client.py +580 -232
  123. tccli/services/postgres/postgres_client.py +455 -182
  124. tccli/services/privatedns/privatedns_client.py +155 -62
  125. tccli/services/pts/pts_client.py +240 -96
  126. tccli/services/quota/quota_client.py +229 -2
  127. tccli/services/quota/v20241204/api.json +451 -2
  128. tccli/services/quota/v20241204/examples.json +42 -3
  129. tccli/services/rce/rce_client.py +5 -2
  130. tccli/services/redis/redis_client.py +545 -218
  131. tccli/services/redis/v20180412/api.json +225 -113
  132. tccli/services/redis/v20180412/examples.json +19 -19
  133. tccli/services/region/region_client.py +15 -6
  134. tccli/services/rum/rum_client.py +300 -120
  135. tccli/services/scf/scf_client.py +210 -84
  136. tccli/services/ses/ses_client.py +145 -58
  137. tccli/services/sms/sms_client.py +90 -36
  138. tccli/services/sqlserver/sqlserver_client.py +695 -278
  139. tccli/services/ssl/ssl_client.py +190 -76
  140. tccli/services/ssm/ssm_client.py +120 -48
  141. tccli/services/sts/sts_client.py +25 -10
  142. tccli/services/tag/tag_client.py +150 -60
  143. tccli/services/tat/tat_client.py +95 -38
  144. tccli/services/tbaas/tbaas_client.py +20 -8
  145. tccli/services/tcaplusdb/tcaplusdb_client.py +260 -104
  146. tccli/services/tchd/tchd_client.py +5 -2
  147. tccli/services/tcmpp/tcmpp_client.py +520 -208
  148. tccli/services/tcr/tcr_client.py +380 -152
  149. tccli/services/tcsas/tcsas_client.py +295 -118
  150. tccli/services/tcsas/v20250106/api.json +101 -61
  151. tccli/services/tcsas/v20250106/examples.json +2 -2
  152. tccli/services/tcss/tcss_client.py +1650 -660
  153. tccli/services/tdid/tdid_client.py +240 -96
  154. tccli/services/tdmq/tdmq_client.py +470 -188
  155. tccli/services/tem/tem_client.py +280 -112
  156. tccli/services/teo/teo_client.py +1365 -483
  157. tccli/services/teo/v20220901/api.json +354 -39
  158. tccli/services/teo/v20220901/examples.json +24 -0
  159. tccli/services/tione/tione_client.py +5 -2
  160. tccli/services/tiw/tiw_client.py +255 -102
  161. tccli/services/tke/tke_client.py +690 -276
  162. tccli/services/tms/tms_client.py +5 -2
  163. tccli/services/tmt/tmt_client.py +5 -2
  164. tccli/services/trabbit/trabbit_client.py +145 -58
  165. tccli/services/trro/trro_client.py +95 -38
  166. tccli/services/trtc/trtc_client.py +255 -102
  167. tccli/services/trtc/v20190722/api.json +11 -11
  168. tccli/services/trtc/v20190722/examples.json +7 -7
  169. tccli/services/tts/tts_client.py +5 -2
  170. tccli/services/vclm/vclm_client.py +10 -4
  171. tccli/services/vm/vm_client.py +20 -8
  172. tccli/services/vod/vod_client.py +895 -358
  173. tccli/services/vpc/v20170312/api.json +970 -75
  174. tccli/services/vpc/v20170312/examples.json +106 -10
  175. tccli/services/vpc/vpc_client.py +2159 -644
  176. tccli/services/waf/waf_client.py +535 -214
  177. tccli/services/wedata/v20250806/api.json +13644 -0
  178. tccli/services/wedata/v20250806/examples.json +621 -0
  179. tccli/services/wedata/wedata_client.py +6067 -1263
  180. tccli/services/yunjing/yunjing_client.py +355 -142
  181. {tccli_intl_en-3.0.1265.1.dist-info → tccli_intl_en-3.1.1.1.dist-info}/METADATA +4 -7
  182. {tccli_intl_en-3.0.1265.1.dist-info → tccli_intl_en-3.1.1.1.dist-info}/RECORD +186 -180
  183. {tccli_intl_en-3.0.1265.1.dist-info → tccli_intl_en-3.1.1.1.dist-info}/WHEEL +1 -1
  184. {tccli_intl_en-3.0.1265.1.dist-info → tccli_intl_en-3.1.1.1.dist-info}/entry_points.txt +0 -1
  185. {tccli_intl_en-3.0.1265.1.dist-info → tccli_intl_en-3.1.1.1.dist-info}/LICENSE +0 -0
  186. {tccli_intl_en-3.0.1265.1.dist-info → tccli_intl_en-3.1.1.1.dist-info}/top_level.txt +0 -0
@@ -27,7 +27,10 @@ def doDescribeRoute(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 doDescribeRoute(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 doDescribeGroupInfo(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 doDescribeGroupInfo(args, parsed_globals):
91
97
  endpoint=g_param[OptionsDefine.Endpoint],
92
98
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
93
99
  )
94
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
100
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
95
101
  if g_param[OptionsDefine.Language]:
96
102
  profile.language = g_param[OptionsDefine.Language]
97
103
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -131,7 +137,10 @@ def doCreateConsumer(args, parsed_globals):
131
137
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
132
138
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
133
139
  )
134
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
140
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
141
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
142
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
143
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
135
144
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
136
145
  else:
137
146
  cred = credential.Credential(
@@ -143,7 +152,7 @@ def doCreateConsumer(args, parsed_globals):
143
152
  endpoint=g_param[OptionsDefine.Endpoint],
144
153
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
145
154
  )
146
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
155
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
147
156
  if g_param[OptionsDefine.Language]:
148
157
  profile.language = g_param[OptionsDefine.Language]
149
158
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -183,7 +192,10 @@ def doCreateAcl(args, parsed_globals):
183
192
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
184
193
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
185
194
  )
186
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
195
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
196
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
197
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
198
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
187
199
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
188
200
  else:
189
201
  cred = credential.Credential(
@@ -195,7 +207,7 @@ def doCreateAcl(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]]
@@ -225,7 +237,7 @@ def doCreateAcl(args, parsed_globals):
225
237
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
226
238
 
227
239
 
228
- def doCreateInstancePost(args, parsed_globals):
240
+ def doDescribeTypeInstances(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 doCreateInstancePost(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,73 @@ def doCreateInstancePost(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.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
255
270
  client._sdkVersion += ("_CLI_" + __version__)
256
271
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
257
- model = models.CreateInstancePostRequest()
272
+ model = models.DescribeTypeInstancesRequest()
258
273
  model.from_json_string(json.dumps(args))
259
274
  start_time = time.time()
260
275
  while True:
261
- rsp = client.CreateInstancePost(model)
276
+ rsp = client.DescribeTypeInstances(model)
277
+ result = rsp.to_json_string()
278
+ try:
279
+ json_obj = json.loads(result)
280
+ except TypeError as e:
281
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
282
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
283
+ break
284
+ cur_time = time.time()
285
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
286
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
287
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
288
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
289
+ else:
290
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
291
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
292
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
293
+
294
+
295
+ def doDescribeDatahubTopics(args, parsed_globals):
296
+ g_param = parse_global_arg(parsed_globals)
297
+
298
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
299
+ cred = credential.CVMRoleCredential()
300
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
301
+ cred = credential.STSAssumeRoleCredential(
302
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
303
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
304
+ )
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):
309
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
310
+ else:
311
+ cred = credential.Credential(
312
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
313
+ )
314
+ http_profile = HttpProfile(
315
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
316
+ reqMethod="POST",
317
+ endpoint=g_param[OptionsDefine.Endpoint],
318
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
319
+ )
320
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
321
+ if g_param[OptionsDefine.Language]:
322
+ profile.language = g_param[OptionsDefine.Language]
323
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
324
+ client = mod.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
325
+ client._sdkVersion += ("_CLI_" + __version__)
326
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
327
+ model = models.DescribeDatahubTopicsRequest()
328
+ model.from_json_string(json.dumps(args))
329
+ start_time = time.time()
330
+ while True:
331
+ rsp = client.DescribeDatahubTopics(model)
262
332
  result = rsp.to_json_string()
263
333
  try:
264
334
  json_obj = json.loads(result)
@@ -287,7 +357,10 @@ def doDescribeAclRule(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,7 +372,7 @@ def doDescribeAclRule(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]]
@@ -339,7 +412,10 @@ def doCreateTopic(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 doCreateTopic(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,7 +457,7 @@ def doCreateTopic(args, parsed_globals):
381
457
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
382
458
 
383
459
 
384
- def doModifyInstancePre(args, parsed_globals):
460
+ def doDescribeSecurityGroupRoutes(args, parsed_globals):
385
461
  g_param = parse_global_arg(parsed_globals)
386
462
 
387
463
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -391,7 +467,10 @@ def doModifyInstancePre(args, parsed_globals):
391
467
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
392
468
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
393
469
  )
394
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
470
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
471
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
472
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
473
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
395
474
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
396
475
  else:
397
476
  cred = credential.Credential(
@@ -403,18 +482,18 @@ def doModifyInstancePre(args, parsed_globals):
403
482
  endpoint=g_param[OptionsDefine.Endpoint],
404
483
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
405
484
  )
406
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
485
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
407
486
  if g_param[OptionsDefine.Language]:
408
487
  profile.language = g_param[OptionsDefine.Language]
409
488
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
410
489
  client = mod.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
411
490
  client._sdkVersion += ("_CLI_" + __version__)
412
491
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
413
- model = models.ModifyInstancePreRequest()
492
+ model = models.DescribeSecurityGroupRoutesRequest()
414
493
  model.from_json_string(json.dumps(args))
415
494
  start_time = time.time()
416
495
  while True:
417
- rsp = client.ModifyInstancePre(model)
496
+ rsp = client.DescribeSecurityGroupRoutes(model)
418
497
  result = rsp.to_json_string()
419
498
  try:
420
499
  json_obj = json.loads(result)
@@ -443,7 +522,10 @@ def doBatchModifyTopicAttributes(args, parsed_globals):
443
522
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
444
523
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
445
524
  )
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):
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):
447
529
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
448
530
  else:
449
531
  cred = credential.Credential(
@@ -455,7 +537,7 @@ def doBatchModifyTopicAttributes(args, parsed_globals):
455
537
  endpoint=g_param[OptionsDefine.Endpoint],
456
538
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
457
539
  )
458
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
540
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
459
541
  if g_param[OptionsDefine.Language]:
460
542
  profile.language = g_param[OptionsDefine.Language]
461
543
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -495,7 +577,10 @@ def doDeleteRoute(args, parsed_globals):
495
577
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
496
578
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
497
579
  )
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):
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):
499
584
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
500
585
  else:
501
586
  cred = credential.Credential(
@@ -507,7 +592,7 @@ def doDeleteRoute(args, parsed_globals):
507
592
  endpoint=g_param[OptionsDefine.Endpoint],
508
593
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
509
594
  )
510
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
595
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
511
596
  if g_param[OptionsDefine.Language]:
512
597
  profile.language = g_param[OptionsDefine.Language]
513
598
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -547,7 +632,10 @@ def doSendMessage(args, parsed_globals):
547
632
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
548
633
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
549
634
  )
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):
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):
551
639
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
552
640
  else:
553
641
  cred = credential.Credential(
@@ -559,7 +647,7 @@ def doSendMessage(args, parsed_globals):
559
647
  endpoint=g_param[OptionsDefine.Endpoint],
560
648
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
561
649
  )
562
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
650
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
563
651
  if g_param[OptionsDefine.Language]:
564
652
  profile.language = g_param[OptionsDefine.Language]
565
653
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -599,7 +687,10 @@ def doDescribeUser(args, parsed_globals):
599
687
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
600
688
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
601
689
  )
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):
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):
603
694
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
604
695
  else:
605
696
  cred = credential.Credential(
@@ -611,7 +702,7 @@ def doDescribeUser(args, parsed_globals):
611
702
  endpoint=g_param[OptionsDefine.Endpoint],
612
703
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
613
704
  )
614
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
705
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
615
706
  if g_param[OptionsDefine.Language]:
616
707
  profile.language = g_param[OptionsDefine.Language]
617
708
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -651,7 +742,10 @@ def doCreateTopicIpWhiteList(args, parsed_globals):
651
742
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
652
743
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
653
744
  )
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):
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):
655
749
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
656
750
  else:
657
751
  cred = credential.Credential(
@@ -663,7 +757,7 @@ def doCreateTopicIpWhiteList(args, parsed_globals):
663
757
  endpoint=g_param[OptionsDefine.Endpoint],
664
758
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
665
759
  )
666
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
760
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
667
761
  if g_param[OptionsDefine.Language]:
668
762
  profile.language = g_param[OptionsDefine.Language]
669
763
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -703,7 +797,10 @@ def doDescribeGroup(args, parsed_globals):
703
797
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
704
798
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
705
799
  )
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):
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):
707
804
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
708
805
  else:
709
806
  cred = credential.Credential(
@@ -715,7 +812,7 @@ def doDescribeGroup(args, parsed_globals):
715
812
  endpoint=g_param[OptionsDefine.Endpoint],
716
813
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
717
814
  )
718
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
815
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
719
816
  if g_param[OptionsDefine.Language]:
720
817
  profile.language = g_param[OptionsDefine.Language]
721
818
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -755,7 +852,10 @@ def doModifyGroupOffsets(args, parsed_globals):
755
852
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
756
853
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
757
854
  )
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):
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):
759
859
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
760
860
  else:
761
861
  cred = credential.Credential(
@@ -767,7 +867,7 @@ def doModifyGroupOffsets(args, parsed_globals):
767
867
  endpoint=g_param[OptionsDefine.Endpoint],
768
868
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
769
869
  )
770
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
870
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
771
871
  if g_param[OptionsDefine.Language]:
772
872
  profile.language = g_param[OptionsDefine.Language]
773
873
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -807,7 +907,10 @@ def doDescribeInstances(args, parsed_globals):
807
907
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
808
908
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
809
909
  )
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):
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):
811
914
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
812
915
  else:
813
916
  cred = credential.Credential(
@@ -819,7 +922,7 @@ def doDescribeInstances(args, parsed_globals):
819
922
  endpoint=g_param[OptionsDefine.Endpoint],
820
923
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
821
924
  )
822
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
925
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
823
926
  if g_param[OptionsDefine.Language]:
824
927
  profile.language = g_param[OptionsDefine.Language]
825
928
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -849,7 +952,7 @@ def doDescribeInstances(args, parsed_globals):
849
952
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
850
953
 
851
954
 
852
- def doModifyInstanceAttributes(args, parsed_globals):
955
+ def doDescribeCvmInfo(args, parsed_globals):
853
956
  g_param = parse_global_arg(parsed_globals)
854
957
 
855
958
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -859,7 +962,10 @@ def doModifyInstanceAttributes(args, parsed_globals):
859
962
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
860
963
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
861
964
  )
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):
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):
863
969
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
864
970
  else:
865
971
  cred = credential.Credential(
@@ -871,18 +977,128 @@ def doModifyInstanceAttributes(args, parsed_globals):
871
977
  endpoint=g_param[OptionsDefine.Endpoint],
872
978
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
873
979
  )
874
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
980
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
875
981
  if g_param[OptionsDefine.Language]:
876
982
  profile.language = g_param[OptionsDefine.Language]
877
983
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
878
984
  client = mod.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
879
985
  client._sdkVersion += ("_CLI_" + __version__)
880
986
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
881
- model = models.ModifyInstanceAttributesRequest()
987
+ model = models.DescribeCvmInfoRequest()
882
988
  model.from_json_string(json.dumps(args))
883
989
  start_time = time.time()
884
990
  while True:
885
- rsp = client.ModifyInstanceAttributes(model)
991
+ rsp = client.DescribeCvmInfo(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 doDescribeDatahubTopic(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.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
1040
+ client._sdkVersion += ("_CLI_" + __version__)
1041
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1042
+ model = models.DescribeDatahubTopicRequest()
1043
+ model.from_json_string(json.dumps(args))
1044
+ start_time = time.time()
1045
+ while True:
1046
+ rsp = client.DescribeDatahubTopic(model)
1047
+ result = rsp.to_json_string()
1048
+ try:
1049
+ json_obj = json.loads(result)
1050
+ except TypeError as e:
1051
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
1052
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1053
+ break
1054
+ cur_time = time.time()
1055
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1056
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1057
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1058
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1059
+ else:
1060
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1061
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1062
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1063
+
1064
+
1065
+ def doCreateRoute(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.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
1095
+ client._sdkVersion += ("_CLI_" + __version__)
1096
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1097
+ model = models.CreateRouteRequest()
1098
+ model.from_json_string(json.dumps(args))
1099
+ start_time = time.time()
1100
+ while True:
1101
+ rsp = client.CreateRoute(model)
886
1102
  result = rsp.to_json_string()
887
1103
  try:
888
1104
  json_obj = json.loads(result)
@@ -911,7 +1127,10 @@ def doModifyDatahubTopic(args, parsed_globals):
911
1127
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
912
1128
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
913
1129
  )
914
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1130
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1131
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1132
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1133
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
915
1134
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
916
1135
  else:
917
1136
  cred = credential.Credential(
@@ -923,7 +1142,7 @@ def doModifyDatahubTopic(args, parsed_globals):
923
1142
  endpoint=g_param[OptionsDefine.Endpoint],
924
1143
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
925
1144
  )
926
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1145
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
927
1146
  if g_param[OptionsDefine.Language]:
928
1147
  profile.language = g_param[OptionsDefine.Language]
929
1148
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -963,7 +1182,10 @@ def doFetchMessageListByOffset(args, parsed_globals):
963
1182
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
964
1183
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
965
1184
  )
966
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1185
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1186
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1187
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1188
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
967
1189
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
968
1190
  else:
969
1191
  cred = credential.Credential(
@@ -975,7 +1197,7 @@ def doFetchMessageListByOffset(args, parsed_globals):
975
1197
  endpoint=g_param[OptionsDefine.Endpoint],
976
1198
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
977
1199
  )
978
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1200
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
979
1201
  if g_param[OptionsDefine.Language]:
980
1202
  profile.language = g_param[OptionsDefine.Language]
981
1203
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1015,7 +1237,10 @@ def doCreateDatahubTopic(args, parsed_globals):
1015
1237
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1016
1238
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1017
1239
  )
1018
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1240
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1241
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1242
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1243
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1019
1244
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1020
1245
  else:
1021
1246
  cred = credential.Credential(
@@ -1027,7 +1252,7 @@ def doCreateDatahubTopic(args, parsed_globals):
1027
1252
  endpoint=g_param[OptionsDefine.Endpoint],
1028
1253
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1029
1254
  )
1030
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1255
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1031
1256
  if g_param[OptionsDefine.Language]:
1032
1257
  profile.language = g_param[OptionsDefine.Language]
1033
1258
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1057,7 +1282,7 @@ def doCreateDatahubTopic(args, parsed_globals):
1057
1282
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1058
1283
 
1059
1284
 
1060
- def doDescribeACL(args, parsed_globals):
1285
+ def doDeleteInstancePost(args, parsed_globals):
1061
1286
  g_param = parse_global_arg(parsed_globals)
1062
1287
 
1063
1288
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1067,7 +1292,10 @@ def doDescribeACL(args, parsed_globals):
1067
1292
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1068
1293
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1069
1294
  )
1070
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1295
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1296
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1297
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1298
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1071
1299
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1072
1300
  else:
1073
1301
  cred = credential.Credential(
@@ -1079,18 +1307,18 @@ def doDescribeACL(args, parsed_globals):
1079
1307
  endpoint=g_param[OptionsDefine.Endpoint],
1080
1308
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1081
1309
  )
1082
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1310
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1083
1311
  if g_param[OptionsDefine.Language]:
1084
1312
  profile.language = g_param[OptionsDefine.Language]
1085
1313
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1086
1314
  client = mod.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
1087
1315
  client._sdkVersion += ("_CLI_" + __version__)
1088
1316
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1089
- model = models.DescribeACLRequest()
1317
+ model = models.DeleteInstancePostRequest()
1090
1318
  model.from_json_string(json.dumps(args))
1091
1319
  start_time = time.time()
1092
1320
  while True:
1093
- rsp = client.DescribeACL(model)
1321
+ rsp = client.DeleteInstancePost(model)
1094
1322
  result = rsp.to_json_string()
1095
1323
  try:
1096
1324
  json_obj = json.loads(result)
@@ -1109,7 +1337,7 @@ def doDescribeACL(args, parsed_globals):
1109
1337
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1110
1338
 
1111
1339
 
1112
- def doDescribeDatahubTopics(args, parsed_globals):
1340
+ def doDescribeACL(args, parsed_globals):
1113
1341
  g_param = parse_global_arg(parsed_globals)
1114
1342
 
1115
1343
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1119,7 +1347,10 @@ def doDescribeDatahubTopics(args, parsed_globals):
1119
1347
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1120
1348
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1121
1349
  )
1122
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1350
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1351
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1352
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1353
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1123
1354
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1124
1355
  else:
1125
1356
  cred = credential.Credential(
@@ -1131,18 +1362,18 @@ def doDescribeDatahubTopics(args, parsed_globals):
1131
1362
  endpoint=g_param[OptionsDefine.Endpoint],
1132
1363
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1133
1364
  )
1134
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1365
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1135
1366
  if g_param[OptionsDefine.Language]:
1136
1367
  profile.language = g_param[OptionsDefine.Language]
1137
1368
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1138
1369
  client = mod.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
1139
1370
  client._sdkVersion += ("_CLI_" + __version__)
1140
1371
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
1141
- model = models.DescribeDatahubTopicsRequest()
1372
+ model = models.DescribeACLRequest()
1142
1373
  model.from_json_string(json.dumps(args))
1143
1374
  start_time = time.time()
1144
1375
  while True:
1145
- rsp = client.DescribeDatahubTopics(model)
1376
+ rsp = client.DescribeACL(model)
1146
1377
  result = rsp.to_json_string()
1147
1378
  try:
1148
1379
  json_obj = json.loads(result)
@@ -1171,7 +1402,10 @@ def doDescribeTopicDetail(args, parsed_globals):
1171
1402
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1172
1403
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1173
1404
  )
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):
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):
1175
1409
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1176
1410
  else:
1177
1411
  cred = credential.Credential(
@@ -1183,7 +1417,7 @@ def doDescribeTopicDetail(args, parsed_globals):
1183
1417
  endpoint=g_param[OptionsDefine.Endpoint],
1184
1418
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1185
1419
  )
1186
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1420
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1187
1421
  if g_param[OptionsDefine.Language]:
1188
1422
  profile.language = g_param[OptionsDefine.Language]
1189
1423
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1213,6 +1447,61 @@ def doDescribeTopicDetail(args, parsed_globals):
1213
1447
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1214
1448
 
1215
1449
 
1450
+ def doCreateInstancePre(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.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
1480
+ client._sdkVersion += ("_CLI_" + __version__)
1481
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
1482
+ model = models.CreateInstancePreRequest()
1483
+ model.from_json_string(json.dumps(args))
1484
+ start_time = time.time()
1485
+ while True:
1486
+ rsp = client.CreateInstancePre(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
+
1216
1505
  def doFetchMessageByOffset(args, parsed_globals):
1217
1506
  g_param = parse_global_arg(parsed_globals)
1218
1507
 
@@ -1223,7 +1512,10 @@ def doFetchMessageByOffset(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 doFetchMessageByOffset(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 doDeleteTopicIpWhiteList(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 doDeleteTopicIpWhiteList(args, parsed_globals):
1287
1582
  endpoint=g_param[OptionsDefine.Endpoint],
1288
1583
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1289
1584
  )
1290
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1585
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1291
1586
  if g_param[OptionsDefine.Language]:
1292
1587
  profile.language = g_param[OptionsDefine.Language]
1293
1588
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1327,7 +1622,10 @@ def doModifyPassword(args, parsed_globals):
1327
1622
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1328
1623
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1329
1624
  )
1330
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1625
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1626
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1627
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1628
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1331
1629
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1332
1630
  else:
1333
1631
  cred = credential.Credential(
@@ -1339,7 +1637,7 @@ def doModifyPassword(args, parsed_globals):
1339
1637
  endpoint=g_param[OptionsDefine.Endpoint],
1340
1638
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1341
1639
  )
1342
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1640
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1343
1641
  if g_param[OptionsDefine.Language]:
1344
1642
  profile.language = g_param[OptionsDefine.Language]
1345
1643
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1379,7 +1677,10 @@ def doDescribeConsumerGroup(args, parsed_globals):
1379
1677
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1380
1678
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1381
1679
  )
1382
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1680
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1681
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1682
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1683
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1383
1684
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1384
1685
  else:
1385
1686
  cred = credential.Credential(
@@ -1391,7 +1692,7 @@ def doDescribeConsumerGroup(args, parsed_globals):
1391
1692
  endpoint=g_param[OptionsDefine.Endpoint],
1392
1693
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1393
1694
  )
1394
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1695
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1395
1696
  if g_param[OptionsDefine.Language]:
1396
1697
  profile.language = g_param[OptionsDefine.Language]
1397
1698
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1431,7 +1732,10 @@ def doDescribeTopicSubscribeGroup(args, parsed_globals):
1431
1732
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1432
1733
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1433
1734
  )
1434
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1735
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
1736
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
1737
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
1738
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1435
1739
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1436
1740
  else:
1437
1741
  cred = credential.Credential(
@@ -1443,7 +1747,7 @@ def doDescribeTopicSubscribeGroup(args, parsed_globals):
1443
1747
  endpoint=g_param[OptionsDefine.Endpoint],
1444
1748
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1445
1749
  )
1446
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1750
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1447
1751
  if g_param[OptionsDefine.Language]:
1448
1752
  profile.language = g_param[OptionsDefine.Language]
1449
1753
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1483,7 +1787,10 @@ def doDeleteRouteTriggerTime(args, parsed_globals):
1483
1787
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1484
1788
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1485
1789
  )
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):
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):
1487
1794
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1488
1795
  else:
1489
1796
  cred = credential.Credential(
@@ -1495,7 +1802,7 @@ def doDeleteRouteTriggerTime(args, parsed_globals):
1495
1802
  endpoint=g_param[OptionsDefine.Endpoint],
1496
1803
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1497
1804
  )
1498
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1805
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1499
1806
  if g_param[OptionsDefine.Language]:
1500
1807
  profile.language = g_param[OptionsDefine.Language]
1501
1808
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1535,7 +1842,10 @@ def doCreatePartition(args, parsed_globals):
1535
1842
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1536
1843
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1537
1844
  )
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):
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):
1539
1849
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1540
1850
  else:
1541
1851
  cred = credential.Credential(
@@ -1547,7 +1857,7 @@ def doCreatePartition(args, parsed_globals):
1547
1857
  endpoint=g_param[OptionsDefine.Endpoint],
1548
1858
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1549
1859
  )
1550
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1860
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1551
1861
  if g_param[OptionsDefine.Language]:
1552
1862
  profile.language = g_param[OptionsDefine.Language]
1553
1863
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1587,7 +1897,10 @@ def doCreateUser(args, parsed_globals):
1587
1897
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1588
1898
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1589
1899
  )
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):
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):
1591
1904
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1592
1905
  else:
1593
1906
  cred = credential.Credential(
@@ -1599,7 +1912,7 @@ def doCreateUser(args, parsed_globals):
1599
1912
  endpoint=g_param[OptionsDefine.Endpoint],
1600
1913
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1601
1914
  )
1602
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1915
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1603
1916
  if g_param[OptionsDefine.Language]:
1604
1917
  profile.language = g_param[OptionsDefine.Language]
1605
1918
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1639,7 +1952,10 @@ def doDescribeTaskStatus(args, parsed_globals):
1639
1952
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1640
1953
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1641
1954
  )
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):
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):
1643
1959
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1644
1960
  else:
1645
1961
  cred = credential.Credential(
@@ -1651,7 +1967,7 @@ def doDescribeTaskStatus(args, parsed_globals):
1651
1967
  endpoint=g_param[OptionsDefine.Endpoint],
1652
1968
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1653
1969
  )
1654
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1970
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1655
1971
  if g_param[OptionsDefine.Language]:
1656
1972
  profile.language = g_param[OptionsDefine.Language]
1657
1973
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1691,7 +2007,10 @@ def doBatchModifyGroupOffsets(args, parsed_globals):
1691
2007
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1692
2008
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1693
2009
  )
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):
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):
1695
2014
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1696
2015
  else:
1697
2016
  cred = credential.Credential(
@@ -1703,7 +2022,7 @@ def doBatchModifyGroupOffsets(args, parsed_globals):
1703
2022
  endpoint=g_param[OptionsDefine.Endpoint],
1704
2023
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1705
2024
  )
1706
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2025
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1707
2026
  if g_param[OptionsDefine.Language]:
1708
2027
  profile.language = g_param[OptionsDefine.Language]
1709
2028
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1743,7 +2062,10 @@ def doDeleteAcl(args, parsed_globals):
1743
2062
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1744
2063
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1745
2064
  )
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):
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):
1747
2069
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1748
2070
  else:
1749
2071
  cred = credential.Credential(
@@ -1755,7 +2077,7 @@ def doDeleteAcl(args, parsed_globals):
1755
2077
  endpoint=g_param[OptionsDefine.Endpoint],
1756
2078
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1757
2079
  )
1758
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2080
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1759
2081
  if g_param[OptionsDefine.Language]:
1760
2082
  profile.language = g_param[OptionsDefine.Language]
1761
2083
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1795,7 +2117,10 @@ def doDescribeAppInfo(args, parsed_globals):
1795
2117
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1796
2118
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1797
2119
  )
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):
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):
1799
2124
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1800
2125
  else:
1801
2126
  cred = credential.Credential(
@@ -1807,7 +2132,7 @@ def doDescribeAppInfo(args, parsed_globals):
1807
2132
  endpoint=g_param[OptionsDefine.Endpoint],
1808
2133
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1809
2134
  )
1810
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2135
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1811
2136
  if g_param[OptionsDefine.Language]:
1812
2137
  profile.language = g_param[OptionsDefine.Language]
1813
2138
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1847,7 +2172,10 @@ def doDescribeGroupOffsets(args, parsed_globals):
1847
2172
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1848
2173
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1849
2174
  )
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):
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):
1851
2179
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1852
2180
  else:
1853
2181
  cred = credential.Credential(
@@ -1859,7 +2187,7 @@ def doDescribeGroupOffsets(args, parsed_globals):
1859
2187
  endpoint=g_param[OptionsDefine.Endpoint],
1860
2188
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1861
2189
  )
1862
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2190
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1863
2191
  if g_param[OptionsDefine.Language]:
1864
2192
  profile.language = g_param[OptionsDefine.Language]
1865
2193
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1899,7 +2227,10 @@ def doDeleteInstancePre(args, parsed_globals):
1899
2227
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1900
2228
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1901
2229
  )
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):
2230
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2231
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2232
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2233
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1903
2234
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1904
2235
  else:
1905
2236
  cred = credential.Credential(
@@ -1911,7 +2242,7 @@ def doDeleteInstancePre(args, parsed_globals):
1911
2242
  endpoint=g_param[OptionsDefine.Endpoint],
1912
2243
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1913
2244
  )
1914
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2245
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1915
2246
  if g_param[OptionsDefine.Language]:
1916
2247
  profile.language = g_param[OptionsDefine.Language]
1917
2248
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -1951,7 +2282,10 @@ def doDescribeInstanceAttributes(args, parsed_globals):
1951
2282
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1952
2283
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
1953
2284
  )
1954
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2285
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2286
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2287
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2288
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1955
2289
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1956
2290
  else:
1957
2291
  cred = credential.Credential(
@@ -1963,7 +2297,7 @@ def doDescribeInstanceAttributes(args, parsed_globals):
1963
2297
  endpoint=g_param[OptionsDefine.Endpoint],
1964
2298
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1965
2299
  )
1966
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2300
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
1967
2301
  if g_param[OptionsDefine.Language]:
1968
2302
  profile.language = g_param[OptionsDefine.Language]
1969
2303
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2003,7 +2337,10 @@ def doDescribeInstancesDetail(args, parsed_globals):
2003
2337
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2004
2338
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2005
2339
  )
2006
- 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):
2340
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2341
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2342
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2343
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2007
2344
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2008
2345
  else:
2009
2346
  cred = credential.Credential(
@@ -2015,7 +2352,7 @@ def doDescribeInstancesDetail(args, parsed_globals):
2015
2352
  endpoint=g_param[OptionsDefine.Endpoint],
2016
2353
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2017
2354
  )
2018
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2355
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2019
2356
  if g_param[OptionsDefine.Language]:
2020
2357
  profile.language = g_param[OptionsDefine.Language]
2021
2358
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2055,7 +2392,10 @@ def doBatchCreateAcl(args, parsed_globals):
2055
2392
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2056
2393
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2057
2394
  )
2058
- 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):
2395
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2396
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2397
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2398
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2059
2399
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2060
2400
  else:
2061
2401
  cred = credential.Credential(
@@ -2067,7 +2407,7 @@ def doBatchCreateAcl(args, parsed_globals):
2067
2407
  endpoint=g_param[OptionsDefine.Endpoint],
2068
2408
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2069
2409
  )
2070
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2410
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2071
2411
  if g_param[OptionsDefine.Language]:
2072
2412
  profile.language = g_param[OptionsDefine.Language]
2073
2413
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2107,7 +2447,10 @@ def doModifyAclRule(args, parsed_globals):
2107
2447
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2108
2448
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2109
2449
  )
2110
- 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):
2450
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2451
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2452
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2453
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2111
2454
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2112
2455
  else:
2113
2456
  cred = credential.Credential(
@@ -2119,7 +2462,7 @@ def doModifyAclRule(args, parsed_globals):
2119
2462
  endpoint=g_param[OptionsDefine.Endpoint],
2120
2463
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2121
2464
  )
2122
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2465
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2123
2466
  if g_param[OptionsDefine.Language]:
2124
2467
  profile.language = g_param[OptionsDefine.Language]
2125
2468
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2159,7 +2502,10 @@ def doDeleteUser(args, parsed_globals):
2159
2502
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2160
2503
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2161
2504
  )
2162
- 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):
2505
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2506
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2507
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2508
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2163
2509
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2164
2510
  else:
2165
2511
  cred = credential.Credential(
@@ -2171,7 +2517,7 @@ def doDeleteUser(args, parsed_globals):
2171
2517
  endpoint=g_param[OptionsDefine.Endpoint],
2172
2518
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2173
2519
  )
2174
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2520
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2175
2521
  if g_param[OptionsDefine.Language]:
2176
2522
  profile.language = g_param[OptionsDefine.Language]
2177
2523
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2211,7 +2557,10 @@ def doDescribeTopicSyncReplica(args, parsed_globals):
2211
2557
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2212
2558
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2213
2559
  )
2214
- 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):
2560
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2561
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2562
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2563
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2215
2564
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2216
2565
  else:
2217
2566
  cred = credential.Credential(
@@ -2223,7 +2572,7 @@ def doDescribeTopicSyncReplica(args, parsed_globals):
2223
2572
  endpoint=g_param[OptionsDefine.Endpoint],
2224
2573
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2225
2574
  )
2226
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2575
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2227
2576
  if g_param[OptionsDefine.Language]:
2228
2577
  profile.language = g_param[OptionsDefine.Language]
2229
2578
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2263,7 +2612,10 @@ def doDescribeTopicAttributes(args, parsed_globals):
2263
2612
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2264
2613
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2265
2614
  )
2266
- 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):
2615
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2616
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2617
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2618
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2267
2619
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2268
2620
  else:
2269
2621
  cred = credential.Credential(
@@ -2275,7 +2627,7 @@ def doDescribeTopicAttributes(args, parsed_globals):
2275
2627
  endpoint=g_param[OptionsDefine.Endpoint],
2276
2628
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2277
2629
  )
2278
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2630
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2279
2631
  if g_param[OptionsDefine.Language]:
2280
2632
  profile.language = g_param[OptionsDefine.Language]
2281
2633
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2305,6 +2657,61 @@ def doDescribeTopicAttributes(args, parsed_globals):
2305
2657
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
2306
2658
 
2307
2659
 
2660
+ def doFetchMessageListByTimestamp(args, parsed_globals):
2661
+ g_param = parse_global_arg(parsed_globals)
2662
+
2663
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
2664
+ cred = credential.CVMRoleCredential()
2665
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
2666
+ cred = credential.STSAssumeRoleCredential(
2667
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2668
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2669
+ )
2670
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2671
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2672
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2673
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2674
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2675
+ else:
2676
+ cred = credential.Credential(
2677
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
2678
+ )
2679
+ http_profile = HttpProfile(
2680
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
2681
+ reqMethod="POST",
2682
+ endpoint=g_param[OptionsDefine.Endpoint],
2683
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2684
+ )
2685
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2686
+ if g_param[OptionsDefine.Language]:
2687
+ profile.language = g_param[OptionsDefine.Language]
2688
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
2689
+ client = mod.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
2690
+ client._sdkVersion += ("_CLI_" + __version__)
2691
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
2692
+ model = models.FetchMessageListByTimestampRequest()
2693
+ model.from_json_string(json.dumps(args))
2694
+ start_time = time.time()
2695
+ while True:
2696
+ rsp = client.FetchMessageListByTimestamp(model)
2697
+ result = rsp.to_json_string()
2698
+ try:
2699
+ json_obj = json.loads(result)
2700
+ except TypeError as e:
2701
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
2702
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
2703
+ break
2704
+ cur_time = time.time()
2705
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
2706
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
2707
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
2708
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
2709
+ else:
2710
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
2711
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
2712
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
2713
+
2714
+
2308
2715
  def doDescribeTopicProduceConnection(args, parsed_globals):
2309
2716
  g_param = parse_global_arg(parsed_globals)
2310
2717
 
@@ -2315,7 +2722,10 @@ def doDescribeTopicProduceConnection(args, parsed_globals):
2315
2722
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2316
2723
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2317
2724
  )
2318
- 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):
2725
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2726
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2727
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2728
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2319
2729
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2320
2730
  else:
2321
2731
  cred = credential.Credential(
@@ -2327,7 +2737,7 @@ def doDescribeTopicProduceConnection(args, parsed_globals):
2327
2737
  endpoint=g_param[OptionsDefine.Endpoint],
2328
2738
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2329
2739
  )
2330
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2740
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2331
2741
  if g_param[OptionsDefine.Language]:
2332
2742
  profile.language = g_param[OptionsDefine.Language]
2333
2743
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2367,7 +2777,10 @@ def doCreatePostPaidInstance(args, parsed_globals):
2367
2777
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2368
2778
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2369
2779
  )
2370
- 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):
2780
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2781
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2782
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2783
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2371
2784
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2372
2785
  else:
2373
2786
  cred = credential.Credential(
@@ -2379,7 +2792,7 @@ def doCreatePostPaidInstance(args, parsed_globals):
2379
2792
  endpoint=g_param[OptionsDefine.Endpoint],
2380
2793
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2381
2794
  )
2382
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2795
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2383
2796
  if g_param[OptionsDefine.Language]:
2384
2797
  profile.language = g_param[OptionsDefine.Language]
2385
2798
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2419,7 +2832,10 @@ def doCreateAclRule(args, parsed_globals):
2419
2832
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2420
2833
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2421
2834
  )
2422
- 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):
2835
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2836
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2837
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2838
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2423
2839
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2424
2840
  else:
2425
2841
  cred = credential.Credential(
@@ -2431,7 +2847,7 @@ def doCreateAclRule(args, parsed_globals):
2431
2847
  endpoint=g_param[OptionsDefine.Endpoint],
2432
2848
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2433
2849
  )
2434
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2850
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2435
2851
  if g_param[OptionsDefine.Language]:
2436
2852
  profile.language = g_param[OptionsDefine.Language]
2437
2853
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2461,7 +2877,7 @@ def doCreateAclRule(args, parsed_globals):
2461
2877
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
2462
2878
 
2463
2879
 
2464
- def doDescribeDatahubTopic(args, parsed_globals):
2880
+ def doModifyInstanceAttributes(args, parsed_globals):
2465
2881
  g_param = parse_global_arg(parsed_globals)
2466
2882
 
2467
2883
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2471,7 +2887,10 @@ def doDescribeDatahubTopic(args, parsed_globals):
2471
2887
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2472
2888
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2473
2889
  )
2474
- 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):
2890
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2891
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2892
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2893
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2475
2894
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2476
2895
  else:
2477
2896
  cred = credential.Credential(
@@ -2483,18 +2902,18 @@ def doDescribeDatahubTopic(args, parsed_globals):
2483
2902
  endpoint=g_param[OptionsDefine.Endpoint],
2484
2903
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2485
2904
  )
2486
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2905
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2487
2906
  if g_param[OptionsDefine.Language]:
2488
2907
  profile.language = g_param[OptionsDefine.Language]
2489
2908
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
2490
2909
  client = mod.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
2491
2910
  client._sdkVersion += ("_CLI_" + __version__)
2492
2911
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
2493
- model = models.DescribeDatahubTopicRequest()
2912
+ model = models.ModifyInstanceAttributesRequest()
2494
2913
  model.from_json_string(json.dumps(args))
2495
2914
  start_time = time.time()
2496
2915
  while True:
2497
- rsp = client.DescribeDatahubTopic(model)
2916
+ rsp = client.ModifyInstanceAttributes(model)
2498
2917
  result = rsp.to_json_string()
2499
2918
  try:
2500
2919
  json_obj = json.loads(result)
@@ -2523,7 +2942,10 @@ def doDescribeCkafkaZone(args, parsed_globals):
2523
2942
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2524
2943
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2525
2944
  )
2526
- 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):
2945
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
2946
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
2947
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
2948
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2527
2949
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2528
2950
  else:
2529
2951
  cred = credential.Credential(
@@ -2535,7 +2957,7 @@ def doDescribeCkafkaZone(args, parsed_globals):
2535
2957
  endpoint=g_param[OptionsDefine.Endpoint],
2536
2958
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2537
2959
  )
2538
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
2960
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2539
2961
  if g_param[OptionsDefine.Language]:
2540
2962
  profile.language = g_param[OptionsDefine.Language]
2541
2963
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2575,7 +2997,10 @@ def doDescribeRegion(args, parsed_globals):
2575
2997
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2576
2998
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2577
2999
  )
2578
- 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):
3000
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3001
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3002
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3003
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2579
3004
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2580
3005
  else:
2581
3006
  cred = credential.Credential(
@@ -2587,7 +3012,7 @@ def doDescribeRegion(args, parsed_globals):
2587
3012
  endpoint=g_param[OptionsDefine.Endpoint],
2588
3013
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2589
3014
  )
2590
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3015
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2591
3016
  if g_param[OptionsDefine.Language]:
2592
3017
  profile.language = g_param[OptionsDefine.Language]
2593
3018
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2627,7 +3052,10 @@ def doDescribeTopic(args, parsed_globals):
2627
3052
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2628
3053
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2629
3054
  )
2630
- 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):
3055
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3056
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3057
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3058
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2631
3059
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2632
3060
  else:
2633
3061
  cred = credential.Credential(
@@ -2639,7 +3067,7 @@ def doDescribeTopic(args, parsed_globals):
2639
3067
  endpoint=g_param[OptionsDefine.Endpoint],
2640
3068
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2641
3069
  )
2642
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3070
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2643
3071
  if g_param[OptionsDefine.Language]:
2644
3072
  profile.language = g_param[OptionsDefine.Language]
2645
3073
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2669,6 +3097,61 @@ def doDescribeTopic(args, parsed_globals):
2669
3097
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
2670
3098
 
2671
3099
 
3100
+ def doModifyInstancePre(args, parsed_globals):
3101
+ g_param = parse_global_arg(parsed_globals)
3102
+
3103
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
3104
+ cred = credential.CVMRoleCredential()
3105
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
3106
+ cred = credential.STSAssumeRoleCredential(
3107
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
3108
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
3109
+ )
3110
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3111
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3112
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3113
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
3114
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
3115
+ else:
3116
+ cred = credential.Credential(
3117
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
3118
+ )
3119
+ http_profile = HttpProfile(
3120
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
3121
+ reqMethod="POST",
3122
+ endpoint=g_param[OptionsDefine.Endpoint],
3123
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
3124
+ )
3125
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
3126
+ if g_param[OptionsDefine.Language]:
3127
+ profile.language = g_param[OptionsDefine.Language]
3128
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
3129
+ client = mod.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
3130
+ client._sdkVersion += ("_CLI_" + __version__)
3131
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
3132
+ model = models.ModifyInstancePreRequest()
3133
+ model.from_json_string(json.dumps(args))
3134
+ start_time = time.time()
3135
+ while True:
3136
+ rsp = client.ModifyInstancePre(model)
3137
+ result = rsp.to_json_string()
3138
+ try:
3139
+ json_obj = json.loads(result)
3140
+ except TypeError as e:
3141
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
3142
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
3143
+ break
3144
+ cur_time = time.time()
3145
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
3146
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
3147
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
3148
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
3149
+ else:
3150
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
3151
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
3152
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
3153
+
3154
+
2672
3155
  def doDeleteTopic(args, parsed_globals):
2673
3156
  g_param = parse_global_arg(parsed_globals)
2674
3157
 
@@ -2679,7 +3162,10 @@ def doDeleteTopic(args, parsed_globals):
2679
3162
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2680
3163
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2681
3164
  )
2682
- 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):
3165
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3166
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3167
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3168
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2683
3169
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2684
3170
  else:
2685
3171
  cred = credential.Credential(
@@ -2691,7 +3177,7 @@ def doDeleteTopic(args, parsed_globals):
2691
3177
  endpoint=g_param[OptionsDefine.Endpoint],
2692
3178
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2693
3179
  )
2694
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3180
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2695
3181
  if g_param[OptionsDefine.Language]:
2696
3182
  profile.language = g_param[OptionsDefine.Language]
2697
3183
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2731,7 +3217,10 @@ def doInquireCkafkaPrice(args, parsed_globals):
2731
3217
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2732
3218
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2733
3219
  )
2734
- 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):
3220
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3221
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3222
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3223
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2735
3224
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2736
3225
  else:
2737
3226
  cred = credential.Credential(
@@ -2743,7 +3232,7 @@ def doInquireCkafkaPrice(args, parsed_globals):
2743
3232
  endpoint=g_param[OptionsDefine.Endpoint],
2744
3233
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2745
3234
  )
2746
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3235
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2747
3236
  if g_param[OptionsDefine.Language]:
2748
3237
  profile.language = g_param[OptionsDefine.Language]
2749
3238
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2783,7 +3272,10 @@ def doModifyTopicAttributes(args, parsed_globals):
2783
3272
  g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
2784
3273
  g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
2785
3274
  )
2786
- 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):
3275
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) \
3276
+ and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) \
3277
+ and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) \
3278
+ and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
2787
3279
  cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
2788
3280
  else:
2789
3281
  cred = credential.Credential(
@@ -2795,7 +3287,7 @@ def doModifyTopicAttributes(args, parsed_globals):
2795
3287
  endpoint=g_param[OptionsDefine.Endpoint],
2796
3288
  proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
2797
3289
  )
2798
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
3290
+ profile = ClientProfile(httpProfile=http_profile, signMethod="TC3-HMAC-SHA256")
2799
3291
  if g_param[OptionsDefine.Language]:
2800
3292
  profile.language = g_param[OptionsDefine.Language]
2801
3293
  mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
@@ -2840,10 +3332,11 @@ ACTION_MAP = {
2840
3332
  "DescribeGroupInfo": doDescribeGroupInfo,
2841
3333
  "CreateConsumer": doCreateConsumer,
2842
3334
  "CreateAcl": doCreateAcl,
2843
- "CreateInstancePost": doCreateInstancePost,
3335
+ "DescribeTypeInstances": doDescribeTypeInstances,
3336
+ "DescribeDatahubTopics": doDescribeDatahubTopics,
2844
3337
  "DescribeAclRule": doDescribeAclRule,
2845
3338
  "CreateTopic": doCreateTopic,
2846
- "ModifyInstancePre": doModifyInstancePre,
3339
+ "DescribeSecurityGroupRoutes": doDescribeSecurityGroupRoutes,
2847
3340
  "BatchModifyTopicAttributes": doBatchModifyTopicAttributes,
2848
3341
  "DeleteRoute": doDeleteRoute,
2849
3342
  "SendMessage": doSendMessage,
@@ -2852,13 +3345,16 @@ ACTION_MAP = {
2852
3345
  "DescribeGroup": doDescribeGroup,
2853
3346
  "ModifyGroupOffsets": doModifyGroupOffsets,
2854
3347
  "DescribeInstances": doDescribeInstances,
2855
- "ModifyInstanceAttributes": doModifyInstanceAttributes,
3348
+ "DescribeCvmInfo": doDescribeCvmInfo,
3349
+ "DescribeDatahubTopic": doDescribeDatahubTopic,
3350
+ "CreateRoute": doCreateRoute,
2856
3351
  "ModifyDatahubTopic": doModifyDatahubTopic,
2857
3352
  "FetchMessageListByOffset": doFetchMessageListByOffset,
2858
3353
  "CreateDatahubTopic": doCreateDatahubTopic,
3354
+ "DeleteInstancePost": doDeleteInstancePost,
2859
3355
  "DescribeACL": doDescribeACL,
2860
- "DescribeDatahubTopics": doDescribeDatahubTopics,
2861
3356
  "DescribeTopicDetail": doDescribeTopicDetail,
3357
+ "CreateInstancePre": doCreateInstancePre,
2862
3358
  "FetchMessageByOffset": doFetchMessageByOffset,
2863
3359
  "DeleteTopicIpWhiteList": doDeleteTopicIpWhiteList,
2864
3360
  "ModifyPassword": doModifyPassword,
@@ -2880,13 +3376,15 @@ ACTION_MAP = {
2880
3376
  "DeleteUser": doDeleteUser,
2881
3377
  "DescribeTopicSyncReplica": doDescribeTopicSyncReplica,
2882
3378
  "DescribeTopicAttributes": doDescribeTopicAttributes,
3379
+ "FetchMessageListByTimestamp": doFetchMessageListByTimestamp,
2883
3380
  "DescribeTopicProduceConnection": doDescribeTopicProduceConnection,
2884
3381
  "CreatePostPaidInstance": doCreatePostPaidInstance,
2885
3382
  "CreateAclRule": doCreateAclRule,
2886
- "DescribeDatahubTopic": doDescribeDatahubTopic,
3383
+ "ModifyInstanceAttributes": doModifyInstanceAttributes,
2887
3384
  "DescribeCkafkaZone": doDescribeCkafkaZone,
2888
3385
  "DescribeRegion": doDescribeRegion,
2889
3386
  "DescribeTopic": doDescribeTopic,
3387
+ "ModifyInstancePre": doModifyInstancePre,
2890
3388
  "DeleteTopic": doDeleteTopic,
2891
3389
  "InquireCkafkaPrice": doInquireCkafkaPrice,
2892
3390
  "ModifyTopicAttributes": doModifyTopicAttributes,