tccli 3.0.1083.1__py2.py3-none-any.whl → 3.0.1085.1__py2.py3-none-any.whl

tccli/services/cdb/v20170320/api.json

@@ -974,9 +974,9 @@
       "status": "online"
     },
     "ReleaseIsolatedDBInstances": {
-      "document": "本接口（ReleaseIsolatedDBInstances）用于恢复已隔离云数据库实例。",
+      "document": "本接口（ReleaseIsolatedDBInstances）用于恢复已隔离云数据库实例。仅用于按量计费实例的解隔离，包年包月实例的解隔离请使用 RenewDBInstance 。",
       "input": "ReleaseIsolatedDBInstancesRequest",
-      "name": "解隔离云数据库实例",
+      "name": "解隔离按量计费云数据库实例",
       "output": "ReleaseIsolatedDBInstancesResponse",
       "status": "online"
     },
@@ -5018,6 +5018,24 @@
           "name": "ProjectId",
           "required": false,
           "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "付费类型，PRE_PAID：包年包月，USED_PAID：按量计费。默认为按量计费",
+          "example": "无",
+          "member": "string",
+          "name": "PayType",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "实例时长，PayType为PRE_PAID时必传，单位：月，可选值包括 [1,2,3,4,5,6,7,8,9,10,11,12,24,36]。",
+          "example": "无",
+          "member": "int64",
+          "name": "Period",
+          "required": false,
+          "type": "int"
         }
       ],
       "type": "object"
@@ -5031,7 +5049,7 @@
           "example": "256117ed-efa08b54-61784d44-91781bbd",
           "member": "string",
           "name": "AsyncRequestId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -16789,7 +16807,7 @@
           "example": "无",
           "member": "ReleaseResult",
           "name": "Items",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -19069,108 +19087,144 @@
       ],
       "usage": "out"
     },
+    "TaskAttachInfo": {
+      "document": "任务列表中的部分任务支持特定的附加信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "升级任务：\n”FastUpgradeStatus“：表示升级类型。1-原地升级；0-普通升级。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "”FastUpgradeStatus“",
+          "member": "string",
+          "name": "AttachKey",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "升级任务：\n”FastUpgradeStatus“：表示升级类型。1-原地升级；0-普通升级。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "”1“",
+          "member": "string",
+          "name": "AttachValue",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
     "TaskDetail": {
       "document": "实例任务详情",
       "members": [
         {
           "disabled": false,
           "document": "错误码。",
-          "example": "",
+          "example": "无",
           "member": "int64",
           "name": "Code",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "错误信息。",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "Message",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "实例任务 ID。",
-          "example": "",
+          "example": "无",
           "member": "int64",
           "name": "JobId",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "实例任务进度。",
-          "example": "",
+          "example": "无",
           "member": "int64",
           "name": "Progress",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "实例任务状态，可能的值包括：\n\"UNDEFINED\" - 未定义；\n\"INITIAL\" - 初始化；\n\"RUNNING\" - 运行中；\n\"SUCCEED\" - 执行成功；\n\"FAILED\" - 执行失败；\n\"KILLED\" - 已终止；\n\"REMOVED\" - 已删除；\n\"PAUSED\" - 已暂停。\n\"WAITING\" - 等待中（可撤销）",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "TaskStatus",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "实例任务类型，可能的值包括：\n\"ROLLBACK\" - 数据库回档；\n\"SQL OPERATION\" - SQL操作；\n\"IMPORT DATA\" - 数据导入；\n\"MODIFY PARAM\" - 参数设置；\n\"INITIAL\" - 初始化云数据库实例；\n\"REBOOT\" - 重启云数据库实例；\n\"OPEN GTID\" - 开启云数据库实例GTID；\n\"UPGRADE RO\" - 只读实例升级；\n\"BATCH ROLLBACK\" - 数据库批量回档；\n\"UPGRADE MASTER\" - 主实例升级；\n\"DROP TABLES\" - 删除云数据库库表；\n\"SWITCH DR TO MASTER\" - 灾备实例提升为主。",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "TaskType",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "实例任务开始时间。",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "StartTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "实例任务结束时间。",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "EndTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "任务关联的实例 ID。\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "InstanceIds",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
         {
           "disabled": false,
           "document": "异步任务的请求 ID。",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "AsyncRequestId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "任务的附加信息。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "TaskAttachInfo",
+          "name": "TaskAttachInfo",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"

tccli/services/cdb/v20170320/examples.json

@@ -158,8 +158,8 @@
     ],
     "CreateCloneInstance": [
       {
-        "document": "",
-        "input": "https://cdb.tencentcloudapi.com/?Action=CreateCloneInstance\n&InstanceId=cdb-9303wd4x\n&SpecifiedRollbackTime=2020-08-0116:27:43\n&UniqVpcId=vpc-594gwq4l\n&UniqSubnetId=subnet-dz5pj862\n&Memory=1000\n&Volume=50\n&<公共请求参数>",
+        "document": "克隆实例并回档到指定时间",
+        "input": "POST / HTTP/1.1\nHost: cdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateCloneInstance\n<公共请求参数>\n\n{\n    \"UniqVpcId\": \"vpc-594gwq4l\",\n    \"InstanceId\": \"cdb-9303wd4x\",\n    \"Volume\": \"50\",\n    \"UniqSubnetId\": \"subnet-dz5pj862\",\n    \"SpecifiedRollbackTime\": \"2020-08-0116:27:43\",\n    \"Memory\": \"1000\"\n}",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"6EF60BEC-0242-43AF-BB20-270359FB54A7\",\n        \"AsyncRequestId\": \"256117ed-efa08b54-61784d44-91781bbd\"\n    }\n}",
         "title": "克隆实例并回档到指定时间"
       }

tccli/services/cdwpg/v20201230/api.json

@@ -274,6 +274,15 @@
           "name": "Tags",
           "required": false,
           "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "版本",
+          "example": "无",
+          "member": "string",
+          "name": "ProductVersion",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"

tccli/services/ckafka/ckafka_client.py

@@ -1057,6 +1057,58 @@ def doModifyDatahubTask(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribePrometheus(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.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribePrometheusRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribePrometheus(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 doDescribeDatahubTasks(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2929,6 +2981,58 @@ def doDescribeAppInfo(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreatePrometheus(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.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CreatePrometheusRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreatePrometheus(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 doInstanceScalingDown(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4260,6 +4364,7 @@ ACTION_MAP = {
     "DeleteConnectResource": doDeleteConnectResource,
     "DescribeGroup": doDescribeGroup,
     "ModifyDatahubTask": doModifyDatahubTask,
+    "DescribePrometheus": doDescribePrometheus,
     "DescribeDatahubTasks": doDescribeDatahubTasks,
     "DescribeInstances": doDescribeInstances,
     "DescribeDatahubTopic": doDescribeDatahubTopic,
@@ -4296,6 +4401,7 @@ ACTION_MAP = {
     "CancelAuthorizationToken": doCancelAuthorizationToken,
     "DeleteAcl": doDeleteAcl,
     "DescribeAppInfo": doDescribeAppInfo,
+    "CreatePrometheus": doCreatePrometheus,
     "InstanceScalingDown": doInstanceScalingDown,
     "DescribeGroupOffsets": doDescribeGroupOffsets,
     "DeleteInstancePre": doDeleteInstancePre,