tccli 3.0.1190.1__py2.py3-none-any.whl → 3.0.1192.1__py2.py3-none-any.whl

tccli/services/cfw/v20190904/api.json

@@ -294,6 +294,13 @@
       "output": "DescribeEnterpriseSecurityGroupRuleResponse",
       "status": "online"
     },
+    "DescribeEnterpriseSecurityGroupRuleList": {
+      "document": "查询新企业安全组规则  从node接口迁移   原接口DescribeSecurityGroupNewList",
+      "input": "DescribeEnterpriseSecurityGroupRuleListRequest",
+      "name": "查询新企业安全组规则列表",
+      "output": "DescribeEnterpriseSecurityGroupRuleListResponse",
+      "status": "online"
+    },
     "DescribeFwEdgeIps": {
       "document": "串行防火墙IP开关列表",
       "input": "DescribeFwEdgeIpsRequest",
@@ -5612,6 +5619,127 @@
       ],
       "type": "object"
     },
+    "DescribeEnterpriseSecurityGroupRuleListRequest": {
+      "document": "DescribeEnterpriseSecurityGroupRuleList请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "分页每页数量",
+          "example": "10",
+          "member": "int64",
+          "name": "Limit",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "分页当前页",
+          "example": "0",
+          "member": "int64",
+          "name": "Offset",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "启用状态 1启用 0 未启用",
+          "example": "1",
+          "member": "string",
+          "name": "Status",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "地域",
+          "example": "ap-guangzhou",
+          "member": "string",
+          "name": "Area",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "规则下发方式筛选  1 新规则和延迟下发  2  仅看新规则  ",
+          "example": "1",
+          "member": "int64",
+          "name": "Filter",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "查询条件",
+          "example": "{\\\"Port\\\":\\\"tcp好多个\\\",\\\"common\\\":\\\"\\\"}",
+          "member": "string",
+          "name": "SearchValue",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "查询条件新",
+          "example": "[{\"Name\":\"test\",\"Values\":[\"test\"]}]",
+          "member": "CommonFilter",
+          "name": "SearchFilters",
+          "required": false,
+          "type": "list"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeEnterpriseSecurityGroupRuleListResponse": {
+      "document": "DescribeEnterpriseSecurityGroupRuleList返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "查询结果总数",
+          "example": "1",
+          "member": "int64",
+          "name": "Total",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "规则总数",
+          "example": "10",
+          "member": "int64",
+          "name": "AllTotal",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "规则列表",
+          "example": "无",
+          "member": "EnterpriseSecurityGroupRuleRuleInfo",
+          "name": "Data",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "规则整体启用状态",
+          "example": "1",
+          "member": "int64",
+          "name": "Enable",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeEnterpriseSecurityGroupRuleRequest": {
       "document": "DescribeEnterpriseSecurityGroupRule请求参数结构体",
       "members": [
@@ -8302,6 +8430,351 @@
       ],
       "usage": "in"
     },
+    "EnterpriseSecurityGroupRuleBetaInfo": {
+      "document": "企业安全组自动化任务信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "任务id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "xxx",
+          "member": "int64",
+          "name": "TaskId",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "任务名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "test",
+          "member": "string",
+          "name": "TaskName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1999-01-01  00:00:01",
+          "member": "string",
+          "name": "LastTime",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "both"
+    },
+    "EnterpriseSecurityGroupRuleRuleInfo": {
+      "document": "企业安全组规则列表信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "排序\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "int64",
+          "name": "OrderIndex",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "主键id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "uint64",
+          "name": "RuleUuid",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "规则uuid\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "sg-xxx",
+          "member": "string",
+          "name": "Uuid",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "源规则内容\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "test",
+          "member": "string",
+          "name": "SourceId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "源规则类型\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "int64",
+          "name": "SourceType",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "目的规则内容\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "test",
+          "member": "string",
+          "name": "TargetId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "目的规则类型\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "int64",
+          "name": "TargetType",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "协议名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "TCP",
+          "member": "string",
+          "name": "Protocol",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "端口\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "3306",
+          "member": "string",
+          "name": "Port",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "策略，1阻断，2放行\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "int64",
+          "name": "Strategy",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "启用状态 ，0未开启，1开启\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "int64",
+          "name": "Status",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "描述\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "test",
+          "member": "string",
+          "name": "Detail",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "标签\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "tag",
+          "member": "string",
+          "name": "AclTags",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "是否最新一次改动的规则,0否，1是\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1",
+          "member": "int64",
+          "name": "IsNew",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "地域\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "ap-guangzhou",
+          "member": "string",
+          "name": "Region",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "是否延迟下发\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "0",
+          "member": "int64",
+          "name": "IsDelay",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "服务模版id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "tpm-xxxx",
+          "member": "string",
+          "name": "ServiceTemplateId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "源资产名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "ins-xxx",
+          "member": "string",
+          "name": "SouInstanceName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "源资产公网ip\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1.1.1.1",
+          "member": "string",
+          "name": "SouPublicIp",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "源资产内网ip\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1.1.1.1",
+          "member": "string",
+          "name": "SouPrivateIp",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "源资产网段信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "10.0.0.0/32",
+          "member": "string",
+          "name": "SouCidr",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "源模版名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "test",
+          "member": "string",
+          "name": "SouParameterName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "目的资产名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "ins-xxx",
+          "member": "string",
+          "name": "InstanceName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "目的资产公网ip\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1.1.1.1",
+          "member": "string",
+          "name": "PublicIp",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "目的资产内网ip\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1.1.1.1",
+          "member": "string",
+          "name": "PrivateIp",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "目的资产网段信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "10.0.0.0/32",
+          "member": "string",
+          "name": "Cidr",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "目的模版名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "test",
+          "member": "string",
+          "name": "ParameterName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "端口模版名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "test",
+          "member": "string",
+          "name": "ProtocolPortName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "自动化任务任务信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "[{}]",
+          "member": "EnterpriseSecurityGroupRuleBetaInfo",
+          "name": "BetaList",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "规则id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "int64",
+          "name": "Id",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
     "ExpandCfwVerticalRequest": {
       "document": "ExpandCfwVertical请求参数结构体",
       "members": [

tccli/services/cfw/v20190904/examples.json

@@ -354,6 +354,14 @@
         "title": "查询新企业安全组规则"
       }
     ],
+    "DescribeEnterpriseSecurityGroupRuleList": [
+      {
+        "document": "示例1",
+        "input": "POST / HTTP/1.1\nHost: cfw.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeEnterpriseSecurityGroupRuleList\n<公共请求参数>\n\n{\n    \"Limit\": 1,\n    \"Offset\": 0,\n    \"SearchFilters\": [\n        {\n            \"Name\": \"common\",\n            \"Values\": [\n                \"模板\"\n            ],\n            \"OperatorType\": 9\n        }\n    ]\n}",
+        "output": "{\n    \"Response\": {\n        \"AllTotal\": 30,\n        \"Data\": [\n            {\n                \"AclTags\": \"云防火墙封禁IP自动下发，请勿删除或修改\",\n                \"BetaList\": [],\n                \"Cidr\": \"\",\n                \"Detail\": \"云防火墙封禁IP自动下发，请勿删除或修改\",\n                \"InstanceName\": \"\",\n                \"IsDelay\": 0,\n                \"IsNew\": 1,\n                \"OrderIndex\": 1,\n                \"ParameterName\": \"\",\n                \"Port\": \"-1/-1\",\n                \"PrivateIp\": \"\",\n                \"Protocol\": \"ANY\",\n                \"ProtocolPortName\": \"\",\n                \"PublicIp\": \"\",\n                \"Region\": \"AllRegion\",\n                \"RuleUuid\": 61257,\n                \"ServiceTemplateId\": \"\",\n                \"SouCidr\": \"\",\n                \"SouInstanceName\": \"\",\n                \"SouParameterName\": \"云防火墙拦截列表IP地址组IN，请勿删除\",\n                \"SouPrivateIp\": \"\",\n                \"SouPublicIp\": \"\",\n                \"SourceId\": \"ipmg-17hphuxg\",\n                \"SourceType\": 7,\n                \"Status\": 1,\n                \"Strategy\": 1,\n                \"TargetId\": \"cfwrg-b803523898534bcbd9b7d2c7d92c175e1712804418\",\n                \"TargetType\": 100,\n                \"Uuid\": \"cfw_newsg_1300448058_0.0.0.0/0_17228848067531\"\n            }\n        ],\n        \"Enable\": 2,\n        \"RequestId\": \"d835bbe0-99e8-4cb7-a29a-3dfe2eff7d14\",\n        \"Total\": 28\n    }\n}",
+        "title": "示例1"
+      }
+    ],
     "DescribeFwEdgeIps": [
       {
         "document": "串行防火墙开关列表",

tccli/services/ckafka/ckafka_client.py

@@ -3709,6 +3709,58 @@ def doDescribeTopicAttributes(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doFetchMessageListByTimestamp(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.CkafkaClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.FetchMessageListByTimestampRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.FetchMessageListByTimestamp(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 doAuthorizeToken(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4467,6 +4519,7 @@ ACTION_MAP = {
     "DeleteUser": doDeleteUser,
     "DescribeTopicSyncReplica": doDescribeTopicSyncReplica,
     "DescribeTopicAttributes": doDescribeTopicAttributes,
+    "FetchMessageListByTimestamp": doFetchMessageListByTimestamp,
     "AuthorizeToken": doAuthorizeToken,
     "DescribeTopicProduceConnection": doDescribeTopicProduceConnection,
     "CreatePostPaidInstance": doCreatePostPaidInstance,

tccli/services/ckafka/v20190819/api.json

@@ -490,6 +490,13 @@
       "output": "FetchMessageListByOffsetResponse",
       "status": "online"
     },
+    "FetchMessageListByTimestamp": {
+      "document": "根据时间戳查询消息列表",
+      "input": "FetchMessageListByTimestampRequest",
+      "name": "根据时间戳查询消息列表",
+      "output": "FetchMessageListByTimestampResponse",
+      "status": "online"
+    },
     "InquireCkafkaPrice": {
       "document": "Ckafka实例购买/续费询价",
       "input": "InquireCkafkaPriceRequest",
@@ -10124,6 +10131,79 @@
       ],
       "type": "object"
     },
+    "FetchMessageListByTimestampRequest": {
+      "document": "FetchMessageListByTimestamp请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例Id",
+          "example": "xxx",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "主题名",
+          "example": "xxx",
+          "member": "string",
+          "name": "Topic",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "分区id",
+          "example": "1",
+          "member": "int64",
+          "name": "Partition",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "查询开始时间，13位时间戳",
+          "example": "1577808000000",
+          "member": "int64",
+          "name": "StartTime",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "最大查询条数，默认20，最大20",
+          "example": "20",
+          "member": "int64",
+          "name": "SinglePartitionRecordNumber",
+          "required": false,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "FetchMessageListByTimestampResponse": {
+      "document": "FetchMessageListByTimestamp返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "返回结果。注意，列表中不返回具体的消息内容（key、value），如果需要查询具体消息内容，请使用FetchMessageByOffset接口",
+          "example": "无",
+          "member": "ConsumerRecord",
+          "name": "Result",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "FieldParam": {
       "document": "数据处理——处理链",
       "members": [