tccli 3.0.1304.1__py2.py3-none-any.whl → 3.0.1307.1__py2.py3-none-any.whl

tccli/services/ckafka/ckafka_client.py

@@ -3553,6 +3553,58 @@ def doDescribeDatahubTopics(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeSecurityGroupRoutes(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.DescribeSecurityGroupRoutesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeSecurityGroupRoutes(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 doDeleteDatahubTask(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4620,6 +4672,7 @@ ACTION_MAP = {
     "CreateConsumer": doCreateConsumer,
     "DescribeTypeInstances": doDescribeTypeInstances,
     "DescribeDatahubTopics": doDescribeDatahubTopics,
+    "DescribeSecurityGroupRoutes": doDescribeSecurityGroupRoutes,
     "DeleteDatahubTask": doDeleteDatahubTask,
     "DescribeGroup": doDescribeGroup,
     "DescribeInstances": doDescribeInstances,

tccli/services/ckafka/v20190819/api.json

@@ -406,6 +406,13 @@
       "output": "DescribeRouteResponse",
       "status": "online"
     },
+    "DescribeSecurityGroupRoutes": {
+      "document": "获取安全组路由信息列表",
+      "input": "DescribeSecurityGroupRoutesRequest",
+      "name": "查询安全组路由信息列表",
+      "output": "DescribeSecurityGroupRoutesResponse",
+      "status": "online"
+    },
     "DescribeTaskStatus": {
       "document": "查询任务状态",
       "input": "DescribeTaskStatusRequest",
@@ -4999,13 +5006,13 @@
       "members": [
         {
           "disabled": false,
-          "document": "ckafka集群实例Id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "ckafka集群实例Id",
           "example": "ckafka-test",
           "member": "string",
           "name": "CkafkaInstanceId",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
@@ -5019,13 +5026,13 @@
         },
         {
           "disabled": false,
-          "document": "IP地址\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "IP地址",
           "example": "10.0.0.30",
           "member": "string",
           "name": "Ip",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -8375,6 +8382,79 @@
       ],
       "type": "object"
     },
+    "DescribeSecurityGroupRoutesRequest": {
+      "document": "DescribeSecurityGroupRoutes请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "路由信息",
+          "example": "{\"instanceId\":\"ckafka-test\", \"routeId\":301}",
+          "member": "InstanceRoute",
+          "name": "InstanceRoute",
+          "required": false,
+          "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "过滤器",
+          "example": "[{\"Name\":\"filtername-test\",\"TagValue\":[\"filtervalue-test\"]}]",
+          "member": "RouteFilter",
+          "name": "Filters",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "分页Offset,默认0",
+          "example": "0",
+          "member": "int64",
+          "name": "Offset",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "分页Limit,默认20",
+          "example": "10",
+          "member": "int64",
+          "name": "Limit",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "关键词,可根据实例id/实例名称/vip模糊搜索",
+          "example": "group-test",
+          "member": "string",
+          "name": "SearchWord",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeSecurityGroupRoutesResponse": {
+      "document": "DescribeSecurityGroupRoutes返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "返回的安全组路由信息结果对象",
+          "example": "{\"securityGroupRoutes\":[{\"instanceRoute\":{\"instanceId\":\"ckafka-test\", \"routeId\":301},\"securityGroupIds\":[\"sg-test\"], \"InstanceName\":\"ckafka测试\",\"vpcId\":\"vpc-test\",\"vip\":\"10.0.0.5\"}], \"returnMessage\":\"success\"}",
+          "member": "SecurityGroupRouteResp",
+          "name": "Result",
+          "output_required": false,
+          "type": "object",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeTaskStatusRequest": {
       "document": "DescribeTaskStatus请求参数结构体",
       "members": [
@@ -12506,6 +12586,34 @@
       ],
       "usage": "out"
     },
+    "InstanceRoute": {
+      "document": "实例路由",
+      "members": [
+        {
+          "disabled": false,
+          "document": "ckafka集群实例Id",
+          "example": "ckafka-test",
+          "member": "string",
+          "name": "InstanceId",
+          "output_required": false,
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "路由Id",
+          "example": "301",
+          "member": "int64",
+          "name": "RouteId",
+          "output_required": false,
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
     "InstanceScalingDownRequest": {
       "document": "InstanceScalingDown请求参数结构体",
       "members": [
@@ -12961,23 +13069,23 @@
       "members": [
         {
           "disabled": false,
-          "document": "cvm和IP 列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "cvm和IP 列表",
           "example": "[{\"CkafkaInstanceId\":\"ckafka-test\",\"InstanceId\":\"ins-test\",\"Ip\":\"10.0.0.30\"}]",
           "member": "CvmAndIpInfo",
           "name": "CvmList",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "实例数据量\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "实例数据量",
           "example": "1",
           "member": "int64",
           "name": "TotalCount",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -16458,6 +16566,45 @@
       ],
       "usage": "out"
     },
+    "RouteFilter": {
+      "document": "路由列表过滤器",
+      "members": [
+        {
+          "disabled": false,
+          "document": "过滤名称,目前支持security-group-id,按安全组关联过滤",
+          "example": "security-group-id",
+          "member": "string",
+          "name": "Name",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "过滤值,当过滤名称为security-group-id时仅支持传单个value",
+          "example": "[\"sg-test\"]",
+          "member": "string",
+          "name": "Values",
+          "output_required": false,
+          "required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "过滤关系,支持IN和NOT_IN,默认为IN",
+          "example": "IN",
+          "member": "string",
+          "name": "Relation",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
     "RouteResponse": {
       "document": "路由信息返回对象",
       "members": [
@@ -16951,6 +17098,93 @@
       ],
       "usage": "both"
     },
+    "SecurityGroupRoute": {
+      "document": "安全组路由信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "路由信息",
+          "example": "{\"InstanceId\":\"ckafka-test\",\"RouteId\":301}",
+          "member": "InstanceRoute",
+          "name": "InstanceRoute",
+          "output_required": false,
+          "required": false,
+          "type": "object",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "关联的安全组列表",
+          "example": "[\"sg-test\"]",
+          "member": "string",
+          "name": "SecurityGroupIds",
+          "output_required": false,
+          "required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "ckafka集群实例名称",
+          "example": "ckafka测试",
+          "member": "string",
+          "name": "InstanceName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "路由vpcId",
+          "example": "vpc-test",
+          "member": "string",
+          "name": "VpcId",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "路由vip",
+          "example": "10.0.0.5",
+          "member": "string",
+          "name": "Vip",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
+    "SecurityGroupRouteResp": {
+      "document": "安全组路由信息返回结果",
+      "members": [
+        {
+          "disabled": false,
+          "document": "符合条件的安全组路由信息总数",
+          "example": "1",
+          "member": "int64",
+          "name": "TotalCount",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "符合条件的安全组路由信息列表",
+          "example": "[{\"InstanceRoute\":{\"InstanceId\":\"ckafka-test\",\"RouteId\":301},\"SecurityGroupIds\":[\"sg-test\"],\"InstanceName\":\"ckafka测试\",\"VpcId\":\"vpc-test\",\"Vip\":\"10.0.0.5\"}]",
+          "member": "SecurityGroupRoute",
+          "name": "SecurityGroupRoutes",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "SendMessageRequest": {
       "document": "SendMessage请求参数结构体",
       "members": [

tccli/services/ckafka/v20190819/examples.json

@@ -500,6 +500,14 @@
         "title": "查看路由信息"
       }
     ],
+    "DescribeSecurityGroupRoutes": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: ckafka.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeSecurityGroupRoutes\n<公共请求参数>\n\n{\n    \"Offset\": 0,\n    \"Limit\": 10\n}",
+        "output": "{\n    \"Response\": {\n        \"Result\": {\n            \"SecurityGroupRoutes\": [\n                {\n                    \"InstanceRoute\": {\n                        \"InstanceId\": \"ckafka-test\",\n                        \"RouteId\": 1234\n                    },\n                    \"SecurityGroupIds\": [],\n                    \"InstanceName\": \"ckafka测试\",\n                    \"VpcId\": \"vpc-test\",\n                    \"Vip\": \"10.0.0.5\"\n                }\n            ],\n            \"TotalCount\": 1\n        },\n        \"RequestId\": \"test-reqId-1134\"\n    }\n}",
+        "title": "获取安全组路由信息列表"
+      }
+    ],
     "DescribeTaskStatus": [
       {
         "document": "",