tccli 3.0.1183.1__py2.py3-none-any.whl → 3.0.1184.1__py2.py3-none-any.whl

tccli/services/ssl/ssl_client.py

@@ -173,6 +173,58 @@ def doDescribeHostCdnInstanceList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCancelAuditCertificate(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.SslClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CancelAuditCertificateRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CancelAuditCertificate(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 doDescribeHostTkeInstanceList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -745,7 +797,7 @@ def doDescribeHostDdosInstanceList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doVerifyManager(args, parsed_globals):
+def doCompleteCertificate(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -774,11 +826,11 @@ def doVerifyManager(args, parsed_globals):
     client = mod.SslClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.VerifyManagerRequest()
+    model = models.CompleteCertificateRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.VerifyManager(model)
+        rsp = client.CompleteCertificate(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1057,7 +1109,7 @@ def doDeleteCertificate(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCompleteCertificate(args, parsed_globals):
+def doVerifyManager(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1086,11 +1138,11 @@ def doCompleteCertificate(args, parsed_globals):
     client = mod.SslClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CompleteCertificateRequest()
+    model = models.VerifyManagerRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CompleteCertificate(model)
+        rsp = client.VerifyManager(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1837,7 +1889,7 @@ def doDescribeCertificateBindResourceTaskResult(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCancelAuditCertificate(args, parsed_globals):
+def doCheckCertificateDomainVerification(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1866,11 +1918,11 @@ def doCancelAuditCertificate(args, parsed_globals):
     client = mod.SslClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CancelAuditCertificateRequest()
+    model = models.CheckCertificateDomainVerificationRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CancelAuditCertificate(model)
+        rsp = client.CheckCertificateDomainVerification(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -3099,6 +3151,7 @@ ACTION_MAP = {
     "DescribeHostCosInstanceList": doDescribeHostCosInstanceList,
     "DescribeCertificates": doDescribeCertificates,
     "DescribeHostCdnInstanceList": doDescribeHostCdnInstanceList,
+    "CancelAuditCertificate": doCancelAuditCertificate,
     "DescribeHostTkeInstanceList": doDescribeHostTkeInstanceList,
     "UploadRevokeLetter": doUploadRevokeLetter,
     "DeleteManager": doDeleteManager,
@@ -3110,13 +3163,13 @@ ACTION_MAP = {
     "SubmitCertificateInformation": doSubmitCertificateInformation,
     "DeleteCertificates": doDeleteCertificates,
     "DescribeHostDdosInstanceList": doDescribeHostDdosInstanceList,
-    "VerifyManager": doVerifyManager,
+    "CompleteCertificate": doCompleteCertificate,
     "DescribeHostClbInstanceList": doDescribeHostClbInstanceList,
     "DescribeHostTeoInstanceList": doDescribeHostTeoInstanceList,
     "CancelCertificateOrder": doCancelCertificateOrder,
     "DownloadCertificate": doDownloadCertificate,
     "DeleteCertificate": doDeleteCertificate,
-    "CompleteCertificate": doCompleteCertificate,
+    "VerifyManager": doVerifyManager,
     "UpdateCertificateInstance": doUpdateCertificateInstance,
     "UploadCertificate": doUploadCertificate,
     "CheckCertificateChain": doCheckCertificateChain,
@@ -3131,7 +3184,7 @@ ACTION_MAP = {
     "DeployCertificateRecordRollback": doDeployCertificateRecordRollback,
     "DeployCertificateRecordRetry": doDeployCertificateRecordRetry,
     "DescribeCertificateBindResourceTaskResult": doDescribeCertificateBindResourceTaskResult,
-    "CancelAuditCertificate": doCancelAuditCertificate,
+    "CheckCertificateDomainVerification": doCheckCertificateDomainVerification,
     "DescribeHostDeployRecord": doDescribeHostDeployRecord,
     "UpdateCertificateRecordRetry": doUpdateCertificateRecordRetry,
     "DescribeDeleteCertificatesTaskResult": doDescribeDeleteCertificatesTaskResult,

tccli/services/ssl/v20191205/api.json

@@ -28,6 +28,13 @@
       "output": "CheckCertificateChainResponse",
       "status": "online"
     },
+    "CheckCertificateDomainVerification": {
+      "document": "检查证书域名验证",
+      "input": "CheckCertificateDomainVerificationRequest",
+      "name": "检查证书域名验证",
+      "output": "CheckCertificateDomainVerificationResponse",
+      "status": "online"
+    },
     "CommitCertificateInformation": {
       "document": "提交证书订单。",
       "input": "CommitCertificateInformationRequest",
@@ -1728,6 +1735,43 @@
       ],
       "type": "object"
     },
+    "CheckCertificateDomainVerificationRequest": {
+      "document": "CheckCertificateDomainVerification请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "证书ID。",
+          "example": "无",
+          "member": "string",
+          "name": "CertificateId",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "CheckCertificateDomainVerificationResponse": {
+      "document": "CheckCertificateDomainVerification返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "域名验证结果\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "DomainValidationResult",
+          "name": "VerificationResults",
+          "required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ClbInstanceDetail": {
       "document": "clb实例详情",
       "members": [
@@ -6724,6 +6768,92 @@
       ],
       "type": "object"
     },
+    "DomainValidationResult": {
+      "document": "域名验证结果",
+      "members": [
+        {
+          "disabled": false,
+          "document": "域名。",
+          "example": "qq.com",
+          "member": "string",
+          "name": "Domain",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "验证类型。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "DNS",
+          "member": "string",
+          "name": "VerifyType",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "本地检查结果。",
+          "example": "1",
+          "member": "int64",
+          "name": "LocalCheck",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "CA检查结果。",
+          "example": "1",
+          "member": "int64",
+          "name": "CaCheck",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "检查失败原因。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "LocalCheckFailReason",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "检查到的值。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "CheckValue",
+          "required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "是否频繁请求。",
+          "example": "false",
+          "member": "bool",
+          "name": "Frequently",
+          "required": true,
+          "type": "bool",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "是否已经签发。",
+          "example": "false",
+          "member": "bool",
+          "name": "Issued",
+          "required": true,
+          "type": "bool",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "DownloadCertificateRequest": {
       "document": "DownloadCertificate请求参数结构体",
       "members": [

tccli/services/ssl/v20191205/examples.json

@@ -32,6 +32,14 @@
         "title": "对证书链进行检查"
       }
     ],
+    "CheckCertificateDomainVerification": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: ssl.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CheckCertificateDomainVerification\n<公共请求参数>\n\n{\n    \"CertificateId\": \"xx\"\n}",
+        "output": "{\n    \"Response\": {\n        \"VerificationResults\": [\n            {\n                \"Domain\": \"xx\",\n                \"CheckValue\": [\n                    \"xx\"\n                ],\n                \"LocalCheckFailReason\": \"xx\",\n                \"LocalCheck\": 0,\n                \"CaCheck\": 0,\n                \"Frequently\": true,\n                \"VerifyType\": \"xx\",\n                \"Issued\": true\n            }\n        ],\n        \"RequestId\": \"xx\"\n    }\n}",
+        "title": "检查证书域名验证"
+      }
+    ],
     "CommitCertificateInformation": [
       {
         "document": "提交证书订单",

tccli/services/thpc/thpc_client.py

@@ -489,6 +489,58 @@ def doDescribeNodes(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreateWorkspaces(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.ThpcClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CreateWorkspacesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreateWorkspaces(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 doDescribeInitNodeScripts(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1085,6 +1137,7 @@ ACTION_MAP = {
     "SetAutoScalingConfiguration": doSetAutoScalingConfiguration,
     "AddQueue": doAddQueue,
     "DescribeNodes": doDescribeNodes,
+    "CreateWorkspaces": doCreateWorkspaces,
     "DescribeInitNodeScripts": doDescribeInitNodeScripts,
     "AttachNodes": doAttachNodes,
     "DescribeQueues": doDescribeQueues,