tccli 3.0.1227.1__py2.py3-none-any.whl → 3.0.1229.1__py2.py3-none-any.whl

tccli/services/sts/v20180813/api.json

@@ -56,7 +56,7 @@
         {
           "disabled": false,
           "document": "密钥ID",
-          "example": "无",
+          "example": "AKID***",
           "member": "string",
           "name": "SecretId",
           "output_required": true,
@@ -66,7 +66,7 @@
         {
           "disabled": false,
           "document": "创建时间(时间戳)",
-          "example": "无",
+          "example": "1575517111",
           "member": "uint64",
           "name": "CreateTime",
           "output_required": true,
@@ -76,7 +76,7 @@
         {
           "disabled": false,
           "document": "状态(2:有效, 3:禁用, 4:已删除)",
-          "example": "无",
+          "example": "2",
           "member": "uint64",
           "name": "Status",
           "output_required": true,
@@ -92,7 +92,7 @@
         {
           "disabled": false,
           "document": "角色的资源描述，可在[访问管理](https://console.cloud.tencent.com/cam/role)，点击角色名获取。\n普通角色：\nqcs::cam::uin/12345678:role/4611686018427397919、qcs::cam::uin/12345678:roleName/testRoleName\n服务角色：\nqcs::cam::uin/12345678:role/tencentcloudServiceRole/4611686018427397920、qcs::cam::uin/12345678:role/tencentcloudServiceRoleName/testServiceRoleName",
-          "example": "qcs%3A%3Acam%3A%3Auin%2F2385420691%3Arole%2F4611686018427397919",
+          "example": "qcs::cam::uin/100015158414:roleName/readOnlyRole",
           "member": "string",
           "name": "RoleArn",
           "required": true,
@@ -119,7 +119,7 @@
         {
           "disabled": false,
           "document": "策略描述\n注意：\n1、该参数需要做urlencode，服务端会对该字段做urldecode， 并按处理后Policy授予临时访问凭证权限，请按规范传入参数。（如果通过 GET 方法请求云 API，发送请求前，所有参数都需要按照[云 API 规范](https://cloud.tencent.com/document/api/598/33159#1.-.E6.8B.BC.E6.8E.A5.E8.A7.84.E8.8C.83.E8.AF.B7.E6.B1.82.E4.B8.B2)再 urlencode 一次）。\n2、策略语法参照[ CAM 策略语法](https://cloud.tencent.com/document/product/598/10603)。\n3、策略中不能包含 principal 元素。",
-          "example": "无",
+          "example": "%7B%22version%22%3A%222.0%22%2C%22statement%22%3A%5B%7B%22effect%22%3A%22allow%22%2C%22action%22%3A%5B%22dlc%3A*%22%5D%2C%22resource%22%3A%5B%22*%22%5D%7D%5D%7D%22%7D%7D%7D",
           "member": "string",
           "name": "Policy",
           "required": false,
@@ -137,7 +137,7 @@
         {
           "disabled": false,
           "document": "会话标签列表。最多可以传递 50 个会话标签，不支持包含相同标签键。",
-          "example": "无",
+          "example": "[{\"Key\":\"partment\",\"Value\":\"product\"}]",
           "member": "Tag",
           "name": "Tags",
           "required": false,
@@ -161,7 +161,7 @@
         {
           "disabled": false,
           "document": "临时访问凭证",
-          "example": "无",
+          "example": "{\"Token\":\"da1e***\",\"TmpSecretId\":\"AKID***\",\"TmpSecretKey\":\"q95K***\"}",
           "member": "Credentials",
           "name": "Credentials",
           "output_required": true,
@@ -257,6 +257,7 @@
           "example": "无",
           "member": "Credentials",
           "name": "Credentials",
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -266,6 +267,7 @@
           "example": "1543914376",
           "member": "uint64",
           "name": "ExpiredTime",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -275,6 +277,7 @@
           "example": "2018-12-04T09:06:16Z",
           "member": "string",
           "name": "Expiration",
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -344,27 +347,30 @@
         {
           "disabled": false,
           "document": "临时访问凭证过期时间(时间戳)",
-          "example": "123456789",
+          "example": "1543914376",
           "member": "uint64",
           "name": "ExpiredTime",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "临时访问凭证过期时间",
-          "example": "2010-12-10",
+          "example": "2018-12-04T09:06:16Z",
           "member": "string",
           "name": "Expiration",
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "临时访问凭证",
-          "example": "无",
+          "example": "{\"Token\":\"1siMD***\",\"TmpSecretId\":\"AKID***\",\"TmpSecretKey\":\"q95K***\"}",
           "member": "Credentials",
           "name": "Credentials",
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -571,7 +577,7 @@
         {
           "disabled": false,
           "document": "密钥ID列表。",
-          "example": "[\"AKIDyqWzF***\",\"AKID5CnA***\"]",
+          "example": "[{\"SecretId\":\"AKID***\",\"CreateTime\":1575517111,\"Status\":2}]",
           "member": "ApiKey",
           "name": "IdKeys",
           "output_required": true,

tccli/services/sts/v20180813/examples.json

@@ -3,8 +3,8 @@
     "AssumeRole": [
       {
         "document": "申请扮演角色临时访问凭证",
-        "input": "POST / HTTP/1.1\nHost: sts.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: AssumeRole\n<公共请求参数>\n\n{\n    \"RoleArn\": \"qcs%3A%3Acam%3A%3Auin%2F2385420691%3Arole%2F4611686018427397919\",\n    \"RoleSessionName\": \"cts\"\n}",
-        "output": "{\n    \"Response\": {\n        \"Credentials\": {\n            \"Token\": \"da1e9d2ee9d***2dfe340001\",\n            \"TmpSecretId\": \"AKID65zyIP0mpXtaI******WIQVMn1umNH58\",\n            \"TmpSecretKey\": \"q95K84wrzuEGoc*******52boxvp71yoh\"\n        },\n        \"ExpiredTime\": 1543914376,\n        \"Expiration\": \"2018-12-04T09:06:16Z\",\n        \"RequestId\": \"4daec797-9cd2-4f09-9e7a-7d4c43b2a74c\"\n    }\n}",
+        "input": "POST / HTTP/1.1\nHost: sts.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: AssumeRole\n<公共请求参数>\n\n{\n    \"RoleArn\": \"qcs::cam::uin/100015158414:roleName/readOnlyRole\",\n    \"RoleSessionName\": \"cts\"\n}",
+        "output": "{\n    \"Response\": {\n        \"Credentials\": {\n            \"Token\": \"da1e***\",\n            \"TmpSecretId\": \"AKID***\",\n            \"TmpSecretKey\": \"q95K***\"\n        },\n        \"ExpiredTime\": 1543914376,\n        \"Expiration\": \"2018-12-04T09:06:16Z\",\n        \"RequestId\": \"4daec797-9cd2-4f09-9e7a-7d4c43b2a74c\"\n    }\n}",
         "title": "申请扮演角色临时访问凭证"
       }
     ],
@@ -12,7 +12,7 @@
       {
         "document": "SAML 断言申请角色临时访问凭证",
         "input": "POST / HTTP/1.1\nHost: sts.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: AssumeRoleWithSAML\n<公共请求参数>\n\n{\n    \"RoleArn\": \"qcs::cam::uin/798950673:roleName/OneLogin-Role\",\n    \"PrincipalArn\": \"qcs::cam::uin/798950673:saml-provider/OneLogin\",\n    \"SAMLAssertion\": \"c2FtbCBhc3NlcnRpb24=\",\n    \"RoleSessionName\": \"test\"\n}",
-        "output": "{\n    \"Response\": {\n        \"Credentials\": {\n            \"Token\": \"1siMD***5ue\",\n            \"TmpSecretId\": \"AKID****H58\",\n            \"TmpSecretKey\": \"q95K****yoh\"\n        },\n        \"ExpiredTime\": 1543914376,\n        \"Expiration\": \"2018-12-04T09:06:16Z\",\n        \"RequestId\": \"4daec797-9cd2-4f09-9e7a-7d4c43b2a74c\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"Credentials\": {\n            \"Token\": \"1siMD***\",\n            \"TmpSecretId\": \"AKID***\",\n            \"TmpSecretKey\": \"q95K***\"\n        },\n        \"ExpiredTime\": 1543914376,\n        \"Expiration\": \"2018-12-04T09:06:16Z\",\n        \"RequestId\": \"4daec797-9cd2-4f09-9e7a-7d4c43b2a74c\"\n    }\n}",
         "title": "SAML 断言申请角色临时访问凭证"
       }
     ],
@@ -20,7 +20,7 @@
       {
         "document": "申请OIDC角色临时访问凭证",
         "input": "POST / HTTP/1.1\nHost: sts.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: AssumeRoleWithWebIdentity\n<公共请求参数>\n\n{\n    \"DurationSeconds\": \"1800\",\n    \"RoleSessionName\": \"test_OIDC\",\n    \"WebIdentityToken\": \"eyJraWQiOiJkT**********CNOQ\",\n    \"RoleArn\": \"qcs::cam::uin/7989***:roleName/OneLogin-Role\",\n    \"ProviderId\": \"OIDC\"\n}",
-        "output": "{\n    \"Response\": {\n        \"ExpiredTime\": 1543914376,\n        \"Expiration\": \"2018-12-04T09:06:16Z\",\n        \"Credentials\": {\n            \"Token\": \"1siMD5r0tPAq9xpR******6a1ad76f09a0069002923def8aFw7tUMd2nH\",\n            \"TmpSecretId\": \"AKID65zyIP0mp****qt2SlWIQVMn1umNH58\",\n            \"TmpSecretKey\": \"q95K84wrzuE****y39zg52boxvp71yoh\"\n        },\n        \"RequestId\": \"f6e7cbcb-add1-47bd-9097-d08cf8f3a919\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"ExpiredTime\": 1543914376,\n        \"Expiration\": \"2018-12-04T09:06:16Z\",\n        \"Credentials\": {\n            \"Token\": \"1siMD***\",\n            \"TmpSecretId\": \"AKID***\",\n            \"TmpSecretKey\": \"q95K***\"\n        },\n        \"RequestId\": \"f6e7cbcb-add1-47bd-9097-d08cf8f3a919\"\n    }\n}",
         "title": "申请OIDC角色临时访问凭证"
       }
     ],
@@ -48,7 +48,7 @@
       {
         "document": "授权临时访问凭证具有以下权限：\n{\"version\":\"2.0\",\"statement\":[{\"effect\":\"allow\",\"action\":[\"name/cos:PutObject\"],\"resource\":[\"qcs::cos:ap-beijing:uid/123456:prefix//123456/bucketA/*\"]}]}\n\n注意，因为GET请求需要给所有参数做urlencode，所以下面示例中的Policy参数是做了两次urlencode的结果。",
         "input": "https://sts.tencentcloudapi.com/?Action=GetFederationToken\n&Name=SUN\n&Policy=%257B%2522version%2522%3A%25222.0%2522%2C%2522statement%2522%3A%255B%257B%2522effect%2522%3A%2522allow%2522%2C%2522action%2522%3A%255B%2522name%2Fcos%3APutObject%2522%255D%2C%2522resource%2522%3A%255B%2522qcs%3A%3Acos%3Aap-beijing%3Auid%2F123456%3Aprefix%2F%2F123456%2FbucketA%2F%2A%2522%255D%257D%255D%257D\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"Credentials\": {\n            \"Token\": \"kTRt***Jb7m\",\n            \"TmpSecretId\": \"AKID****CjE6\",\n            \"TmpSecretKey\": \"Eo28***7ps=\"\n        },\n        \"Expiration\": \"2023-06-14T05:06:57Z\",\n        \"ExpiredTime\": 1686719217,\n        \"RequestId\": \"59a5e07e-4147-4d2e-a808-dca76ac5b3fd\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"Credentials\": {\n            \"Token\": \"kTRt***\",\n            \"TmpSecretId\": \"AKID***\",\n            \"TmpSecretKey\": \"Eo28***\"\n        },\n        \"Expiration\": \"2023-06-14T05:06:57Z\",\n        \"ExpiredTime\": 1686719217,\n        \"RequestId\": \"59a5e07e-4147-4d2e-a808-dca76ac5b3fd\"\n    }\n}",
         "title": "获取临时访问凭证"
       }
     ],
@@ -56,7 +56,7 @@
       {
         "document": "",
         "input": "https://sts.tencentcloudapi.com/?Action=QueryApiKey\n&TargetUin=100020328651\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"IdKeys\": [\n            {\n                \"SecretId\": \"AKID5Cn***\",\n                \"CreateTime\": 1575517111,\n                \"Status\": 2\n            }\n        ],\n        \"RequestId\": \"5cf9d558-a46a-4ce7-bbc2-500cad68b0da\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"IdKeys\": [\n            {\n                \"SecretId\": \"AKID***\",\n                \"CreateTime\": 1575517111,\n                \"Status\": 2\n            }\n        ],\n        \"RequestId\": \"5cf9d558-a46a-4ce7-bbc2-500cad68b0da\"\n    }\n}",
         "title": "拉取API密钥列表"
       }
     ]

tccli/services/tcr/v20190924/api.json

@@ -7864,7 +7864,7 @@
           "example": "无",
           "member": "string",
           "name": "RegistryId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -7874,7 +7874,7 @@
           "example": "无",
           "member": "string",
           "name": "RegistryName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -7884,17 +7884,17 @@
           "example": "无",
           "member": "string",
           "name": "RegistryType",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "实例状态",
+          "document": "实例状态。有以下状态：\nPending, 初始化中\nDeploying, 创建中\nRunning, 运行中\nUnhealthy, 状态异常\nFailedCreated, 创建失败\nFailedUpdated, 更新失败\nBucket-Error, 存储桶异常\nIsolate, 待回收\nDeleting, 删除中\nDeleteBucketFailed, 实例删除存储桶失败\nDeleteFailed, 实例删除失败",
           "example": "无",
           "member": "string",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -7904,7 +7904,7 @@
           "example": "无",
           "member": "string",
           "name": "PublicDomain",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -7914,7 +7914,7 @@
           "example": "无",
           "member": "datetime_iso",
           "name": "CreatedAt",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -7924,7 +7924,7 @@
           "example": "无",
           "member": "string",
           "name": "RegionName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -7934,7 +7934,7 @@
           "example": "无",
           "member": "uint64",
           "name": "RegionId",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -7944,7 +7944,7 @@
           "example": "无",
           "member": "bool",
           "name": "EnableAnonymous",
-          "required": true,
+          "output_required": true,
           "type": "bool",
           "value_allowed_null": false
         },
@@ -7954,7 +7954,7 @@
           "example": "无",
           "member": "uint64",
           "name": "TokenValidTime",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -7964,7 +7964,7 @@
           "example": "无",
           "member": "string",
           "name": "InternalEndpoint",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -7974,7 +7974,7 @@
           "example": "无",
           "member": "TagSpecification",
           "name": "TagSpecification",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -7984,7 +7984,7 @@
           "example": "无",
           "member": "string",
           "name": "ExpiredAt",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7994,7 +7994,7 @@
           "example": "无",
           "member": "int64",
           "name": "PayMod",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -8004,7 +8004,7 @@
           "example": "无",
           "member": "int64",
           "name": "RenewFlag",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -8014,7 +8014,7 @@
           "example": "无",
           "member": "bool",
           "name": "DeletionProtection",
-          "required": false,
+          "output_required": true,
           "type": "bool",
           "value_allowed_null": false
         }

tccli/services/tdmq/tdmq_client.py

@@ -1941,58 +1941,6 @@ def doCreateRabbitMQVirtualHost(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteCluster(args, parsed_globals):
-    g_param = parse_global_arg(parsed_globals)
-
-    if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
-        cred = credential.CVMRoleCredential()
-    elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
-        cred = credential.STSAssumeRoleCredential(
-            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
-            g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
-        )
-    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):
-        cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
-    else:
-        cred = credential.Credential(
-            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
-        )
-    http_profile = HttpProfile(
-        reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
-        reqMethod="POST",
-        endpoint=g_param[OptionsDefine.Endpoint],
-        proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
-    )
-    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
-    if g_param[OptionsDefine.Language]:
-        profile.language = g_param[OptionsDefine.Language]
-    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
-    client = mod.TdmqClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteClusterRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.DeleteCluster(model)
-        result = rsp.to_json_string()
-        try:
-            json_obj = json.loads(result)
-        except TypeError as e:
-            json_obj = json.loads(result.decode('utf-8'))  # python3.3
-        if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
-            break
-        cur_time = time.time()
-        if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
-            raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
-            (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
-            search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
-        else:
-            print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
-        time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
-    FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
-
-
 def doDeleteCmqTopic(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2461,7 +2409,7 @@ def doDescribeRabbitMQVirtualHost(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeCmqDeadLetterSourceQueues(args, parsed_globals):
+def doDeleteCluster(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2490,11 +2438,11 @@ def doDescribeCmqDeadLetterSourceQueues(args, parsed_globals):
     client = mod.TdmqClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeCmqDeadLetterSourceQueuesRequest()
+    model = models.DeleteClusterRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeCmqDeadLetterSourceQueues(model)
+        rsp = client.DeleteCluster(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -7605,7 +7553,6 @@ ACTION_MAP = {
     "DescribePublisherSummary": doDescribePublisherSummary,
     "DeleteRocketMQNamespace": doDeleteRocketMQNamespace,
     "CreateRabbitMQVirtualHost": doCreateRabbitMQVirtualHost,
-    "DeleteCluster": doDeleteCluster,
     "DeleteCmqTopic": doDeleteCmqTopic,
     "ModifyPublicNetworkAccessPoint": doModifyPublicNetworkAccessPoint,
     "ModifyRocketMQInstance": doModifyRocketMQInstance,
@@ -7615,7 +7562,7 @@ ACTION_MAP = {
     "DescribeRocketMQMigratingTopicList": doDescribeRocketMQMigratingTopicList,
     "DescribeCmqSubscriptionDetail": doDescribeCmqSubscriptionDetail,
     "DescribeRabbitMQVirtualHost": doDescribeRabbitMQVirtualHost,
-    "DescribeCmqDeadLetterSourceQueues": doDescribeCmqDeadLetterSourceQueues,
+    "DeleteCluster": doDeleteCluster,
     "CreateRocketMQVipInstance": doCreateRocketMQVipInstance,
     "ResetRocketMQConsumerOffSet": doResetRocketMQConsumerOffSet,
     "DescribeClusters": doDescribeClusters,