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

tccli/services/vpc/v20170312/api.json

@@ -29,7 +29,7 @@
       "status": "online"
     },
     "AddTemplateMember": {
-      "document": "增加模板对象中的IP地址、协议端口、IP地址组、协议端口组。当前仅支持北京、泰国、北美地域请求。",
+      "document": "增加模板对象中的IP地址、协议端口、IP地址组、协议端口组。",
       "input": "AddTemplateMemberRequest",
       "name": "增加模板对象成员",
       "output": "AddTemplateMemberResponse",
@@ -708,7 +708,7 @@
       "status": "online"
     },
     "DeleteTemplateMember": {
-      "document": "删除模板对象中的IP地址、协议端口、IP地址组、协议端口组。当前仅支持北京、泰国、北美地域请求。",
+      "document": "删除模板对象中的IP地址、协议端口、IP地址组、协议端口组。",
       "input": "DeleteTemplateMemberRequest",
       "name": "删除模板对象成员",
       "output": "DeleteTemplateMemberResponse",
@@ -1268,7 +1268,7 @@
       "status": "online"
     },
     "DescribeVpcEndPointService": {
-      "document": "查询终端节点服务列表。",
+      "document": "本接口（DescribeVpcEndPointService）用于查询终端节点服务列表。",
       "input": "DescribeVpcEndPointServiceRequest",
       "name": "查询终端节点服务列表",
       "output": "DescribeVpcEndPointServiceResponse",
@@ -1912,7 +1912,7 @@
       "status": "online"
     },
     "ModifyTemplateMember": {
-      "document": "修改模板对象中的IP地址、协议端口、IP地址组、协议端口组。当前仅支持北京、泰国、北美地域请求。",
+      "document": "修改模板对象中的IP地址、协议端口、IP地址组、协议端口组。",
       "input": "ModifyTemplateMemberRequest",
       "name": "修改模板对象成员",
       "output": "ModifyTemplateMemberResponse",
@@ -12586,7 +12586,7 @@
         },
         {
           "disabled": false,
-          "document": "排序字段。支持 `InPkg` `OutPkg` `InTraffic` `OutTraffic`。默认值`OutTraffic`。",
+          "document": "排序字段。支持 `InPkg` `OutPkg` `InTraffic` `OutTraffic`，标准型nat额外支持 并发连接数`ConcurrentConnectionCount` 、新建连接速率`NewConnectionRate`。默认值`OutTraffic`。",
           "example": "InPkg",
           "member": "string",
           "name": "OrderField",
@@ -15462,7 +15462,7 @@
         },
         {
           "disabled": false,
-          "document": "<li>不支持同时传入参数 Filters 。</li> <li>列出授权给当前账号的终端节点服务信息。可以配合EndPointServiceIds参数进行过滤，那些终端节点服务授权了该账户。</li>",
+          "document": "<li>不支持同时传入参数 Filters 。</li> <li>列出授权给当前账号的终端节点服务信息。可以配合EndPointServiceIds参数进行过滤，哪些终端节点服务授权了该账户。</li>",
           "example": "无",
           "member": "bool",
           "name": "IsListAuthorizedEndPointService",
@@ -18518,50 +18518,70 @@
         {
           "disabled": false,
           "document": "来源`IP`。",
-          "example": "",
+          "example": "无",
           "member": "string",
           "name": "PrivateIpAddress",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "入包量。",
-          "example": "",
+          "example": "无",
           "member": "uint64",
           "name": "InPkg",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "出包量。",
-          "example": "",
+          "example": "无",
           "member": "uint64",
           "name": "OutPkg",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "入流量，单位：`Byte`。",
-          "example": "",
+          "example": "无",
           "member": "uint64",
           "name": "InTraffic",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "出流量，单位：`Byte`。",
-          "example": "",
+          "example": "无",
           "member": "uint64",
           "name": "OutTraffic",
-          "required": true,
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "并发连接数。仅标准型nat支持此参数。",
+          "example": "无",
+          "member": "uint64",
+          "name": "ConcurrentConnectionCount",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "新建连接速率。仅标准型nat支持此参数。",
+          "example": "无",
+          "member": "uint64",
+          "name": "NewConnectionRate",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         }

tccli/services/vpc/v20170312/examples.json

@@ -1298,10 +1298,16 @@
     ],
     "DescribeGatewayFlowMonitorDetail": [
       {
-        "document": "查询一个NAT网关流量监控明细",
+        "document": "查询一个传统型NAT网关流量监控明细",
         "input": "https://vpc.tencentcloudapi.com/?Action=DescribeGatewayFlowMonitorDetail\n&TimePoint=2019-02-28 18:15:20\n&NatId=nat-lz6rjk7n\n&OrderField=OutTraffic\n&OrderDirection=DESC\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"GatewayFlowMonitorDetailSet\": [\n            {\n                \"PrivateIpAddress\": \"172.20.65.74\",\n                \"InPkg\": 182,\n                \"OutPkg\": 263,\n                \"InTraffic\": 17316,\n                \"OutTraffic\": 35269\n            },\n            {\n                \"PrivateIpAddress\": \"172.20.65.63\",\n                \"InPkg\": 0,\n                \"OutPkg\": 20,\n                \"InTraffic\": 0,\n                \"OutTraffic\": 1960\n            },\n            {\n                \"PrivateIpAddress\": \"172.20.65.70\",\n                \"InPkg\": 0,\n                \"OutPkg\": 20,\n                \"InTraffic\": 0,\n                \"OutTraffic\": 1960\n            },\n            {\n                \"PrivateIpAddress\": \"172.20.65.172\",\n                \"InPkg\": 0,\n                \"OutPkg\": 20,\n                \"InTraffic\": 0,\n                \"OutTraffic\": 1960\n            },\n            {\n                \"PrivateIpAddress\": \"172.20.65.249\",\n                \"InPkg\": 0,\n                \"OutPkg\": 20,\n                \"InTraffic\": 0,\n                \"OutTraffic\": 1960\n            }\n        ],\n        \"TotalCount\": 261,\n        \"RequestId\": \"0fc9884d-7aa1-4d95-95d3-7945108d2b10\"\n    }\n}",
-        "title": "查询一个NAT网关流量监控明细"
+        "output": "{\n    \"Response\": {\n        \"GatewayFlowMonitorDetailSet\": [\n            {\n                \"PrivateIpAddress\": \"172.20.65.74\",\n                \"InPkg\": 182,\n                \"OutPkg\": 263,\n                \"InTraffic\": 17316,\n                \"OutTraffic\": 35269,\n                \"NewConnectionRate\": 0,\n                \"ConcurrentConnectionCount\": 0\n            },\n            {\n                \"PrivateIpAddress\": \"172.20.65.63\",\n                \"InPkg\": 0,\n                \"OutPkg\": 20,\n                \"InTraffic\": 0,\n                \"OutTraffic\": 1960,\n                \"NewConnectionRate\": 0,\n                \"ConcurrentConnectionCount\": 0\n            },\n            {\n                \"PrivateIpAddress\": \"172.20.65.70\",\n                \"InPkg\": 0,\n                \"OutPkg\": 20,\n                \"InTraffic\": 0,\n                \"OutTraffic\": 1960,\n                \"NewConnectionRate\": 0,\n                \"ConcurrentConnectionCount\": 0\n            },\n            {\n                \"PrivateIpAddress\": \"172.20.65.172\",\n                \"InPkg\": 0,\n                \"OutPkg\": 20,\n                \"InTraffic\": 0,\n                \"OutTraffic\": 1960,\n                \"NewConnectionRate\": 0,\n                \"ConcurrentConnectionCount\": 0\n            },\n            {\n                \"PrivateIpAddress\": \"172.20.65.249\",\n                \"InPkg\": 0,\n                \"OutPkg\": 20,\n                \"InTraffic\": 0,\n                \"OutTraffic\": 1960,\n                \"NewConnectionRate\": 0,\n                \"ConcurrentConnectionCount\": 0\n            }\n        ],\n        \"TotalCount\": 261,\n        \"RequestId\": \"0fc9884d-7aa1-4d95-95d3-7945108d2b10\"\n    }\n}",
+        "title": "查询一个传统型NAT网关流量监控明细"
+      },
+      {
+        "document": "查询一个标准型NAT网关流量监控明细",
+        "input": "https://vpc.tencentcloudapi.com/?Action=DescribeGatewayFlowMonitorDetail\n&TimePoint=2024-06-24 14:03:00\n&NatId=nat-g0pwqefo\n&OrderField=InTraffic\n&OrderDirection=DESC\n&<公共请求参数>",
+        "output": "{\n    \"Response\": {\n        \"GatewayFlowMonitorDetailSet\": [\n            {\n                \"PrivateIpAddress\": \"2.2.2.2\",\n                \"InPkg\": 5455,\n                \"OutPkg\": 4444,\n                \"InTraffic\": 1048576,\n                \"OutTraffic\": 1234567,\n                \"NewConnectionRate\": 8888,\n                \"ConcurrentConnectionCount\": 9999\n            }\n        ],\n        \"TotalCount\": 1,\n        \"RequestId\": \"396e6170-f2ce-4233-9405-9a2e5ce8b0b5\"\n    }\n}",
+        "title": "查询一个标准型NAT网关流量监控明细"
       }
     ],
     "DescribeGatewayFlowQos": [

tccli/services/waf/v20180125/api.json

@@ -14,6 +14,13 @@
       "output": "AddAntiInfoLeakRulesResponse",
       "status": "online"
     },
+    "AddAreaBanAreas": {
+      "document": "添加地域封禁中的地域信息",
+      "input": "AddAreaBanAreasRequest",
+      "name": "添加封禁地域",
+      "output": "AddAreaBanAreasResponse",
+      "status": "online"
+    },
     "AddAttackWhiteRule": {
       "document": "供用户控制台调用，增加Tiga规则引擎白名单。",
       "input": "AddAttackWhiteRuleRequest",
@@ -1529,6 +1536,69 @@
       ],
       "type": "object"
     },
+    "AddAreaBanAreasRequest": {
+      "document": "AddAreaBanAreas请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "需要修改的域名",
+          "example": "无",
+          "member": "string",
+          "name": "Domain",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "需要新增的封禁地域",
+          "example": "无",
+          "member": "string",
+          "name": "Areas",
+          "required": true,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "waf版本信息，spart-waf或者clb-waf，其他无效，请一定填写",
+          "example": "无",
+          "member": "string",
+          "name": "Edition",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "定时任务类型",
+          "example": "无",
+          "member": "string",
+          "name": "JobType",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "定时任务配置",
+          "example": "无",
+          "member": "JobDateTime",
+          "name": "JobDateTime",
+          "required": false,
+          "type": "object"
+        }
+      ],
+      "type": "object"
+    },
+    "AddAreaBanAreasResponse": {
+      "document": "AddAreaBanAreas返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "AddAttackWhiteRuleRequest": {
       "document": "AddAttackWhiteRule请求参数结构体",
       "members": [

tccli/services/waf/v20180125/examples.json

@@ -22,6 +22,14 @@
         "title": "添加信息防泄漏规则"
       }
     ],
+    "AddAreaBanAreas": [
+      {
+        "document": "",
+        "input": "https://waf.tencentcloudapi.com/?Action=AddAreaBanAreas\r\n&Domain=test.qcloud.com\r\n&Edition=clb-waf\r\n&Areas.0=新疆\r\n&Areas.1=江西\r\n&<公共请求参数>",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"abc\"\n    }\n}",
+        "title": "添加封禁地域"
+      }
+    ],
     "AddAttackWhiteRule": [
       {
         "document": "",

tccli/services/waf/waf_client.py

@@ -4749,6 +4749,58 @@ def doAddAttackWhiteRule(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doAddAreaBanAreas(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.AddAreaBanAreasRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.AddAreaBanAreas(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 doDescribeDomainCountInfo(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7451,6 +7503,7 @@ ACTION_MAP = {
     "DeleteAttackWhiteRule": doDeleteAttackWhiteRule,
     "DescribeIpAccessControl": doDescribeIpAccessControl,
     "AddAttackWhiteRule": doAddAttackWhiteRule,
+    "AddAreaBanAreas": doAddAreaBanAreas,
     "DescribeDomainCountInfo": doDescribeDomainCountInfo,
     "DeleteSpartaProtection": doDeleteSpartaProtection,
     "SwitchDomainRules": doSwitchDomainRules,

{tccli-3.0.1134.1.dist-info → tccli-3.0.1136.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tccli
-Version: 3.0.1134.1
+Version: 3.0.1136.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.1134
+Requires-Dist: tencentcloud-sdk-python>=3.0.1136
 Description-Content-Type: text/markdown
 
 # 命令行工具简介