tccli 3.0.1203.1__py2.py3-none-any.whl → 3.0.1204.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1203.1'
+__version__ = '3.0.1204.1'

tccli/services/apm/v20210622/api.json

@@ -217,8 +217,8 @@
       "members": [
         {
           "disabled": false,
-          "document": "实例ID\t",
-          "example": "1o8yMC47u\t",
+          "document": "业务系统ID\t",
+          "example": "apm-059oXBfTL",
           "member": "string",
           "name": "InstanceKey",
           "output_required": true,
@@ -228,7 +228,7 @@
         },
         {
           "disabled": false,
-          "document": "服务名\t",
+          "document": "应用名\t",
           "example": "java-order-service\t",
           "member": "string",
           "name": "ServiceName",
@@ -250,7 +250,7 @@
         },
         {
           "disabled": false,
-          "document": "异常过滤",
+          "document": "错误类型过滤",
           "example": "io.grpc.StatusRuntimeException,java.sql.(.*?)\t",
           "member": "string",
           "name": "ExceptionFilter",
@@ -261,7 +261,7 @@
         },
         {
           "disabled": false,
-          "document": "错误码过滤\t",
+          "document": "HTTP状态码过滤",
           "example": "400,500\t",
           "member": "string",
           "name": "ErrorCodeFilter",
@@ -272,7 +272,7 @@
         },
         {
           "disabled": false,
-          "document": "应用诊断开关\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "应用诊断开关（已废弃）\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "true",
           "member": "bool",
           "name": "EventEnable",
@@ -338,7 +338,7 @@
         },
         {
           "disabled": false,
-          "document": "日志来源\t\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "日志源\t\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "CLS",
           "member": "string",
           "name": "LogSource",
@@ -349,7 +349,7 @@
         },
         {
           "disabled": false,
-          "document": "CLS日志集 ",
+          "document": "日志集 ",
           "example": "postgres",
           "member": "string",
           "name": "LogSet",
@@ -360,7 +360,7 @@
         },
         {
           "disabled": false,
-          "document": "日志主题ID",
+          "document": "日志主题",
           "example": "032f3078-10b6-46a0-978f-1696e8e79696",
           "member": "string",
           "name": "LogTopicID",
@@ -371,7 +371,7 @@
         },
         {
           "disabled": false,
-          "document": "线程剖析开关",
+          "document": "方法栈快照开关 true 开启 false 关闭",
           "example": "false",
           "member": "bool",
           "name": "SnapshotEnable",
@@ -382,7 +382,7 @@
         },
         {
           "disabled": false,
-          "document": "线程剖析超时阈值\t",
+          "document": "慢调用监听触发阈值",
           "example": "2000",
           "member": "int64",
           "name": "SnapshotTimeout",
@@ -393,7 +393,7 @@
         },
         {
           "disabled": false,
-          "document": "探针开启开关",
+          "document": "探针总开关",
           "example": "true",
           "member": "bool",
           "name": "AgentEnable",
@@ -404,7 +404,7 @@
         },
         {
           "disabled": false,
-          "document": "组件列表开关\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "组件列表开关（已废弃）\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "[{\"Name\":\"dubbo\",\"Enable\":true},{\"Name\":\"googlehttpclient\",\"Enable\":true},{\"Name\":\"grpc\",\"Enable\":true},{\"Name\":\"httpclient3\",\"Enable\":true},{\"Name\":\"httpclient4\",\"Enable\":true},{\"Name\":\"hystrix\",\"Enable\":true},{\"Name\":\"lettuce\",\"Enable\":true},{\"Name\":\"mongodb\",\"Enable\":true},{\"Name\":\"mybatis\",\"Enable\":true},{\"Name\":\"mysql\",\"Enable\":true},{\"Name\":\"okhttp\",\"Enable\":true},{\"Name\":\"redis\",\"Enable\":true},{\"Name\":\"rxjava\",\"Enable\":true},{\"Name\":\"spring-webmvc\",\"Enable\":true},{\"Name\":\"tomcat\",\"Enable\":true}]",
           "member": "Instrument",
           "name": "InstrumentList",
@@ -415,7 +415,7 @@
         },
         {
           "disabled": false,
-          "document": "链路压缩开关",
+          "document": "链路压缩开关（已废弃）",
           "example": "true",
           "member": "bool",
           "name": "TraceSquash",
@@ -2057,7 +2057,7 @@
       "members": [
         {
           "disabled": false,
-          "document": "实例Id",
+          "document": "业务系统Id",
           "example": "apm-059oXBfTL",
           "member": "string",
           "name": "InstanceId",
@@ -2066,7 +2066,7 @@
         },
         {
           "disabled": false,
-          "document": "需要修改的字段key value分别指定字段名、字段值",
+          "document": "需要修改的字段key value分别指定字段名、字段值\n[具体字段请见](https://cloud.tencent.com/document/product/248/111241)",
           "example": "\"Tags\":[{\"Key\":\"UrlConvergence\",\"Value\":\"RPCServer/market.MarketServiceleetcode9(.*?)\"},{\"Key\":\"UrlConvergenceThreshold\",\"Value\":\"600\"},{\"Key\":\"UrlConvergenceSwitch\",\"Value\":\"1\"},{\"Key\":\"AgentEnable\",\"Value\":\"true\"}]\t",
           "member": "ApmTag",
           "name": "Tags",
@@ -2075,7 +2075,7 @@
         },
         {
           "disabled": false,
-          "document": "需要修改配置的服务列表名称\t",
+          "document": "需要修改配置的应用列表名称\t",
           "example": "\"ServiceNames\":[\"stock-service\",\"profile-service28\",\"profile-service08\"],\t",
           "member": "string",
           "name": "ServiceNames",

tccli/services/apm/v20210622/examples.json

@@ -26,7 +26,7 @@
     ],
     "DescribeGeneralApmApplicationConfig": [
       {
-        "document": "查询指定实例下应用的配置信息",
+        "document": "查询指定业务系统下应用的配置信息",
         "input": "POST / HTTP/1.1\nHost: apm.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeGeneralApmApplicationConfig\n<公共请求参数>\n\n{\n    \"InstanceId\": \"apm-6xYKFXYxo\",\n    \"ServiceName\": \"java-order-service\"\n}",
         "output": "{\n    \"Response\": {\n        \"ApmApplicationConfigView\": {\n            \"InstanceKey\": \"apm-059oXBfTL\",\n            \"ServiceName\": \"profile-service\",\n            \"OperationNameFilter\": \"\",\n            \"ExceptionFilter\": \"\",\n            \"ErrorCodeFilter\": \"\",\n            \"EventEnable\": false,\n            \"UrlConvergenceSwitch\": 1,\n            \"UrlConvergenceThreshold\": 500,\n            \"UrlConvergence\": \"RPCServer/market.MarketService2/(.*?)\",\n            \"UrlExclude\": \"\",\n            \"IsRelatedLog\": 0,\n            \"LogSource\": \"CLS\",\n            \"LogSet\": \"\",\n            \"LogTopicID\": \"\",\n            \"SnapshotEnable\": true,\n            \"SnapshotTimeout\": 2000,\n            \"AgentEnable\": true,\n            \"InstrumentList\": [\n                {\n                    \"Name\": \"dubbo\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"googlehttpclient\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"grpc\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"httpclient3\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"httpclient4\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"hystrix\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"lettuce\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"mongodb\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"mybatis\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"mysql\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"okhttp\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"redis\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"rxjava\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"spring-webmvc\",\n                    \"Enable\": true\n                },\n                {\n                    \"Name\": \"tomcat\",\n                    \"Enable\": true\n                }\n            ],\n            \"TraceSquash\": true\n        },\n        \"RequestId\": \"test-test-test0980990\"\n    }\n}",
         "title": "查询应用配置信息"

tccli/services/cls/v20201016/api.json

@@ -8081,6 +8081,15 @@
           "name": "Limit",
           "required": false,
           "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "控制Filters相关字段是否为精确匹配。  0: 默认值，shipperName模糊匹配 1: shipperName 精确匹配",
+          "example": "无",
+          "member": "uint64",
+          "name": "PreciseSearch",
+          "required": false,
+          "type": "int"
         }
       ],
       "type": "object"

tccli/services/cvm/v20170312/api.json

@@ -4506,6 +4506,7 @@
           "example": "2",
           "member": "int64",
           "name": "TotalCount",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -4515,6 +4516,7 @@
           "example": "NA",
           "member": "RepairTaskInfo",
           "name": "RepairTaskInfoSet",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -9958,6 +9960,7 @@
           "example": "rep-xxxxxxxx",
           "member": "string",
           "name": "TaskId",
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },

tccli/services/essbasic/essbasic_client.py

@@ -3867,6 +3867,58 @@ def doChannelCreateUserAutoSignSealUrl(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreateChannelSubOrganizationActive(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.EssbasicClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CreateChannelSubOrganizationActiveRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreateChannelSubOrganizationActive(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 doGenerateOrganizationSeal(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -6866,6 +6918,7 @@ ACTION_MAP = {
     "ChannelGetTaskResultApi": doChannelGetTaskResultApi,
     "DescribeSubOrganizations": doDescribeSubOrganizations,
     "ChannelCreateUserAutoSignSealUrl": doChannelCreateUserAutoSignSealUrl,
+    "CreateChannelSubOrganizationActive": doCreateChannelSubOrganizationActive,
     "GenerateOrganizationSeal": doGenerateOrganizationSeal,
     "DescribeFileIdsByCustomIds": doDescribeFileIdsByCustomIds,
     "DescribeTemplates": doDescribeTemplates,

tccli/services/essbasic/v20210526/api.json

@@ -343,6 +343,13 @@
       "output": "CreateChannelOrganizationInfoChangeUrlResponse",
       "status": "online"
     },
+    "CreateChannelSubOrganizationActive": {
+      "document": "激活或续期子客企业， 在激活状态下，企业可以正常发起合同；在非激活状态下，企业仅能查看和签署合同。\n\n**1. 激活**：使用一个许可证将子客企业从未激活状态转变为激活状态。**激活状态的有效期为一年，一年后将自动回到未激活状态**。\n\n**2. 续期**：使用一个许可证将已激活的子客企业的有效期延长一年。只有处于激活状态的子企业才能进行续期操作（**若处于非激活状态，则需先激活**）。您可以使用多个许可证对同一子客企业进行多次续费。\n\n\n该接口的效果同：**【企业应用管理】 -> 【子客企业管理】 -> 【激活】或者【续期】**\n\n![image](https://qcloudimg.tencent-cloud.cn/raw/cd63761ca6e814c64b4ecf131555b74e.png)\n\n\n如果不想调用此接口或者页面点击进行激活或续期，可以在【应用扩展服务】中打开自动激活或续期，在许可证充足的情况下会自动激活或续期子客企业\n\n![image](https://qcloudimg.tencent-cloud.cn/raw/2ccb37ef6bde463c15c39fdda789216f.png)",
+      "input": "CreateChannelSubOrganizationActiveRequest",
+      "name": "激活或者续期子企业",
+      "output": "CreateChannelSubOrganizationActiveResponse",
+      "status": "online"
+    },
     "CreateConsoleLoginUrl": {
       "document": "此接口（CreateConsoleLoginUrl）用于创建第三方平台子客企业控制台Web/移动登录链接。支持web控制台、电子签小程序和H5链接。登录链接是进入子客web企业控制台的唯一入口。\n\nWeb链接访问后，会根据子客企业(**Agent中ProxyOrganizationOpenId表示**)和员工(**Agent中OpenId表示**)的状态，进入不同的流程，主要情况分类如下：\n<table>\n<thead>\n<tr>\n<th>子客企业状态</th>\n<th>子客企业员工状态</th>\n<th>点击链接进入的流程</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>企业未激活</td>\n<td>员工未认证</td>\n<td>进入企业激活流程，首次完成企业激活流程的员工会成为超管</td>\n</tr>\n<tr>\n<td>企业已激活</td>\n<td>员工未认证</td>\n<td>进入员工认证并加入企业流程</td>\n</tr>\n<tr>\n<td>企业已激活</td>\n<td>员工已认证</td>\n<td>进入子客企业Web控制台</td>\n</tr>\n</tbody>\n</table>\n如果是企业激活流程，需要注意如下情况：\n\n1. 若在激活过程中，**更换用户OpenID重新生成链接，之前的认证会被清理**。因此不要在企业认证过程生成多个链接给多人同时操作，会导致认证过程互相影响。\n2. 若您认证中发现信息有误需要重新认证，**可通过更换用户OpenID重新生成链接的方式，来清理掉已有的流程**。\n\n系统的渠道企业, 应用, 子客企业, 子客员工的组织形式\n![image](https://qcloudimg.tencent-cloud.cn/raw/77677faeea26c9d7f37474597c81fe01.png)\n\n\n<font color=\"red\">相关视频指引</font> <br>\n1. <a href=\"https://dyn.ess.tencent.cn/guide/apivideo/essbasic-createconsoleloginin.mp4\" target=\"_blank\">【生成子客登录链接】代码编写 &  子企业认证示例</a><br>",
       "input": "CreateConsoleLoginUrlRequest",
@@ -5110,6 +5117,28 @@
           "required": false,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "子企业激活状态。值如下：\n<ul>\n  <li>**0**： 未激活</li>\n  <li>**1**： 已激活</li>\n</ul>",
+          "example": "0",
+          "member": "int64",
+          "name": "ActiveStatus",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "账号过期时间，时间戳",
+          "example": "无",
+          "member": "int64",
+          "name": "LicenseExpireTime",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
         }
       ],
       "usage": "both"
@@ -6191,6 +6220,51 @@
       ],
       "type": "object"
     },
+    "CreateChannelSubOrganizationActiveRequest": {
+      "document": "CreateChannelSubOrganizationActive请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "关于渠道应用的相关信息，包括渠道应用标识、第三方平台子客企业标识及第三方平台子客企业中的员工标识等内容，您可以参阅开发者中心所提供的 Agent 结构体以获取详细定义。\n\n此接口下面信息必填。\n<ul>\n<li>渠道应用标识:  Agent.AppId</li>\n<li>第三方平台子客企业标识: Agent.ProxyOrganizationOpenId</li>\n<li>第三方平台子客企业中的员工标识: Agent. ProxyOperator.OpenId</li>\n</ul>\n第三方平台子客企业和员工必须已经经过实名认证",
+          "example": "无",
+          "member": "Agent",
+          "name": "Agent",
+          "required": true,
+          "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "要进行激活或者续期的子客企业OrganizationOpenId列表，请确保所有列出的子客企业均已完成认证。",
+          "example": "无",
+          "member": "string",
+          "name": "SubOrganizationOpenIds",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "操作类型，可以选择如下：\n\n**false**：（默认）激活子客企业\n**true**：续期子客企业\n",
+          "example": "无",
+          "member": "bool",
+          "name": "Renew",
+          "required": false,
+          "type": "bool"
+        }
+      ],
+      "type": "object"
+    },
+    "CreateChannelSubOrganizationActiveResponse": {
+      "document": "CreateChannelSubOrganizationActive返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "CreateConsoleLoginUrlRequest": {
       "document": "CreateConsoleLoginUrl请求参数结构体",
       "members": [

tccli/services/essbasic/v20210526/examples.json

@@ -782,6 +782,20 @@
         "title": "创建超管变更链接（小程序链接）"
       }
     ],
+    "CreateChannelSubOrganizationActive": [
+      {
+        "document": "org_zhangsan和org_lisi两个企业已经是激活态，现在花费两个许可证给两个子客企业分别再续期1年",
+        "input": "POST / HTTP/1.1\nHost: essbasic.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateChannelSubOrganizationActive\n<公共请求参数>\n\n{\n    \"Agent\": {\n        \"AppId\": \"yDwhxUUckp3gl8j5UuFX33LSNozpRsbi\",\n        \"ProxyOrganizationOpenId\": \"org_dianziqian\",\n        \"ProxyOperator\": {\n            \"OpenId\": \"n9527\"\n        }\n    },\n    \"SubOrganizationOpenIds\": [\n        \"org_zhangsan\",\n        \"org_lisi\"\n    ],\n    \"Renew\": true\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"00f08f1c-3823-44c3-8cd1-4e66a0587ab4\"\n    }\n}",
+        "title": "子客续期"
+      },
+      {
+        "document": "org_zhangsan和org_lisi两个企业现在是非激活态（可能是过期，也可能是没有激活过），现在花费两个许可证激活这两个子客企业",
+        "input": "POST / HTTP/1.1\nHost: essbasic.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateChannelSubOrganizationActive\n<公共请求参数>\n\n{\n    \"Agent\": {\n        \"AppId\": \"yDwhxUUckp3gl8j5UuFX33LSNozpRsbi\",\n        \"ProxyOrganizationOpenId\": \"org_dianziqian\",\n        \"ProxyOperator\": {\n            \"OpenId\": \"n9527\"\n        }\n    },\n    \"SubOrganizationOpenIds\": [\n        \"org_zhangsan\",\n        \"org_lisi\"\n    ]\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"00f08f1c-3823-44c3-8cd1-4e66a0587ab4\"\n    }\n}",
+        "title": "子客激活"
+      }
+    ],
     "CreateConsoleLoginUrl": [
       {
         "document": "如果<b>典子谦示例企业的员工张三已经完成了认证和加入企业</b>，  此时给典子谦示例企业的员工张三生成登录的PC控制台的链接\n\n典子谦示例企业的定义标识为：org_dianziqian\n员工张三定义员工标识为：n9527\n",

tccli/services/mariadb/mariadb_client.py

@@ -3033,7 +3033,7 @@ def doDescribeDBTmpInstances(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doIsolateHourDBInstance(args, parsed_globals):
+def doDescribeDBSyncMode(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -3062,11 +3062,11 @@ def doIsolateHourDBInstance(args, parsed_globals):
     client = mod.MariadbClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.IsolateHourDBInstanceRequest()
+    model = models.DescribeDBSyncModeRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.IsolateHourDBInstance(model)
+        rsp = client.DescribeDBSyncMode(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -3605,6 +3605,58 @@ def doCloneAccount(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doIsolateHourDBInstance(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.MariadbClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.IsolateHourDBInstanceRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.IsolateHourDBInstance(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 doUpgradeDBInstance(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4038,7 +4090,7 @@ ACTION_MAP = {
     "GrantAccountPrivileges": doGrantAccountPrivileges,
     "ModifyRealServerAccessStrategy": doModifyRealServerAccessStrategy,
     "DescribeDBTmpInstances": doDescribeDBTmpInstances,
-    "IsolateHourDBInstance": doIsolateHourDBInstance,
+    "DescribeDBSyncMode": doDescribeDBSyncMode,
     "DescribeDatabases": doDescribeDatabases,
     "IsolateDedicatedDBInstance": doIsolateDedicatedDBInstance,
     "ModifyInstanceVport": doModifyInstanceVport,
@@ -4049,6 +4101,7 @@ ACTION_MAP = {
     "CancelDcnJob": doCancelDcnJob,
     "TerminateDedicatedDBInstance": doTerminateDedicatedDBInstance,
     "CloneAccount": doCloneAccount,
+    "IsolateHourDBInstance": doIsolateHourDBInstance,
     "UpgradeDBInstance": doUpgradeDBInstance,
     "ModifyBackupConfigs": doModifyBackupConfigs,
     "DescribeBinlogTime": doDescribeBinlogTime,

tccli/services/mariadb/v20170312/api.json

@@ -182,6 +182,13 @@
       "output": "DescribeDBSlowLogsResponse",
       "status": "online"
     },
+    "DescribeDBSyncMode": {
+      "document": "本接口（DescribeDBSyncMode）用于查询云数据库实例的同步模式。",
+      "input": "DescribeDBSyncModeRequest",
+      "name": "查询同步模式",
+      "output": "DescribeDBSyncModeResponse",
+      "status": "online"
+    },
     "DescribeDBTmpInstances": {
       "document": "本接口（DescribeDBTmpInstances）用于获取实例回档生成的临时实例",
       "input": "DescribeDBTmpInstancesRequest",
@@ -4983,6 +4990,63 @@
       ],
       "type": "object"
     },
+    "DescribeDBSyncModeRequest": {
+      "document": "DescribeDBSyncMode请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例ID，形如：tdsql-ow728lmc",
+          "example": "tdsql-avw0207d",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeDBSyncModeResponse": {
+      "document": "DescribeDBSyncMode返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "同步模式：0 异步，1 强同步， 2 强同步可退化",
+          "example": "0",
+          "member": "int64",
+          "name": "SyncMode",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "是否有修改流程在执行中：1 是， 0 否。",
+          "example": "0",
+          "member": "int64",
+          "name": "IsModifying",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "当前复制方式，0 异步，1 同步",
+          "example": "0",
+          "member": "int64",
+          "name": "CurrentSyncMode",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeDBTmpInstancesRequest": {
       "document": "DescribeDBTmpInstances请求参数结构体",
       "members": [

tccli/services/mariadb/v20170312/examples.json

@@ -208,6 +208,14 @@
         "title": "查询慢查询日志列表"
       }
     ],
+    "DescribeDBSyncMode": [
+      {
+        "document": "",
+        "input": "https://mariadb.tencentcloudapi.com/?Action=DescribeDBSyncMode\n&InstanceId=tdsql-avw0207d\n&<公共请求参数>",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"901bd41c-08a2-4001-8364-5a63f32056ae\",\n        \"SyncMode\": 0,\n        \"CurrentSyncMode\": 0,\n        \"IsModifying\": 0\n    }\n}",
+        "title": "查询云数据库同步模式"
+      }
+    ],
     "DescribeDBTmpInstances": [
       {
         "document": "",

tccli/services/scf/v20180416/api.json

@@ -3476,7 +3476,7 @@
           "example": "10",
           "member": "int64",
           "name": "TotalCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -3486,7 +3486,7 @@
           "example": "无",
           "member": "RequestStatus",
           "name": "Data",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },

tccli/services/scf/v20180416/examples.json

@@ -172,7 +172,7 @@
       {
         "document": "",
         "input": "https://scf.tencentcloudapi.com/?Action=GetRequestStatus\n&FunctionName=<FunctionName>\n&FunctionRequestId=<FunctionRequestId>\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"TotalCount\": 1,\n        \"Data\": [\n            {\n                \"MemUsage\": 0.0,\n                \"RetCode\": 0,\n                \"RetMsg\": \"xx\",\n                \"RequestId\": \"xx\",\n                \"StartTime\": \"xx\",\n                \"Duration\": 0.0,\n                \"RetryNum\": 0,\n                \"FunctionName\": \"xx\"\n            }\n        ],\n        \"RequestId\": \"xx\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"TotalCount\": 0,\n        \"Data\": [\n            {\n                \"FunctionName\": \"abc\",\n                \"RetMsg\": \"abc\",\n                \"RequestId\": \"abc\",\n                \"StartTime\": \"abc\",\n                \"RetCode\": 0,\n                \"Duration\": 0,\n                \"MemUsage\": 0,\n                \"RetryNum\": 0\n            }\n        ],\n        \"RequestId\": \"abc\"\n    }\n}",
         "title": "获取函数运行状态"
       }
     ],

tccli/services/sqlserver/v20180328/api.json

@@ -2377,7 +2377,7 @@
         },
         {
           "disabled": false,
-          "document": "购买实例的宿主机类型，CLOUD_PREMIUM-虚拟机高性能云盘，CLOUD_SSD-虚拟机SSD云盘,CLOUD_HSSD-虚拟机加强型SSD云盘，CLOUD_TSSD-虚拟机极速型SSD云盘，CLOUD_BSSD-虚拟机通用型SSD云盘",
+          "document": "购买实例的宿主机类型，CLOUD_PREMIUM-虚拟机高性能云硬盘，CLOUD_SSD-虚拟机SSD云硬盘,CLOUD_HSSD-虚拟机增强型SSD云硬盘，CLOUD_BSSD-虚拟机通用型SSD云盘",
           "example": "CLOUD_PREMIUM",
           "member": "string",
           "name": "MachineType",

tccli/services/tcss/v20201101/api.json

@@ -41553,6 +41553,15 @@
           "name": "ConnDetectConfig",
           "required": false,
           "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "仓库唯一id",
+          "example": "无",
+          "member": "int64",
+          "name": "RegistryId",
+          "required": false,
+          "type": "int"
         }
       ],
       "type": "object"