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

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1245.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/dbdc/v20201029/api.json

@@ -1238,90 +1238,90 @@
         {
           "disabled": false,
           "document": "设备ID",
-          "example": "",
+          "example": "18504",
           "member": "int64",
           "name": "DeviceId",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "设备No",
-          "example": "",
+          "example": "SNxxx",
           "member": "string",
           "name": "DeviceNo",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "设备类型",
-          "example": "",
+          "example": "SH12",
           "member": "string",
           "name": "DevClass",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "设备总内存，单位GB",
-          "example": "",
+          "example": "576",
           "member": "float",
           "name": "MaxMemory",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "设备总磁盘，单位GB",
-          "example": "",
+          "example": "28000",
           "member": "float",
           "name": "MaxDisk",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "设备剩余内存，单位GB",
-          "example": "",
+          "example": "216",
           "member": "float",
           "name": "RestMemory",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "设备剩余磁盘，单位GB",
-          "example": "",
+          "example": "6420",
           "member": "float",
           "name": "RestDisk",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "设备机器个数",
-          "example": "",
+          "example": "3",
           "member": "uint64",
           "name": "RawDeviceNum",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "数据库实例个数",
-          "example": "",
+          "example": "31",
           "member": "uint64",
           "name": "InstanceNum",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         }
@@ -1580,100 +1580,100 @@
         {
           "disabled": false,
           "document": "集群状态，0：运行中，1：不在运行",
-          "example": "",
+          "example": "0",
           "member": "int64",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "读写集群剩余内存容量，单位GB",
-          "example": "",
+          "example": "216",
           "member": "float",
           "name": "ReadWriteTotalLeaveMemory",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "读写集群剩余磁盘容量，单位GB",
-          "example": "",
+          "example": "6420",
           "member": "float",
           "name": "ReadWriteTotalLeaveDisk",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "读写集群总内存容量，单位GB",
-          "example": "",
+          "example": "576",
           "member": "float",
           "name": "ReadWriteTotalMemory",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "读写集群总磁盘容量，单位GB",
-          "example": "",
+          "example": "28000",
           "member": "float",
           "name": "ReadWriteTotalDisk",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "只读集群剩余内存容量，单位GB",
-          "example": "",
+          "example": "0",
           "member": "float",
           "name": "ReadOnlyTotalLeaveMemory",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "只读集群剩余磁盘容量，单位GB",
-          "example": "",
+          "example": "0",
           "member": "float",
           "name": "ReadOnlyTotalLeaveDisk",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "只读集群总内存容量，单位GB",
-          "example": "",
+          "example": "0",
           "member": "float",
           "name": "ReadOnlyTotalMemory",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "只读集群总磁盘容量，单位GB",
-          "example": "",
+          "example": "0",
           "member": "float",
           "name": "ReadOnlyTotalDisk",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "集群设备详情",
-          "example": "",
+          "example": "见InstanceDeviceInfo数据结构",
           "member": "InstanceDeviceInfo",
           "name": "InstanceDeviceInfos",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         }
@@ -1686,40 +1686,40 @@
         {
           "disabled": false,
           "document": "集群ID\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "",
+          "example": "cage-gz-3-7",
           "member": "string",
           "name": "InstanceId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
         {
           "disabled": false,
           "document": "读写设备组\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "",
+          "example": "详见DeviceInfo",
           "member": "DeviceInfo",
           "name": "ReadWriteDevice",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
         {
           "disabled": false,
           "document": "只读设备组\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "",
+          "example": "详见DeviceInfo",
           "member": "DeviceInfo",
           "name": "ReadOnlyDevice",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
         {
           "disabled": false,
           "document": "空闲设备组\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "",
+          "example": "详见DeviceInfo",
           "member": "DeviceInfo",
           "name": "FreeDevice",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         }
@@ -1732,130 +1732,130 @@
         {
           "disabled": false,
           "document": "集群ID",
-          "example": "",
+          "example": "dbdc-dcdjhdzk",
           "member": "string",
           "name": "InstanceId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "集群名称",
-          "example": "",
+          "example": "exclusivetest",
           "member": "string",
           "name": "InstanceName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "用户ID",
-          "example": "",
+          "example": "1270047691",
           "member": "uint64",
           "name": "AppId",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "地域",
-          "example": "",
+          "example": "ap-guangzhou",
           "member": "string",
           "name": "Region",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "可用区",
-          "example": "",
+          "example": "ap-guangzhou-1",
           "member": "string",
           "name": "Zone",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "集群类型： 0：一主一备，1：一主两备",
-          "example": "",
+          "example": "1",
           "member": "int64",
           "name": "InstanceType",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "集群状态: 0 集群创建中, 1 集群有效, 2 集群扩容中, 3 集群删除中, 4 集群缩容中 -1 集群已隔离 -2 集群已删除",
-          "example": "",
+          "example": "1",
           "member": "int64",
           "name": "InstanceStatus",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "创建时间",
-          "example": "",
+          "example": "2021-02-25T16:08:47+08:00",
           "member": "string",
           "name": "CreateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "实例自动续费标识： 0正常续费 1自动续费 2到期不续费",
-          "example": "",
+          "example": "1",
           "member": "int64",
           "name": "AutoRenewFlag",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "机型",
-          "example": "",
+          "example": "SH12",
           "member": "string",
           "name": "Machine",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "过期时间",
-          "example": "",
+          "example": "2021-09-25T16:08:47+08:00",
           "member": "string",
           "name": "PeriodEndTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "集群信息",
-          "example": "",
+          "example": "详见InstanceDetail",
           "member": "InstanceDetail",
           "name": "InstanceDetail",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "计费侧的产品ID",
-          "example": "",
+          "example": "10875",
           "member": "int64",
           "name": "Pid",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         }

tccli/services/dcdb/v20180411/api.json

@@ -1412,7 +1412,7 @@
         {
           "disabled": false,
           "document": "安全组id",
-          "example": "无",
+          "example": "sg-9tfjckm6",
           "member": "string",
           "name": "SecurityGroupId",
           "required": false,
@@ -6072,7 +6072,7 @@
           "example": "无",
           "member": "Database",
           "name": "Databases",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -6082,7 +6082,7 @@
           "example": "dcdbt-52s53yyh",
           "member": "string",
           "name": "InstanceId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },

tccli/services/dcdb/v20180411/examples.json

@@ -314,7 +314,7 @@
       {
         "document": "",
         "input": "https://dcdb.tencentcloudapi.com/?Action=DescribeDatabases\n&InstanceId=dcdbt-52s53yyh\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"d0f51893-e15f-44ac-be6d-900450a6b8c2\",\n        \"InstanceId\": \"dcdbt-52s53yyh\",\n        \"Databases\": [\n            {\n                \"DbName\": \"information_schema\"\n            },\n            {\n                \"DbName\": \"mysql\"\n            },\n            {\n                \"DbName\": \"performance_schema\"\n            },\n            {\n                \"DbName\": \"test\"\n            }\n        ]\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"d0f51893-e15f-44ac-be6d-900450a6b8c2\",\n        \"InstanceId\": \"dcdbt-52s53yyh\",\n        \"Databases\": [\n            {\n                \"DbName\": \"information_schema\"\n            },\n            {\n                \"DbName\": \"mysql\"\n            },\n            {\n                \"DbName\": \"performance_schema\"\n            },\n            {\n                \"DbName\": \"product_db\"\n            }\n        ]\n    }\n}",
         "title": "查询云数据库实例上的数据库列表"
       }
     ],