tccli 3.0.1283.1__py2.py3-none-any.whl → 3.0.1285.1__py2.py3-none-any.whl

tccli/services/bh/bh_client.py

@@ -953,6 +953,58 @@ def doDeleteAcls(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doAccessDevices(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.BhClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.AccessDevicesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.AccessDevices(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 doDescribeResources(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -3270,6 +3322,7 @@ ACTION_MAP = {
     "BindDeviceAccountPassword": doBindDeviceAccountPassword,
     "SearchSession": doSearchSession,
     "DeleteAcls": doDeleteAcls,
+    "AccessDevices": doAccessDevices,
     "DescribeResources": doDescribeResources,
     "DeleteUserGroupMembers": doDeleteUserGroupMembers,
     "ModifyChangePwdTask": doModifyChangePwdTask,

tccli/services/bh/v20230418/api.json

@@ -1,5 +1,12 @@
 {
   "actions": {
+    "AccessDevices": {
+      "document": "外部客户访问资产",
+      "input": "AccessDevicesRequest",
+      "name": "运维登录资产",
+      "output": "AccessDevicesResponse",
+      "status": "online"
+    },
     "AddDeviceGroupMembers": {
       "document": "添加资产组成员",
       "input": "AddDeviceGroupMembersRequest",
@@ -481,6 +488,198 @@
       ],
       "usage": "both"
     },
+    "AccessDevicesRequest": {
+      "document": "AccessDevices请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "资源id",
+          "example": "ins-bhtest",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "账号",
+          "example": "root",
+          "member": "string",
+          "name": "Account",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "运维端登录账号",
+          "example": "zhangsan",
+          "member": "string",
+          "name": "LoginAccount",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "运维端登录密码",
+          "example": "980930",
+          "member": "string",
+          "name": "LoginPassword",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "密码",
+          "example": "1a2b3c",
+          "member": "string",
+          "name": "Password",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "私钥",
+          "example": "bh-test-private-key",
+          "member": "string",
+          "name": "PrivateKey",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "私钥密码",
+          "example": "1a2b3c",
+          "member": "string",
+          "name": "PrivateKeyPassword",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "客户端工具",
+          "example": "mrd",
+          "member": "string",
+          "name": "Exe",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "RDP挂载盘符驱动（mstsc支持）",
+          "example": "[\"c:\",\"d:\"]",
+          "member": "string",
+          "name": "Drivers",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "窗口宽度（RDP支持）",
+          "example": "800",
+          "member": "uint64",
+          "name": "Width",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "窗口高度（RDP支持）",
+          "example": "600",
+          "member": "uint64",
+          "name": "Height",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "是否内网访问（默认不是）",
+          "example": "false",
+          "member": "bool",
+          "name": "IntranetAccess",
+          "required": false,
+          "type": "bool"
+        }
+      ],
+      "type": "object"
+    },
+    "AccessDevicesResponse": {
+      "document": "AccessDevices返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "认证信息",
+          "example": "{\"Ip\":\"127.0.0.1\",\"Port\":22}",
+          "member": "AccessInfo",
+          "name": "AccessInfo",
+          "output_required": false,
+          "type": "object",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "AccessInfo": {
+      "document": "认证信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "地址",
+          "example": "127.0.0.1",
+          "member": "string",
+          "name": "Ip",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "端口",
+          "example": "80",
+          "member": "uint64",
+          "name": "Port",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "账号",
+          "example": "v_feifei",
+          "member": "string",
+          "name": "User",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "密码",
+          "example": "980930",
+          "member": "string",
+          "name": "Password",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "唤起链接｜wss链接",
+          "example": "tsecbh://CgcxLjIuMS4xEgNtcmQaDzEyMy4yMDcuMTA2LjIxNyDFQSoNMTkyLjE2OC4xMS4xMzIr546w572R546v5aKD5YaF572R6K6_6Zeu6ZW_5pyf5L2_55SoLeWLv-WIoDoNYWRtaW5pc3RyYXRvckIQcmYwU1pIQ0ozcmlFQ1lVb0gBUIAIWIAGeAA",
+          "member": "string",
+          "name": "AccessURL",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "Acl": {
       "document": "访问权限",
       "members": [

tccli/services/bh/v20230418/examples.json

@@ -1,5 +1,13 @@
 {
   "actions": {
+    "AccessDevices": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: bh.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: AccessDevices\n<公共请求参数>\n\n{\n    \"InstanceId\": \"ins-2ftyp2vu\",\n    \"Account\": \"zhangsan\",\n    \"LoginAccount\": \"account\",\n    \"LoginPassword\": \"pass\",\n    \"Password\": \"\",\n    \"PrivateKey\": \"\",\n    \"PrivateKeyPassword\": \"\",\n    \"Exe\": \"web\",\n    \"Drivers\": [\n        \"\"\n    ],\n    \"Width\": 60,\n    \"Height\": 80,\n    \"IntranetAccess\": false\n}",
+        "output": "{\n    \"Response\": {\n        \"AccessInfo\": {\n            \"AccessURL\": \"\",\n            \"Ip\": \"11.11.11.11\",\n            \"Password\": \"sHUbwq6nFm9mja05n10X6YZ1TbTr0mpS\",\n            \"Port\": 8322,\n            \"User\": \"root@FdfmcRltiJZ2nNam\"\n        },\n        \"RequestId\": \"3bd56f7b-6453-476d-b0fa-c97c164d68b8\"\n    }\n}",
+        "title": "访问示例"
+      }
+    ],
     "AddDeviceGroupMembers": [
       {
         "document": "",

tccli/services/cdn/v20180606/api.json

@@ -16281,9 +16281,10 @@
         {
           "disabled": false,
           "document": "国内特殊配置。\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "",
+          "example": "null",
           "member": "MainlandConfig",
           "name": "Mainland",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": true
@@ -16291,9 +16292,10 @@
         {
           "disabled": false,
           "document": "海外特殊配置。\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "",
+          "example": "null",
           "member": "OverseaConfig",
           "name": "Overseas",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": true

tccli/services/cdwch/v20200915/api.json

@@ -2419,7 +2419,7 @@
         {
           "disabled": false,
           "document": "错误流程说明信息\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "\"\"",
+          "example": "error",
           "member": "string",
           "name": "FlowMsg",
           "output_required": true,
@@ -2479,7 +2479,7 @@
         {
           "disabled": false,
           "document": "日志主题ID\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "xxx",
+          "example": "error",
           "member": "string",
           "name": "ClsTopicId",
           "output_required": true,
@@ -2489,7 +2489,7 @@
         {
           "disabled": false,
           "document": "日志集ID\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "xxx",
+          "example": "error",
           "member": "string",
           "name": "ClsLogSetId",
           "output_required": true,
@@ -2639,7 +2639,7 @@
         {
           "disabled": false,
           "document": "服务信息\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "[]",
+          "example": "[\"error\"]",
           "member": "ServiceInfo",
           "name": "Components",
           "output_required": true,
@@ -2649,7 +2649,7 @@
         {
           "disabled": false,
           "document": "可升级的内核版本\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "xxx",
+          "example": "error",
           "member": "string",
           "name": "UpgradeVersions",
           "output_required": true,
@@ -2755,6 +2755,16 @@
           "output_required": false,
           "type": "list",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "是否开启公网clb",
+          "example": "true",
+          "member": "bool",
+          "name": "HasPublicCloudClb",
+          "output_required": false,
+          "type": "bool",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -3975,7 +3985,7 @@
           "example": "123",
           "member": "string",
           "name": "FlowId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -3985,17 +3995,17 @@
           "example": "cdwch-xxxxxxx",
           "member": "string",
           "name": "InstanceId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
         {
           "disabled": false,
           "document": "错误信息\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "xxx",
+          "example": "InvalidParameter",
           "member": "string",
           "name": "ErrorMsg",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },

tccli/services/cdwch/v20200915/examples.json

@@ -220,7 +220,7 @@
       {
         "document": "",
         "input": "POST / HTTP/1.1\nHost: cdwch.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ScaleUpInstance\n<公共请求参数>\n\n{\n    \"InstanceId\": \"cdwch-nzb9s4zz\",\n    \"Type\": \"DATA\",\n    \"SpecName\": \"SCH1\",\n    \"ScaleUpEnableRolling\": false\n}",
-        "output": "{\n    \"Response\": {\n        \"InstanceId\": \"xx\",\n        \"FlowId\": 0,\n        \"RequestId\": \"xx\",\n        \"ErrorMsg\": \"xx\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"InstanceId\": \"cdwch-xxxxxxxx\",\n        \"FlowId\": \"001\",\n        \"RequestId\": \"20a71202-27c4-4120-80c4-fb1a8e15dxxx\",\n        \"ErrorMsg\": \"InvalidParameter\"\n    }\n}",
         "title": "示例"
       }
     ]

tccli/services/cdwdoris/v20211228/api.json

@@ -4281,6 +4281,15 @@
           "name": "SortOrder",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "user",
+          "example": "user1",
+          "member": "string",
+          "name": "UserName",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -4453,6 +4462,15 @@
           "name": "SortOrder",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "user",
+          "example": "user1",
+          "member": "string",
+          "name": "UserName",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"