tccli 3.0.1136.1__py2.py3-none-any.whl → 3.0.1137.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1136.1'
+__version__ = '3.0.1137.1'

tccli/command.py

@@ -154,7 +154,10 @@ class ServiceCommand(BaseCommand):
             version = self._cli_data.get_service_default_version(service_name)
         available_version_list = self._cli_data.get_available_services()[service_name]
         if version not in available_version_list:
-            raise Exception("available versions: %s" % " ".join(available_version_list))
+            raise Exception("Version: %s is invalid in service: %s, available versions: %s. \n"
+                            "Please check your command or configure file to find out "
+                            "if version setting is correct."
+                            % (service_name, version, " ".join(available_version_list)))
         self._version = version
         self._command_map = None
         self._service_model = None

tccli/help_command.py

@@ -26,7 +26,10 @@ class BaseHelpCommand(object):
                 version = self._cli_data.get_service_default_version(service_name)
             available_version_list = self._cli_data.get_available_services()[service_name]
             if version not in available_version_list:
-                raise Exception("available versions: %s" % " ".join(available_version_list))
+                raise Exception("Version: %s is invalid in service: %s, available versions: %s. \n"
+                                "Please check your command or configure file to find out "
+                                "if version setting is correct."
+                                % (service_name, version, " ".join(available_version_list)))
             self._version = version
 
     def __call__(self, args, parsed_globals):

tccli/services/cdb/v20170320/api.json

@@ -7178,7 +7178,7 @@
           "example": "2",
           "member": "int64",
           "name": "TotalCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -7188,7 +7188,7 @@
           "example": "无",
           "member": "AccountInfo",
           "name": "Items",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -7198,7 +7198,7 @@
           "example": "10240",
           "member": "int64",
           "name": "MaxUserConnections",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },

tccli/services/cls/v20201016/api.json

@@ -1596,6 +1596,34 @@
       ],
       "usage": "both"
     },
+    "AnonymousInfo": {
+      "document": "免鉴权信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "操作列表，支持trackLog(JS/HTTP上传日志  )和realtimeProducer(kafka协议上传日志)",
+          "example": "无",
+          "member": "string",
+          "name": "Operations",
+          "output_required": false,
+          "required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "条件列表",
+          "example": "无",
+          "member": "ConditionInfo",
+          "name": "Conditions",
+          "output_required": false,
+          "required": false,
+          "type": "list",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
     "ApplyConfigToMachineGroupRequest": {
       "document": "ApplyConfigToMachineGroup请求参数结构体",
       "members": [
@@ -1984,6 +2012,45 @@
       ],
       "usage": "both"
     },
+    "ConditionInfo": {
+      "document": "免鉴权条件信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "条件属性，目前只支持VpcID",
+          "example": "VpcID",
+          "member": "string",
+          "name": "Attributes",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "条件规则，1:等于，2:不等于",
+          "example": "1",
+          "member": "uint64",
+          "name": "Rule",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "对应条件属性的值",
+          "example": "vpc-6jfhit1t",
+          "member": "string",
+          "name": "ConditionValue",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
     "ConfigExtraInfo": {
       "document": "特殊采集规则配置信息",
       "members": [
@@ -4759,6 +4826,15 @@
           "name": "IsWebTracking",
           "required": false,
           "type": "bool"
+        },
+        {
+          "disabled": false,
+          "document": "日志主题扩展信息",
+          "example": "无",
+          "member": "TopicExtendInfo",
+          "name": "Extends",
+          "required": false,
+          "type": "object"
         }
       ],
       "type": "object"
@@ -13441,6 +13517,23 @@
       ],
       "usage": "both"
     },
+    "TopicExtendInfo": {
+      "document": "日志主题扩展信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "日志主题免鉴权配置信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "AnonymousInfo",
+          "name": "AnonymousAccess",
+          "output_required": false,
+          "required": false,
+          "type": "object",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "both"
+    },
     "TopicIdAndRegion": {
       "document": "仪表盘 topic与地域信息",
       "members": [

tccli/services/cwp/cwp_client.py

@@ -21129,58 +21129,6 @@ def doDescribeAssetTypes(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteAttackLogs(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.CwpClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteAttackLogsRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.DeleteAttackLogs(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 doDescribeVulLabels(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -27318,7 +27266,6 @@ ACTION_MAP = {
     "DescribeAssetSystemPackageList": doDescribeAssetSystemPackageList,
     "DescribeSecurityBroadcasts": doDescribeSecurityBroadcasts,
     "DescribeAssetTypes": doDescribeAssetTypes,
-    "DeleteAttackLogs": doDeleteAttackLogs,
     "DescribeVulLabels": doDescribeVulLabels,
     "DescribeHistoryService": doDescribeHistoryService,
     "StopBaselineDetect": doStopBaselineDetect,

tccli/services/cwp/v20180228/api.json

@@ -203,13 +203,6 @@
       "output": "DeleteAllJavaMemShellsResponse",
       "status": "online"
     },
-    "DeleteAttackLogs": {
-      "document": "ModifyEventAttackStatus 接口替代\n\n删除网络攻击日志",
-      "input": "DeleteAttackLogsRequest",
-      "name": "删除网络攻击日志",
-      "output": "DeleteAttackLogsResponse",
-      "status": "deprecated"
-    },
     "DeleteBanWhiteList": {
       "document": "删除阻断白名单列表",
       "input": "DeleteBanWhiteListRequest",
@@ -15429,42 +15422,6 @@
       ],
       "type": "object"
     },
-    "DeleteAttackLogsRequest": {
-      "document": "DeleteAttackLogs请求参数结构体",
-      "members": [
-        {
-          "disabled": false,
-          "document": "日志ID数组，最大100条。",
-          "example": "[]",
-          "member": "uint64",
-          "name": "Ids",
-          "required": false,
-          "type": "list"
-        },
-        {
-          "disabled": false,
-          "document": "是否全部删除",
-          "example": "true",
-          "member": "bool",
-          "name": "IsAll",
-          "required": false,
-          "type": "bool"
-        }
-      ],
-      "type": "object"
-    },
-    "DeleteAttackLogsResponse": {
-      "document": "DeleteAttackLogs返回参数结构体",
-      "members": [
-        {
-          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
-          "member": "string",
-          "name": "RequestId",
-          "type": "string"
-        }
-      ],
-      "type": "object"
-    },
     "DeleteBanWhiteListRequest": {
       "document": "DeleteBanWhiteList请求参数结构体",
       "members": [

tccli/services/cwp/v20180228/examples.json

@@ -238,14 +238,6 @@
         "title": "删除全部java内存马事件"
       }
     ],
-    "DeleteAttackLogs": [
-      {
-        "document": "删除网络攻击日志",
-        "input": "POST / HTTP/1.1\nHost: cwp.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DeleteAttackLogs\n<公共请求参数>\n\n{\n    \"Ids\": [\n        \"2\",\n        \"1\"\n    ]\n}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"354f4ac3-8546-4516-8c8a-69e3ab73aa8a\"\n    }\n}",
-        "title": "删除网络攻击日志"
-      }
-    ],
     "DeleteBanWhiteList": [
       {
         "document": "",

tccli/services/cynosdb/v20190107/api.json

@@ -1821,6 +1821,16 @@
           "output_required": false,
           "type": "list",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "事务ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "int64",
+          "name": "TrxId",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"

tccli/services/dlc/v20210125/api.json

@@ -2696,7 +2696,7 @@
         },
         {
           "disabled": false,
-          "document": "表类型",
+          "document": "表类型：EXTERNAL_TABLE, VIRTUAL_VIEW, MATERIALIZED_VIEW",
           "example": "EXTERNAL",
           "member": "string",
           "name": "Type",
@@ -7415,7 +7415,7 @@
           "example": "n1",
           "member": "string",
           "name": "Name",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7425,7 +7425,7 @@
           "example": "schema1",
           "member": "string",
           "name": "SchemaName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7435,7 +7435,7 @@
           "example": "cosn://123",
           "member": "string",
           "name": "Location",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7445,7 +7445,7 @@
           "example": "无",
           "member": "Asset",
           "name": "Asset",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -7682,7 +7682,7 @@
           "example": "无",
           "member": "Asset",
           "name": "Asset",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -7692,7 +7692,7 @@
           "example": "select 1",
           "member": "string",
           "name": "ViewOriginalText",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7702,7 +7702,7 @@
           "example": "select 1",
           "member": "string",
           "name": "ViewExpandedText",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7712,7 +7712,7 @@
           "example": "1",
           "member": "int64",
           "name": "Retention",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -7722,7 +7722,7 @@
           "example": "无",
           "member": "DMSSds",
           "name": "Sds",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -7732,7 +7732,7 @@
           "example": "无",
           "member": "DMSColumn",
           "name": "PartitionKeys",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -7742,7 +7742,7 @@
           "example": "无",
           "member": "DMSPartition",
           "name": "Partitions",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -7752,7 +7752,7 @@
           "example": "EXTERNAL",
           "member": "string",
           "name": "Type",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7762,7 +7762,7 @@
           "example": "db1",
           "member": "string",
           "name": "DbName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7772,7 +7772,7 @@
           "example": "schema1",
           "member": "string",
           "name": "SchemaName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7782,7 +7782,7 @@
           "example": "1",
           "member": "int64",
           "name": "StorageSize",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -7792,7 +7792,7 @@
           "example": "0",
           "member": "int64",
           "name": "RecordCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -7802,7 +7802,7 @@
           "example": "1",
           "member": "int64",
           "name": "LifeTime",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -7812,7 +7812,7 @@
           "example": "2020-01-01 11:11:11",
           "member": "datetime_iso",
           "name": "LastAccessTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7822,7 +7822,7 @@
           "example": "2020-01-01 11:11:11",
           "member": "datetime_iso",
           "name": "DataUpdateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7832,7 +7832,7 @@
           "example": "2020-01-01 11:11:11",
           "member": "datetime_iso",
           "name": "StructUpdateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -7842,7 +7842,7 @@
           "example": "无",
           "member": "DMSColumn",
           "name": "Columns",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -7852,7 +7852,7 @@
           "example": "table1",
           "member": "string",
           "name": "Name",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },