tccli 3.0.1306.1__py2.py3-none-any.whl → 3.0.1308.1__py2.py3-none-any.whl

tccli/services/cvm/v20170312/api.json

@@ -2103,7 +2103,7 @@
       "members": [
         {
           "disabled": false,
-          "document": "密钥对名称，可由数字，字母和下划线组成，长度不超过25个字符。",
+          "document": "密钥对名称，可由数字、字母和下划线组成，长度不超过25个字符。密钥对名称不能和已经存在的密钥对名称重复。",
           "example": "Tencent",
           "member": "string",
           "name": "KeyName",
@@ -2420,7 +2420,7 @@
         {
           "disabled": false,
           "document": "只允许传递 Update 和 Replace 参数，在模板使用自定义 Metadata 且在 RunInstances 也传递 Metadata 时生效。默认采用 Replace。\n\n- Update：设模板 t含本参数值为Update、 metadata=[k1:v1, k2:v2] ，则RunInstances（给metadata=[k2:v3]）+ t 创建的 cvm 使用metadata=[k1:v1, k2:v3] \n- Replace：模板 t含本参数值为Replace、 metadata=[k1:v1, k2:v2] ，则RunInstances（给metadata=[k2:v3]）+ t 创建的 cvm 使用metadata=[k2:v3] \n**注：内测中**。",
-          "example": "无",
+          "example": "Update",
           "member": "string",
           "name": "TemplateDataModifyAction",
           "required": false,
@@ -2718,7 +2718,7 @@
         {
           "disabled": false,
           "document": "只允许传递 Update 和 Replace 参数，在模板使用自定义 Metadata 且在 RunInstances 也传递 Metadata 时生效。默认采用 Replace。\n\n- Update：设模板 t含本参数值为Update、 metadata=[k1:v1, k2:v2] ，则RunInstances（给metadata=[k2:v3]）+ t 创建的 cvm 使用metadata=[k1:v1, k2:v3] \n- Replace：模板 t含本参数值为Replace、 metadata=[k1:v1, k2:v2] ，则RunInstances（给metadata=[k2:v3]）+ t 创建的 cvm 使用metadata=[k2:v3] \n**注：内测中**。",
-          "example": "无",
+          "example": "Update",
           "member": "string",
           "name": "TemplateDataModifyAction",
           "required": false,
@@ -9269,7 +9269,7 @@
         {
           "disabled": false,
           "document": "一个或多个待操作的CDH实例ID。",
-          "example": "[\"host-ey16rkyg\\n\"]",
+          "example": "[\"host-ey16rkyg\"]",
           "member": "string",
           "name": "HostIds",
           "required": true,
@@ -9286,7 +9286,7 @@
         },
         {
           "disabled": false,
-          "document": "自动续费标识。取值范围：<br><li>NOTIFY_AND_AUTO_RENEW：通知过期且自动续费<br><li>NOTIFY_AND_MANUAL_RENEW：通知过期不自动续费<br><li>DISABLE_NOTIFY_AND_MANUAL_RENEW：不通知过期不自动续费<br><br>若该参数指定为NOTIFY_AND_AUTO_RENEW，在账户余额充足的情况下，实例到期后将按月自动续费。",
+          "document": "自动续费标识。取值范围：<br><li>NOTIFY_AND_AUTO_RENEW：通知过期且自动续费</li><li>NOTIFY_AND_MANUAL_RENEW：通知过期不自动续费</li><li>DISABLE_NOTIFY_AND_MANUAL_RENEW：不通知过期不自动续费</li><br>若该参数指定为NOTIFY_AND_AUTO_RENEW，在账户余额充足的情况下，实例到期后将按月自动续费。",
           "example": "NOTIFY_AND_AUTO_RENEW",
           "member": "string",
           "name": "RenewFlag",

tccli/services/cynosdb/cynosdb_client.py

@@ -8129,6 +8129,58 @@ def doRemoveClusterSlaveZone(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCloseSSL(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.CynosdbClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CloseSSLRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CloseSSL(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 doDescribeInstanceErrorLogs(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -8400,6 +8452,7 @@ ACTION_MAP = {
     "OpenClusterPasswordComplexity": doOpenClusterPasswordComplexity,
     "OpenAuditService": doOpenAuditService,
     "RemoveClusterSlaveZone": doRemoveClusterSlaveZone,
+    "CloseSSL": doCloseSSL,
     "DescribeInstanceErrorLogs": doDescribeInstanceErrorLogs,
     "IsolateInstance": doIsolateInstance,
 

tccli/services/cynosdb/v20190107/api.json

@@ -63,6 +63,13 @@
       "output": "CloseProxyEndPointResponse",
       "status": "online"
     },
+    "CloseSSL": {
+      "document": "关闭SSL加密",
+      "input": "CloseSSLRequest",
+      "name": "关闭SSL加密",
+      "output": "CloseSSLResponse",
+      "status": "online"
+    },
     "CloseWan": {
       "document": "本接口（CloseWan）用于关闭外网。",
       "input": "CloseWanRequest",
@@ -3323,6 +3330,62 @@
       ],
       "type": "object"
     },
+    "CloseSSLRequest": {
+      "document": "CloseSSL请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "集群ID",
+          "example": "cynosdbmysql-bzxxrmtq",
+          "member": "string",
+          "name": "ClusterId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "实例ID",
+          "example": "cynosdbmysql-ins-bzxxrmtq",
+          "member": "string",
+          "name": "InstanceId",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "CloseSSLResponse": {
+      "document": "CloseSSL返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "流程ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "123",
+          "member": "int64",
+          "name": "FlowId",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "任务id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "int64",
+          "name": "TaskId",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "CloseWanRequest": {
       "document": "CloseWan请求参数结构体",
       "members": [
@@ -4291,6 +4354,15 @@
           "required": false,
           "type": "int"
         },
+        {
+          "disabled": false,
+          "document": "实例数量，数量范围为(0,16]，默认值为2（即一个rw实例+一个ro实例），传递的n表示1个rw实例+n-1个ro实例（规格相同），如需要更精确的集群组成搭配，请使用InstanceInitInfos",
+          "example": "1",
+          "member": "int64",
+          "name": "InstanceCount",
+          "required": false,
+          "type": "int"
+        },
         {
           "disabled": false,
           "document": "该参数无实际意义，已废弃。\n存储大小，单位GB。",
@@ -4399,15 +4471,6 @@
           "required": false,
           "type": "int"
         },
-        {
-          "disabled": false,
-          "document": "实例数量，数量范围为(0,16]",
-          "example": "1",
-          "member": "int64",
-          "name": "InstanceCount",
-          "required": false,
-          "type": "int"
-        },
         {
           "disabled": false,
           "document": "包年包月购买时长",

tccli/services/cynosdb/v20190107/examples.json

@@ -72,6 +72,14 @@
         "title": "关闭数据库代理连接地址"
       }
     ],
+    "CloseSSL": [
+      {
+        "document": "关闭SSL加密",
+        "input": "POST / HTTP/1.1\nHost: cynosdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CloseSSL\n<公共请求参数>\n\n{\n    \"ClusterId\": \"cynosdbmysql-jd510000\",\n    \"InstanceId\": \"cynosdbmysql-ins-906n0000\"\n}",
+        "output": "{\n    \"Response\": {\n        \"FlowId\": 1,\n        \"RequestId\": \"42d79173-6d36-4239-b7ad-5b993559a5c6\",\n        \"TaskId\": 1\n    }\n}",
+        "title": "关闭SSL加密"
+      }
+    ],
     "CloseWan": [
       {
         "document": "",

tccli/services/dlc/v20210125/api.json

@@ -12353,6 +12353,15 @@
           "name": "Sorting",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "是否设置为常驻：1非常驻（默认）、2常驻（仅能设置一个常驻）",
+          "example": "2",
+          "member": "int64",
+          "name": "IsDefault",
+          "required": false,
+          "type": "int"
         }
       ],
       "type": "object"
@@ -20669,6 +20678,16 @@
           "output_required": false,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "是否设置为常驻：1非常驻（默认）、2常驻（仅能设置一个常驻）",
+          "example": "2",
+          "member": "int64",
+          "name": "IsDefault",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"