tccli 3.0.1048.1__py2.py3-none-any.whl → 3.0.1050.1__py2.py3-none-any.whl

tccli/services/cls/v20201016/api.json

@@ -4199,6 +4199,15 @@
           "name": "EndTime",
           "required": false,
           "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "cos桶存储类型",
+          "example": "STANDARD",
+          "member": "string",
+          "name": "StorageType",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -4212,6 +4221,7 @@
           "example": "57f5808c-4a55-11eb-b378-0242ac130002",
           "member": "string",
           "name": "ShipperId",
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -10284,6 +10294,15 @@
           "name": "FilenameMode",
           "required": false,
           "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "cos桶类型",
+          "example": "STANDARD",
+          "member": "string",
+          "name": "StorageType",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -11987,7 +12006,7 @@
           "example": "57f5808c-4a55-11eb-b378-0242ac130002",
           "member": "string",
           "name": "ShipperId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -11997,7 +12016,7 @@
           "example": "57f5808c-4a55-11eb-b378-0242ac130002",
           "member": "string",
           "name": "TopicId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -12007,7 +12026,7 @@
           "example": "无",
           "member": "string",
           "name": "Bucket",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -12017,7 +12036,7 @@
           "example": "无",
           "member": "string",
           "name": "Prefix",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -12027,7 +12046,7 @@
           "example": "testShipper",
           "member": "string",
           "name": "ShipperName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -12037,7 +12056,7 @@
           "example": "300",
           "member": "uint64",
           "name": "Interval",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -12047,7 +12066,7 @@
           "example": "256",
           "member": "uint64",
           "name": "MaxSize",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -12057,7 +12076,7 @@
           "example": "true",
           "member": "bool",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "bool",
           "value_allowed_null": false
         },
@@ -12067,7 +12086,7 @@
           "example": "无",
           "member": "FilterRuleInfo",
           "name": "FilterRules",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -12077,7 +12096,7 @@
           "example": "无",
           "member": "string",
           "name": "Partition",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -12087,7 +12106,7 @@
           "example": "无",
           "member": "CompressInfo",
           "name": "Compress",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -12097,7 +12116,7 @@
           "example": "无",
           "member": "ContentInfo",
           "name": "Content",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -12107,7 +12126,7 @@
           "example": "无",
           "member": "string",
           "name": "CreateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -12117,7 +12136,7 @@
           "example": "无",
           "member": "uint64",
           "name": "FilenameMode",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -12127,7 +12146,7 @@
           "example": "1670642281",
           "member": "int64",
           "name": "StartTime",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -12137,7 +12156,7 @@
           "example": "0",
           "member": "int64",
           "name": "EndTime",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -12147,7 +12166,7 @@
           "example": "5.6",
           "member": "float",
           "name": "Progress",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": true
         },
@@ -12157,7 +12176,7 @@
           "example": "23",
           "member": "int64",
           "name": "RemainTime",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -12167,9 +12186,19 @@
           "example": "1",
           "member": "int64",
           "name": "HistoryStatus",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "cos桶类型\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "StorageType",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"

tccli/services/csip/csip_client.py

@@ -901,6 +901,58 @@ def doDescribeCVMAssets(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyRiskCenterScanTask(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.ModifyRiskCenterScanTaskRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyRiskCenterScanTask(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 doDescribeRiskCenterWebsiteRiskList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1629,6 +1681,58 @@ def doModifyRiskCenterRiskStatus(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyOrganizationAccountStatus(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.ModifyOrganizationAccountStatusRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyOrganizationAccountStatus(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 doDescribeOrganizationUserInfo(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1813,6 +1917,7 @@ ACTION_MAP = {
     "DescribeVpcAssets": doDescribeVpcAssets,
     "DescribeRiskCenterServerRiskList": doDescribeRiskCenterServerRiskList,
     "DescribeCVMAssets": doDescribeCVMAssets,
+    "ModifyRiskCenterScanTask": doModifyRiskCenterScanTask,
     "DescribeRiskCenterWebsiteRiskList": doDescribeRiskCenterWebsiteRiskList,
     "StopRiskCenterTask": doStopRiskCenterTask,
     "CreateRiskCenterScanTask": doCreateRiskCenterScanTask,
@@ -1827,6 +1932,7 @@ ACTION_MAP = {
     "DescribeRiskCenterAssetViewPortRiskList": doDescribeRiskCenterAssetViewPortRiskList,
     "DescribeVULRiskAdvanceCFGList": doDescribeVULRiskAdvanceCFGList,
     "ModifyRiskCenterRiskStatus": doModifyRiskCenterRiskStatus,
+    "ModifyOrganizationAccountStatus": doModifyOrganizationAccountStatus,
     "DescribeOrganizationUserInfo": doDescribeOrganizationUserInfo,
     "DescribeTaskLogURL": doDescribeTaskLogURL,
     "DescribeCVMAssetInfo": doDescribeCVMAssetInfo,

tccli/services/csip/v20221121/api.json

@@ -224,6 +224,13 @@
       "output": "DescribeVpcAssetsResponse",
       "status": "online"
     },
+    "ModifyOrganizationAccountStatus": {
+      "document": "修改集团账号状态",
+      "input": "ModifyOrganizationAccountStatusRequest",
+      "name": "修改集团账号状态",
+      "output": "ModifyOrganizationAccountStatusResponse",
+      "status": "online"
+    },
     "ModifyRiskCenterRiskStatus": {
       "document": "修改风险中心风险状态",
       "input": "ModifyRiskCenterRiskStatusRequest",
@@ -231,6 +238,13 @@
       "output": "ModifyRiskCenterRiskStatusResponse",
       "status": "online"
     },
+    "ModifyRiskCenterScanTask": {
+      "document": "修改风险中心扫描任务",
+      "input": "ModifyRiskCenterScanTaskRequest",
+      "name": "修改风险中心扫描任务",
+      "output": "ModifyRiskCenterScanTaskResponse",
+      "status": "online"
+    },
     "StopRiskCenterTask": {
       "document": "停止扫风险中心扫描任务",
       "input": "StopRiskCenterTaskRequest",
@@ -6866,6 +6880,42 @@
       ],
       "usage": "out"
     },
+    "ModifyOrganizationAccountStatusRequest": {
+      "document": "ModifyOrganizationAccountStatus请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "修改集团账号状态，1 开启， 2关闭",
+          "example": "无",
+          "member": "int64",
+          "name": "Status",
+          "required": true,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "ModifyOrganizationAccountStatusResponse": {
+      "document": "ModifyOrganizationAccountStatus返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "返回值为0，则修改成功",
+          "example": "0",
+          "member": "int64",
+          "name": "Status",
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ModifyRiskCenterRiskStatusRequest": {
       "document": "ModifyRiskCenterRiskStatus请求参数结构体",
       "members": [
@@ -6911,6 +6961,144 @@
       ],
       "type": "object"
     },
+    "ModifyRiskCenterScanTaskRequest": {
+      "document": "ModifyRiskCenterScanTask请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "任务名称",
+          "example": "helloworld",
+          "member": "string",
+          "name": "TaskName",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "0-全扫，1-指定资产扫，2-排除资产扫，3-手动填写扫；1和2则Assets字段必填，3则SelfDefiningAssets必填",
+          "example": "0",
+          "member": "int64",
+          "name": "ScanAssetType",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "扫描项目；port/poc/weakpass/webcontent/configrisk",
+          "example": "无",
+          "member": "string",
+          "name": "ScanItem",
+          "required": true,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "0-周期任务,1-立即扫描,2-定时扫描,3-自定义；0,2,3则ScanPlanContent必填",
+          "example": "1",
+          "member": "int64",
+          "name": "ScanPlanType",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "要修改的任务id",
+          "example": "无",
+          "member": "string",
+          "name": "TaskId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "扫描资产信息列表",
+          "example": "无",
+          "member": "TaskAssetObject",
+          "name": "Assets",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "扫描计划详情",
+          "example": "无",
+          "member": "string",
+          "name": "ScanPlanContent",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "ip/域名/url数组",
+          "example": "无",
+          "member": "string",
+          "name": "SelfDefiningAssets",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "高级配置",
+          "example": "无",
+          "member": "TaskAdvanceCFG",
+          "name": "TaskAdvanceCFG",
+          "required": false,
+          "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "体检模式，0-标准模式，1-快速模式，2-高级模式，默认标准模式",
+          "example": "无",
+          "member": "int64",
+          "name": "TaskMode",
+          "required": false,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "ModifyRiskCenterScanTaskResponse": {
+      "document": "ModifyRiskCenterScanTask返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "任务id",
+          "example": "无",
+          "member": "string",
+          "name": "TaskId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "0，修改成功，其他失败；-1为存在资产未认证",
+          "example": "0",
+          "member": "int64",
+          "name": "Status",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "未认证资产列表",
+          "example": "无",
+          "member": "string",
+          "name": "UnAuthAsset",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "NICAsset": {
       "document": "网卡资产",
       "members": [

tccli/services/csip/v20221121/examples.json

@@ -256,6 +256,14 @@
         "title": "空示例"
       }
     ],
+    "ModifyOrganizationAccountStatus": [
+      {
+        "document": "修改集团账号状态",
+        "input": "POST / HTTP/1.1\nHost: csip.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifyOrganizationAccountStatus\n<公共请求参数>\n\n{\n    \"Status\": 0\n}",
+        "output": "{\n    \"Response\": {\n        \"Status\": 0,\n        \"RequestId\": \"abc\"\n    }\n}",
+        "title": "修改集团账号状态"
+      }
+    ],
     "ModifyRiskCenterRiskStatus": [
       {
         "document": "修改风险中心风险状态",
@@ -264,6 +272,14 @@
         "title": "修改风险中心风险状态"
       }
     ],
+    "ModifyRiskCenterScanTask": [
+      {
+        "document": "修改风险中心扫描任务",
+        "input": "POST / HTTP/1.1\nHost: csip.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifyRiskCenterScanTask\n<公共请求参数>\n\n{\n    \"TaskName\": \"abc\",\n    \"Assets\": [\n        {\n            \"AssetName\": \"abc\",\n            \"InstanceType\": \"abc\",\n            \"AssetType\": \"abc\",\n            \"Asset\": \"abc\",\n            \"Region\": \"abc\"\n        }\n    ],\n    \"ScanAssetType\": 0,\n    \"ScanItem\": [\n        \"abc\"\n    ],\n    \"ScanPlanType\": 0,\n    \"ScanPlanContent\": \"abc\",\n    \"SelfDefiningAssets\": [\n        \"abc\"\n    ],\n    \"TaskId\": \"abc\",\n    \"TaskAdvanceCFG\": {\n        \"VulRisk\": [\n            {\n                \"RiskId\": \"abc\",\n                \"Enable\": 0\n            }\n        ],\n        \"WeakPwdRisk\": [\n            {\n                \"CheckItemId\": 0,\n                \"Enable\": 0\n            }\n        ],\n        \"CFGRisk\": [\n            {\n                \"ItemId\": \"abc\",\n                \"Enable\": 0,\n                \"ResourceType\": \"abc\"\n            }\n        ]\n    },\n    \"TaskMode\": 0\n}",
+        "output": "{\n    \"Response\": {\n        \"TaskId\": \"abc\",\n        \"Status\": 0,\n        \"RequestId\": \"abc\"\n    }\n}",
+        "title": "修改风险中心扫描任务"
+      }
+    ],
     "StopRiskCenterTask": [
       {
         "document": "停止扫风险中心扫描任务",