tccli 3.0.1350.1__py2.py3-none-any.whl → 3.0.1351.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1350.1'
+__version__ = '3.0.1351.1'

tccli/services/apm/v20210622/api.json

@@ -38,7 +38,7 @@
     "DescribeGeneralMetricData": {
       "document": "获取指标数据通用接口。用户根据需要上送请求参数，返回对应的指标数据。\n接口调用频率限制为：20次/秒，1200次/分钟。单请求的数据点数限制为1440个。",
       "input": "DescribeGeneralMetricDataRequest",
-      "name": "获取指标数据通用接口",
+      "name": "获取指标数据通用接口（推荐）",
       "output": "DescribeGeneralMetricDataResponse",
       "status": "online"
     },
@@ -1503,7 +1503,7 @@
         {
           "disabled": false,
           "document": "需要查询的指标名称，不可自定义输入，[详情请见。](https://cloud.tencent.com/document/product/248/101681)",
-          "example": "[\"request_count\"、“duration”]",
+          "example": "[\"request_count\"、“duration_avg”]",
           "member": "string",
           "name": "Metrics",
           "required": true,
@@ -1566,7 +1566,7 @@
         {
           "disabled": false,
           "document": "是否按固定时间跨度聚合，填入1及大于1的值按1处理，不填按0处理。\n- 填入0，则计算开始时间到截止时间的指标数据。\n- 填入1，则会按照开始时间到截止时间的时间跨度选择聚合粒度：\n - 时间跨度 (0,12) 小时，则按一分钟粒度聚合。\n - 时间跨度 [12,48] 小时，则按五分钟粒度聚合。\n - 时间跨度 (48, +∞) 小时，则按一小时粒度聚合。",
-          "example": "60",
+          "example": "1",
           "member": "int64",
           "name": "Period",
           "required": false,
@@ -1575,7 +1575,7 @@
         {
           "disabled": false,
           "document": "对查询指标进行排序：\nKey 填写云 API 指标名称，[详情请见。](https://cloud.tencent.com/document/product/248/101681)\nValue 填写排序方式：     \n- asc：对查询指标进行升序排序\n- desc：对查询指标进行降序排序",
-          "example": "{ \t\"Key\": \"duration\",         \"Value\": \"desc\"",
+          "example": "{ \t\"Key\": \"duration_avg\",         \"Value\": \"desc\"",
           "member": "OrderBy",
           "name": "OrderBy",
           "required": false,
@@ -2244,12 +2244,11 @@
         {
           "disabled": false,
           "document": "过滤维度名",
-          "example": "serviceName",
+          "example": "service.name",
           "member": "string",
           "name": "Key",
           "required": true,
-          "type": "string",
-          "value_allowed_null": false
+          "type": "string"
         },
         {
           "disabled": false,
@@ -2258,8 +2257,7 @@
           "member": "string",
           "name": "Value",
           "required": true,
-          "type": "string",
-          "value_allowed_null": false
+          "type": "string"
         }
       ],
       "usage": "in"

tccli/services/cdn/v20180606/api.json

@@ -10119,7 +10119,7 @@
         },
         {
           "disabled": false,
-          "document": "http 头部值，最多可设置 1000 个字符\nMode 为 del 时非必填\nMode 为 add/set 时必填\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "http 头部值，最多可设置 2000 个字符\nMode 为 del 时非必填\nMode 为 add/set 时必填\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "value",
           "member": "string",
           "name": "HeaderValue",

tccli/services/cdwch/v20200915/api.json

@@ -1649,7 +1649,7 @@
         {
           "disabled": false,
           "document": "搜索的集群id名称",
-          "example": "cdwch-xxxx",
+          "example": "clickhouse-cn-xxxxxx",
           "member": "string",
           "name": "SearchInstanceID",
           "required": false,
@@ -1658,7 +1658,7 @@
         {
           "disabled": false,
           "document": "搜索的集群name",
-          "example": "-",
+          "example": "clickhouse-cn-xxxxxx",
           "member": "string",
           "name": "SearchInstanceName",
           "required": false,
@@ -1694,7 +1694,7 @@
         {
           "disabled": false,
           "document": "集群类型，弹性版或自研数仓版",
-          "example": "无",
+          "example": "clickhouse-cn",
           "member": "string",
           "name": "InstanceType",
           "required": false,
@@ -1703,7 +1703,7 @@
         {
           "disabled": false,
           "document": "组件名称列表",
-          "example": "无",
+          "example": "0",
           "member": "string",
           "name": "Components",
           "required": false,
@@ -1728,7 +1728,7 @@
         {
           "disabled": false,
           "document": "实例数组\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "-",
+          "example": "[{\"instanceId:\"clickhouse-cn\"\"}]",
           "member": "CnInstanceInfo",
           "name": "InstancesList",
           "output_required": true,
@@ -1737,8 +1737,8 @@
         },
         {
           "disabled": false,
-          "document": "-\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "-",
+          "document": "错误信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "-1",
           "member": "string",
           "name": "ErrorMsg",
           "output_required": true,

tccli/services/cdwch/v20200915/examples.json

@@ -67,8 +67,8 @@
     "DescribeCNInstances": [
       {
         "document": "",
-        "input": "POST / HTTP/1.1\nHost: cdwch.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeCNInstances\n<公共请求参数>\n\n{\n    \"Offset\": 0,\n    \"Limit\": 0,\n    \"SearchTags\": [\n        {\n            \"AllValue\": 0,\n            \"TagKey\": \"test\",\n            \"TagValue\": \"test\"\n        }\n    ],\n    \"SearchInstanceID\": \"test\",\n    \"SearchInstanceName\": \"test\"\n}",
-        "output": "{\n    \"Response\": {\n        \"TotalCount\": 0,\n        \"InstancesList\": [\n            {\n                \"ID\": 0,\n                \"InstanceType\": \"abc\",\n                \"InstanceName\": \"abc\",\n                \"Status\": \"abc\",\n                \"StatusDesc\": \"abc\",\n                \"InstanceStateInfo\": {\n                    \"InstanceState\": \"abc\",\n                    \"FlowCreateTime\": \"abc\",\n                    \"FlowName\": \"abc\",\n                    \"FlowProgress\": 0,\n                    \"InstanceStateDesc\": \"abc\",\n                    \"FlowMsg\": \"abc\",\n                    \"ProcessName\": \"abc\",\n                    \"RequestId\": \"abc\",\n                    \"ProcessSubName\": \"abc\"\n                },\n                \"InstanceID\": \"abc\",\n                \"Resources\": [\n                    {\n                        \"ID\": 0,\n                        \"InstanceID\": \"abc\",\n                        \"AppID\": 0,\n                        \"Uin\": \"abc\",\n                        \"Component\": \"abc\",\n                        \"DeployMode\": 0,\n                        \"SpecName\": \"abc\",\n                        \"ResourceID\": \"abc\",\n                        \"Status\": 0,\n                        \"IP\": \"abc\",\n                        \"CPU\": 1,\n                        \"Memory\": 1,\n                        \"Storage\": 1,\n                        \"UUID\": \"abc\",\n                        \"Region\": \"abc\",\n                        \"Zone\": \"abc\",\n                        \"Details\": \"abc\",\n                        \"CreateTime\": \"abc\",\n                        \"ModifyTime\": \"abc\",\n                        \"ExpireTime\": \"abc\"\n                    }\n                ]\n            }\n        ],\n        \"ErrorMsg\": \"abc\",\n        \"RequestId\": \"abc\"\n    }\n}",
+        "input": "POST / HTTP/1.1\nHost: cdwch.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeInstances\n<公共请求参数>\n\n{\n    \"Limit\": 10,\n    \"SearchInstanceName\": \"\",\n    \"SearchInstanceID\": \"\",\n    \"Offset\": 0\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"1093578c-caab-42fe-a888-37968fd42035\",\n        \"InstancesList\": [\n            {\n                \"ID\": 1336,\n                \"InstanceType\": \"clickhouse-cn\",\n                \"InstanceID\": \"clickhouse-cn-xxxxxx\",\n                \"InstanceName\": \"cdwch-test-3\",\n                \"Status\": \"Serving\",\n                \"StatusDesc\": \"运行中\"\n            }\n        ],\n        \"ErrorMsg\": \"\",\n        \"TotalCount\": 1\n    }\n}",
         "title": "查询云原生实例列表"
       }
     ],

tccli/services/ctem/ctem_client.py

@@ -121,6 +121,58 @@ def doDescribeManages(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeLeakageDatas(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.CtemClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeLeakageDatasRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeLeakageDatas(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 doModifyCustomer(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -537,6 +589,58 @@ def doDescribeCustomers(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeLeakageEmails(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.CtemClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeLeakageEmailsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeLeakageEmails(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 doDescribeApps(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1005,6 +1109,58 @@ def doDescribeDarkWebs(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeLeakageCodes(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.CtemClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeLeakageCodesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeLeakageCodes(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 doDescribeWechatOfficialAccounts(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1330,6 +1486,7 @@ MODELS_MAP = {
 ACTION_MAP = {
     "DescribeNetDisks": doDescribeNetDisks,
     "DescribeManages": doDescribeManages,
+    "DescribeLeakageDatas": doDescribeLeakageDatas,
     "ModifyCustomer": doModifyCustomer,
     "DescribeDomains": doDescribeDomains,
     "DescribeVuls": doDescribeVuls,
@@ -1338,6 +1495,7 @@ ACTION_MAP = {
     "DescribeSensitiveInfos": doDescribeSensitiveInfos,
     "DescribeSubDomains": doDescribeSubDomains,
     "DescribeCustomers": doDescribeCustomers,
+    "DescribeLeakageEmails": doDescribeLeakageEmails,
     "DescribeApps": doDescribeApps,
     "DescribeJobRecordDetails": doDescribeJobRecordDetails,
     "DescribeSuspiciousAssets": doDescribeSuspiciousAssets,
@@ -1347,6 +1505,7 @@ ACTION_MAP = {
     "DescribeHttps": doDescribeHttps,
     "DescribeAssets": doDescribeAssets,
     "DescribeDarkWebs": doDescribeDarkWebs,
+    "DescribeLeakageCodes": doDescribeLeakageCodes,
     "DescribeWechatOfficialAccounts": doDescribeWechatOfficialAccounts,
     "DescribeEnterprises": doDescribeEnterprises,
     "CreateCustomer": doCreateCustomer,