tccli 3.0.1133.1__py2.py3-none-any.whl → 3.0.1135.1__py2.py3-none-any.whl

tccli/services/cmq/v20190304/api.json

@@ -64,7 +64,7 @@
       "status": "online"
     },
     "DescribeQueueDetail": {
-      "document": "枚举队列",
+      "document": "枚举队列列表",
       "input": "DescribeQueueDetailRequest",
       "name": "枚举队列",
       "output": "DescribeQueueDetailResponse",
@@ -78,9 +78,9 @@
       "status": "online"
     },
     "DescribeTopicDetail": {
-      "document": "查询主题详情 ",
+      "document": "查询主题详情",
       "input": "DescribeTopicDetailRequest",
-      "name": "查询主题详情",
+      "name": "查询主题列表",
       "output": "DescribeTopicDetailResponse",
       "status": "online"
     },
@@ -772,17 +772,17 @@
       "members": [
         {
           "disabled": false,
-          "document": "分页时本页获取队列列表的起始位置。如果填写了该值，必须也要填写 limit 。该值缺省时，后台取默认值 0",
-          "example": "",
-          "member": "uint64",
-          "name": "Offset",
+          "document": "标签搜索",
+          "example": "tag",
+          "member": "string",
+          "name": "TagKey",
           "required": false,
-          "type": "int"
+          "type": "string"
         },
         {
           "disabled": false,
           "document": "分页时本页获取队列的个数，如果不传递该参数，则该参数默认为20，最大值为50。",
-          "example": "",
+          "example": "20",
           "member": "uint64",
           "name": "Limit",
           "required": false,
@@ -790,30 +790,30 @@
         },
         {
           "disabled": false,
-          "document": "筛选参数，目前支持QueueName筛选，且仅支持一个关键字",
-          "example": "",
-          "member": "Filter",
-          "name": "Filters",
+          "document": "精确匹配QueueName",
+          "example": "test",
+          "member": "string",
+          "name": "QueueName",
           "required": false,
-          "type": "list"
+          "type": "string"
         },
         {
           "disabled": false,
-          "document": "标签搜索",
-          "example": "",
-          "member": "string",
-          "name": "TagKey",
+          "document": "筛选参数，目前支持QueueName筛选，且仅支持一个关键字",
+          "example": "name",
+          "member": "Filter",
+          "name": "Filters",
           "required": false,
-          "type": "string"
+          "type": "list"
         },
         {
           "disabled": false,
-          "document": "精确匹配QueueName",
-          "example": "",
-          "member": "string",
-          "name": "QueueName",
+          "document": "分页时本页获取队列列表的起始位置。如果填写了该值，必须也要填写 limit 。该值缺省时，后台取默认值 0",
+          "example": "20",
+          "member": "uint64",
+          "name": "Offset",
           "required": false,
-          "type": "string"
+          "type": "int"
         }
       ],
       "type": "object"
@@ -824,18 +824,20 @@
         {
           "disabled": false,
           "document": "总队列数。",
-          "example": "",
+          "example": "20",
           "member": "uint64",
           "name": "TotalCount",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "队列详情列表。",
-          "example": "",
+          "example": "[]",
           "member": "QueueSet",
           "name": "QueueSet",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -925,17 +927,17 @@
       "members": [
         {
           "disabled": false,
-          "document": "分页时本页获取队列列表的起始位置。如果填写了该值，必须也要填写 limit 。该值缺省时，后台取默认值 0。",
-          "example": "",
-          "member": "uint64",
-          "name": "Offset",
+          "document": "标签匹配。",
+          "example": "aa",
+          "member": "string",
+          "name": "TagKey",
           "required": false,
-          "type": "int"
+          "type": "string"
         },
         {
           "disabled": false,
           "document": "分页时本页获取队列的个数，如果不传递该参数，则该参数默认为20，最大值为50。",
-          "example": "",
+          "example": "20",
           "member": "uint64",
           "name": "Limit",
           "required": false,
@@ -943,30 +945,30 @@
         },
         {
           "disabled": false,
-          "document": "目前只支持过滤TopicName ， 且只能填一个过滤值。",
-          "example": "",
-          "member": "Filter",
-          "name": "Filters",
+          "document": "精确匹配TopicName。",
+          "example": "topic1",
+          "member": "string",
+          "name": "TopicName",
           "required": false,
-          "type": "list"
+          "type": "string"
         },
         {
           "disabled": false,
-          "document": "标签匹配。",
-          "example": "",
-          "member": "string",
-          "name": "TagKey",
+          "document": "目前只支持过滤TopicName ， 且只能填一个过滤值。",
+          "example": "[]",
+          "member": "Filter",
+          "name": "Filters",
           "required": false,
-          "type": "string"
+          "type": "list"
         },
         {
           "disabled": false,
-          "document": "精确匹配TopicName。",
-          "example": "",
-          "member": "string",
-          "name": "TopicName",
+          "document": "分页时本页获取队列列表的起始位置。如果填写了该值，必须也要填写 limit 。该值缺省时，后台取默认值 0。",
+          "example": "0",
+          "member": "uint64",
+          "name": "Offset",
           "required": false,
-          "type": "string"
+          "type": "int"
         }
       ],
       "type": "object"
@@ -977,18 +979,20 @@
         {
           "disabled": false,
           "document": "主题列表总数。",
-          "example": "",
+          "example": "3",
           "member": "uint64",
           "name": "TotalCount",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "主题详情列表。",
-          "example": "",
+          "example": "[]",
           "member": "TopicSet",
           "name": "TopicSet",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },

tccli/services/cmq/v20190304/examples.json

@@ -91,8 +91,8 @@
     "DescribeTopicDetail": [
       {
         "document": "",
-        "input": "https://cmq.tencentcloudapi.com/?Action=DescribeTopicDetail\r\n&Offset=0&Limit=2\r\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"TotalCount\": 2,\n        \"TopicSet\": [\n            {\n                \"Tags\": [],\n                \"TopicId\": \"topic-rga4l1o4\",\n                \"TopicName\": \"ConnTopic\",\n                \"CreateUin\": 20548499,\n                \"MsgRetentionSeconds\": 10000,\n                \"MaxMsgSize\": 20000,\n                \"Qps\": 10000,\n                \"FilterType\": 1,\n                \"CreateTime\": 1581516588,\n                \"LastModifyTime\": 1581563581,\n                \"MsgCount\": 0\n            },\n            {\n                \"Tags\": [],\n                \"TopicId\": \"topic-388k6x98\",\n                \"TopicName\": \"test123\",\n                \"CreateUin\": 20548499,\n                \"MsgRetentionSeconds\": 86400,\n                \"MaxMsgSize\": 65536,\n                \"Qps\": 5000,\n                \"FilterType\": 1,\n                \"CreateTime\": 1581493669,\n                \"LastModifyTime\": 1581495310,\n                \"MsgCount\": 0\n            }\n        ],\n        \"RequestId\": \"68ebb46b-5eac-467a-9942-1a5da83a65ca\"\n    }\n}",
+        "input": "POST / HTTP/1.1\nHost: cmq.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeTopicDetail\n<公共请求参数>\n\n{\n    \"TagKey\": \"abc\",\n    \"Limit\": 1,\n    \"TopicName\": \"abc\",\n    \"Filters\": [\n        {\n            \"Values\": [\n                \"test123\"\n            ],\n            \"Name\": \"TopicName\"\n        }\n    ],\n    \"Offset\": 1\n}",
+        "output": "{\n    \"Response\": {\n        \"TotalCount\": 2,\n        \"TopicSet\": [\n            {\n                \"Tags\": [],\n                \"TopicId\": \"topic-388k6x98\",\n                \"TopicName\": \"test123\",\n                \"CreateUin\": 20548499,\n                \"MsgRetentionSeconds\": 86400,\n                \"MaxMsgSize\": 65536,\n                \"Qps\": 5000,\n                \"FilterType\": 1,\n                \"CreateTime\": 1581493669,\n                \"LastModifyTime\": 1581495310,\n                \"MsgCount\": 0\n            }\n        ],\n        \"RequestId\": \"68ebb46b-5eac-467a-9942-1a5da83a65ca\"\n    }\n}",
         "title": "查询主题详情"
       }
     ],

tccli/services/cynosdb/cynosdb_client.py

@@ -693,7 +693,7 @@ def doCreateAuditLogFile(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doSwitchClusterVpc(args, parsed_globals):
+def doRenewClusters(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -722,11 +722,11 @@ def doSwitchClusterVpc(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.SwitchClusterVpcRequest()
+    model = models.RenewClustersRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.SwitchClusterVpc(model)
+        rsp = client.RenewClusters(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -5425,6 +5425,58 @@ def doModifyAccountDescription(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doSwitchClusterVpc(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.SwitchClusterVpcRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.SwitchClusterVpc(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 doCreateClusterDatabase(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7373,7 +7425,7 @@ ACTION_MAP = {
     "DescribeResourcePackageList": doDescribeResourcePackageList,
     "DescribeSupportProxyVersion": doDescribeSupportProxyVersion,
     "CreateAuditLogFile": doCreateAuditLogFile,
-    "SwitchClusterVpc": doSwitchClusterVpc,
+    "RenewClusters": doRenewClusters,
     "CloseProxy": doCloseProxy,
     "DescribeProxySpecs": doDescribeProxySpecs,
     "DescribeClusterDetail": doDescribeClusterDetail,
@@ -7464,6 +7516,7 @@ ACTION_MAP = {
     "StopCLSDelivery": doStopCLSDelivery,
     "DescribeBackupList": doDescribeBackupList,
     "ModifyAccountDescription": doModifyAccountDescription,
+    "SwitchClusterVpc": doSwitchClusterVpc,
     "CreateClusterDatabase": doCreateClusterDatabase,
     "ModifyResourcePackageName": doModifyResourcePackageName,
     "DeleteAuditLogFile": doDeleteAuditLogFile,

tccli/services/cynosdb/v20190107/api.json

@@ -854,6 +854,13 @@
       "output": "RemoveClusterSlaveZoneResponse",
       "status": "online"
     },
+    "RenewClusters": {
+      "document": "续费集群",
+      "input": "RenewClustersRequest",
+      "name": "续费集群",
+      "output": "RenewClustersResponse",
+      "status": "online"
+    },
     "ResetAccountPassword": {
       "document": "本接口(ResetAccountPassword)用于修改数据库账号密码",
       "input": "ResetAccountPasswordRequest",
@@ -17297,6 +17304,110 @@
       ],
       "type": "object"
     },
+    "RenewClustersRequest": {
+      "document": "RenewClusters请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "集群ID",
+          "example": "cynosdbpg-bzxxrmtq",
+          "member": "string",
+          "name": "ClusterId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "续费时长",
+          "example": "1",
+          "member": "float",
+          "name": "TimeSpan",
+          "required": true,
+          "type": "float"
+        },
+        {
+          "disabled": false,
+          "document": "时间单位 y,m,d,h,i,s",
+          "example": "m",
+          "member": "string",
+          "name": "TimeUnit",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "交易模式 0-下单并支付 1-下单",
+          "example": "0",
+          "member": "int64",
+          "name": "DealMode",
+          "required": false,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "RenewClustersResponse": {
+      "document": "RenewClusters返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "预付费总订单号\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "123",
+          "member": "string",
+          "name": "BigDealIds",
+          "required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "退款订单号\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "[134]",
+          "member": "string",
+          "name": "DealNames",
+          "required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "冻结流水，一次开通一个冻结流水\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "0",
+          "member": "string",
+          "name": "TranId",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "每个订单号对应的发货资源id列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "ResourceIds",
+          "required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "集群id列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "ClusterIds",
+          "required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ResetAccountPasswordRequest": {
       "document": "ResetAccountPassword请求参数结构体",
       "members": [

tccli/services/cynosdb/v20190107/examples.json

@@ -1000,6 +1000,14 @@
         "title": "关闭多可用区部署"
       }
     ],
+    "RenewClusters": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cynosdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: RenewClusters\n<公共请求参数>\n\n{\n    \"TimeUnit\": \"xx\",\n    \"DealMode\": 0,\n    \"ClusterId\": \"xx\",\n    \"TimeSpan\": 0.0\n}",
+        "output": "{\n    \"Response\": {\n        \"TranId\": \"\",\n        \"BigDealIds\": null,\n        \"ResourceIds\": [],\n        \"RequestId\": \"11b4ce54-xxxx\",\n        \"ClusterIds\": [],\n        \"DealNames\": [\n            \"xxx\",\n            \"xxx\",\n            \"xxx\"\n        ]\n    }\n}",
+        "title": "续费集群"
+      }
+    ],
     "ResetAccountPassword": [
       {
         "document": "修改数据库账号密码",

tccli/services/dlc/dlc_client.py

@@ -2565,6 +2565,58 @@ def doReportHeartbeatMetaData(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeSparkSessionBatchSQLCost(args, parsed_globals):
+    g_param = parse_global_arg(parsed_globals)
+
+    if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+        cred = credential.CVMRoleCredential()
+    elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+        cred = credential.STSAssumeRoleCredential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+            g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE)             and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+        cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+    else:
+        cred = credential.Credential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+        )
+    http_profile = HttpProfile(
+        reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+        reqMethod="POST",
+        endpoint=g_param[OptionsDefine.Endpoint],
+        proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+    )
+    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.DlcClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeSparkSessionBatchSQLCostRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeSparkSessionBatchSQLCost(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 doDescribeUpdatableDataEngines(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7305,6 +7357,7 @@ ACTION_MAP = {
     "DescribeTablesName": doDescribeTablesName,
     "DeleteCHDFSBindingProduct": doDeleteCHDFSBindingProduct,
     "ReportHeartbeatMetaData": doReportHeartbeatMetaData,
+    "DescribeSparkSessionBatchSQLCost": doDescribeSparkSessionBatchSQLCost,
     "DescribeUpdatableDataEngines": doDescribeUpdatableDataEngines,
     "CreateInternalTable": doCreateInternalTable,
     "GenerateCreateMangedTableSql": doGenerateCreateMangedTableSql,