tccli 3.0.1158.1__py2.py3-none-any.whl → 3.0.1159.1__py2.py3-none-any.whl

tccli/services/cynosdb/v20190107/api.json

@@ -3824,6 +3824,24 @@
           "name": "CLSInfoList",
           "required": true,
           "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "日志类型",
+          "example": "无",
+          "member": "string",
+          "name": "LogType",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "是否维护时间运行",
+          "example": "无",
+          "member": "string",
+          "name": "IsInMaintainPeriod",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -7678,6 +7696,24 @@
           "name": "CLSTopicIds",
           "required": true,
           "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "日志类型",
+          "example": "无",
+          "member": "string",
+          "name": "LogType",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "是否维护时间运行",
+          "example": "无",
+          "member": "string",
+          "name": "IsInMaintainPeriod",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -9708,6 +9744,15 @@
           "name": "InstanceId",
           "required": true,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "日志类型",
+          "example": "无",
+          "member": "string",
+          "name": "LogType",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -12638,6 +12683,16 @@
           "output_required": false,
           "type": "string",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "日志类型\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "LogType",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"
@@ -19656,6 +19711,24 @@
           "name": "CLSTopicIds",
           "required": true,
           "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "日志类型",
+          "example": "无",
+          "member": "string",
+          "name": "LogType",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "是否维护时间运行",
+          "example": "无",
+          "member": "string",
+          "name": "IsInMaintainPeriod",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -19702,6 +19775,24 @@
           "name": "CLSTopicIds",
           "required": true,
           "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "日志类型",
+          "example": "无",
+          "member": "string",
+          "name": "LogType",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "是否维护时间运行",
+          "example": "无",
+          "member": "string",
+          "name": "IsInMaintainPeriod",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"

tccli/services/ecm/v20190719/api.json

@@ -10657,7 +10657,7 @@
         {
           "disabled": false,
           "document": "VPC实例ID。形如：vpc-f49l6u0z。",
-          "example": "",
+          "example": "vpc-m7sr81gh",
           "member": "string",
           "name": "VpcId",
           "required": true,
@@ -10666,7 +10666,7 @@
         {
           "disabled": false,
           "document": "ECM 地域",
-          "example": "",
+          "example": "ap-shenyang-ecm-cu",
           "member": "string",
           "name": "EcmRegion",
           "required": true,
@@ -10675,7 +10675,7 @@
         {
           "disabled": false,
           "document": "私有网络名称，可任意命名，但不得超过60个字符。",
-          "example": "",
+          "example": "TEST",
           "member": "string",
           "name": "VpcName",
           "required": false,
@@ -10684,7 +10684,7 @@
         {
           "disabled": false,
           "document": "标签",
-          "example": "",
+          "example": "无",
           "member": "Tag",
           "name": "Tags",
           "required": false,
@@ -10693,11 +10693,29 @@
         {
           "disabled": false,
           "document": "私有网络描述",
-          "example": "",
+          "example": "TEST",
           "member": "string",
           "name": "Description",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "DNS地址，最多支持4个，第1个默认为主，其余为备。\t",
+          "example": "['183.60.83.19']",
+          "member": "string",
+          "name": "DnsServers",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "域名。",
+          "example": "TEST",
+          "member": "string",
+          "name": "DomainName",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"

tccli/services/emr/emr_client.py

@@ -2097,6 +2097,58 @@ def doDescribeClusterNodes(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeTrinoQueryInfo(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.EmrClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeTrinoQueryInfoRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeTrinoQueryInfo(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 doDescribeInstancesList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2356,6 +2408,7 @@ ACTION_MAP = {
     "DescribeResourceSchedule": doDescribeResourceSchedule,
     "DescribeAutoScaleGroupGlobalConf": doDescribeAutoScaleGroupGlobalConf,
     "DescribeClusterNodes": doDescribeClusterNodes,
+    "DescribeTrinoQueryInfo": doDescribeTrinoQueryInfo,
     "DescribeInstancesList": doDescribeInstancesList,
     "ModifyResourcePools": doModifyResourcePools,
     "DescribeInsightList": doDescribeInsightList,