tccli 3.0.896.1__py2.py3-none-any.whl → 3.0.898.1__py2.py3-none-any.whl

tccli/services/cynosdb/cynosdb_client.py

@@ -589,6 +589,58 @@ def doDescribeResourcePackageList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeSupportProxyVersion(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('-', '_')]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_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.DescribeSupportProxyVersionRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeSupportProxyVersion(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 doCreateAuditLogFile(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -745,6 +797,58 @@ def doCloseProxy(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('-', '_')]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_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 doDescribeClusterDetail(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -6591,9 +6695,11 @@ ACTION_MAP = {
     "CopyClusterPasswordComplexity": doCopyClusterPasswordComplexity,
     "CloseAuditService": doCloseAuditService,
     "DescribeResourcePackageList": doDescribeResourcePackageList,
+    "DescribeSupportProxyVersion": doDescribeSupportProxyVersion,
     "CreateAuditLogFile": doCreateAuditLogFile,
     "SwitchClusterVpc": doSwitchClusterVpc,
     "CloseProxy": doCloseProxy,
+    "DescribeProxySpecs": doDescribeProxySpecs,
     "DescribeClusterDetail": doDescribeClusterDetail,
     "DescribeBackupConfig": doDescribeBackupConfig,
     "DescribeBinlogDownloadUrl": doDescribeBinlogDownloadUrl,

tccli/services/cynosdb/v20190107/api.json

@@ -420,6 +420,13 @@
       "output": "DescribeProxyNodesResponse",
       "status": "online"
     },
+    "DescribeProxySpecs": {
+      "document": "查询数据库代理规格",
+      "input": "DescribeProxySpecsRequest",
+      "name": "查询数据库代理规格",
+      "output": "DescribeProxySpecsResponse",
+      "status": "online"
+    },
     "DescribeResourcePackageDetail": {
       "document": "查询资源包使用详情",
       "input": "DescribeResourcePackageDetailRequest",
@@ -462,6 +469,13 @@
       "output": "DescribeRollbackTimeValidityResponse",
       "status": "online"
     },
+    "DescribeSupportProxyVersion": {
+      "document": "查询支持的数据库代理版本",
+      "input": "DescribeSupportProxyVersionRequest",
+      "name": "查询支持的数据库代理版本",
+      "output": "DescribeSupportProxyVersionResponse",
+      "status": "online"
+    },
     "DescribeZones": {
       "document": "本接口(DescribeZones)用于查询可售卖地域可用区信息。",
       "input": "DescribeZonesRequest",
@@ -3306,6 +3320,7 @@
           "example": "20190522160000003106844584180998",
           "member": "string",
           "name": "TranId",
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -3315,6 +3330,7 @@
           "example": "[\"20190522112283\"]",
           "member": "string",
           "name": "DealNames",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -3324,6 +3340,7 @@
           "example": "[\"cynosdbpg-ins-67rmucgk\"]",
           "member": "string",
           "name": "ResourceIds",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -3333,6 +3350,7 @@
           "example": "[\"cynosdbmysql-sls-9nts65r2\"]",
           "member": "string",
           "name": "ClusterIds",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -3342,6 +3360,7 @@
           "example": "[\"xxx\"]",
           "member": "string",
           "name": "BigDealIds",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -9090,6 +9109,33 @@
       ],
       "type": "object"
     },
+    "DescribeProxySpecsRequest": {
+      "document": "DescribeProxySpecs请求参数结构体",
+      "members": [],
+      "type": "object"
+    },
+    "DescribeProxySpecsResponse": {
+      "document": "DescribeProxySpecs返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "数据库代理规格列表",
+          "example": "无",
+          "member": "ProxySpec",
+          "name": "ProxySpecs",
+          "required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeResourcePackageDetailRequest": {
       "document": "DescribeResourcePackageDetail请求参数结构体",
       "members": [
@@ -9561,6 +9607,64 @@
       ],
       "type": "object"
     },
+    "DescribeSupportProxyVersionRequest": {
+      "document": "DescribeSupportProxyVersion请求参数结构体",
+      "members": [
+        {
+          "default": "",
+          "disabled": false,
+          "document": "集群ID",
+          "example": "cynosdbmysql-xxxxxxx",
+          "member": "string",
+          "name": "ClusterId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "数据库代理组ID",
+          "example": "无",
+          "member": "string",
+          "name": "ProxyGroupId",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeSupportProxyVersionResponse": {
+      "document": "DescribeSupportProxyVersion返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "支持的数据库代理版本集合\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "SupportProxyVersions",
+          "required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "当前proxy版本号\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "CurrentProxyVersion",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeZonesRequest": {
       "document": "DescribeZones请求参数结构体",
       "members": [
@@ -14414,6 +14518,34 @@
       ],
       "usage": "out"
     },
+    "ProxySpec": {
+      "document": "数据库代理规格",
+      "members": [
+        {
+          "default": "",
+          "disabled": false,
+          "document": "数据库代理cpu核数",
+          "example": "无",
+          "member": "int64",
+          "name": "Cpu",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "default": "",
+          "disabled": false,
+          "document": "数据库代理内存",
+          "example": "无",
+          "member": "int64",
+          "name": "Mem",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "ProxyZone": {
       "document": "proxy节点可用区内个数",
       "members": [
@@ -14749,6 +14881,7 @@
           "example": "package-123456",
           "member": "string",
           "name": "PackageId",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": true
@@ -14759,6 +14892,7 @@
           "example": "CCU",
           "member": "string",
           "name": "PackageType",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": true

tccli/services/cynosdb/v20190107/examples.json

@@ -486,6 +486,20 @@
         "title": "查询数据库代理节点列表"
       }
     ],
+    "DescribeProxySpecs": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cynosdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeProxySpecs\n<公共请求参数>\n\n{}",
+        "output": "{\n    \"Response\": {\n        \"ProxySpecs\": [\n            {\n                \"Mem\": 0,\n                \"Cpu\": 0\n            }\n        ],\n        \"RequestId\": \"request-756112\"\n    }\n}",
+        "title": "查询数据库代理规格"
+      },
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cynosdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeProxySpecs\n<公共请求参数>\n\n{}",
+        "output": "{\n    \"Response\": {\n        \"ProxySpecs\": [\n            {\n                \"Cpu\": 2,\n                \"Mem\": 4000\n            },\n            {\n                \"Cpu\": 4,\n                \"Mem\": 8000\n            },\n            {\n                \"Cpu\": 8,\n                \"Mem\": 16000\n            }\n        ],\n        \"RequestId\": \"f4479b74-e428-40d9-a81f-e34cac00ae70\"\n    }\n}",
+        "title": "查询proxy规格"
+      }
+    ],
     "DescribeResourcePackageDetail": [
       {
         "document": "查询资源包使用详情\n",
@@ -534,6 +548,14 @@
         "title": "查询指定时间点是否看回档"
       }
     ],
+    "DescribeSupportProxyVersion": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cynosdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeSupportProxyVersion\n<公共请求参数>\n\n{\n    \"ClusterId\": \"xx\"\n}",
+        "output": "{\n    \"Response\": {\n        \"SupportProxyVersions\": [\n            \"xx\"\n        ],\n        \"CurrentProxyVersion\": \"0.0\",\n        \"RequestId\": \"xx\"\n    }\n}",
+        "title": "查询支持的数据库代理版本"
+      }
+    ],
     "DescribeZones": [
       {
         "document": "仅查看用户有权限的可用区",

tccli/services/emr/v20190103/api.json

@@ -8514,26 +8514,29 @@
           "example": "0",
           "member": "int64",
           "name": "RollingRestartSwitch",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": true
         },
         {
           "disabled": false,
-          "document": "滚动重启每批次的重启数量\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "滚动重启每批次的重启数量，最大重启台数为 99999 台\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "1",
           "member": "int64",
           "name": "BatchSize",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": true
         },
         {
           "disabled": false,
-          "document": "滚动重启每批停止等待时间 ,最大重启台数为 99999 台，最大间隔为 5 分钟 单位是秒\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "滚动重启每批停止等待时间 ,最大间隔为 5 分钟 单位是秒\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "5",
           "member": "int64",
           "name": "TimeWait",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": true
@@ -8544,6 +8547,7 @@
           "example": "0",
           "member": "int64",
           "name": "DealOnFail",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": true