tccli 3.0.1158.1__py2.py3-none-any.whl → 3.0.1160.1__py2.py3-none-any.whl

tccli/services/csip/csip_client.py

@@ -1161,6 +1161,58 @@ def doDescribeRiskCenterWebsiteRiskList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeCFWAssetStatistics(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.CsipClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeCFWAssetStatisticsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeCFWAssetStatistics(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 doStopRiskCenterTask(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2234,6 +2286,7 @@ ACTION_MAP = {
     "DescribeAssetViewVulRiskList": doDescribeAssetViewVulRiskList,
     "DescribeVULRiskDetail": doDescribeVULRiskDetail,
     "DescribeRiskCenterWebsiteRiskList": doDescribeRiskCenterWebsiteRiskList,
+    "DescribeCFWAssetStatistics": doDescribeCFWAssetStatistics,
     "StopRiskCenterTask": doStopRiskCenterTask,
     "CreateRiskCenterScanTask": doCreateRiskCenterScanTask,
     "DescribeGatewayAssets": doDescribeGatewayAssets,

tccli/services/csip/v20221121/api.json

@@ -49,6 +49,13 @@
       "output": "DescribeAssetViewVulRiskListResponse",
       "status": "online"
     },
+    "DescribeCFWAssetStatistics": {
+      "document": "云防资产中心统计数据",
+      "input": "DescribeCFWAssetStatisticsRequest",
+      "name": "云防资产中心统计数据",
+      "output": "DescribeCFWAssetStatisticsResponse",
+      "status": "online"
+    },
     "DescribeCVMAssetInfo": {
       "document": "cvm详情",
       "input": "DescribeCVMAssetInfoRequest",
@@ -5477,6 +5484,133 @@
       ],
       "type": "object"
     },
+    "DescribeCFWAssetStatisticsRequest": {
+      "document": "DescribeCFWAssetStatistics请求参数结构体",
+      "members": [],
+      "type": "object"
+    },
+    "DescribeCFWAssetStatisticsResponse": {
+      "document": "DescribeCFWAssetStatistics返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "网络资产总数",
+          "example": "无",
+          "member": "int64",
+          "name": "NetworkTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "资产clb数量",
+          "example": "无",
+          "member": "int64",
+          "name": "ClbTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "nat数量",
+          "example": "无",
+          "member": "int64",
+          "name": "NatTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "公网ip数量",
+          "example": "无",
+          "member": "int64",
+          "name": "PublicAssetTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "主机数量",
+          "example": "无",
+          "member": "int64",
+          "name": "CVMAssetTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "配置风险",
+          "example": "无",
+          "member": "int64",
+          "name": "CFGTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "端口风险",
+          "example": "无",
+          "member": "int64",
+          "name": "PortTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "内容风险",
+          "example": "无",
+          "member": "int64",
+          "name": "WebsiteTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "风险服务暴露",
+          "example": "无",
+          "member": "int64",
+          "name": "ServerTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "弱口令风险",
+          "example": "无",
+          "member": "int64",
+          "name": "WeakPasswordTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "漏洞风险",
+          "example": "无",
+          "member": "int64",
+          "name": "VULTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeCVMAssetInfoRequest": {
       "document": "DescribeCVMAssetInfo请求参数结构体",
       "members": [

tccli/services/csip/v20221121/examples.json

@@ -56,6 +56,14 @@
         "title": "success1"
       }
     ],
+    "DescribeCFWAssetStatistics": [
+      {
+        "document": "资产中心统计",
+        "input": "POST / HTTP/1.1\nHost: csip.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeCFWAssetStatistics\n<公共请求参数>\n\n{}",
+        "output": "{\n    \"Response\": {\n        \"NetworkTotal\": 0,\n        \"ClbTotal\": 0,\n        \"NatTotal\": 0,\n        \"PublicAssetTotal\": 0,\n        \"CVMAssetTotal\": 0,\n        \"CFGTotal\": 0,\n        \"PortTotal\": 0,\n        \"WebsiteTotal\": 0,\n        \"ServerTotal\": 0,\n        \"WeakPasswordTotal\": 0,\n        \"VULTotal\": 0,\n        \"RequestId\": \"abc\"\n    }\n}",
+        "title": "资产中心统计"
+      }
+    ],
     "DescribeCVMAssetInfo": [
       {
         "document": "接口测试",

tccli/services/cwp/v20180228/api.json

@@ -11295,7 +11295,7 @@
           "example": "1",
           "member": "uint64",
           "name": "Id",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -11305,7 +11305,7 @@
           "example": "dadada",
           "member": "string",
           "name": "Uuid",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11315,7 +11315,7 @@
           "example": "dadasda",
           "member": "string",
           "name": "Quuid",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11325,7 +11325,7 @@
           "example": "127.0.0.1",
           "member": "string",
           "name": "Hostip",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11335,7 +11335,7 @@
           "example": "root",
           "member": "string",
           "name": "User",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11345,7 +11345,7 @@
           "example": "1",
           "member": "uint64",
           "name": "Platform",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -11355,7 +11355,7 @@
           "example": "rm",
           "member": "string",
           "name": "BashCmd",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11365,7 +11365,7 @@
           "example": "1",
           "member": "uint64",
           "name": "RuleId",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -11375,7 +11375,7 @@
           "example": "1",
           "member": "string",
           "name": "RuleName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11385,7 +11385,7 @@
           "example": "1",
           "member": "uint64",
           "name": "RuleLevel",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -11395,7 +11395,7 @@
           "example": "1",
           "member": "uint64",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -11405,7 +11405,7 @@
           "example": "2021-03-30 19:17:28",
           "member": "string",
           "name": "CreateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11415,7 +11415,7 @@
           "example": "主机",
           "member": "string",
           "name": "MachineName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11425,7 +11425,7 @@
           "example": "1",
           "member": "uint64",
           "name": "DetectBy",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -11435,7 +11435,7 @@
           "example": "1",
           "member": "string",
           "name": "Pid",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11445,7 +11445,7 @@
           "example": "1.exe",
           "member": "string",
           "name": "Exe",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11455,7 +11455,7 @@
           "example": "2021-03-30 19:17:28",
           "member": "string",
           "name": "ModifyTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11465,7 +11465,7 @@
           "example": "0",
           "member": "uint64",
           "name": "RuleCategory",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -11475,7 +11475,17 @@
           "example": "rm -rf /tmp/t*",
           "member": "string",
           "name": "RegexBashCmd",
-          "required": true,
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "主机HostName\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "ins-1324",
+          "member": "string",
+          "name": "HostName",
+          "output_required": false,
           "type": "string",
           "value_allowed_null": true
         }
@@ -11707,7 +11717,7 @@
           "example": "1",
           "member": "uint64",
           "name": "Id",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -11717,7 +11727,7 @@
           "example": "dadada",
           "member": "string",
           "name": "Uuid",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11727,7 +11737,7 @@
           "example": "dadasda",
           "member": "string",
           "name": "Quuid",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11737,7 +11747,7 @@
           "example": "127.0.0.1",
           "member": "string",
           "name": "HostIp",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11747,7 +11757,7 @@
           "example": "1",
           "member": "uint64",
           "name": "Platform",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -11757,7 +11767,7 @@
           "example": "rm",
           "member": "string",
           "name": "BashCmd",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11767,7 +11777,7 @@
           "example": "1",
           "member": "uint64",
           "name": "RuleId",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -11777,7 +11787,7 @@
           "example": "1",
           "member": "string",
           "name": "RuleName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11787,7 +11797,7 @@
           "example": "1",
           "member": "uint64",
           "name": "RuleLevel",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -11797,7 +11807,7 @@
           "example": "1",
           "member": "uint64",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -11807,7 +11817,7 @@
           "example": "2021-03-30 19:17:28",
           "member": "string",
           "name": "CreateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11817,7 +11827,7 @@
           "example": "主机",
           "member": "string",
           "name": "MachineName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11827,7 +11837,7 @@
           "example": "1.exe",
           "member": "string",
           "name": "Exe",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11837,7 +11847,7 @@
           "example": "2021-03-30 19:17:28",
           "member": "string",
           "name": "ModifyTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11847,7 +11857,7 @@
           "example": "0",
           "member": "uint64",
           "name": "RuleCategory",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -11857,7 +11867,7 @@
           "example": "rm -rf /tmp/t*",
           "member": "string",
           "name": "RegexBashCmd",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11867,7 +11877,7 @@
           "example": "\"[{\"pid\":1234,\"exe\":\"/usr/bin/bash\",\"account\":\"root:root\",\"cmdl\"",
           "member": "string",
           "name": "PsTree",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11877,7 +11887,7 @@
           "example": "建议方案",
           "member": "string",
           "name": "SuggestScheme",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11887,7 +11897,7 @@
           "example": "描述",
           "member": "string",
           "name": "HarmDescribe",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11897,7 +11907,7 @@
           "example": "[\"标签1\",\"标签2\"]",
           "member": "string",
           "name": "Tags",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -11907,7 +11917,7 @@
           "example": "[\"http://www.tencent.com\"]",
           "member": "string",
           "name": "References",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -11917,7 +11927,7 @@
           "example": "124.2.4.55",
           "member": "string",
           "name": "MachineWanIp",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11927,7 +11937,7 @@
           "example": "ONLINE",
           "member": "string",
           "name": "MachineStatus",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11937,7 +11947,7 @@
           "example": "test",
           "member": "string",
           "name": "User",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -11947,7 +11957,17 @@
           "example": "1234",
           "member": "string",
           "name": "Pid",
-          "required": true,
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "数据来源\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "DetectBy",
+          "output_required": false,
           "type": "string",
           "value_allowed_null": true
         }
@@ -38386,7 +38406,7 @@
           "example": "xx",
           "member": "string",
           "name": "DownloadUrl",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -40737,7 +40757,7 @@
           "example": "xxx",
           "member": "string",
           "name": "DownloadUrl",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },

tccli/services/cwp/v20180228/examples.json

@@ -3040,7 +3040,7 @@
       {
         "document": "",
         "input": "POST / HTTP/1.1\nHost: cwp.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ExportAssetRecentMachineInfo\n<公共请求参数>\n\n{\n    \"BeginDate\": \"2020-09-22\",\n    \"EndDate\": \"2020-09-22\"\n}",
-        "output": "{\n    \"Response\": {\n        \"DownloadUrl\": \"xx\",\n        \"RequestId\": \"xx\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"DownloadUrl\": \"http://xx/xxx\",\n        \"RequestId\": \"abcs12434\"\n    }\n}",
         "title": "导出主机概况趋势"
       }
     ],