tccli 3.0.1228.1__py2.py3-none-any.whl → 3.0.1229.1__py2.py3-none-any.whl

tccli/services/config/v20220802/examples.json

@@ -18,24 +18,24 @@
     ],
     "ListConfigRules": [
       {
-        "document": "",
-        "input": "POST / HTTP/1.1\nHost: config.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ListConfigRules\n<公共请求参数>\n\n{\n    \"Offset\": 0,\n    \"Limit\": 10,\n    \"OrderType\": \"\",\n    \"RiskLevel\": [],\n    \"State\": \"ACTIVE\",\n    \"ComplianceResult\": [],\n    \"RuleName\": \"\"\n}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"149e116a-90ef-45f3-9d5d-3d77fd1c9eb3\",\n        \"Items\": [\n            {\n                \"Annotation\": null,\n                \"CompliancePackId\": \"cp-xzfz0vu007feuhwi8auv\",\n                \"CompliancePackName\": \"合规1\",\n                \"ComplianceResult\": \"NON_COMPLIANT\",\n                \"ConfigRuleId\": \"cr-13vkg9c31dixgabkepxe\",\n                \"ConfigRuleInvokedTime\": null,\n                \"CreateTime\": \"2022-11-16 14:25:01\",\n                \"Description\": \"帐号访问管理中用户至少关联一个用户组，则符合规则。\",\n                \"Identifier\": \"cam-user-group-bound\",\n                \"IdentifierType\": \"SYSTEM\",\n                \"InputParameter\": [],\n                \"Labels\": [],\n                \"ManageInputParameter\": [],\n                \"ResourceType\": [\n                    \"QCS::CAM::User\"\n                ],\n                \"RiskLevel\": 3,\n                \"RuleName\": \"CAM访问管理子用户必须关联用户组\",\n                \"ServiceFunction\": null,\n                \"SourceCondition\": [\n                    {\n                        \"DesiredValue\": \"1\",\n                        \"EmptyAs\": \"COMPLIANT\",\n                        \"Operator\": \"GreaterOrEquals\",\n                        \"Required\": false,\n                        \"SelectPath\": \"$User.GroupBindNum\"\n                    }\n                ],\n                \"Status\": \"ACTIVE\",\n                \"TriggerType\": [\n                    {\n                        \"MaximumExecutionFrequency\": \"TwentyFour_Hours\",\n                        \"MessageType\": \"ScheduledNotification\"\n                    }\n                ]\n            },\n            {\n                \"Annotation\": null,\n                \"CompliancePackId\": \"\",\n                \"CompliancePackName\": null,\n                \"ComplianceResult\": \"NON_COMPLIANT\",\n                \"ConfigRuleId\": \"cr-bdunf5kx3aywn0ac5bkk\",\n                \"ConfigRuleInvokedTime\": null,\n                \"CreateTime\": \"2022-11-16 14:22:59\",\n                \"Description\": \"帐号访问管理中用户至少关联一个用户组，则符合规则。\",\n                \"Identifier\": \"cam-user-group-bound\",\n                \"IdentifierType\": \"SYSTEM\",\n                \"InputParameter\": [],\n                \"Labels\": [],\n                \"ManageInputParameter\": [],\n                \"ResourceType\": [\n                    \"QCS::CAM::User\"\n                ],\n                \"RiskLevel\": 3,\n                \"RuleName\": \"CAM访问管理子用户必须关联用户组\",\n                \"ServiceFunction\": null,\n                \"SourceCondition\": [\n                    {\n                        \"DesiredValue\": \"1\",\n                        \"EmptyAs\": \"COMPLIANT\",\n                        \"Operator\": \"GreaterOrEquals\",\n                        \"Required\": false,\n                        \"SelectPath\": \"$User.GroupBindNum\"\n                    }\n                ],\n                \"Status\": \"ACTIVE\",\n                \"TriggerType\": [\n                    {\n                        \"MaximumExecutionFrequency\": \"TwentyFour_Hours\",\n                        \"MessageType\": \"ScheduledNotification\"\n                    }\n                ]\n            },\n            {\n                \"Annotation\": null,\n                \"CompliancePackId\": \"\",\n                \"CompliancePackName\": null,\n                \"ComplianceResult\": \"NON_COMPLIANT\",\n                \"ConfigRuleId\": \"cr-2d3brhnvyazqb9j1el6o\",\n                \"ConfigRuleInvokedTime\": null,\n                \"CreateTime\": \"2022-11-16 11:36:45\",\n                \"Description\": \"帐号访问管理中用户至少关联一个用户组，则符合规则。\",\n                \"Identifier\": \"cam-user-group-bound\",\n                \"IdentifierType\": \"SYSTEM\",\n                \"InputParameter\": [],\n                \"Labels\": [],\n                \"ManageInputParameter\": [],\n                \"ResourceType\": [\n                    \"QCS::CAM::User\"\n                ],\n                \"RiskLevel\": 3,\n                \"RuleName\": \"CAM访问管理子用户必须关联用户组\",\n                \"ServiceFunction\": null,\n                \"SourceCondition\": [\n                    {\n                        \"DesiredValue\": \"1\",\n                        \"EmptyAs\": \"COMPLIANT\",\n                        \"Operator\": \"GreaterOrEquals\",\n                        \"Required\": false,\n                        \"SelectPath\": \"$User.GroupBindNum\"\n                    }\n                ],\n                \"Status\": \"ACTIVE\",\n                \"TriggerType\": [\n                    {\n                        \"MaximumExecutionFrequency\": \"TwentyFour_Hours\",\n                        \"MessageType\": \"ScheduledNotification\"\n                    }\n                ]\n            }\n        ],\n        \"Total\": 3\n    }\n}",
+        "document": "获取规则列表",
+        "input": "POST / HTTP/1.1\nHost: config.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ListConfigRules\n<公共请求参数>\n\n{\n    \"Offset\": 0,\n    \"Limit\": 10,\n    \"OrderType\": \"desc\",\n    \"RiskLevel\": [\n        1\n    ],\n    \"State\": \"ACTIVE\",\n    \"ComplianceResult\": [\n        \"COMPLIANT\"\n    ],\n    \"RuleName\": \"CAM\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"107f8d51-7095-4a6f-b374-a8aa7743584b\",\n        \"Items\": [\n            {\n                \"AccountGroupId\": \"ca-324234\",\n                \"AccountGroupName\": \"账号组\",\n                \"Annotation\": null,\n                \"CompliancePackId\": \"\",\n                \"CompliancePackName\": null,\n                \"ComplianceResult\": \"NON_COMPLIANT\",\n                \"ConfigRuleId\": \"cr-HQxxxxxxxhR0BxxxxGodh\",\n                \"ConfigRuleInvokedTime\": null,\n                \"CreateTime\": \"2024-11-15 14:21:47\",\n                \"Description\": \"CAM用户下不存在已禁用的 AccessKey，则符合规则。\",\n                \"ExcludeResourceIdsScope\": [],\n                \"Identifier\": \"cam-user-invalid-ak-check\",\n                \"IdentifierType\": \"SYSTEM\",\n                \"InputParameter\": [],\n                \"Labels\": [\n                    \"用户\",\n                    \"密钥\"\n                ],\n                \"ManageInputParameter\": [],\n                \"ManageTriggerType\": [\n                    \"ConfigurationItemChangeNotification\"\n                ],\n                \"RegionsScope\": [],\n                \"ResourceType\": [\n                    \"QCS::CAM::User\"\n                ],\n                \"RiskLevel\": 3,\n                \"RuleName\": \"CAM用户下不存在已禁用的访问密钥AccessKey\",\n                \"RuleOwnerId\": 84935363164,\n                \"ServiceFunction\": null,\n                \"SourceCondition\": [],\n                \"Status\": \"ACTIVE\",\n                \"TagsScope\": [],\n                \"TriggerType\": [\n                    {\n                        \"MaximumExecutionFrequency\": null,\n                        \"MessageType\": \"ConfigurationItemChangeNotification\"\n                    }\n                ]\n            }\n        ],\n        \"Total\": 1\n    }\n}",
         "title": "获取规则列表"
       }
     ],
     "ListDiscoveredResources": [
       {
         "document": "",
-        "input": "POST / HTTP/1.1\nHost: config.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ListDiscoveredResources\n<公共请求参数>\n\n{\n    \"OrderType\": \"xx\",\n    \"NextToken\": \"xx\",\n    \"MaxResults\": 1,\n    \"Filters\": [\n        {\n            \"Values\": [\n                \"xx\"\n            ],\n            \"Name\": \"xx\"\n        }\n    ],\n    \"Tags\": [\n        {\n            \"TagKey\": \"xx\",\n            \"TagValue\": \"xx\"\n        }\n    ]\n}",
-        "output": "{\n    \"Response\": {\n        \"Items\": [\n            {\n                \"ResourceStatus\": \"xx\",\n                \"Tags\": [\n                    {\n                        \"TagKey\": \"xx\",\n                        \"TagValue\": \"xx\"\n                    }\n                ],\n                \"ResourceType\": \"xx\",\n                \"ResourceId\": \"xx\",\n                \"ResourceCreateTime\": 1,\n                \"ResourceRegion\": \"xx\",\n                \"ResourceName\": \"xx\",\n                \"ResourceZone\": \"xx\",\n                \"ResourceDelete\": 1,\n                \"ComplianceResult\": \"xx\"\n            }\n        ],\n        \"NextToken\": \"xx\",\n        \"RequestId\": \"xx\"\n    }\n}",
+        "input": "POST / HTTP/1.1\nHost: config.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ListDiscoveredResources\n<公共请求参数>\n\n{\n    \"OrderType\": \"desc\",\n    \"NextToken\": \"C3IptlTj6hTlW0WKVO3NI\",\n    \"MaxResults\": 10,\n    \"Filters\": [\n        {\n            \"Values\": [\n                \"ins-234234\"\n            ],\n            \"Name\": \"resourceName\"\n        }\n    ],\n    \"Tags\": [\n        {\n            \"TagKey\": \"开发部\",\n            \"TagValue\": \"运营部\"\n        }\n    ]\n}",
+        "output": "{\n    \"Response\": {\n        \"Items\": [\n            {\n                \"ResourceStatus\": \"Running\",\n                \"Tags\": [\n                    {\n                        \"TagKey\": \"开发部\",\n                        \"TagValue\": \"运营部\"\n                    }\n                ],\n                \"ResourceType\": \"cvm\",\n                \"ResourceId\": \"ins-234er\",\n                \"ResourceCreateTime\": \"2022-10-10 12:56:37\",\n                \"ResourceRegion\": \"ap-guangzhou\",\n                \"ResourceName\": \"云服务器\",\n                \"ResourceZone\": \"ap-guangzhou-1\",\n                \"ResourceDelete\": 1,\n                \"ComplianceResult\": \"COMPLIANT\"\n            }\n        ],\n        \"NextToken\": \"C3IptlTj6hTlW0WKVO3NI\",\n        \"RequestId\": \"4006b9ea-9b33-4b80-8496-6917c900b122\"\n    }\n}",
         "title": "获取资源列表"
       }
     ],
     "PutEvaluations": [
       {
         "document": "上报自定义规则评估结果",
-        "input": "POST / HTTP/1.1\nHost: config.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: PutEvaluations\n<公共请求参数>\n\n \n\n \n\n \n\n \n\n{\n    \"ResultToken\": \"Wm9yZlY3WmlKa3cxaW1oQlu-H3WA6JZnH46cUAn2DWGJ9dp3GwJyhMyXsJyeXRcqa8sCimZKH6hy-7RGW_DEtva2Bjd36ryyDg0tbNOfYpf3r6lJB_gHRUCPRrr8HQbEvCoeoGw-KH7LqNUsoa4GzyrvKx2Ak1vycWzfAGaiTISWoTQ2mYr_BYSsVcO077lUlY4hieGJyolSxxUf1V9fDoIXFQikxW6AmU4cTUUpEJ-OF4Mvbq_7quPYZQOjDuo9cAxzUX-D8w==\",\n    \"Evaluations\": [\n        {\n            \"ComplianceResourceId\": \"disk-26itbqha\",\n            \"ComplianceResourceType\": \"QCS::CBS::Disk\",\n            \"ComplianceRegion\": \"ap-guangzhou\",\n            \"ComplianceType\": \"NON_COMPLIANT\",\n            \"Annotation\": {\n                \"Configuration\": \"1\",\n                \"DesiredValue\": \"2\",\n                \"Operator\": \"equal\",\n                \"Property\": \"age\"\n            }\n        }\n    ]\n}",
+        "input": "POST / HTTP/1.1\nHost: config.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: PutEvaluations\n<公共请求参数>\n\n{\n    \"ResultToken\": \"Wm9yZlY3WmlKa3cxaW1oQlu-H3WA6JZnH46cUAn2DWG****\",\n    \"Evaluations\": [\n        {\n            \"ComplianceResourceId\": \"disk-26itbqha\",\n            \"ComplianceResourceType\": \"QCS::CBS::Disk\",\n            \"ComplianceRegion\": \"ap-guangzhou\",\n            \"ComplianceType\": \"NON_COMPLIANT\",\n            \"Annotation\": {\n                \"Configuration\": \"1\",\n                \"DesiredValue\": \"2\",\n                \"Operator\": \"equal\",\n                \"Property\": \"age\"\n            }\n        }\n    ]\n}",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"d947eba9-f908-4d2e-9b3d-63bde43abd1a\"\n    }\n}",
         "title": "上报自定义规则评估结果"
       }

tccli/services/cynosdb/cynosdb_client.py

@@ -69,7 +69,7 @@ def doResumeServerless(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeInstanceSpecs(args, parsed_globals):
+def doDescribeBackupConfig(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -98,11 +98,11 @@ def doDescribeInstanceSpecs(args, parsed_globals):
     client = mod.CynosdbClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeInstanceSpecsRequest()
+    model = models.DescribeBackupConfigRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeInstanceSpecs(model)
+        rsp = client.DescribeBackupConfig(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -797,6 +797,58 @@ def doRenewClusters(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCloseProxyEndPoint(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.CynosdbClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CloseProxyEndPointRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CloseProxyEndPoint(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 doCloseProxy(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1057,7 +1109,7 @@ def doDescribeTasks(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeBackupConfig(args, parsed_globals):
+def doDescribeInstanceSpecs(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1086,11 +1138,11 @@ def doDescribeBackupConfig(args, parsed_globals):
     client = mod.CynosdbClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeBackupConfigRequest()
+    model = models.DescribeInstanceSpecsRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeBackupConfig(model)
+        rsp = client.DescribeInstanceSpecs(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2565,7 +2617,7 @@ def doIsolateCluster(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeProxySpecs(args, parsed_globals):
+def doDescribeInstancesWithinSameCluster(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2594,11 +2646,11 @@ def doDescribeProxySpecs(args, parsed_globals):
     client = mod.CynosdbClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeProxySpecsRequest()
+    model = models.DescribeInstancesWithinSameClusterRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeProxySpecs(model)
+        rsp = client.DescribeInstancesWithinSameCluster(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -3709,6 +3761,58 @@ def doAddInstances(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeProxySpecs(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.CynosdbClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeProxySpecsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeProxySpecs(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 doModifyInstanceUpgradeLimitDays(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7881,7 +7985,7 @@ MODELS_MAP = {
 
 ACTION_MAP = {
     "ResumeServerless": doResumeServerless,
-    "DescribeInstanceSpecs": doDescribeInstanceSpecs,
+    "DescribeBackupConfig": doDescribeBackupConfig,
     "ModifyBinlogConfig": doModifyBinlogConfig,
     "CreateProxyEndPoint": doCreateProxyEndPoint,
     "ModifyResourcePackageClusters": doModifyResourcePackageClusters,
@@ -7895,12 +7999,13 @@ ACTION_MAP = {
     "DescribeSupportProxyVersion": doDescribeSupportProxyVersion,
     "CreateAuditLogFile": doCreateAuditLogFile,
     "RenewClusters": doRenewClusters,
+    "CloseProxyEndPoint": doCloseProxyEndPoint,
     "CloseProxy": doCloseProxy,
     "ExportResourcePackageDeductDetails": doExportResourcePackageDeductDetails,
     "InquirePriceModify": doInquirePriceModify,
     "DescribeClusterDetail": doDescribeClusterDetail,
     "DescribeTasks": doDescribeTasks,
-    "DescribeBackupConfig": doDescribeBackupConfig,
+    "DescribeInstanceSpecs": doDescribeInstanceSpecs,
     "DescribeBinlogDownloadUrl": doDescribeBinlogDownloadUrl,
     "DescribeResourcesByDealName": doDescribeResourcesByDealName,
     "ModifyClusterStorage": doModifyClusterStorage,
@@ -7929,7 +8034,7 @@ ACTION_MAP = {
     "CreateBackup": doCreateBackup,
     "OfflineInstance": doOfflineInstance,
     "IsolateCluster": doIsolateCluster,
-    "DescribeProxySpecs": doDescribeProxySpecs,
+    "DescribeInstancesWithinSameCluster": doDescribeInstancesWithinSameCluster,
     "RestartInstance": doRestartInstance,
     "UpgradeProxy": doUpgradeProxy,
     "DescribeClusters": doDescribeClusters,
@@ -7951,6 +8056,7 @@ ACTION_MAP = {
     "SwitchClusterZone": doSwitchClusterZone,
     "OpenClusterTransparentEncrypt": doOpenClusterTransparentEncrypt,
     "AddInstances": doAddInstances,
+    "DescribeProxySpecs": doDescribeProxySpecs,
     "ModifyInstanceUpgradeLimitDays": doModifyInstanceUpgradeLimitDays,
     "DeleteAccounts": doDeleteAccounts,
     "RevokeAccountPrivileges": doRevokeAccountPrivileges,

tccli/services/cynosdb/v20190107/api.json

@@ -56,6 +56,13 @@
       "output": "CloseProxyResponse",
       "status": "online"
     },
+    "CloseProxyEndPoint": {
+      "document": "关闭数据库代理连接地址",
+      "input": "CloseProxyEndPointRequest",
+      "name": "关闭数据库代理连接地址",
+      "output": "CloseProxyEndPointResponse",
+      "status": "online"
+    },
     "CloseWan": {
       "document": "本接口（CloseWan）用于关闭外网。",
       "input": "CloseWanRequest",
@@ -441,6 +448,13 @@
       "output": "DescribeInstancesResponse",
       "status": "online"
     },
+    "DescribeInstancesWithinSameCluster": {
+      "document": "本接口(DescribeInstancesWithinSameCluster)用于查询同一集群下实例列表",
+      "input": "DescribeInstancesWithinSameClusterRequest",
+      "name": "查询同一集群下实例列表",
+      "output": "DescribeInstancesWithinSameClusterResponse",
+      "status": "online"
+    },
     "DescribeIsolatedInstances": {
       "document": "本接口(DescribeIsolatedInstances)用于查询回收站实例列表。",
       "input": "DescribeIsolatedInstancesRequest",
@@ -3156,6 +3170,62 @@
       ],
       "type": "object"
     },
+    "CloseProxyEndPointRequest": {
+      "document": "CloseProxyEndPoint请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "集群ID",
+          "example": "cynosdbmysql-xxxxxxx",
+          "member": "string",
+          "name": "ClusterId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "数据库代理组ID",
+          "example": "无",
+          "member": "string",
+          "name": "ProxyGroupId",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "CloseProxyEndPointResponse": {
+      "document": "CloseProxyEndPoint返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "异步流程ID",
+          "example": "无",
+          "member": "int64",
+          "name": "FlowId",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "异步任务ID",
+          "example": "无",
+          "member": "int64",
+          "name": "TaskId",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "CloseProxyRequest": {
       "document": "CloseProxy请求参数结构体",
       "members": [
@@ -10597,6 +10667,62 @@
       ],
       "type": "object"
     },
+    "DescribeInstancesWithinSameClusterRequest": {
+      "document": "DescribeInstancesWithinSameCluster请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "vpcId",
+          "example": "xx",
+          "member": "string",
+          "name": "UniqVpcId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "vip",
+          "example": "xx",
+          "member": "string",
+          "name": "Vip",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeInstancesWithinSameClusterResponse": {
+      "document": "DescribeInstancesWithinSameCluster返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例个数",
+          "example": "26",
+          "member": "int64",
+          "name": "TotalCount",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "实例ID列表",
+          "example": "无",
+          "member": "string",
+          "name": "InstanceIds",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeIsolatedInstancesRequest": {
       "document": "DescribeIsolatedInstances请求参数结构体",
       "members": [

tccli/services/cynosdb/v20190107/examples.json

@@ -64,6 +64,14 @@
         "title": "关闭数据库代理"
       }
     ],
+    "CloseProxyEndPoint": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cynosdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CloseProxyEndPoint\n<公共请求参数>\n\n{\n    \"ClusterId\": \"abc\",\n    \"ProxyGroupId\": \"abc\"\n}",
+        "output": "{\n    \"Response\": {\n        \"FlowId\": 0,\n        \"TaskId\": 0,\n        \"RequestId\": \"abc\"\n    }\n}",
+        "title": "关闭数据库代理连接地址"
+      }
+    ],
     "CloseWan": [
       {
         "document": "",
@@ -522,6 +530,14 @@
         "title": "查询实例列表"
       }
     ],
+    "DescribeInstancesWithinSameCluster": [
+      {
+        "document": "查询统一集群下实例ID列表",
+        "input": "POST / HTTP/1.1\nHost: cynosdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeInstancesWithinSameCluster\n<公共请求参数>\n\n{\n    \"UniqVpcId\": \"abc\",\n    \"Vip\": \"abc\"\n}",
+        "output": "{\n    \"Response\": {\n        \"TotalCount\": 0,\n        \"InstanceIds\": [\n            \"abc\"\n        ],\n        \"RequestId\": \"abc\"\n    }\n}",
+        "title": "查询统一集群下实例ID列表"
+      }
+    ],
     "DescribeIsolatedInstances": [
       {
         "document": "",

tccli/services/essbasic/v20210526/api.json

@@ -9205,6 +9205,16 @@
           "output_required": false,
           "type": "string",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "签署参与人在本流程中的编号ID（每个流程不同），可用此ID来定位签署参与人在本流程的签署节点。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "yDRS4UUg********sCOsHS",
+          "member": "string",
+          "name": "SignId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"

tccli/services/facefusion/v20181201/api.json

@@ -223,6 +223,7 @@
           "member": "int64",
           "name": "X",
           "output_required": true,
+          "required": false,
           "type": "int",
           "value_allowed_null": false
         },
@@ -233,6 +234,7 @@
           "member": "int64",
           "name": "Y",
           "output_required": true,
+          "required": false,
           "type": "int",
           "value_allowed_null": false
         },
@@ -243,6 +245,7 @@
           "member": "int64",
           "name": "Width",
           "output_required": true,
+          "required": false,
           "type": "int",
           "value_allowed_null": false
         },
@@ -253,11 +256,12 @@
           "member": "int64",
           "name": "Height",
           "output_required": true,
+          "required": false,
           "type": "int",
           "value_allowed_null": false
         }
       ],
-      "usage": "out"
+      "usage": "both"
     },
     "FaceRect": {
       "document": "人脸框信息",
@@ -559,25 +563,27 @@
         {
           "disabled": false,
           "document": "人脸序号",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "FaceId",
-          "required": true,
+          "output_required": true,
+          "required": false,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "人脸框信息",
-          "example": "",
+          "example": "无",
           "member": "FaceInfo",
           "name": "FaceInfo",
-          "required": true,
+          "output_required": true,
+          "required": false,
           "type": "object",
           "value_allowed_null": false
         }
       ],
-      "usage": "out"
+      "usage": "both"
     },
     "MergeInfo": {
       "document": "人脸图片和待被融合的素材模板图的人脸位置信息。",

tccli/services/hai/v20230812/api.json

@@ -570,7 +570,7 @@
         {
           "disabled": false,
           "document": "实例显示名称",
-          "example": "test",
+          "example": "hai",
           "member": "string",
           "name": "InstanceName",
           "required": false,
@@ -958,7 +958,7 @@
         {
           "disabled": false,
           "document": "实例id\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "无",
+          "example": "hai-k31lvhiv",
           "member": "string",
           "name": "InstanceId",
           "output_required": false,
@@ -1312,7 +1312,7 @@
         {
           "disabled": false,
           "document": "默认为False，True代表只验证接口连通性",
-          "example": "无",
+          "example": "False",
           "member": "bool",
           "name": "DryRun",
           "required": false,
@@ -1327,7 +1327,7 @@
         {
           "disabled": false,
           "document": "task任务id",
-          "example": "123456",
+          "example": "232558431",
           "member": "uint64",
           "name": "TaskId",
           "output_required": false,
@@ -1367,7 +1367,7 @@
         {
           "disabled": false,
           "document": "默认为False，True代表只验证接口连通性",
-          "example": "无",
+          "example": "False",
           "member": "bool",
           "name": "DryRun",
           "required": false,
@@ -1382,7 +1382,7 @@
         {
           "disabled": false,
           "document": "task任务id",
-          "example": "123456",
+          "example": "232558431",
           "member": "uint64",
           "name": "TaskId",
           "output_required": false,

tccli/services/hai/v20230812/examples.json

@@ -20,7 +20,7 @@
       {
         "document": "查看指定实例hai-jklfaded的信息",
         "input": "POST / HTTP/1.1\nHost: hai.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeInstances\n<公共请求参数>\n\n{\n    \"InstanceIds\": [\n        \"hai-jklfaded\"\n    ],\n    \"Offset\": 0,\n    \"Limit\": 1\n}",
-        "output": "{\n    \"Response\": {\n        \"TotalCount\": 10,\n        \"InstanceSet\": [\n            {\n                \"InstanceId\": \"hai-jklfaded\",\n                \"InstanceName\": \"abc\",\n                \"InstanceState\": \"RUNNING\",\n                \"ApplicationName\": \"pytorch\",\n                \"BundleName\": \"基础型\",\n                \"GPUPerformance\": \"8+TFlops\",\n                \"GPUMemory\": \"16+GB\",\n                \"CPU\": \"20C\",\n                \"Memory\": \"80GB\",\n                \"SystemDisk\": {\n                    \"DiskType\": \"CLOUD_SSD\",\n                    \"DiskSize\": 80\n                },\n                \"PrivateIpAddresses\": [\n                    \"1.1.1.1\"\n                ],\n                \"PublicIpAddresses\": [\n                    \"2.2.2.2\"\n                ],\n                \"SecurityGroupIds\": [\n                    \"sg-xxxxxxxx\"\n                ],\n                \"LatestOperation\": \"RunInstances\",\n                \"LatestOperationState\": \"SUCCESS\",\n                \"CreateTime\": \"2023-08-01 00:00:00\",\n                \"MaxOutBandwidth\": \"10Mbps\",\n                \"MaxFreeTraffic\": \"1000GB\",\n                \"ConfigurationEnvironment\": \"cuda 10 | pytorch | tensorflow\",\n                \"LoginServices\": [\n                    {\n                        \"ServiceName\": \"jupyter\"\n                    }\n                ],\n                \"OSType\": \"linux\"\n            }\n        ],\n        \"RequestId\": \"41fa870d-8592-493c-b794-9fe19f23e800\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"TotalCount\": 10,\n        \"InstanceSet\": [\n            {\n                \"InstanceId\": \"hai-jklfaded\",\n                \"InstanceName\": \"hai\",\n                \"InstanceState\": \"RUNNING\",\n                \"ApplicationName\": \"pytorch\",\n                \"BundleName\": \"基础型\",\n                \"GPUPerformance\": \"8+TFlops\",\n                \"GPUMemory\": \"16+GB\",\n                \"CPU\": \"20C\",\n                \"Memory\": \"80GB\",\n                \"SystemDisk\": {\n                    \"DiskType\": \"CLOUD_SSD\",\n                    \"DiskSize\": 80\n                },\n                \"PrivateIpAddresses\": [\n                    \"1.1.1.1\"\n                ],\n                \"PublicIpAddresses\": [\n                    \"2.2.2.2\"\n                ],\n                \"SecurityGroupIds\": [\n                    \"sg-xxxxxxxx\"\n                ],\n                \"LatestOperation\": \"RunInstances\",\n                \"LatestOperationState\": \"SUCCESS\",\n                \"CreateTime\": \"2023-08-01 00:00:00\",\n                \"MaxOutBandwidth\": \"10Mbps\",\n                \"MaxFreeTraffic\": \"1000GB\",\n                \"ConfigurationEnvironment\": \"cuda 10 | pytorch | tensorflow\",\n                \"LoginServices\": [\n                    {\n                        \"ServiceName\": \"jupyter\"\n                    }\n                ],\n                \"OSType\": \"linux\"\n            }\n        ],\n        \"RequestId\": \"41fa870d-8592-493c-b794-9fe19f23e800\"\n    }\n}",
         "title": "查看指定实例hai-jklfaded的信息"
       }
     ],
@@ -51,7 +51,7 @@
     "InquirePriceRunInstances": [
       {
         "document": "",
-        "input": "POST / HTTP/1.1\nHost: hai.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: InquirePriceRunInstances\n<公共请求参数>\n\n{\n    \"ApplicationId\": \"app-jknfna\",\n    \"BundleType\": \"S\",\n    \"SystemDisk\": {\n        \"DiskType\": \"CLOUD_PREMIUM\",\n        \"DiskSize\": 250\n    },\n    \"InstanceName\": \"test\"\n}",
+        "input": "POST / HTTP/1.1\nHost: hai.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: InquirePriceRunInstances\n<公共请求参数>\n\n{\n    \"ApplicationId\": \"app-jknfna\",\n    \"BundleType\": \"S\",\n    \"SystemDisk\": {\n        \"DiskType\": \"CLOUD_PREMIUM\",\n        \"DiskSize\": 250\n    },\n    \"InstanceName\": \"hai\"\n}",
         "output": "{\n    \"Response\": {\n        \"Price\": {\n            \"InstancePrice\": {\n                \"UnitPrice\": 0.88,\n                \"DiscountUnitPrice\": 0.88,\n                \"Discount\": 100.0,\n                \"ChargeUnit\": \"HOUR\",\n                \"Amount\": 1\n            },\n            \"CloudDiskPrice\": {\n                \"UnitPrice\": 0,\n                \"DiscountUnitPrice\": 0,\n                \"Discount\": 0,\n                \"ChargeUnit\": \"HOUR\",\n                \"Amount\": 1\n            }\n        },\n        \"RequestId\": \"abc\"\n    }\n}",
         "title": "发货询价"
       }