tccli 3.0.1306.1__py2.py3-none-any.whl → 3.0.1308.1__py2.py3-none-any.whl

tccli/services/dsgc/dsgc_client.py

@@ -4073,6 +4073,58 @@ def doDescribeDSPAAssessmentRiskTemplateVulnerableList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeDSPADiscoveryTasks(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.DsgcClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeDSPADiscoveryTasksRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeDSPADiscoveryTasks(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 doDeleteDSPAAssessmentTask(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7750,6 +7802,7 @@ ACTION_MAP = {
     "CreateDSPACOSDiscoveryTask": doCreateDSPACOSDiscoveryTask,
     "DescribeDSPACategoryRules": doDescribeDSPACategoryRules,
     "DescribeDSPAAssessmentRiskTemplateVulnerableList": doDescribeDSPAAssessmentRiskTemplateVulnerableList,
+    "DescribeDSPADiscoveryTasks": doDescribeDSPADiscoveryTasks,
     "DeleteDSPAAssessmentTask": doDeleteDSPAAssessmentTask,
     "VerifyDSPADiscoveryRule": doVerifyDSPADiscoveryRule,
     "DescribeDSPACOSDiscoveryTasks": doDescribeDSPACOSDiscoveryTasks,

tccli/services/dsgc/v20190723/api.json

@@ -609,6 +609,13 @@
       "output": "DescribeDSPADiscoveryTaskTablesResponse",
       "status": "online"
     },
+    "DescribeDSPADiscoveryTasks": {
+      "document": "获取分类分级任务列表",
+      "input": "DescribeDSPADiscoveryTasksRequest",
+      "name": "获取分类分级任务信息列表",
+      "output": "DescribeDSPADiscoveryTasksResponse",
+      "status": "online"
+    },
     "DescribeDSPAESDataAssetByComplianceId": {
       "document": "根据合规组id，去查询ES的概览页统计数据",
       "input": "DescribeDSPAESDataAssetByComplianceIdRequest",
@@ -1838,7 +1845,7 @@
         {
           "disabled": false,
           "document": "支持的数据源类型",
-          "example": "[mysq,pgsql]",
+          "example": "[mysql,pgsql]",
           "member": "string",
           "name": "SupportDataSource",
           "output_required": true,
@@ -2307,7 +2314,7 @@
         {
           "disabled": false,
           "document": "数据源Id",
-          "example": "cos-xadsa",
+          "example": "cos-cd514cb2baa46034bedae480c871f5b6a367e123",
           "member": "string",
           "name": "DataSourceId",
           "output_required": true,
@@ -9456,6 +9463,107 @@
       ],
       "type": "object"
     },
+    "DescribeDSPADiscoveryTasksRequest": {
+      "document": "DescribeDSPADiscoveryTasks请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "DSPA实例ID",
+          "example": "dspa-001",
+          "member": "string",
+          "name": "DspaId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "数据源类型，可取值如下：\ncdb 表示云数据库 MySQL,\ndcdb 表示TDSQL MySQL版,\nmariadb 表示云数据库 MariaDB,\npostgres 表示云数据库 PostgreSQL,\ncynosdbpg 表示TDSQL-C PostgreSQL版,\ncynosdbmysql 表示TDSQL-C MySQL版,\nselfbuilt-db 表示自建数据库",
+          "example": "cdb",
+          "member": "string",
+          "name": "DataSourceType",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "任务ID",
+          "example": "1",
+          "member": "int64",
+          "name": "TaskId",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "任务名称",
+          "example": "扫描敏感数据任务",
+          "member": "string",
+          "name": "Name",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "任务扫描结果状态，可供选择的状态值有：-1待触发 0待扫描 1扫描中 2扫描终止 3扫描成功 4扫描失败",
+          "example": "[1,2]",
+          "member": "int64",
+          "name": "StatusList",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "偏移量，默认为0",
+          "example": "0",
+          "member": "int64",
+          "name": "Offset",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "返回结果集数量，默认值是10000，最大值为10000，根据该资源的个数限制条件，该资源的个数不会超过10000，所以如果不输入该字段，默认获取全量数据",
+          "example": "20",
+          "member": "int64",
+          "name": "Limit",
+          "required": false,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeDSPADiscoveryTasksResponse": {
+      "document": "DescribeDSPADiscoveryTasks返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "任务列表",
+          "example": "无",
+          "member": "DspaDiscoveryTask",
+          "name": "Items",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "符合条件的任务列表数",
+          "example": "1",
+          "member": "int64",
+          "name": "TotalCount",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeDSPAESDataAssetByComplianceIdRequest": {
       "document": "DescribeDSPAESDataAssetByComplianceId请求参数结构体",
       "members": [
@@ -10520,7 +10628,7 @@
         {
           "disabled": false,
           "document": "下载链接集合",
-          "example": "[htpp://www.xxx.com/url]",
+          "example": "[http://www.xxx.com/url]",
           "member": "string",
           "name": "DownloadUrlSet",
           "output_required": false,
@@ -12666,6 +12774,112 @@
       ],
       "usage": "out"
     },
+    "DspaDiscoveryTask": {
+      "document": "分类分级任务相关信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "任务名称",
+          "example": "无",
+          "member": "string",
+          "name": "Name",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "任务描述",
+          "example": "无",
+          "member": "string",
+          "name": "Description",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "执行周期，0单次 1每天 2每周 3每月",
+          "example": "无",
+          "member": "int64",
+          "name": "Period",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "执行计划，0立即 1定时",
+          "example": "无",
+          "member": "int64",
+          "name": "Plan",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "任务开关；1 打开，0 关闭",
+          "example": "无",
+          "member": "int64",
+          "name": "Enable",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "元数据对象信息",
+          "example": "无",
+          "member": "DspaDiscoveryTaskDataSource",
+          "name": "DataSourceInfo",
+          "required": true,
+          "type": "object",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "通用规则集开关，0 关闭，1 启用",
+          "example": "1",
+          "member": "int64",
+          "name": "GeneralRuleSetEnable",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "任务最新的一次执行结果信息，该字段用于查询任务列表接口\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "ScanTaskResult",
+          "name": "Result",
+          "required": true,
+          "type": "object",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "定时开始时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2021-12-1212:12:12",
+          "member": "string",
+          "name": "TimingStartTime",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "关联模板是否更新\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "true",
+          "member": "bool",
+          "name": "ComplianceUpdate",
+          "required": true,
+          "type": "bool",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
     "DspaDiscoveryTaskCOSCondition": {
       "document": "描述对象存储类敏感识别扫描人元数据条件。",
       "members": [
@@ -14492,7 +14706,7 @@
         {
           "disabled": false,
           "document": "地域",
-          "example": "ap-shanghia",
+          "example": "ap-shanghai",
           "member": "string",
           "name": "ResourceRegion",
           "output_required": false,
@@ -15662,7 +15876,7 @@
         {
           "disabled": false,
           "document": "风险等级名称",
-          "example": "riskLevel",
+          "example": "高风险",
           "member": "string",
           "name": "RiskLevelName",
           "required": true,
@@ -15671,7 +15885,7 @@
         {
           "disabled": false,
           "document": "风险的描述",
-          "example": "rislDesc",
+          "example": "高风险",
           "member": "string",
           "name": "RiskLevelDescription",
           "required": true,
@@ -15806,7 +16020,7 @@
         {
           "disabled": false,
           "document": "模板的描述",
-          "example": "tmplate-desc",
+          "example": "template-desc",
           "member": "string",
           "name": "TemplateDescription",
           "required": false,

tccli/services/dsgc/v20190723/examples.json

@@ -702,6 +702,14 @@
         "title": "获取分级分级扫描的表集合"
       }
     ],
+    "DescribeDSPADiscoveryTasks": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: dsgc.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeDSPADiscoveryTasks\n<公共请求参数>\n\n{\n    \"DataSourceType\": \"cdb\",\n    \"DspaId\": \"dspa-001\",\n    \"Limit\": \"1\",\n    \"Offset\": \"0\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"91c7a73v-e540-4780-8b8e-74e0b65b4f1a\",\n        \"TotalCount\": 1,\n        \"Items\": [\n            {\n                \"Name\": \"通用规则集测试\",\n                \"Description\": \"\",\n                \"Period\": 0,\n                \"Plan\": 0,\n                \"Enable\": 1,\n                \"TimingStartTime\": null,\n                \"GeneralRuleSetEnable\": 0,\n                \"DataSourceInfo\": {\n                    \"ResourceRegion\": \"ap-guangzhou\",\n                    \"DataSourceId\": \"cdb-6dcpe42v\",\n                    \"DataSourceName\": \"采集测试\",\n                    \"ProxyAddress\": null,\n                    \"Condition\": \"test_report,dsgctest001\",\n                    \"DataSourceType\": \"cdb\"\n                },\n                \"ComplianceUpdate\": false,\n                \"Result\": {\n                    \"Id\": 4142,\n                    \"EndTime\": \"2024-11-05 17:17:30\",\n                    \"Status\": 3,\n                    \"Result\": \"\"\n                }\n            }\n        ]\n    }\n}",
+        "title": "获取分类分级任务列表"
+      }
+    ],
     "DescribeDSPAESDataAssetByComplianceId": [
       {
         "document": "概览页",