tccli 3.0.1244.1__py2.py3-none-any.whl → 3.0.1246.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1244.1'
+__version__ = '3.0.1246.1'

tccli/services/__init__.py

@@ -469,6 +469,9 @@ SERVICE_VERSIONS = {
     "lke": [
         "2023-11-30"
     ],
+    "lkeap": [
+        "2024-05-22"
+    ],
     "lowcode": [
         "2021-01-08"
     ],

tccli/services/cdb/cdb_client.py

@@ -173,6 +173,58 @@ def doCreateAuditPolicy(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeTableColumns(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.CdbClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeTableColumnsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeTableColumns(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 doDescribeDBInstanceLogToCLS(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -8923,6 +8975,7 @@ ACTION_MAP = {
     "DescribeDBInstanceGTID": doDescribeDBInstanceGTID,
     "CreateRoInstanceIp": doCreateRoInstanceIp,
     "CreateAuditPolicy": doCreateAuditPolicy,
+    "DescribeTableColumns": doDescribeTableColumns,
     "DescribeDBInstanceLogToCLS": doDescribeDBInstanceLogToCLS,
     "DescribeDBFeatures": doDescribeDBFeatures,
     "CreateAuditRuleTemplate": doCreateAuditRuleTemplate,

tccli/services/cdb/v20170320/api.json

@@ -721,6 +721,13 @@
       "output": "DescribeSupportedPrivilegesResponse",
       "status": "online"
     },
+    "DescribeTableColumns": {
+      "document": "本接口(DescribeTableColumns)用于查询云数据库实例的指定数据库表的列信息，仅支持主实例和灾备实例。",
+      "input": "DescribeTableColumnsRequest",
+      "name": "查询云数据库实例的列",
+      "output": "DescribeTableColumnsResponse",
+      "status": "online"
+    },
     "DescribeTables": {
       "document": "本接口(DescribeTables)用于查询云数据库实例的数据库表信息，仅支持主实例和灾备实例，不支持只读实例。",
       "input": "DescribeTablesRequest",
@@ -12772,6 +12779,71 @@
       ],
       "type": "object"
     },
+    "DescribeTableColumnsRequest": {
+      "document": "DescribeTableColumns请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例ID，格式如：cdb-c1nl9rpv，与云数据库控制台页面中显示的实例ID相同，可使用[查询实例列表](https://cloud.tencent.com/document/api/236/15872) 接口获取，其值为输出参数中字段 InstanceId 的值。",
+          "example": "cdb-c1nl9rpv",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "数据库名称，可使用[查询数据库](https://cloud.tencent.com/document/api/253/7167)接口获得。",
+          "example": "test_data_base",
+          "member": "string",
+          "name": "Database",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "数据库中的表的名称。",
+          "example": "test_table",
+          "member": "string",
+          "name": "Table",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeTableColumnsResponse": {
+      "document": "DescribeTableColumns返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "符合查询条件的实例总数。",
+          "example": "10",
+          "member": "int64",
+          "name": "TotalCount",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "返回的数据库列信息。",
+          "example": "[             \"TABLE_CATALOG\",             \"TABLE_SCHEMA\",      ",
+          "member": "string",
+          "name": "Items",
+          "required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeTablesRequest": {
       "document": "DescribeTables请求参数结构体",
       "members": [

tccli/services/cdb/v20170320/examples.json

@@ -866,6 +866,14 @@
         "title": "查询云数据库实例支持的权限信息"
       }
     ],
+    "DescribeTableColumns": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeTableColumns\n<公共请求参数>\n\n{\n    \"InstanceId\": \"cdb-c1nl9rpv\",\n    \"Table\": \"COLUMNS\",\n    \"Database\": \"information_schema\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"6EF60BEC-0242-43AF-BB20-270359FB54A7\",\n        \"TotalCount\": 20,\n        \"Items\": [\n            \"TABLE_CATALOG\",\n            \"TABLE_SCHEMA\",\n            \"TABLE_NAME\",\n            \"COLUMN_NAME\",\n            \"ORDINAL_POSITION\",\n            \"COLUMN_DEFAULT\",\n            \"IS_NULLABLE\",\n            \"DATA_TYPE\",\n            \"CHARACTER_MAXIMUM_LENGTH\",\n            \"CHARACTER_OCTET_LENGTH\",\n            \"NUMERIC_PRECISION\",\n            \"NUMERIC_SCALE\",\n            \"DATETIME_PRECISION\",\n            \"CHARACTER_SET_NAME\",\n            \"COLLATION_NAME\",\n            \"COLUMN_TYPE\",\n            \"COLUMN_KEY\",\n            \"EXTRA\",\n            \"PRIVILEGES\",\n            \"COLUMN_COMMENT\"\n        ]\n    }\n}",
+        "title": "查询云数据库实例的列"
+      }
+    ],
     "DescribeTables": [
       {
         "document": "",

tccli/services/dbbrain/dbbrain_client.py

@@ -1423,7 +1423,7 @@ def doDescribeHealthScore(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCancelKillTask(args, parsed_globals):
+def doDescribeRedisTopHotKeys(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1452,11 +1452,11 @@ def doCancelKillTask(args, parsed_globals):
     client = mod.DbbrainClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CancelKillTaskRequest()
+    model = models.DescribeRedisTopHotKeysRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CancelKillTask(model)
+        rsp = client.DescribeRedisTopHotKeys(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2359,6 +2359,58 @@ def doDeleteSqlFilters(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCancelKillTask(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.DbbrainClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CancelKillTaskRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CancelKillTask(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 doDescribeDiagDBInstances(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -3335,7 +3387,7 @@ ACTION_MAP = {
     "DescribeDBSpaceStatus": doDescribeDBSpaceStatus,
     "CreateProxySessionKillTask": doCreateProxySessionKillTask,
     "DescribeHealthScore": doDescribeHealthScore,
-    "CancelKillTask": doCancelKillTask,
+    "DescribeRedisTopHotKeys": doDescribeRedisTopHotKeys,
     "CreateSecurityAuditLogExportTask": doCreateSecurityAuditLogExportTask,
     "CloseAuditService": doCloseAuditService,
     "DeleteSecurityAuditLogExportTasks": doDeleteSecurityAuditLogExportTasks,
@@ -3353,6 +3405,7 @@ ACTION_MAP = {
     "DescribeSlowLogTimeSeriesStats": doDescribeSlowLogTimeSeriesStats,
     "DescribeTopSpaceSchemaTimeSeries": doDescribeTopSpaceSchemaTimeSeries,
     "DeleteSqlFilters": doDeleteSqlFilters,
+    "CancelKillTask": doCancelKillTask,
     "DescribeDiagDBInstances": doDescribeDiagDBInstances,
     "AddUserContact": doAddUserContact,
     "DescribeIndexRecommendInfo": doDescribeIndexRecommendInfo,

tccli/services/dbbrain/v20210527/api.json

@@ -280,6 +280,13 @@
       "output": "DescribeRedisTopBigKeysResponse",
       "status": "online"
     },
+    "DescribeRedisTopHotKeys": {
+      "document": "热Key分析",
+      "input": "DescribeRedisTopHotKeysRequest",
+      "name": "获取redis top热key",
+      "output": "DescribeRedisTopHotKeysResponse",
+      "status": "online"
+    },
     "DescribeRedisTopKeyPrefixList": {
       "document": "查询redis实例top key前缀列表。",
       "input": "DescribeRedisTopKeyPrefixListRequest",
@@ -4268,6 +4275,88 @@
       ],
       "type": "object"
     },
+    "DescribeRedisTopHotKeysRequest": {
+      "document": "DescribeRedisTopHotKeys请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例 ID 。",
+          "example": "crs-test1234",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "开始时间，如“2024-09-22T00:00:00+00:00”。0天 < 当前服务器时间 - 开始时间 <= 10天。",
+          "example": "2024-09-22T00:00:00+00:00",
+          "member": "datetime_iso",
+          "name": "StartTime",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "结束时间，如“2024-09-22T01:00:00+00:00”，0天 < 结束时间 - 开始时间 <= 10天。",
+          "example": "2024-09-22T01:00:00+00:00",
+          "member": "datetime_iso",
+          "name": "EndTime",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "服务产品类型，仅仅支持值 \"redis\" - 云数据库 Redis。",
+          "example": "redis",
+          "member": "string",
+          "name": "Product",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "Redis 节点数组。",
+          "example": "[\"fa765e5e2e432806328a3e91d591e47097ecd17r\"]",
+          "member": "string",
+          "name": "InstanceNodeIds",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "top 数目，默认为20，最大值为100。",
+          "example": "20",
+          "member": "int64",
+          "name": "Limit",
+          "required": false,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeRedisTopHotKeysResponse": {
+      "document": "DescribeRedisTopHotKeys返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "热Key分析结果",
+          "example": "无",
+          "member": "TopHotKeys",
+          "name": "TopHotKeys",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeRedisTopKeyPrefixListRequest": {
       "document": "DescribeRedisTopKeyPrefixList请求参数结构体",
       "members": [
@@ -9326,6 +9415,62 @@
       ],
       "usage": "out"
     },
+    "TopHotKeys": {
+      "document": "热key分析返回信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "访问频次。",
+          "example": "100",
+          "member": "int64",
+          "name": "Count",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "热Key所属数据库。",
+          "example": "0",
+          "member": "string",
+          "name": "Db",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "Redis节点。",
+          "example": "fa765e5e2e432806328a3e91d591e47097ecd27d",
+          "member": "string",
+          "name": "InstanceNodeId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "热Key。",
+          "example": "string|key:00000009688",
+          "member": "string",
+          "name": "Key",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "数据类型。",
+          "example": "string",
+          "member": "string",
+          "name": "Type",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "UpdateAgentSwitchRequest": {
       "document": "UpdateAgentSwitch请求参数结构体",
       "members": [

tccli/services/dbbrain/v20210527/examples.json

@@ -320,6 +320,14 @@
         "title": "查询redis实例大key列表"
       }
     ],
+    "DescribeRedisTopHotKeys": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: dbbrain.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeRedisTopHotKeys\n<公共请求参数>\n\n{\n    \"Product\": \"redis\",\n    \"InstanceId\": \"crs-179943dsc\",\n    \"StartTime\": \"2024-09-22T00:00:00+00:00\",\n    \"EndTime\": \"2024-09-22T01:00:00+00:00\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"75421bae-7fcb-4b32-83df-d66b060b4cbf\",\n        \"TopHotKeys\": [\n            {\n                \"Count\": 100,\n                \"Db\": \"0\",\n                \"InstanceNodeId\": \"fa765e5e2e432806328a691d591e47097ecd133d\",\n                \"Key\": \"string|key:000000096\",\n                \"Type\": \"string\"\n            }\n        ]\n    }\n}",
+        "title": "查询热Key分析"
+      }
+    ],
     "DescribeRedisTopKeyPrefixList": [
       {
         "document": "",