tccli 3.0.832.1__py2.py3-none-any.whl → 3.0.834.1__py2.py3-none-any.whl

tccli/services/cls/v20201016/api.json

@@ -5226,7 +5226,6 @@
       "document": "日志集相关信息",
       "members": [
         {
-          "default": "",
           "document": "日志集ID",
           "example": "4463e7b0-3ec8-41a1-ae48-5d24b22167c2",
           "member": "string",
@@ -5236,7 +5235,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "日志集名称",
           "example": "test",
           "member": "string",
@@ -5246,7 +5244,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "创建时间",
           "example": "2021-04-01 08:00:00",
           "member": "string",
@@ -5256,7 +5253,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "云产品标识，日志集由其它云产品创建时，该字段会显示云产品名称，例如CDN、TKE\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "TCB",
           "member": "string",
@@ -5266,7 +5262,6 @@
           "value_allowed_null": true
         },
         {
-          "default": "",
           "document": "日志集绑定的标签\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "无",
           "member": "Tag",
@@ -5276,7 +5271,6 @@
           "value_allowed_null": true
         },
         {
-          "default": "",
           "document": "日志集下日志主题的数目",
           "example": "10",
           "member": "int64",
@@ -5286,7 +5280,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "若AssumerName非空，则表示创建该日志集的服务方角色",
           "example": "TCB_QcsRole",
           "member": "string",
@@ -7315,8 +7308,8 @@
       "document": "创建资源实例时同时绑定的标签对说明",
       "members": [
         {
-          "default": "",
           "document": "标签键",
+          "example": "无",
           "member": "string",
           "name": "Key",
           "required": true,
@@ -7324,8 +7317,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "标签值",
+          "example": "无",
           "member": "string",
           "name": "Value",
           "required": true,
@@ -7339,7 +7332,6 @@
       "document": "日志主题信息",
       "members": [
         {
-          "default": "",
           "document": "日志集ID",
           "example": "57f5808c-4a55-11eb-b378-0242ac130002",
           "member": "string",
@@ -7349,7 +7341,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "日志主题ID",
           "example": "57f5808c-4a55-11eb-b378-0242ac130002",
           "member": "string",
@@ -7359,7 +7350,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "日志主题名称",
           "example": "test",
           "member": "string",
@@ -7369,7 +7359,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "主题分区个数",
           "example": "1",
           "member": "int64",
@@ -7379,7 +7368,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "是否开启索引",
           "example": "true",
           "member": "bool",
@@ -7389,7 +7377,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "云产品标识，日志主题由其它云产品创建时，该字段会显示云产品名称，例如CDN、TKE\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "test",
           "member": "string",
@@ -7399,7 +7386,6 @@
           "value_allowed_null": true
         },
         {
-          "default": "",
           "document": "创建时间",
           "example": "无",
           "member": "string",
@@ -7409,7 +7395,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "日主主题是否开启采集",
           "example": "true",
           "member": "bool",
@@ -7419,7 +7404,6 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "日志主题绑定的标签信息\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "无",
           "member": "Tag",
@@ -7429,7 +7413,6 @@
           "value_allowed_null": true
         },
         {
-          "default": "",
           "document": "该主题是否开启自动分裂\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "true",
           "member": "bool",
@@ -7439,7 +7422,6 @@
           "value_allowed_null": true
         },
         {
-          "default": "",
           "document": "若开启自动分裂的话，该主题能够允许的最大分区数\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "50",
           "member": "int64",
@@ -7449,7 +7431,6 @@
           "value_allowed_null": true
         },
         {
-          "default": "",
           "document": "日主题的存储类型\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "hot",
           "member": "string",
@@ -7459,7 +7440,6 @@
           "value_allowed_null": true
         },
         {
-          "default": "",
           "document": "生命周期，单位天，可取值范围1~3600。取值为3640时代表永久保存\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "30",
           "member": "int64",
@@ -7469,7 +7449,6 @@
           "value_allowed_null": true
         },
         {
-          "default": "",
           "document": "云产品二级标识，日志主题由其它云产品创建时，该字段会显示云产品名称及其日志类型的二级分类，例如TKE-Audit、TKE-Event。部分云产品仅有云产品标识(AssumerName)，无该字段。\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "TKE-Audio",
           "member": "string",
@@ -7479,7 +7458,6 @@
           "value_allowed_null": true
         },
         {
-          "default": "",
           "document": "日志主题描述\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "xx部门xx业务topic",
           "member": "string",
@@ -7487,6 +7465,15 @@
           "required": true,
           "type": "string",
           "value_allowed_null": true
+        },
+        {
+          "document": "开启日志沉降，热存储的生命周期， hotPeriod < Period。\n热存储为 hotPeriod, 冷存储则为 Period-hotPeriod。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "0",
+          "member": "uint64",
+          "name": "HotPeriod",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"

tccli/services/cls/v20201016/examples.json

@@ -356,7 +356,7 @@
       {
         "document": "获取日志主题列表",
         "input": "POST / HTTP/1.1\nHost: cls.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeTopics\n<公共请求参数>\n\n{\n    \"Filters\": [],\n    \"Offset\": 10,\n    \"Limit\": 30\n}",
-        "output": "{\n    \"Response\": {\n        \"TotalCount\": 1,\n        \"Topics\": [\n            {\n                \"Index\": true,\n                \"PartitionCount\": 1,\n                \"Describes\": \"x1\",\n                \"Status\": true,\n                \"Tags\": [\n                    {\n                        \"Value\": \"x10\",\n                        \"Key\": \"x11\"\n                    }\n                ],\n                \"AssumerName\": \"x12\",\n                \"SubAssumerName\": \"x13\",\n                \"MaxSplitPartitions\": 0,\n                \"LogsetId\": \"x15\",\n                \"TopicId\": \"x16\",\n                \"StorageType\": \"x17\",\n                \"Period\": 0,\n                \"AutoSplit\": true,\n                \"CreateTime\": \"x18\",\n                \"TopicName\": \"x19\"\n            }\n        ],\n        \"RequestId\": \"x20\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"TotalCount\": 1,\n        \"Topics\": [\n            {\n                \"Index\": true,\n                \"PartitionCount\": 1,\n                \"Describes\": \"x1\",\n                \"Status\": true,\n                \"Tags\": [\n                    {\n                        \"Value\": \"x10\",\n                        \"Key\": \"x11\"\n                    }\n                ],\n                \"AssumerName\": \"x12\",\n                \"SubAssumerName\": \"x13\",\n                \"MaxSplitPartitions\": 0,\n                \"LogsetId\": \"x15\",\n                \"TopicId\": \"x16\",\n                \"HotPeriod\": 1,\n                \"StorageType\": \"x17\",\n                \"Period\": 0,\n                \"AutoSplit\": true,\n                \"CreateTime\": \"x18\",\n                \"TopicName\": \"x19\"\n            }\n        ],\n        \"RequestId\": \"x20\"\n    }\n}",
         "title": "获取日志主题列表"
       }
     ],

tccli/services/cvm/cvm_client.py

@@ -3085,6 +3085,58 @@ def doDescribeKeyPairs(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeTaskInfo(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.CvmClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeTaskInfoRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeTaskInfo(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 doDescribeReservedInstancesOfferings(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4871,6 +4923,7 @@ ACTION_MAP = {
     "DescribeInstanceVncUrl": doDescribeInstanceVncUrl,
     "ModifyInstancesProject": doModifyInstancesProject,
     "DescribeKeyPairs": doDescribeKeyPairs,
+    "DescribeTaskInfo": doDescribeTaskInfo,
     "DescribeReservedInstancesOfferings": doDescribeReservedInstancesOfferings,
     "InquiryPriceModifyInstancesChargeType": doInquiryPriceModifyInstancesChargeType,
     "DescribeInternetChargeTypeConfigs": doDescribeInternetChargeTypeConfigs,