tccli 3.0.897.1__py2.py3-none-any.whl → 3.0.899.1__py2.py3-none-any.whl

Sign up to get free protection for your applications and to get access to all the features.
Files changed (86) hide show
  1. tccli/__init__.py +1 -1
  2. tccli/examples/cdn/v20180606/ModifyDomainConfig.md +88 -0
  3. tccli/examples/cfs/v20190719/CreateMigrationTask.md +1 -1
  4. tccli/examples/cfs/v20190719/DeleteMigrationTask.md +1 -1
  5. tccli/examples/cfs/v20190719/ModifyFileSystemAutoScaleUpRule.md +1 -1
  6. tccli/examples/cfs/v20190719/ScaleUpFileSystem.md +1 -1
  7. tccli/examples/ckafka/v20190819/CreatePostPaidInstance.md +154 -0
  8. tccli/examples/cls/v20201016/DeleteShipper.md +2 -2
  9. tccli/examples/cls/v20201016/ModifyShipper.md +2 -2
  10. tccli/examples/cynosdb/v20190107/DescribeSupportProxyVersion.md +24 -0
  11. tccli/examples/ess/v20201111/CreateFlowApprovers.md +3 -1
  12. tccli/examples/ess/v20201111/DescribeThirdPartyAuthCode.md +1 -1
  13. tccli/examples/live/v20180801/DescribeLiveDomains.md +1 -1
  14. tccli/examples/nlp/v20190408/AnalyzeSentiment.md +24 -0
  15. tccli/examples/nlp/v20190408/ClassifyContent.md +39 -0
  16. tccli/examples/nlp/v20190408/ComposeCouplet.md +27 -0
  17. tccli/examples/nlp/v20190408/ComposePoetry.md +29 -0
  18. tccli/examples/postgres/v20170312/CreateReadOnlyDBInstance.md +1 -1
  19. tccli/examples/postgres/v20170312/UpgradeDBInstanceKernelVersion.md +1 -1
  20. tccli/examples/sqlserver/v20180328/DescribeDBInstancesAttribute.md +6 -1
  21. tccli/examples/sqlserver/v20180328/DescribeDBs.md +1 -1
  22. tccli/examples/tdmq/v20200217/CreateCmqQueue.md +2 -2
  23. tccli/examples/tke/v20180525/CreateClusterEndpointVip.md +1 -1
  24. tccli/examples/trp/v20210515/CreateCodeBatch.md +11 -5
  25. tccli/examples/trp/v20210515/DescribeScanLogs.md +1 -1
  26. tccli/examples/trp/v20210515/DescribeTraceCodeById.md +16 -11
  27. tccli/examples/trp/v20210515/ModifyCodeBatch.md +3 -3
  28. tccli/examples/waf/v20180125/ModifySpartaProtection.md +154 -0
  29. tccli/examples/wedata/v20210820/DescribeDimensionScore.md +15 -3
  30. tccli/examples/wedata/v20210820/DescribeQualityScore.md +1 -1
  31. tccli/examples/wedata/v20210820/DescribeQualityScoreTrend.md +10 -2
  32. tccli/examples/wedata/v20210820/DescribeTableQualityDetails.md +1 -1
  33. tccli/examples/wedata/v20210820/DescribeTableScoreTrend.md +10 -2
  34. tccli/services/antiddos/v20200309/api.json +45 -26
  35. tccli/services/apigateway/v20180808/api.json +17 -28
  36. tccli/services/asr/v20190614/api.json +3 -2
  37. tccli/services/cdb/v20170320/api.json +16 -11
  38. tccli/services/cdn/cdn_client.py +57 -4
  39. tccli/services/cdn/v20180606/api.json +52 -0
  40. tccli/services/cdn/v20180606/examples.json +26 -0
  41. tccli/services/cfs/v20190719/api.json +7 -0
  42. tccli/services/cfs/v20190719/examples.json +4 -4
  43. tccli/services/ckafka/ckafka_client.py +61 -8
  44. tccli/services/ckafka/v20190819/api.json +296 -6
  45. tccli/services/ckafka/v20190819/examples.json +20 -0
  46. tccli/services/cls/v20201016/api.json +3 -4
  47. tccli/services/cls/v20201016/examples.json +4 -4
  48. tccli/services/cynosdb/cynosdb_client.py +53 -0
  49. tccli/services/cynosdb/v20190107/api.json +72 -0
  50. tccli/services/cynosdb/v20190107/examples.json +8 -0
  51. tccli/services/ess/v20201111/api.json +44 -11
  52. tccli/services/ess/v20201111/examples.json +3 -3
  53. tccli/services/essbasic/v20210526/api.json +27 -1
  54. tccli/services/live/v20180801/api.json +4 -11
  55. tccli/services/live/v20180801/examples.json +1 -1
  56. tccli/services/nlp/nlp_client.py +216 -4
  57. tccli/services/nlp/v20190408/api.json +329 -0
  58. tccli/services/nlp/v20190408/examples.json +32 -0
  59. tccli/services/postgres/v20170312/api.json +2 -31
  60. tccli/services/postgres/v20170312/examples.json +2 -2
  61. tccli/services/sqlserver/v20180328/api.json +72 -15
  62. tccli/services/sqlserver/v20180328/examples.json +3 -3
  63. tccli/services/tbaas/tbaas_client.py +4 -322
  64. tccli/services/tbaas/v20180416/api.json +123 -825
  65. tccli/services/tbaas/v20180416/examples.json +0 -48
  66. tccli/services/tdid/tdid_client.py +60 -1650
  67. tccli/services/tdid/v20210519/api.json +394 -3848
  68. tccli/services/tdid/v20210519/examples.json +0 -240
  69. tccli/services/tdmq/v20200217/api.json +2 -19
  70. tccli/services/tdmq/v20200217/examples.json +2 -2
  71. tccli/services/tione/v20211111/api.json +24 -2
  72. tccli/services/tke/v20180525/api.json +4 -6
  73. tccli/services/tke/v20180525/examples.json +2 -2
  74. tccli/services/trp/v20210515/api.json +285 -113
  75. tccli/services/trp/v20210515/examples.json +6 -6
  76. tccli/services/tts/v20190823/api.json +7 -3
  77. tccli/services/waf/v20180125/api.json +401 -0
  78. tccli/services/waf/v20180125/examples.json +26 -0
  79. tccli/services/waf/waf_client.py +57 -4
  80. tccli/services/wedata/v20210820/api.json +151 -83
  81. tccli/services/wedata/v20210820/examples.json +8 -8
  82. {tccli-3.0.897.1.dist-info → tccli-3.0.899.1.dist-info}/METADATA +2 -2
  83. {tccli-3.0.897.1.dist-info → tccli-3.0.899.1.dist-info}/RECORD +86 -78
  84. {tccli-3.0.897.1.dist-info → tccli-3.0.899.1.dist-info}/WHEEL +0 -0
  85. {tccli-3.0.897.1.dist-info → tccli-3.0.899.1.dist-info}/entry_points.txt +0 -0
  86. {tccli-3.0.897.1.dist-info → tccli-3.0.899.1.dist-info}/license_files/LICENSE +0 -0
@@ -276,7 +276,7 @@
276
276
  "DescribeDBInstancesAttribute": {
277
277
  "document": "本接口(DescribeDBInstancesAttribute)用于查询实例附属属性",
278
278
  "input": "DescribeDBInstancesAttributeRequest",
279
- "name": "实例附属属性",
279
+ "name": "查询实例附属属性",
280
280
  "output": "DescribeDBInstancesAttributeResponse",
281
281
  "status": "online"
282
282
  },
@@ -3868,9 +3868,9 @@
3868
3868
  "document": "数据库信息",
3869
3869
  "members": [
3870
3870
  {
3871
- "default": "",
3872
3871
  "disabled": false,
3873
3872
  "document": "数据库名称",
3873
+ "example": "无",
3874
3874
  "member": "string",
3875
3875
  "name": "Name",
3876
3876
  "required": true,
@@ -3878,9 +3878,9 @@
3878
3878
  "value_allowed_null": false
3879
3879
  },
3880
3880
  {
3881
- "default": "",
3882
3881
  "disabled": false,
3883
3882
  "document": "字符集",
3883
+ "example": "无",
3884
3884
  "member": "string",
3885
3885
  "name": "Charset",
3886
3886
  "required": true,
@@ -3888,9 +3888,9 @@
3888
3888
  "value_allowed_null": false
3889
3889
  },
3890
3890
  {
3891
- "default": "",
3892
3891
  "disabled": false,
3893
3892
  "document": "备注",
3893
+ "example": "无",
3894
3894
  "member": "string",
3895
3895
  "name": "Remark",
3896
3896
  "required": true,
@@ -3898,9 +3898,9 @@
3898
3898
  "value_allowed_null": false
3899
3899
  },
3900
3900
  {
3901
- "default": "",
3902
3901
  "disabled": false,
3903
3902
  "document": "数据库创建时间",
3903
+ "example": "无",
3904
3904
  "member": "datetime",
3905
3905
  "name": "CreateTime",
3906
3906
  "required": true,
@@ -3908,9 +3908,9 @@
3908
3908
  "value_allowed_null": false
3909
3909
  },
3910
3910
  {
3911
- "default": "",
3912
3911
  "disabled": false,
3913
3912
  "document": "数据库状态。1--创建中, 2--运行中, 3--修改中,-1--删除中",
3913
+ "example": "无",
3914
3914
  "member": "int64",
3915
3915
  "name": "Status",
3916
3916
  "required": true,
@@ -3918,9 +3918,9 @@
3918
3918
  "value_allowed_null": false
3919
3919
  },
3920
3920
  {
3921
- "default": "",
3922
3921
  "disabled": false,
3923
3922
  "document": "数据库账号权限信息",
3923
+ "example": "无",
3924
3924
  "member": "AccountPrivilege",
3925
3925
  "name": "Accounts",
3926
3926
  "required": true,
@@ -3928,14 +3928,24 @@
3928
3928
  "value_allowed_null": false
3929
3929
  },
3930
3930
  {
3931
- "default": "",
3932
3931
  "disabled": false,
3933
3932
  "document": "内部状态。ONLINE表示运行中",
3933
+ "example": "无",
3934
3934
  "member": "string",
3935
3935
  "name": "InternalStatus",
3936
3936
  "required": true,
3937
3937
  "type": "string",
3938
3938
  "value_allowed_null": false
3939
+ },
3940
+ {
3941
+ "disabled": false,
3942
+ "document": "是否已开启TDE加密,enable-已加密,disable-未加密",
3943
+ "example": "disable",
3944
+ "member": "string",
3945
+ "name": "Encryption",
3946
+ "required": false,
3947
+ "type": "string",
3948
+ "value_allowed_null": false
3939
3949
  }
3940
3950
  ],
3941
3951
  "usage": "out"
@@ -6463,6 +6473,15 @@
6463
6473
  "type": "int",
6464
6474
  "value_allowed_null": false
6465
6475
  },
6476
+ {
6477
+ "disabled": false,
6478
+ "document": "TDE透明数据加密配置",
6479
+ "example": "无",
6480
+ "member": "TDEConfigAttribute",
6481
+ "name": "TDEConfig",
6482
+ "type": "object",
6483
+ "value_allowed_null": false
6484
+ },
6466
6485
  {
6467
6486
  "document": "唯一请求 ID,每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
6468
6487
  "member": "string",
@@ -6757,7 +6776,6 @@
6757
6776
  "document": "DescribeDBs请求参数结构体",
6758
6777
  "members": [
6759
6778
  {
6760
- "default": "",
6761
6779
  "disabled": false,
6762
6780
  "document": "实例ID",
6763
6781
  "example": "[\"mssql-njj2mtpl\\r\\n\"]",
@@ -6767,7 +6785,6 @@
6767
6785
  "type": "list"
6768
6786
  },
6769
6787
  {
6770
- "default": "",
6771
6788
  "disabled": false,
6772
6789
  "document": "分页返回,每页返回的数目,取值为1-100,默认值为20",
6773
6790
  "example": "10",
@@ -6777,7 +6794,6 @@
6777
6794
  "type": "int"
6778
6795
  },
6779
6796
  {
6780
- "default": "",
6781
6797
  "disabled": false,
6782
6798
  "document": "分页返回,页编号,默认值为第0页",
6783
6799
  "example": "0",
@@ -6787,7 +6803,6 @@
6787
6803
  "type": "int"
6788
6804
  },
6789
6805
  {
6790
- "default": "",
6791
6806
  "disabled": false,
6792
6807
  "document": "数据库名称",
6793
6808
  "example": "test_db",
@@ -6797,7 +6812,6 @@
6797
6812
  "type": "string"
6798
6813
  },
6799
6814
  {
6800
- "default": "",
6801
6815
  "disabled": false,
6802
6816
  "document": "排序规则(desc-降序,asc-升序),默认desc",
6803
6817
  "example": "desc",
@@ -6805,6 +6819,15 @@
6805
6819
  "name": "OrderByType",
6806
6820
  "required": false,
6807
6821
  "type": "string"
6822
+ },
6823
+ {
6824
+ "disabled": false,
6825
+ "document": "是否已开启TDE加密,enable-已加密,disable-未加密",
6826
+ "example": "disable",
6827
+ "member": "string",
6828
+ "name": "Encryption",
6829
+ "required": false,
6830
+ "type": "string"
6808
6831
  }
6809
6832
  ],
6810
6833
  "type": "object"
@@ -6818,7 +6841,6 @@
6818
6841
  "example": "1",
6819
6842
  "member": "int64",
6820
6843
  "name": "TotalCount",
6821
- "required": true,
6822
6844
  "type": "int",
6823
6845
  "value_allowed_null": false
6824
6846
  },
@@ -6828,7 +6850,6 @@
6828
6850
  "example": "无",
6829
6851
  "member": "InstanceDBDetail",
6830
6852
  "name": "DBInstances",
6831
- "required": true,
6832
6853
  "type": "list",
6833
6854
  "value_allowed_null": false
6834
6855
  },
@@ -13518,6 +13539,42 @@
13518
13539
  ],
13519
13540
  "type": "object"
13520
13541
  },
13542
+ "TDEConfigAttribute": {
13543
+ "document": "TDE透明数据加密配置",
13544
+ "members": [
13545
+ {
13546
+ "disabled": false,
13547
+ "document": "是否已开通TDE加密,enable-已开通,disable-未开通",
13548
+ "example": "disable",
13549
+ "member": "string",
13550
+ "name": "Encryption",
13551
+ "required": false,
13552
+ "type": "string",
13553
+ "value_allowed_null": false
13554
+ },
13555
+ {
13556
+ "disabled": false,
13557
+ "document": "证书归属。self-表示使用该账号自身的证书,others-表示引用其他账号的证书,none-表示没有证书",
13558
+ "example": "self",
13559
+ "member": "string",
13560
+ "name": "CertificateAttribution",
13561
+ "required": false,
13562
+ "type": "string",
13563
+ "value_allowed_null": false
13564
+ },
13565
+ {
13566
+ "disabled": false,
13567
+ "document": "开通TDE加密时引用的其他主账号ID\n注意:此字段可能返回 null,表示取不到有效值。",
13568
+ "example": "无",
13569
+ "member": "string",
13570
+ "name": "QuoteUin",
13571
+ "required": false,
13572
+ "type": "string",
13573
+ "value_allowed_null": true
13574
+ }
13575
+ ],
13576
+ "usage": "out"
13577
+ },
13521
13578
  "TerminateDBInstanceRequest": {
13522
13579
  "document": "TerminateDBInstance请求参数结构体",
13523
13580
  "members": [
@@ -338,9 +338,9 @@
338
338
  ],
339
339
  "DescribeDBInstancesAttribute": [
340
340
  {
341
- "document": "实例附属属性",
341
+ "document": "查询实例附属属性",
342
342
  "input": "POST / HTTP/1.1\nHost: sqlserver.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeDBInstancesAttribute\n<公共请求参数>\n\n{\n \"InstanceId\": \"mssql-j8kv137v\"\n}",
343
- "output": "{\n \"Response\": {\n \"InstanceId\": \"mssql-j8kv137v\",\n \"RegularBackupSaveDays\": 1,\n \"RequestId\": \"7\",\n \"RegularBackupCounts\": 1,\n \"RegularBackupEnable\": \"enable\",\n \"RegularBackupStrategy\": \"months\",\n \"RegularBackupStartTime\": \"2022-10-10\",\n \"EventSaveDays\": 0,\n \"BlockedThreshold\": 6\n }\n}",
343
+ "output": "{\n \"Response\": {\n \"InstanceId\": \"mssql-j8kv137v\",\n \"RegularBackupSaveDays\": 1,\n \"RequestId\": \"7\",\n \"RegularBackupCounts\": 1,\n \"RegularBackupEnable\": \"enable\",\n \"RegularBackupStrategy\": \"months\",\n \"RegularBackupStartTime\": \"2022-10-10\",\n \"EventSaveDays\": 0,\n \"TDEConfig\": {\n \"Encryption\": \"disable\",\n \"CertificateAttribution\": \"self\",\n \"QuoteUin\": \"\"\n },\n \"BlockedThreshold\": 6\n }\n}",
344
344
  "title": "查询实例mssql-j8kv137v的附属属性"
345
345
  }
346
346
  ],
@@ -354,7 +354,7 @@
354
354
  ],
355
355
  "DescribeDBs": [
356
356
  {
357
- "document": "",
357
+ "document": "查询数据库列表",
358
358
  "input": "POST / HTTP/1.1\nHost: sqlserver.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeDBs\n<公共请求参数>\n\n{\n \"InstanceIdSet\": [\n \"mssql-njj2mtpl\"\n ]\n}",
359
359
  "output": "{\n \"Response\": {\n \"RequestId\": \"5062de55-d048-4d3b-92f9-b98b6f244360\",\n \"TotalCount\": 1,\n \"DBInstances\": [\n {\n \"InstanceId\": \"mssql-632eyp63\",\n \"DBDetails\": [\n {\n \"Name\": \"ceshi1\",\n \"Charset\": \"Chinese_PRC_CI_AS\",\n \"Remark\": \"测试db1\",\n \"CreateTime\": \"2018-07-02 20:12:24\",\n \"Status\": 2,\n \"Accounts\": [\n {\n \"UserName\": \"victorwind\",\n \"Privilege\": \"ReadWrite\"\n }\n ],\n \"InternalStatus\": \"ONLINE\"\n }\n ]\n }\n ]\n }\n}",
360
360
  "title": "查询数据库列表"
@@ -17,58 +17,6 @@ from tencentcloud.tbaas.v20180416 import models as models_v20180416
17
17
  from jmespath import search
18
18
  import time
19
19
 
20
- def doInvokeBcosTrans(args, parsed_globals):
21
- g_param = parse_global_arg(parsed_globals)
22
-
23
- if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
24
- cred = credential.CVMRoleCredential()
25
- elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
26
- cred = credential.STSAssumeRoleCredential(
27
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
28
- g_param[OptionsDefine.RoleSessionName.replace('-', '_')]
29
- )
30
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
31
- cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
32
- else:
33
- cred = credential.Credential(
34
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
35
- )
36
- http_profile = HttpProfile(
37
- reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
38
- reqMethod="POST",
39
- endpoint=g_param[OptionsDefine.Endpoint],
40
- proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
41
- )
42
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
43
- if g_param[OptionsDefine.Language]:
44
- profile.language = g_param[OptionsDefine.Language]
45
- mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
46
- client = mod.TbaasClient(cred, g_param[OptionsDefine.Region], profile)
47
- client._sdkVersion += ("_CLI_" + __version__)
48
- models = MODELS_MAP[g_param[OptionsDefine.Version]]
49
- model = models.InvokeBcosTransRequest()
50
- model.from_json_string(json.dumps(args))
51
- start_time = time.time()
52
- while True:
53
- rsp = client.InvokeBcosTrans(model)
54
- result = rsp.to_json_string()
55
- try:
56
- json_obj = json.loads(result)
57
- except TypeError as e:
58
- json_obj = json.loads(result.decode('utf-8')) # python3.3
59
- if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
60
- break
61
- cur_time = time.time()
62
- if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
63
- raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
64
- (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
65
- search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
66
- else:
67
- print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
68
- time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
69
- FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
70
-
71
-
72
20
  def doQueryChainMakerTransaction(args, parsed_globals):
73
21
  g_param = parse_global_arg(parsed_globals)
74
22
 
@@ -121,58 +69,6 @@ def doQueryChainMakerTransaction(args, parsed_globals):
121
69
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
122
70
 
123
71
 
124
- def doGetBcosBlockByNumber(args, parsed_globals):
125
- g_param = parse_global_arg(parsed_globals)
126
-
127
- if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
128
- cred = credential.CVMRoleCredential()
129
- elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
130
- cred = credential.STSAssumeRoleCredential(
131
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
132
- g_param[OptionsDefine.RoleSessionName.replace('-', '_')]
133
- )
134
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
135
- cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
136
- else:
137
- cred = credential.Credential(
138
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
139
- )
140
- http_profile = HttpProfile(
141
- reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
142
- reqMethod="POST",
143
- endpoint=g_param[OptionsDefine.Endpoint],
144
- proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
145
- )
146
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
147
- if g_param[OptionsDefine.Language]:
148
- profile.language = g_param[OptionsDefine.Language]
149
- mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
150
- client = mod.TbaasClient(cred, g_param[OptionsDefine.Region], profile)
151
- client._sdkVersion += ("_CLI_" + __version__)
152
- models = MODELS_MAP[g_param[OptionsDefine.Version]]
153
- model = models.GetBcosBlockByNumberRequest()
154
- model.from_json_string(json.dumps(args))
155
- start_time = time.time()
156
- while True:
157
- rsp = client.GetBcosBlockByNumber(model)
158
- result = rsp.to_json_string()
159
- try:
160
- json_obj = json.loads(result)
161
- except TypeError as e:
162
- json_obj = json.loads(result.decode('utf-8')) # python3.3
163
- if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
164
- break
165
- cur_time = time.time()
166
- if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
167
- raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
168
- (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
169
- search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
170
- else:
171
- print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
172
- time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
173
- FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
174
-
175
-
176
72
  def doApplyChainMakerBatchUserCert(args, parsed_globals):
177
73
  g_param = parse_global_arg(parsed_globals)
178
74
 
@@ -277,7 +173,7 @@ def doGetChaincodeLogForUser(args, parsed_globals):
277
173
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
278
174
 
279
175
 
280
- def doGetBcosTransByHash(args, parsed_globals):
176
+ def doQueryChainMakerDemoTransaction(args, parsed_globals):
281
177
  g_param = parse_global_arg(parsed_globals)
282
178
 
283
179
  if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -306,11 +202,11 @@ def doGetBcosTransByHash(args, parsed_globals):
306
202
  client = mod.TbaasClient(cred, g_param[OptionsDefine.Region], profile)
307
203
  client._sdkVersion += ("_CLI_" + __version__)
308
204
  models = MODELS_MAP[g_param[OptionsDefine.Version]]
309
- model = models.GetBcosTransByHashRequest()
205
+ model = models.QueryChainMakerDemoTransactionRequest()
310
206
  model.from_json_string(json.dumps(args))
311
207
  start_time = time.time()
312
208
  while True:
313
- rsp = client.GetBcosTransByHash(model)
209
+ rsp = client.QueryChainMakerDemoTransaction(model)
314
210
  result = rsp.to_json_string()
315
211
  try:
316
212
  json_obj = json.loads(result)
@@ -381,58 +277,6 @@ def doGetClusterListForUser(args, parsed_globals):
381
277
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
382
278
 
383
279
 
384
- def doGetBcosBlockList(args, parsed_globals):
385
- g_param = parse_global_arg(parsed_globals)
386
-
387
- if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
388
- cred = credential.CVMRoleCredential()
389
- elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
390
- cred = credential.STSAssumeRoleCredential(
391
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
392
- g_param[OptionsDefine.RoleSessionName.replace('-', '_')]
393
- )
394
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
395
- cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
396
- else:
397
- cred = credential.Credential(
398
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
399
- )
400
- http_profile = HttpProfile(
401
- reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
402
- reqMethod="POST",
403
- endpoint=g_param[OptionsDefine.Endpoint],
404
- proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
405
- )
406
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
407
- if g_param[OptionsDefine.Language]:
408
- profile.language = g_param[OptionsDefine.Language]
409
- mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
410
- client = mod.TbaasClient(cred, g_param[OptionsDefine.Region], profile)
411
- client._sdkVersion += ("_CLI_" + __version__)
412
- models = MODELS_MAP[g_param[OptionsDefine.Version]]
413
- model = models.GetBcosBlockListRequest()
414
- model.from_json_string(json.dumps(args))
415
- start_time = time.time()
416
- while True:
417
- rsp = client.GetBcosBlockList(model)
418
- result = rsp.to_json_string()
419
- try:
420
- json_obj = json.loads(result)
421
- except TypeError as e:
422
- json_obj = json.loads(result.decode('utf-8')) # python3.3
423
- if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
424
- break
425
- cur_time = time.time()
426
- if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
427
- raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
428
- (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
429
- search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
430
- else:
431
- print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
432
- time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
433
- FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
434
-
435
-
436
280
  def doQueryChainMakerContract(args, parsed_globals):
437
281
  g_param = parse_global_arg(parsed_globals)
438
282
 
@@ -693,58 +537,6 @@ def doGetPeerLogForUser(args, parsed_globals):
693
537
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
694
538
 
695
539
 
696
- def doDeployDynamicBcosContract(args, parsed_globals):
697
- g_param = parse_global_arg(parsed_globals)
698
-
699
- if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
700
- cred = credential.CVMRoleCredential()
701
- elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
702
- cred = credential.STSAssumeRoleCredential(
703
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
704
- g_param[OptionsDefine.RoleSessionName.replace('-', '_')]
705
- )
706
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
707
- cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
708
- else:
709
- cred = credential.Credential(
710
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
711
- )
712
- http_profile = HttpProfile(
713
- reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
714
- reqMethod="POST",
715
- endpoint=g_param[OptionsDefine.Endpoint],
716
- proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
717
- )
718
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
719
- if g_param[OptionsDefine.Language]:
720
- profile.language = g_param[OptionsDefine.Language]
721
- mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
722
- client = mod.TbaasClient(cred, g_param[OptionsDefine.Region], profile)
723
- client._sdkVersion += ("_CLI_" + __version__)
724
- models = MODELS_MAP[g_param[OptionsDefine.Version]]
725
- model = models.DeployDynamicBcosContractRequest()
726
- model.from_json_string(json.dumps(args))
727
- start_time = time.time()
728
- while True:
729
- rsp = client.DeployDynamicBcosContract(model)
730
- result = rsp.to_json_string()
731
- try:
732
- json_obj = json.loads(result)
733
- except TypeError as e:
734
- json_obj = json.loads(result.decode('utf-8')) # python3.3
735
- if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
736
- break
737
- cur_time = time.time()
738
- if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
739
- raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
740
- (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
741
- search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
742
- else:
743
- print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
744
- time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
745
- FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
746
-
747
-
748
540
  def doGetLatestTransactionList(args, parsed_globals):
749
541
  g_param = parse_global_arg(parsed_globals)
750
542
 
@@ -901,58 +693,6 @@ def doCreateChaincodeAndInstallForUser(args, parsed_globals):
901
693
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
902
694
 
903
695
 
904
- def doQueryChainMakerDemoTransaction(args, parsed_globals):
905
- g_param = parse_global_arg(parsed_globals)
906
-
907
- if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
908
- cred = credential.CVMRoleCredential()
909
- elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
910
- cred = credential.STSAssumeRoleCredential(
911
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
912
- g_param[OptionsDefine.RoleSessionName.replace('-', '_')]
913
- )
914
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
915
- cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
916
- else:
917
- cred = credential.Credential(
918
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
919
- )
920
- http_profile = HttpProfile(
921
- reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
922
- reqMethod="POST",
923
- endpoint=g_param[OptionsDefine.Endpoint],
924
- proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
925
- )
926
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
927
- if g_param[OptionsDefine.Language]:
928
- profile.language = g_param[OptionsDefine.Language]
929
- mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
930
- client = mod.TbaasClient(cred, g_param[OptionsDefine.Region], profile)
931
- client._sdkVersion += ("_CLI_" + __version__)
932
- models = MODELS_MAP[g_param[OptionsDefine.Version]]
933
- model = models.QueryChainMakerDemoTransactionRequest()
934
- model.from_json_string(json.dumps(args))
935
- start_time = time.time()
936
- while True:
937
- rsp = client.QueryChainMakerDemoTransaction(model)
938
- result = rsp.to_json_string()
939
- try:
940
- json_obj = json.loads(result)
941
- except TypeError as e:
942
- json_obj = json.loads(result.decode('utf-8')) # python3.3
943
- if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
944
- break
945
- cur_time = time.time()
946
- if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
947
- raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
948
- (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
949
- search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
950
- else:
951
- print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
952
- time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
953
- FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
954
-
955
-
956
696
  def doGetLatesdTransactionList(args, parsed_globals):
957
697
  g_param = parse_global_arg(parsed_globals)
958
698
 
@@ -1525,58 +1265,6 @@ def doSrvInvoke(args, parsed_globals):
1525
1265
  FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1526
1266
 
1527
1267
 
1528
- def doGetBcosTransList(args, parsed_globals):
1529
- g_param = parse_global_arg(parsed_globals)
1530
-
1531
- if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
1532
- cred = credential.CVMRoleCredential()
1533
- elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
1534
- cred = credential.STSAssumeRoleCredential(
1535
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
1536
- g_param[OptionsDefine.RoleSessionName.replace('-', '_')]
1537
- )
1538
- elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
1539
- cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
1540
- else:
1541
- cred = credential.Credential(
1542
- g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
1543
- )
1544
- http_profile = HttpProfile(
1545
- reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
1546
- reqMethod="POST",
1547
- endpoint=g_param[OptionsDefine.Endpoint],
1548
- proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
1549
- )
1550
- profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
1551
- if g_param[OptionsDefine.Language]:
1552
- profile.language = g_param[OptionsDefine.Language]
1553
- mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
1554
- client = mod.TbaasClient(cred, g_param[OptionsDefine.Region], profile)
1555
- client._sdkVersion += ("_CLI_" + __version__)
1556
- models = MODELS_MAP[g_param[OptionsDefine.Version]]
1557
- model = models.GetBcosTransListRequest()
1558
- model.from_json_string(json.dumps(args))
1559
- start_time = time.time()
1560
- while True:
1561
- rsp = client.GetBcosTransList(model)
1562
- result = rsp.to_json_string()
1563
- try:
1564
- json_obj = json.loads(result)
1565
- except TypeError as e:
1566
- json_obj = json.loads(result.decode('utf-8')) # python3.3
1567
- if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
1568
- break
1569
- cur_time = time.time()
1570
- if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
1571
- raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
1572
- (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
1573
- search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
1574
- else:
1575
- print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
1576
- time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
1577
- FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
1578
-
1579
-
1580
1268
  def doInvokeChainMakerDemoContract(args, parsed_globals):
1581
1269
  g_param = parse_global_arg(parsed_globals)
1582
1270
 
@@ -1848,24 +1536,19 @@ MODELS_MAP = {
1848
1536
  }
1849
1537
 
1850
1538
  ACTION_MAP = {
1851
- "InvokeBcosTrans": doInvokeBcosTrans,
1852
1539
  "QueryChainMakerTransaction": doQueryChainMakerTransaction,
1853
- "GetBcosBlockByNumber": doGetBcosBlockByNumber,
1854
1540
  "ApplyChainMakerBatchUserCert": doApplyChainMakerBatchUserCert,
1855
1541
  "GetChaincodeLogForUser": doGetChaincodeLogForUser,
1856
- "GetBcosTransByHash": doGetBcosTransByHash,
1542
+ "QueryChainMakerDemoTransaction": doQueryChainMakerDemoTransaction,
1857
1543
  "GetClusterListForUser": doGetClusterListForUser,
1858
- "GetBcosBlockList": doGetBcosBlockList,
1859
1544
  "QueryChainMakerContract": doQueryChainMakerContract,
1860
1545
  "GetTransactionDetailForUser": doGetTransactionDetailForUser,
1861
1546
  "Invoke": doInvoke,
1862
1547
  "GetClusterSummary": doGetClusterSummary,
1863
1548
  "GetPeerLogForUser": doGetPeerLogForUser,
1864
- "DeployDynamicBcosContract": doDeployDynamicBcosContract,
1865
1549
  "GetLatestTransactionList": doGetLatestTransactionList,
1866
1550
  "DownloadUserCert": doDownloadUserCert,
1867
1551
  "CreateChaincodeAndInstallForUser": doCreateChaincodeAndInstallForUser,
1868
- "QueryChainMakerDemoTransaction": doQueryChainMakerDemoTransaction,
1869
1552
  "GetLatesdTransactionList": doGetLatesdTransactionList,
1870
1553
  "ApplyUserCert": doApplyUserCert,
1871
1554
  "InvokeChainMakerContract": doInvokeChainMakerContract,
@@ -1877,7 +1560,6 @@ ACTION_MAP = {
1877
1560
  "QueryChainMakerDemoContract": doQueryChainMakerDemoContract,
1878
1561
  "QueryChainMakerDemoBlockTransaction": doQueryChainMakerDemoBlockTransaction,
1879
1562
  "SrvInvoke": doSrvInvoke,
1880
- "GetBcosTransList": doGetBcosTransList,
1881
1563
  "InvokeChainMakerDemoContract": doInvokeChainMakerDemoContract,
1882
1564
  "GetChaincodeCompileLogForUser": doGetChaincodeCompileLogForUser,
1883
1565
  "GetBlockTransactionListForUser": doGetBlockTransactionListForUser,