tccli 3.0.1129.1__py2.py3-none-any.whl → 3.0.1131.1__py2.py3-none-any.whl

tccli/services/waf/v20180125/api.json

@@ -238,6 +238,13 @@
       "output": "DescribeAntiInfoLeakageRulesResponse",
       "status": "online"
     },
+    "DescribeAreaBanAreas": {
+      "document": "获取地域封禁配置包括地域封禁开关，设置封禁的地区信息",
+      "input": "DescribeAreaBanAreasRequest",
+      "name": "获取地域封禁配置",
+      "output": "DescribeAreaBanAreasResponse",
+      "status": "online"
+    },
     "DescribeAreaBanSupportAreas": {
       "document": "获取WAF地域封禁支持的地域列表",
       "input": "DescribeAreaBanSupportAreasRequest",
@@ -5934,6 +5941,108 @@
       ],
       "usage": "out"
     },
+    "DescribeAreaBanAreasRequest": {
+      "document": "DescribeAreaBanAreas请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "需要查询的域名",
+          "example": "",
+          "member": "string",
+          "name": "Domain",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeAreaBanAreasResponse": {
+      "document": "DescribeAreaBanAreas返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "回包内容\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "",
+          "member": "DescribeAreaBanAreasRsp",
+          "name": "Data",
+          "type": "object",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeAreaBanAreasRsp": {
+      "document": "DescribeAreaBanAreas接口的回包",
+      "members": [
+        {
+          "disabled": false,
+          "document": "状态 \"0\"：未开启地域封禁 \"1\"：开启地域封禁",
+          "example": "无",
+          "member": "string",
+          "name": "Status",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "数据来源 custom-自定义(默认)、batch-批量防护\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "custom",
+          "member": "string",
+          "name": "Source",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "字符串数据，配置的地域列表",
+          "example": "无",
+          "member": "string",
+          "name": "Areas",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "定时任务类型\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "JobType",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "定时任务详细配置\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "JobDateTime",
+          "name": "JobDateTime",
+          "output_required": false,
+          "type": "object",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "周期任务配置\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "CronType",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
     "DescribeAreaBanSupportAreasRequest": {
       "document": "DescribeAreaBanSupportAreas请求参数结构体",
       "members": [],

tccli/services/waf/v20180125/examples.json

@@ -294,6 +294,20 @@
         "title": "获取信息防泄漏规则列表"
       }
     ],
+    "DescribeAreaBanAreas": [
+      {
+        "document": "",
+        "input": "https://waf.tencentcloudapi.com/?Action=DescribeAreaBanAreas\r\n&Domain=test.qcloudwaf.com\r\n&<公共请求参数>",
+        "output": "{\n    \"Response\": {\n        \"Data\": {\n            \"Areas\": [\n                \"新疆\",\n                \"江西\"\n            ],\n            \"Status\": \"0\"\n        },\n        \"RequestId\": \"5ae9f295-4075-4472-8fd5-da69cc6ffa58\"\n    }\n}",
+        "title": "获取地域封禁配置"
+      },
+      {
+        "document": "",
+        "input": "https://waf.tencentcloudapi.com/?Action=DescribeAreaBanAreas\r\n&Domain=www.test.com\r\n&<公共请求参数>",
+        "output": "{\n    \"Response\": {\n        \"Data\": null,\n        \"RequestId\": \"7b9c4e2b-8282-4a6a-90cf-f64f2caef67a\"\n    }\n}",
+        "title": "未设置封禁区域的场景"
+      }
+    ],
     "DescribeAreaBanSupportAreas": [
       {
         "document": "",

tccli/services/waf/waf_client.py

@@ -433,6 +433,58 @@ def doDescribeAntiInfoLeakRules(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeAreaBanAreas(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.WafClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeAreaBanAreasRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeAreaBanAreas(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 doModifyCustomRule(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1577,7 +1629,7 @@ def doDescribeWebshellStatus(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doGenerateDealsAndPayNew(args, parsed_globals):
+def doDescribeDomainWhiteRules(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1606,11 +1658,11 @@ def doGenerateDealsAndPayNew(args, parsed_globals):
     client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.GenerateDealsAndPayNewRequest()
+    model = models.DescribeDomainWhiteRulesRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.GenerateDealsAndPayNew(model)
+        rsp = client.DescribeDomainWhiteRules(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -5009,7 +5061,7 @@ def doDeleteSession(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeDomainWhiteRules(args, parsed_globals):
+def doGenerateDealsAndPayNew(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -5038,11 +5090,11 @@ def doDescribeDomainWhiteRules(args, parsed_globals):
     client = mod.WafClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeDomainWhiteRulesRequest()
+    model = models.GenerateDealsAndPayNewRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeDomainWhiteRules(model)
+        rsp = client.GenerateDealsAndPayNew(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -7316,6 +7368,7 @@ ACTION_MAP = {
     "DescribeBatchIpAccessControl": doDescribeBatchIpAccessControl,
     "DeleteIpAccessControl": doDeleteIpAccessControl,
     "DescribeAntiInfoLeakRules": doDescribeAntiInfoLeakRules,
+    "DescribeAreaBanAreas": doDescribeAreaBanAreas,
     "ModifyCustomRule": doModifyCustomRule,
     "DescribeFindDomainList": doDescribeFindDomainList,
     "ModifyInstanceQpsLimit": doModifyInstanceQpsLimit,
@@ -7338,7 +7391,7 @@ ACTION_MAP = {
     "DescribeIpHitItems": doDescribeIpHitItems,
     "DescribeHistogram": doDescribeHistogram,
     "DescribeWebshellStatus": doDescribeWebshellStatus,
-    "GenerateDealsAndPayNew": doGenerateDealsAndPayNew,
+    "DescribeDomainWhiteRules": doDescribeDomainWhiteRules,
     "DeleteAntiInfoLeakRule": doDeleteAntiInfoLeakRule,
     "ModifyAreaBanAreas": doModifyAreaBanAreas,
     "CreateDeals": doCreateDeals,
@@ -7404,7 +7457,7 @@ ACTION_MAP = {
     "AddCustomWhiteRule": doAddCustomWhiteRule,
     "DescribeWafAutoDenyRules": doDescribeWafAutoDenyRules,
     "DeleteSession": doDeleteSession,
-    "DescribeDomainWhiteRules": doDescribeDomainWhiteRules,
+    "GenerateDealsAndPayNew": doGenerateDealsAndPayNew,
     "CreateHost": doCreateHost,
     "ModifyDomainsCLSStatus": doModifyDomainsCLSStatus,
     "RefreshAccessCheckResult": doRefreshAccessCheckResult,

tccli/services/wedata/v20210820/api.json

@@ -252,6 +252,13 @@
       "output": "CreateTaskAlarmRegularResponse",
       "status": "online"
     },
+    "CreateTaskFolder": {
+      "document": "编排空间-工作流-创建任务文件夹",
+      "input": "CreateTaskFolderRequest",
+      "name": "创建任务文件夹",
+      "output": "CreateTaskFolderResponse",
+      "status": "online"
+    },
     "CreateTaskVersionDs": {
       "document": "提交任务版本",
       "input": "CreateTaskVersionDsRequest",
@@ -7702,6 +7709,70 @@
       ],
       "type": "object"
     },
+    "CreateTaskFolderRequest": {
+      "document": "CreateTaskFolder请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "项目Id",
+          "example": "无",
+          "member": "string",
+          "name": "ProjectId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "文件夹名称",
+          "example": "无",
+          "member": "string",
+          "name": "FolderName",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "工作量ID",
+          "example": "无",
+          "member": "string",
+          "name": "WorkflowId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "父文件夹ID",
+          "example": "无",
+          "member": "string",
+          "name": "ParentFolderId",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "CreateTaskFolderResponse": {
+      "document": "CreateTaskFolder返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "任务文件夹Id，null则创建失败\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "Data",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "CreateTaskRequest": {
       "document": "CreateTask请求参数结构体",
       "members": [

tccli/services/wedata/v20210820/examples.json

@@ -300,6 +300,14 @@
         "title": "创建集成任务告警规则"
       }
     ],
+    "CreateTaskFolder": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: wedata.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateTaskFolder\n<公共请求参数>\n\n{\n    \"ProjectId\": \"1522676572149563392\",\n    \"FolderName\": \"FFFOOOLLLDDDEERR\",\n    \"ParentFolderId\": \"6cccb832-b76a-11ed-b7fc-043f72e73c62\",\n    \"WorkflowId\": \"63b3878f-0602-11ee-b7fc-043f72e73c62\"\n}",
+        "output": "{\n    \"Response\": {\n        \"Data\": \"277e97b2-8475-11ee-bfeb-b8cef68a6637\",\n        \"RequestId\": \"7d1d9f10-fb66-40c3-b704-5e174ebc95dd\"\n    }\n}",
+        "title": "创建工作流中任务目录接口"
+      }
+    ],
     "CreateTaskVersionDs": [
       {
         "document": "失败",

tccli/services/wedata/wedata_client.py

@@ -10365,6 +10365,58 @@ def doModifyDimensionWeight(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreateTaskFolder(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.WedataClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CreateTaskFolderRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreateTaskFolder(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 doBatchStopWorkflowsByIds(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -11667,6 +11719,7 @@ ACTION_MAP = {
     "DescribeOpsMakePlans": doDescribeOpsMakePlans,
     "DescribeRealTimeTaskInstanceNodeInfo": doDescribeRealTimeTaskInstanceNodeInfo,
     "ModifyDimensionWeight": doModifyDimensionWeight,
+    "CreateTaskFolder": doCreateTaskFolder,
     "BatchStopWorkflowsByIds": doBatchStopWorkflowsByIds,
     "BatchResumeIntegrationTasks": doBatchResumeIntegrationTasks,
     "SetTaskAlarmNew": doSetTaskAlarmNew,

{tccli-3.0.1129.1.dist-info → tccli-3.0.1131.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tccli
-Version: 3.0.1129.1
+Version: 3.0.1131.1
 Summary: Universal Command Line Environment for Tencent Cloud
 Project-URL: Bug Tracker, https://github.com/TencentCloud/tencentcloud-cli/issues
 Project-URL: Homepage, https://github.com/TencentCloud/tencentcloud-cli
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: jmespath==0.10.0
 Requires-Dist: six==1.16.0
-Requires-Dist: tencentcloud-sdk-python>=3.0.1129
+Requires-Dist: tencentcloud-sdk-python>=3.0.1131
 Description-Content-Type: text/markdown
 
 # 命令行工具简介