tccli 3.0.1138.1__py2.py3-none-any.whl → 3.0.1140.1__py2.py3-none-any.whl

tccli/services/ses/v20201002/examples.json

@@ -8,6 +8,14 @@
         "title": "新增批量发送任务"
       }
     ],
+    "CreateCustomBlacklist": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: ses.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateCustomBlacklist\n<公共请求参数>\n\n{\n    \"ExpireDate\": \"2024-06-19\",\n    \"Emails\": [\n        \"b@gmail.com\",\n        \"a@gmail.com\"\n    ]\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"8979fc1e-9564-4fc9-bf7d-2958ce679b72\"\n    }\n}",
+        "title": "添加邮箱地址到黑名单"
+      }
+    ],
     "CreateEmailAddress": [
       {
         "document": "",
@@ -70,6 +78,14 @@
         "title": "删除收件人黑名单"
       }
     ],
+    "DeleteCustomBlackList": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: ses.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DeleteCustomBlackList\n<公共请求参数>\n\n{\n    \"Emails\": [\n        \"b@gmail.com\",\n        \"a@gmail.com\"\n    ]\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"8979fc1e-9564-4fc9-bf7d-2958ce679b72\"\n    }\n}",
+        "title": "删除自定义黑名单邮箱地址"
+      }
+    ],
     "DeleteEmailAddress": [
       {
         "document": "",
@@ -148,6 +164,14 @@
         "title": "获取黑名单邮箱地址"
       }
     ],
+    "ListCustomBlacklist": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: ses.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ListCustomBlacklist\n<公共请求参数>\n\n{\n    \"Offset\": 1,\n    \"Limit\": 1,\n    \"Status\": 1,\n    \"Email\": \"abc@mail.com\"\n}",
+        "output": "{\n    \"Response\": {\n        \"Data\": [\n            {\n                \"CreateTime\": \"2024-06-26 10:04:43\",\n                \"Email\": \"abc@foxmail.com\",\n                \"ExpireDate\": \"2024-06-27\",\n                \"Id\": 304323,\n                \"Status\": 1\n            },\n            {\n                \"CreateTime\": \"2024-06-25 14:27:38\",\n                \"Email\": \"abc@abc.com\",\n                \"ExpireDate\": \"2024-06-26\",\n                \"Id\": 304320,\n                \"Status\": 0\n            }\n        ],\n        \"RequestId\": \"3df4264a-a5c9-4a4d-abfe-770c730ca683\",\n        \"TotalCount\": 293023\n    }\n}",
+        "title": "获取自定义黑名单列表"
+      }
+    ],
     "ListEmailAddress": [
       {
         "document": "",
@@ -216,6 +240,14 @@
         "title": "发送纯文本邮件"
       }
     ],
+    "UpdateCustomBlackList": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: ses.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: UpdateCustomBlackList\n<公共请求参数>\n\n{\n    \"Id\": 1,\n    \"ExpireDate\": \"2024-06-19\",\n    \"Email\": \"b@gmail.com\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"8979fc1e-9564-4fc9-bf7d-2958ce679b72\"\n    }\n}",
+        "title": "更新自定义黑名单"
+      }
+    ],
     "UpdateEmailIdentity": [
       {
         "document": "",

tccli/services/ssl/ssl_client.py

@@ -641,6 +641,58 @@ def doSubmitCertificateInformation(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDeleteCertificates(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.DeleteCertificatesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DeleteCertificates(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 doDescribeHostDdosInstanceList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -3056,6 +3108,7 @@ ACTION_MAP = {
     "DescribePackages": doDescribePackages,
     "DescribeDeployedResources": doDescribeDeployedResources,
     "SubmitCertificateInformation": doSubmitCertificateInformation,
+    "DeleteCertificates": doDeleteCertificates,
     "DescribeHostDdosInstanceList": doDescribeHostDdosInstanceList,
     "VerifyManager": doVerifyManager,
     "DescribeHostClbInstanceList": doDescribeHostClbInstanceList,

tccli/services/ssl/v20191205/api.json

@@ -50,7 +50,7 @@
       "status": "online"
     },
     "CreateCertificateBindResourceSyncTask": {
-      "document": "创建证书绑定关联云资源异步任务， 该接口用于查询证书关联云资源。 若证书ID已存在查询云资源任务，则结果返回该任务ID。关联云资源类型，支持以下云资源：clb、cdn、waf、live、vod、ddos、tke、apigateway、tcb、teo（edgeOne）。查询关联云资源结果使用DescribeCertificateBindResourceTaskResult接口",
+      "document": "创建证书绑定关联云资源异步任务， 该接口用于查询证书关联云资源。 若证书ID已存在查询云资源任务，则结果返回该任务ID。关联云资源类型，支持以下云资源：clb、cdn、waf、live、vod、ddos、tke、apigateway、tcb、teo（edgeOne）、cos。查询关联云资源结果使用DescribeCertificateBindResourceTaskResult接口",
       "input": "CreateCertificateBindResourceSyncTaskRequest",
       "name": "创建证书关联云资源异步任务",
       "output": "CreateCertificateBindResourceSyncTaskResponse",
@@ -70,6 +70,13 @@
       "output": "DeleteCertificateResponse",
       "status": "online"
     },
+    "DeleteCertificates": {
+      "document": "批量删除证书，删除证书前支持查询证书是否关联了腾讯云云资源 （需自定义配置参数，参数名称：IsSync）",
+      "input": "DeleteCertificatesRequest",
+      "name": "批量删除证书",
+      "output": "DeleteCertificatesResponse",
+      "status": "online"
+    },
     "DeleteManager": {
       "document": "删除管理人",
       "input": "DeleteManagerRequest",
@@ -113,7 +120,7 @@
       "status": "online"
     },
     "DescribeCertificateBindResourceTaskResult": {
-      "document": "查询CreateCertificateBindResourceSyncTask任务结果， 返回证书关联云资源异步任务结果， 支持以下云资源：clb、cdn、waf、live、vod、ddos、tke、apigateway、tcb、teo（edgeOne）",
+      "document": "查询CreateCertificateBindResourceSyncTask任务结果， 返回证书关联云资源异步任务结果， 支持以下云资源：clb、cdn、waf、live、vod、ddos、tke、apigateway、tcb、teo（edgeOne）、cos",
       "input": "DescribeCertificateBindResourceTaskResultRequest",
       "name": "查询证书关联云资源任务结果 - 仅返回总数",
       "output": "DescribeCertificateBindResourceTaskResultResponse",
@@ -679,6 +686,32 @@
       ],
       "type": "object"
     },
+    "BatchDeleteFail": {
+      "document": "批量删除失败的项",
+      "members": [
+        {
+          "disabled": false,
+          "document": "失败的证书ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "23y5RzQp",
+          "member": "string",
+          "name": "CertId",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "失败的原因\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "当前证书未过期，不能被删除",
+          "member": "string",
+          "name": "Msg",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
     "BindResourceRegionResult": {
       "document": "绑定资源地域结果",
       "members": [
@@ -701,6 +734,16 @@
           "output_required": true,
           "type": "int",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "是否查询异常\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "Error",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"
@@ -2579,6 +2622,53 @@
       ],
       "type": "object"
     },
+    "DeleteCertificatesRequest": {
+      "document": "DeleteCertificates请求参数结构体",
+      "members": [],
+      "type": "object"
+    },
+    "DeleteCertificatesResponse": {
+      "document": "DeleteCertificates返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "成功的ID",
+          "example": "无",
+          "member": "string",
+          "name": "Success",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "失败的ID和原因",
+          "example": "无",
+          "member": "BatchDeleteFail",
+          "name": "Fail",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "证书ID和异步任务的ID",
+          "example": "无",
+          "member": "CertTaskId",
+          "name": "CertTaskIds",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DeleteManagerRequest": {
       "document": "DeleteManager请求参数结构体",
       "members": [
@@ -9392,7 +9482,7 @@
         },
         {
           "disabled": false,
-          "document": "需要部署的资源类型，参数值可选（小写）：clb、cdn、waf、live、ddos、teo、apigateway、vod、tke、tcb、tse",
+          "document": "需要部署的资源类型，参数值可选（小写）：clb、cdn、waf、live、ddos、teo、apigateway、vod、tke、tcb、tse、cos",
           "example": "无",
           "member": "string",
           "name": "ResourceTypes",

tccli/services/ssl/v20191205/examples.json

@@ -86,6 +86,14 @@
         "title": "异步删除"
       }
     ],
+    "DeleteCertificates": [
+      {
+        "document": "批量删除",
+        "input": "POST / HTTP/1.1\nHost: ssl.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DeleteCertificates\n<公共请求参数>\n\n{}",
+        "output": "{\n    \"Response\": {\n        \"CertTaskIds\": [\n            {\n                \"CertId\": \"1ODjBeH8\",\n                \"TaskId\": \"1\"\n            },\n            {\n                \"CertId\": \"25EMBPYQ\",\n                \"TaskId\": \"2\"\n            },\n            {\n                \"CertId\": \"txV0pewo\",\n                \"TaskId\": \"3\"\n            },\n            {\n                \"CertId\": \"rcGiGyTx\",\n                \"TaskId\": \"4\"\n            },\n            {\n                \"CertId\": \"4FVmnb1u\",\n                \"TaskId\": \"5\"\n            }\n        ],\n        \"Success\": [],\n        \"Fail\": [],\n        \"RequestId\": \"687f27b0-c256-40ea-adf6-efb715001f2e\"\n    }\n}",
+        "title": "批量删除"
+      }
+    ],
     "DeleteManager": [
       {
         "document": "",
@@ -144,7 +152,7 @@
       {
         "document": "仅返回总数",
         "input": "POST / HTTP/1.1\nHost: ssl.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeCertificateBindResourceTaskResult\n<公共请求参数>\n\n{\n    \"TaskIds\": [\n        \"abc\"\n    ]\n}",
-        "output": "{\n    \"Response\": {\n        \"SyncTaskBindResourceResult\": [\n            {\n                \"TaskId\": \"abc\",\n                \"BindResourceResult\": [\n                    {\n                        \"ResourceType\": \"abc\",\n                        \"BindResourceRegionResult\": [\n                            {\n                                \"Region\": \"abc\",\n                                \"TotalCount\": 1\n                            }\n                        ]\n                    }\n                ],\n                \"Status\": 1,\n                \"Error\": {\n                    \"Code\": \"abc\",\n                    \"Message\": \"abc\"\n                },\n                \"CacheTime\": \"abc\"\n            }\n        ],\n        \"RequestId\": \"abc\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"SyncTaskBindResourceResult\": [\n            {\n                \"TaskId\": \"abc\",\n                \"BindResourceResult\": [\n                    {\n                        \"ResourceType\": \"abc\",\n                        \"BindResourceRegionResult\": [\n                            {\n                                \"Region\": \"abc\",\n                                \"TotalCount\": 1,\n                                \"Error\": \"abc\"\n                            }\n                        ]\n                    }\n                ],\n                \"Status\": 1,\n                \"Error\": {\n                    \"Code\": \"abc\",\n                    \"Message\": \"abc\"\n                },\n                \"CacheTime\": \"abc\"\n            }\n        ],\n        \"RequestId\": \"abc\"\n    }\n}",
         "title": "查询证书关联云资源结果 "
       }
     ],

tccli/services/tcr/v20190924/api.json

@@ -4735,7 +4735,7 @@
         },
         {
           "disabled": false,
-          "document": "过滤条件",
+          "document": "过滤条件\n- 按照【标签】过滤\n   Name: Tags\n   Value:   tagKey:tagVal\n",
           "example": "无",
           "member": "Filter",
           "name": "Filters",
@@ -4763,6 +4763,7 @@
           "example": "无",
           "member": "TcrNamespaceInfo",
           "name": "NamespaceList",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -4772,6 +4773,7 @@
           "example": "2",
           "member": "int64",
           "name": "TotalCount",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -5113,6 +5115,7 @@
           "example": "[       {         \"BriefDescription\": \"\",         \"CreationTime\": \"2022-08-02 03:52:06.915755 +0000 UTC\",         \"Description\": \"\",         \"Name\": \"library/busybox\",         \"Namespace\": \"library\",         \"Public\": false,         \"UpdateTime\": \"2022-08-02 03:52:06.915755 +0000 UTC\"       }     ],",
           "member": "TcrRepositoryInfo",
           "name": "RepositoryList",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -5122,6 +5125,7 @@
           "example": "1",
           "member": "int64",
           "name": "TotalCount",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },

tccli/services/tcr/v20190924/examples.json

@@ -567,7 +567,7 @@
     "DescribeNamespaces": [
       {
         "document": "查询实例内所有的命名空间信息",
-        "input": "POST / HTTP/1.1\nHost: tcr.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeNamespaces\n<公共请求参数>\n\n{\n    \"Limit\": \"20\",\n    \"RegistryId\": \"tcr-f7g1ir99\",\n    \"Offset\": \"0\"\n}",
+        "input": "POST / HTTP/1.1\nHost: tcr.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeNamespaces\n<公共请求参数>\n\n{\n    \"Limit\": 20,\n    \"RegistryId\": \"tcr-f7g1ir99\",\n    \"Offset\": 0\n}",
         "output": "{\n    \"Response\": {\n        \"NamespaceList\": [\n            {\n                \"Public\": true,\n                \"Name\": \"ns1\",\n                \"CreationTime\": \"2020-09-22T00:00:00+00:00\",\n                \"NamespaceId\": 1,\n                \"TagSpecification\": {\n                    \"ResourceType\": \"namespace\",\n                    \"Tags\": [\n                        {\n                            \"Value\": \"tag-value\",\n                            \"Key\": \"tag-key\"\n                        }\n                    ]\n                },\n                \"Metadata\": [\n                    {\n                        \"Key\": \"prevent_vul\",\n                        \"Value\": \"false\"\n                    }\n                ],\n                \"CVEWhitelistItems\": [\n                    {\n                        \"CVEID\": \"1\"\n                    }\n                ],\n                \"AutoScan\": true,\n                \"PreventVUL\": true,\n                \"Severity\": \"low\"\n            }\n        ],\n        \"TotalCount\": 2,\n        \"RequestId\": \"866bda78-ed75-4b10-8876-e82de555f69b\"\n    }\n}",
         "title": "查询命名空间信息"
       }