tccli 3.0.1134.1__py2.py3-none-any.whl → 3.0.1136.1__py2.py3-none-any.whl

tccli/services/cdb/v20170320/api.json

@@ -588,6 +588,13 @@
       "output": "DescribeInstanceParamsResponse",
       "status": "online"
     },
+    "DescribeInstanceUpgradeType": {
+      "document": "本接口(DescribeInstanceUpgradeType)用于查询数据库实例升级类型。",
+      "input": "DescribeInstanceUpgradeTypeRequest",
+      "name": "查询数据库实例升级类型",
+      "output": "DescribeInstanceUpgradeTypeResponse",
+      "status": "online"
+    },
     "DescribeLocalBinlogConfig": {
       "document": "该接口用于查询实例本地binlog保留策略。",
       "input": "DescribeLocalBinlogConfigRequest",
@@ -4223,6 +4230,30 @@
       ],
       "usage": "both"
     },
+    "ClusterTopology": {
+      "document": "集群版的节点拓扑配置。",
+      "members": [
+        {
+          "disabled": false,
+          "document": "RW 节点拓扑。",
+          "example": "无",
+          "member": "ReadWriteNode",
+          "name": "ReadWriteNode",
+          "required": false,
+          "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "RO 节点拓扑。",
+          "example": "无",
+          "member": "ReadonlyNode",
+          "name": "ReadOnlyNodes",
+          "required": false,
+          "type": "list"
+        }
+      ],
+      "usage": "in"
+    },
     "ColumnPrivilege": {
       "document": "列权限信息",
       "members": [
@@ -10858,6 +10889,161 @@
       ],
       "type": "object"
     },
+    "DescribeInstanceUpgradeTypeRequest": {
+      "document": "DescribeInstanceUpgradeType请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例id",
+          "example": "cdb-xxx",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "目标实例cpu",
+          "example": "2",
+          "member": "float",
+          "name": "DstCpu",
+          "required": true,
+          "type": "float"
+        },
+        {
+          "disabled": false,
+          "document": "目标实例内存",
+          "example": "4000",
+          "member": "uint64",
+          "name": "DstMemory",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "目标实例磁盘",
+          "example": "8000",
+          "member": "uint64",
+          "name": "DstDisk",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "目标实例版本",
+          "example": "5.7",
+          "member": "string",
+          "name": "DstVersion",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "目标实例部署模型",
+          "example": "0",
+          "member": "int64",
+          "name": "DstDeployMode",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "目标实例复制类型",
+          "example": "0",
+          "member": "int64",
+          "name": "DstProtectMode",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "目标实例备机1可用区",
+          "example": "100001",
+          "member": "int64",
+          "name": "DstSlaveZone",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "目标实例备机2可用区",
+          "example": "100001",
+          "member": "int64",
+          "name": "DstBackupZone",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "目标实例类型",
+          "example": "CUSTOM",
+          "member": "string",
+          "name": "DstCdbType",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "目标实例主可用区",
+          "example": "100001",
+          "member": "int64",
+          "name": "DstZoneId",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "独享集群CDB实例的节点分布情况",
+          "example": "无",
+          "member": "NodeDistribution",
+          "name": "NodeDistribution",
+          "required": false,
+          "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "集群版的节点拓扑配置",
+          "example": "无",
+          "member": "ClusterTopology",
+          "name": "ClusterTopology",
+          "required": false,
+          "type": "object"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeInstanceUpgradeTypeResponse": {
+      "document": "DescribeInstanceUpgradeType返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例id",
+          "example": "cdb-xxx",
+          "member": "string",
+          "name": "InstanceId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "实例升级类型",
+          "example": "Trsf",
+          "member": "string",
+          "name": "UpgradeType",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeLocalBinlogConfigRequest": {
       "document": "DescribeLocalBinlogConfig请求参数结构体",
       "members": [
@@ -16097,6 +16283,42 @@
       ],
       "type": "object"
     },
+    "NodeDistribution": {
+      "document": "独享集群CDB实例的节点分布情况",
+      "members": [
+        {
+          "disabled": false,
+          "document": "主实例Master节点所在主机ID或者只读实例所在主机ID",
+          "example": "dch-fexbu7pp",
+          "member": "string",
+          "name": "Node",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "主实例第一Slave节点所在主机ID",
+          "example": "dch-cawss6q",
+          "member": "string",
+          "name": "SlaveNodeOne",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "主实例第二Slave节点所在主机ID",
+          "example": "dch-bsxj39l",
+          "member": "string",
+          "name": "SlaveNodeTwo",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "in"
+    },
     "OfflineIsolatedInstancesRequest": {
       "document": "OfflineIsolatedInstances请求参数结构体",
       "members": [
@@ -17320,6 +17542,54 @@
       ],
       "usage": "in"
     },
+    "ReadWriteNode": {
+      "document": "集群版 RW 节点的配置。",
+      "members": [
+        {
+          "disabled": false,
+          "document": "RW 节点所在可用区。",
+          "example": "ap-guangzhou-4",
+          "member": "string",
+          "name": "Zone",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "升级集群版实例时，如果要调整只读节点可用区，需要指定节点id。",
+          "example": "dbn-73ktfl1j",
+          "member": "string",
+          "name": "NodeId",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "usage": "in"
+    },
+    "ReadonlyNode": {
+      "document": "集群版的 RO 节点配置。",
+      "members": [
+        {
+          "disabled": false,
+          "document": "是否分布在随机可用区。传入YES表示随机可用区。否则使用Zone指定的可用区。",
+          "example": "YES",
+          "member": "string",
+          "name": "IsRandomZone",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "指定该节点分布在哪个可用区。",
+          "example": "无",
+          "member": "string",
+          "name": "Zone",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "usage": "in"
+    },
     "ReleaseIsolatedDBInstancesRequest": {
       "document": "ReleaseIsolatedDBInstances请求参数结构体",
       "members": [

tccli/services/cdb/v20170320/examples.json

@@ -714,6 +714,14 @@
         "title": "查询实例的可设置参数列表"
       }
     ],
+    "DescribeInstanceUpgradeType": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeInstanceUpgradeType\n<公共请求参数>\n\n{\n    \"InstanceId\": \"cdb-xxxxx\",\n    \"DstCpu\": 1,\n    \"DstMemory\": 1000,\n    \"DstDisk\": 200,\n    \"DstVersion\": \"8.0\",\n    \"DstProtectMode\": 0,\n    \"DstDeployMode\": 0,\n    \"DstSlaveZone\": 100003,\n    \"DstBackupZone\": 0,\n    \"DstCdbType\": \"CUSTOM\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"6EF60BEC-0242-43AF-BB20-270359FB54A7\",\n        \"InstanceId\": \"cdb-xxx\",\n        \"UpgradeType\": \"Trsf\"\n    }\n}",
+        "title": "查询数据库实例升级类型"
+      }
+    ],
     "DescribeLocalBinlogConfig": [
       {
         "document": "",

tccli/services/ckafka/v20190819/api.json

@@ -7979,7 +7979,7 @@
           "example": "无",
           "member": "InstanceResponse",
           "name": "Result",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },

tccli/services/cls/v20201016/api.json

@@ -7587,7 +7587,7 @@
       "members": [
         {
           "disabled": false,
-          "document": "* topicName 按照【日志主题名称】进行过滤，默认为模糊匹配，可使用PreciseSearch参数设置为精确匹配。类型：String。必选：否\n* logsetName 按照【日志集名称】进行过滤，默认为模糊匹配，可使用PreciseSearch参数设置为精确匹配。类型：String。必选：否\n* topicId 按照【日志主题ID】进行过滤。类型：String。必选：否\n* logsetId 按照【日志集ID】进行过滤，可通过调用DescribeLogsets查询已创建的日志集列表或登录控制台进行查看；也可以调用CreateLogset创建新的日志集。类型：String。必选：否\n* tagKey 按照【标签键】进行过滤。类型：String。必选：否\n* tag:tagKey 按照【标签键值对】进行过滤。tagKey使用具体的标签键进行替换，例如tag:exampleKey。类型：String。必选：否\n* storageType 按照【日志主题的存储类型】进行过滤。可选值 hot（标准存储），cold（低频存储）类型：String。必选：否\n\n注意：每次请求的Filters的上限为10，Filter.Values的上限为100。",
+          "document": "<ul><li>topicName 按照【日志主题名称】进行过滤，默认为模糊匹配，可使用 PreciseSearch 参数设置为精确匹配。类型：String。必选：否</li>\n<li>logsetName 按照【日志集名称】进行过滤，默认为模糊匹配，可使用 PreciseSearch 参数设置为精确匹配。类型：String。必选：否</li>\n<li>topicId 按照【日志主题ID】进行过滤。类型：String。必选：否</li>\n<li>logsetId 按照【日志集ID】进行过滤，可通过调用 DescribeLogsets 查询已创建的日志集列表或登录控制台进行查看；也可以调用 CreateLogset 创建新的日志集。类型：String。必选：否</li>\n<li>tagKey 按照【标签键】进行过滤。类型：String。必选：否</li>\n<li>tag:tagKey 按照【标签键值对】进行过滤。tagKey 使用具体的标签键进行替换，例如 tag:exampleKey。类型：String。必选：否</li>\n<li>storageType 按照【日志主题的存储类型】进行过滤。可选值 hot（标准存储），cold（低频存储）类型：String。必选：否</li></ul>\n注意：每次请求的 Filters 的上限为10，Filter.Values 的上限为100。",
           "example": "无",
           "member": "Filter",
           "name": "Filters",
@@ -7614,7 +7614,7 @@
         },
         {
           "disabled": false,
-          "document": "控制Filters相关字段是否为精确匹配。\n- 0: 默认值，topicName和logsetName模糊匹配\n- 1: topicName精确匹配\n- 2: logsetName精确匹配\n- 3: topicName和logsetName都精确匹配",
+          "document": "控制Filters相关字段是否为精确匹配。\n<ul><li>0: 默认值，topicName 和 logsetName 模糊匹配</li>\n<li>1: topicName   精确匹配</li>\n<li>2: logsetName精确匹配</li>\n<li>3: topicName 和logsetName 都精确匹配</li></ul>",
           "example": "1",
           "member": "uint64",
           "name": "PreciseSearch",
@@ -7623,7 +7623,7 @@
         },
         {
           "disabled": false,
-          "document": "主题类型\n- 0:日志主题，默认值\n- 1:指标主题\n",
+          "document": "主题类型\n<ul><li>0:日志主题，默认值</li>\n<li>1:指标主题</li></ul>",
           "example": "无",
           "member": "uint64",
           "name": "BizType",

tccli/services/dlc/dlc_client.py

@@ -2825,6 +2825,58 @@ def doAttachWorkGroupPolicy(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeDataEnginesScaleDetail(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.DlcClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeDataEnginesScaleDetailRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeDataEnginesScaleDetail(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 doCreateSparkApp(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7362,6 +7414,7 @@ ACTION_MAP = {
     "CreateInternalTable": doCreateInternalTable,
     "GenerateCreateMangedTableSql": doGenerateCreateMangedTableSql,
     "AttachWorkGroupPolicy": doAttachWorkGroupPolicy,
+    "DescribeDataEnginesScaleDetail": doDescribeDataEnginesScaleDetail,
     "CreateSparkApp": doCreateSparkApp,
     "DescribeThirdPartyAccessUser": doDescribeThirdPartyAccessUser,
     "RollbackDataEngineImage": doRollbackDataEngineImage,

tccli/services/dlc/v20210125/api.json

@@ -427,6 +427,13 @@
       "output": "DescribeDataEnginesResponse",
       "status": "online"
     },
+    "DescribeDataEnginesScaleDetail": {
+      "document": "查询引擎规格详情",
+      "input": "DescribeDataEnginesScaleDetailRequest",
+      "name": "查看引擎的规格明细",
+      "output": "DescribeDataEnginesScaleDetailResponse",
+      "status": "online"
+    },
     "DescribeDatabases": {
       "document": "本接口（DescribeDatabases）用于查询数据库列表。",
       "input": "DescribeDatabasesRequest",
@@ -6230,6 +6237,78 @@
       ],
       "usage": "both"
     },
+    "DataEngineScaleInfo": {
+      "document": "引擎规格详情",
+      "members": [
+        {
+          "disabled": false,
+          "document": "引擎ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "dataengine-abc",
+          "member": "string",
+          "name": "DataEngineId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "引擎名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "abc",
+          "member": "string",
+          "name": "DataEngineName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "引擎规格详情\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": " [             {                 \"StartTime\": \"2024-06-06 12:00:00\",                 \"EndTime\": \"2024-06-06 13:00:00\",                 \"CU\": 0             }         ]",
+          "member": "DataEngineScaleInfoDetail",
+          "name": "ScaleDetail",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
+    "DataEngineScaleInfoDetail": {
+      "document": "引擎规格详情",
+      "members": [
+        {
+          "disabled": false,
+          "document": "统计开始时间，格式为：yyyy-MM-dd HH:mm:ss\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2024-06-06 12:00:00",
+          "member": "string",
+          "name": "StartTime",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "统计结束时间，格式为：yyyy-MM-dd HH:mm:ss\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2024-06-06 13:00:00",
+          "member": "string",
+          "name": "EndTime",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "当前统计时间段，引擎规格\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "16",
+          "member": "int64",
+          "name": "CU",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
     "DataFormat": {
       "document": "数据表数据格式。",
       "members": [
@@ -7918,7 +7997,7 @@
           "example": "无",
           "member": "DMSTableInfo",
           "name": "TableList",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -7928,7 +8007,7 @@
           "example": "1",
           "member": "int64",
           "name": "TotalCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -8312,6 +8391,61 @@
       ],
       "type": "object"
     },
+    "DescribeDataEnginesScaleDetailRequest": {
+      "document": "DescribeDataEnginesScaleDetail请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "引擎名称列表",
+          "example": "[\"test\"]",
+          "member": "string",
+          "name": "DataEngineNames",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "开始时间，时间格式：yyyy-MM-dd HH:mm:ss，最长查询一个月内的记录",
+          "example": "2024-06-07 00:00:00",
+          "member": "string",
+          "name": "StartTime",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "结束时间，时间格式：yyyy-MM-dd HH:mm:ss，最长查询一个月内的记录",
+          "example": "2024-06-08 00:00:00",
+          "member": "string",
+          "name": "EndTime",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeDataEnginesScaleDetailResponse": {
+      "document": "DescribeDataEnginesScaleDetail返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "引擎规格统计详细信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "DataEngineScaleInfo",
+          "name": "Scales",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeDatabasesRequest": {
       "document": "DescribeDatabases请求参数结构体",
       "members": [
@@ -11600,10 +11734,10 @@
         {
           "disabled": false,
           "document": "状态",
-          "example": "无",
+          "example": "true",
           "member": "bool",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "bool",
           "value_allowed_null": false
         },