tccli 3.0.828.1__tar.gz → 3.0.829.1__tar.gz

{tccli-3.0.828.1/tccli.egg-info → tccli-3.0.829.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: tccli
-Version: 3.0.828.1
+Version: 3.0.829.1
 Summary: Universal Command Line Environment for Tencent Cloud
 Home-page: https://github.com/TencentCloud/tencentcloud-cli.git
 Author: Tencent Cloud

tccli-3.0.829.1/tccli/__init__.py

@@ -0,0 +1 @@
+__version__ = '3.0.829.1'

{tccli-3.0.828.1 → tccli-3.0.829.1}/tccli/services/autoscaling/v20180419/api.json

@@ -3631,8 +3631,8 @@
       "document": "实例信息",
       "members": [
         {
-          "default": "",
           "document": "实例ID",
+          "example": "ins-089dlszs",
           "member": "string",
           "name": "InstanceId",
           "required": true,
@@ -3640,8 +3640,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "伸缩组ID",
+          "example": "asg-02ofd40a",
           "member": "string",
           "name": "AutoScalingGroupId",
           "required": true,
@@ -3649,8 +3649,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "启动配置ID",
+          "example": "asc-23yf98ie",
           "member": "string",
           "name": "LaunchConfigurationId",
           "required": true,
@@ -3658,8 +3658,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "启动配置名称",
+          "example": "测试asc-01_2.3",
           "member": "string",
           "name": "LaunchConfigurationName",
           "required": true,
@@ -3667,8 +3667,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
-          "document": "生命周期状态，取值如下：<br>\n<li>IN_SERVICE：运行中\n<li>CREATING：创建中\n<li>CREATION_FAILED：创建失败\n<li>TERMINATING：中止中\n<li>TERMINATION_FAILED：中止失败\n<li>ATTACHING：绑定中\n<li>DETACHING：解绑中\n<li>ATTACHING_LB：绑定LB中<li>DETACHING_LB：解绑LB中\n<li>STARTING：开机中\n<li>START_FAILED：开机失败\n<li>STOPPING：关机中\n<li>STOP_FAILED：关机失败\n<li>STOPPED：已关机",
+          "document": "生命周期状态，取值如下：<br>\n<li>IN_SERVICE：运行中\n<li>CREATING：创建中\n<li>CREATION_FAILED：创建失败\n<li>TERMINATING：中止中\n<li>TERMINATION_FAILED：中止失败\n<li>ATTACHING：绑定中\n<li>ATTACH_FAILED：绑定失败\n<li>DETACHING：解绑中\n<li>DETACH_FAILED：解绑失败\n<li>ATTACHING_LB：绑定LB中\n<li>DETACHING_LB：解绑LB中\n<li>MODIFYING_LB：修改LB中\n<li>STARTING：开机中\n<li>START_FAILED：开机失败\n<li>STOPPING：关机中\n<li>STOP_FAILED：关机失败\n<li>STOPPED：已关机\n<li>IN_LAUNCHING_HOOK：扩容生命周期挂钩中\n<li>IN_TERMINATING_HOOK：缩容生命周期挂钩中",
+          "example": "IN_SERVICE",
           "member": "string",
           "name": "LifeCycleState",
           "required": true,
@@ -3676,8 +3676,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "健康状态，取值包括HEALTHY和UNHEALTHY",
+          "example": "HEALTHY",
           "member": "string",
           "name": "HealthStatus",
           "required": true,
@@ -3685,8 +3685,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "是否加入缩容保护",
+          "example": "false",
           "member": "bool",
           "name": "ProtectedFromScaleIn",
           "required": true,
@@ -3694,8 +3694,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "可用区",
+          "example": "ap-guangzhou-1",
           "member": "string",
           "name": "Zone",
           "required": true,
@@ -3703,8 +3703,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "创建类型，取值包括AUTO_CREATION, MANUAL_ATTACHING。",
+          "example": "AUTO_CREATION",
           "member": "string",
           "name": "CreationType",
           "required": true,
@@ -3712,8 +3712,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "实例加入时间",
+          "example": "2023-01-13T03:06:25Z",
           "member": "datetime_iso",
           "name": "AddTime",
           "required": true,
@@ -3721,8 +3721,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "实例类型",
+          "example": "S3.MEDIUM2",
           "member": "string",
           "name": "InstanceType",
           "required": true,
@@ -3730,8 +3730,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "版本号",
+          "example": "1",
           "member": "int64",
           "name": "VersionNumber",
           "required": true,
@@ -3739,8 +3739,8 @@
           "value_allowed_null": false
         },
         {
-          "default": "",
           "document": "伸缩组名称",
+          "example": "测试asg-01_2.3",
           "member": "string",
           "name": "AutoScalingGroupName",
           "required": true,

{tccli-3.0.828.1 → tccli-3.0.829.1}/tccli/services/cloudstudio/cloudstudio_client.py

@@ -329,6 +329,58 @@ def doDescribeWorkspaceEnvList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreateWorkspaceTemporaryToken(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('-', '_')]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_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.CloudstudioClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CreateWorkspaceTemporaryTokenRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreateWorkspaceTemporaryToken(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 doCreateWorkspaceByTemplate(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1074,6 +1126,7 @@ ACTION_MAP = {
     "ModifyCustomizeTemplateVersionControl": doModifyCustomizeTemplateVersionControl,
     "ModifyCustomizeTemplatesPartById": doModifyCustomizeTemplatesPartById,
     "DescribeWorkspaceEnvList": doDescribeWorkspaceEnvList,
+    "CreateWorkspaceTemporaryToken": doCreateWorkspaceTemporaryToken,
     "CreateWorkspaceByTemplate": doCreateWorkspaceByTemplate,
     "DescribeCustomizeTemplates": doDescribeCustomizeTemplates,
     "DescribeCustomizeTemplatesPresets": doDescribeCustomizeTemplatesPresets,

{tccli-3.0.828.1 → tccli-3.0.829.1}/tccli/services/cloudstudio/v20210524/api.json

@@ -28,6 +28,13 @@
       "output": "CreateWorkspaceByVersionControlResponse",
       "status": "online"
     },
+    "CreateWorkspaceTemporaryToken": {
+      "document": "为工作空间创建临时访问凭证，重复调用会创建新的 Token，旧的 Token 将会自动失效",
+      "input": "CreateWorkspaceTemporaryTokenRequest",
+      "name": "为工作空间创建临时访问凭证",
+      "output": "CreateWorkspaceTemporaryTokenResponse",
+      "status": "online"
+    },
     "DeleteCustomizeTemplatesById": {
       "document": "删除自定义模板",
       "input": "DeleteCustomizeTemplatesByIdRequest",
@@ -434,6 +441,40 @@
       ],
       "type": "object"
     },
+    "CreateWorkspaceTemporaryTokenRequest": {
+      "document": "CreateWorkspaceTemporaryToken请求参数结构体",
+      "members": [
+        {
+          "document": "创建工作空间凭证 DTO",
+          "example": "无",
+          "member": "WorkspaceTokenDTO",
+          "name": "WorkspaceTokenDTO",
+          "required": true,
+          "type": "object"
+        }
+      ],
+      "type": "object"
+    },
+    "CreateWorkspaceTemporaryTokenResponse": {
+      "document": "CreateWorkspaceTemporaryToken返回参数结构体",
+      "members": [
+        {
+          "document": "工作空间临时访问 token 信息",
+          "example": "无",
+          "member": "WorkspaceTokenInfoV0",
+          "name": "Data",
+          "type": "object",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "CustomizeTemplatesPresetsInfo": {
       "document": "模板的预置参数",
       "members": [
@@ -2430,6 +2471,54 @@
         }
       ],
       "usage": "out"
+    },
+    "WorkspaceTokenDTO": {
+      "document": "创建临时工作空间凭证 DTO",
+      "members": [
+        {
+          "document": "工作空间 SpaceKey\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "knhwex",
+          "member": "string",
+          "name": "SpaceKey",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "document": "token过期时间，单位是秒，默认 3600\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "3600",
+          "member": "uint64",
+          "name": "TokenExpiredLimitSec",
+          "required": false,
+          "type": "int",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "in"
+    },
+    "WorkspaceTokenInfoV0": {
+      "document": "获取工作空间临时访问 token 出参",
+      "members": [
+        {
+          "document": "访问工作空间临时凭证",
+          "example": "83c99d6a03aa94f5e7bbfb4eded0de0b1153f44d05126d34b5f36e8343eca973",
+          "member": "string",
+          "name": "Token",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "token 过期时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2023-02-13T12:33:48 GMT+08:00",
+          "member": "string",
+          "name": "ExpiredTime",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
     }
   },
   "version": "1.0"

{tccli-3.0.828.1 → tccli-3.0.829.1}/tccli/services/cloudstudio/v20210524/examples.json

@@ -32,6 +32,14 @@
         "title": "CreateWorkspaceByVersionControl"
       }
     ],
+    "CreateWorkspaceTemporaryToken": [
+      {
+        "document": "为工作空间创建临时访问凭证，重复调用会创建新的 Token，旧的 Token 将会自动失效",
+        "input": "POST / HTTP/1.1\nHost: cloudstudio.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateWorkspaceTemporaryToken\n<公共请求参数>\n\n{\n    \"WorkspaceTokenDTO\": {\n        \"SpaceKey\": \"xx\",\n        \"TokenExpiredLimitSec\": 3600\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"Data\": {\n            \"Token\": \"83c99d6a03aa94f5e7bbfb4eded0de0b1153f44d05126d34b5f36e8343eca973\",\n            \"ExpiredTime\": \"2023-02-13T12:33:48 GMT+08:00\"\n        },\n        \"RequestId\": \"xx\"\n    }\n}",
+        "title": "为工作空间创建临时访问凭证"
+      }
+    ],
     "DeleteCustomizeTemplatesById": [
       {
         "document": "",

{tccli-3.0.828.1 → tccli-3.0.829.1}/tccli/services/ess/v20201111/api.json

@@ -1218,6 +1218,15 @@
           "name": "Approvers",
           "required": true,
           "type": "list"
+        },
+        {
+          "default": "",
+          "document": "企微消息中的发起人",
+          "example": "无",
+          "member": "string",
+          "name": "Initiator",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"

{tccli-3.0.828.1 → tccli-3.0.829.1}/tccli/services/ess/v20201111/examples.json

@@ -63,7 +63,7 @@
     "CreateFlowApprovers": [
       {
         "document": "",
-        "input": "POST / HTTP/1.1\nHost: ess.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateFlowApprovers\n<公共请求参数>\n\n{\n    \"Operator\": {\n        \"UserId\": \"\"\n    },\n    \"FlowId\": \"flow_id_xxxxx\",\n    \"Approvers\": [\n        {\n            \"RecipientId\": \"RecipientId_1\",\n            \"ApproverSource\": \"WEWORK\",\n            \"CustomUserId\": \"Zhangsan\"\n        },\n        {\n            \"RecipientId\": \"RecipientId_1\",\n            \"ApproverSource\": \"WEWORK\",\n            \"CustomUserId\": \"Lisi\"\n        },\n        {\n            \"RecipientId\": \"RecipientId_2\",\n            \"ApproverSource\": \"WEWORK\",\n            \"CustomUserId\": \"Wangwu\"\n        },\n        {\n            \"RecipientId\": \"RecipientId_2\",\n            \"ApproverSource\": \"WEWORK\",\n            \"CustomUserId\": \"ZhaoLiu\"\n        }\n    ]\n}",
+        "input": "POST / HTTP/1.1\nHost: ess.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateFlowApprovers\n<公共请求参数>\n\n{\n    \"Operator\": {\n        \"UserId\": \"\"\n    },\n    \"FlowId\": \"flow_id_xxxxx\",\n    \"Initiator\": \"xxx\",\n    \"Approvers\": [\n        {\n            \"RecipientId\": \"RecipientId_1\",\n            \"ApproverSource\": \"WEWORK\",\n            \"CustomUserId\": \"Zhangsan\"\n        },\n        {\n            \"RecipientId\": \"RecipientId_1\",\n            \"ApproverSource\": \"WEWORK\",\n            \"CustomUserId\": \"Lisi\"\n        },\n        {\n            \"RecipientId\": \"RecipientId_2\",\n            \"ApproverSource\": \"WEWORK\",\n            \"CustomUserId\": \"Wangwu\"\n        },\n        {\n            \"RecipientId\": \"RecipientId_2\",\n            \"ApproverSource\": \"WEWORK\",\n            \"CustomUserId\": \"ZhaoLiu\"\n        }\n    ]\n}",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"2846e98d-7f-d2632a7fceef\"\n    }\n}",
         "title": "测试"
       }