tccli 3.0.1015.1__py2.py3-none-any.whl → 3.0.1016.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1015.1'
+__version__ = '3.0.1016.1'

tccli/examples/oceanus/v20190422/DescribeFolder.md

@@ -0,0 +1,49 @@
+**Example 1: 查询文件夹**
+
+查询文件夹
+
+Input: 
+
+```
+tccli oceanus DescribeFolder --cli-unfold-argument  \
+    --FolderId folder-bnjsm2sb \
+    --WorkSpaceId space-7rfcnslf \
+    --FolderType 1
+```
+
+Output: 
+```
+{
+    "Response": {
+        "FolderId": "folder-bnjsm2sb",
+        "FolderName": "6.9_connector",
+        "FolderType": 1,
+        "ParentId": "root",
+        "RequestId": "3ca249e8-b742-4e97-856d-1fca5a95d6a5",
+        "SubFolderInfo": [
+            {
+                "FolderId": "folder-gbtcphg0",
+                "FolderName": "hive_catalog_config_311"
+            },
+            {
+                "FolderId": "folder-79b2dxuc",
+                "FolderName": "sql_server"
+            },
+            {
+                "FolderId": "folder-oc406jen",
+                "FolderName": "doris"
+            },
+            {
+                "FolderId": "folder-3ldo2w3g",
+                "FolderName": "mysql_cdc"
+            },
+            {
+                "FolderId": "folder-nodi86tq",
+                "FolderName": "kudu"
+            }
+        ],
+        "WorkSpaceId": "space-7rfcnslf"
+    }
+}
+```
+

tccli/services/oceanus/oceanus_client.py

@@ -433,6 +433,58 @@ def doCreateJob(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeFolder(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_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.OceanusClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeFolderRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeFolder(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 doDescribeResourceConfigs(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1856,6 +1908,7 @@ ACTION_MAP = {
     "CreateWorkSpace": doCreateWorkSpace,
     "CreateResourceConfig": doCreateResourceConfig,
     "CreateJob": doCreateJob,
+    "DescribeFolder": doDescribeFolder,
     "DescribeResourceConfigs": doDescribeResourceConfigs,
     "ModifyFolder": doModifyFolder,
     "DescribeJobSavepoint": doDescribeJobSavepoint,

tccli/services/oceanus/v20190422/api.json

@@ -112,6 +112,13 @@
       "output": "DescribeClustersResponse",
       "status": "online"
     },
+    "DescribeFolder": {
+      "document": "查询指定文件夹及其相应的子文件夹信息",
+      "input": "DescribeFolderRequest",
+      "name": "查询文件夹",
+      "output": "DescribeFolderResponse",
+      "status": "online"
+    },
     "DescribeJobConfigs": {
       "document": "查询作业配置列表，一次最多查询100个",
       "input": "DescribeJobConfigsRequest",
@@ -2502,6 +2509,111 @@
       ],
       "type": "object"
     },
+    "DescribeFolderRequest": {
+      "document": "DescribeFolder请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "folder id",
+          "example": "folder-lfqkt10s",
+          "member": "string",
+          "name": "FolderId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "workspace id",
+          "example": "space-53rqk422",
+          "member": "string",
+          "name": "WorkSpaceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "1:资源文件夹\n其他:作业文件夹",
+          "example": "1",
+          "member": "int64",
+          "name": "FolderType",
+          "required": true,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeFolderResponse": {
+      "document": "DescribeFolder返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "folder id",
+          "example": "folder-lfqkt10s",
+          "member": "string",
+          "name": "FolderId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "folder name",
+          "example": "test",
+          "member": "string",
+          "name": "FolderName",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "父文件夹id",
+          "example": "folder-lfqkt10i",
+          "member": "string",
+          "name": "ParentId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "文件夹类型",
+          "example": "1",
+          "member": "int64",
+          "name": "FolderType",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "workspace id",
+          "example": "无",
+          "member": "string",
+          "name": "WorkSpaceId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "子文件夹信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "SubFolderInfo",
+          "name": "SubFolderInfo",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，每次请求都会返回。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeJobConfigsRequest": {
       "document": "DescribeJobConfigs请求参数结构体",
       "members": [
@@ -6450,6 +6562,32 @@
       ],
       "type": "object"
     },
+    "SubFolderInfo": {
+      "document": "子目录信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "folder id",
+          "example": "folder-lfqkt10s",
+          "member": "string",
+          "name": "FolderId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "folder name",
+          "example": "test",
+          "member": "string",
+          "name": "FolderName",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "SystemResourceItem": {
       "document": "系统资源返回值",
       "members": [

tccli/services/oceanus/v20190422/examples.json

@@ -146,6 +146,14 @@
         "title": "查询集群"
       }
     ],
+    "DescribeFolder": [
+      {
+        "document": "查询文件夹",
+        "input": "POST / HTTP/1.1\nHost: oceanus.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeFolder\n<公共请求参数>\n\n{\n    \"FolderId\": \"folder-bnjsm2sb\",\n    \"WorkSpaceId\": \"space-7rfcnslf\",\n    \"FolderType\": 1\n}",
+        "output": "{\n    \"Response\": {\n        \"FolderId\": \"folder-bnjsm2sb\",\n        \"FolderName\": \"6.9_connector\",\n        \"FolderType\": 1,\n        \"ParentId\": \"root\",\n        \"RequestId\": \"3ca249e8-b742-4e97-856d-1fca5a95d6a5\",\n        \"SubFolderInfo\": [\n            {\n                \"FolderId\": \"folder-gbtcphg0\",\n                \"FolderName\": \"hive_catalog_config_311\"\n            },\n            {\n                \"FolderId\": \"folder-79b2dxuc\",\n                \"FolderName\": \"sql_server\"\n            },\n            {\n                \"FolderId\": \"folder-oc406jen\",\n                \"FolderName\": \"doris\"\n            },\n            {\n                \"FolderId\": \"folder-3ldo2w3g\",\n                \"FolderName\": \"mysql_cdc\"\n            },\n            {\n                \"FolderId\": \"folder-nodi86tq\",\n                \"FolderName\": \"kudu\"\n            }\n        ],\n        \"WorkSpaceId\": \"space-7rfcnslf\"\n    }\n}",
+        "title": "查询文件夹"
+      }
+    ],
     "DescribeJobConfigs": [
       {
         "document": "查询指定的作业配置",

{tccli-3.0.1015.1.dist-info → tccli-3.0.1016.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tccli
-Version: 3.0.1015.1
+Version: 3.0.1016.1
 Summary: Universal Command Line Environment for Tencent Cloud
 Project-URL: Bug Tracker, https://github.com/TencentCloud/tencentcloud-cli/issues
 Project-URL: Homepage, https://github.com/TencentCloud/tencentcloud-cli
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: jmespath==0.10.0
 Requires-Dist: six==1.16.0
-Requires-Dist: tencentcloud-sdk-python>=3.0.1015
+Requires-Dist: tencentcloud-sdk-python>=3.0.1016
 Description-Content-Type: text/markdown
 
 # 命令行工具简介

{tccli-3.0.1015.1.dist-info → tccli-3.0.1016.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tccli/__init__.py,sha256=gndS9WJvBFlQFGDWbZM9V6TLGl2KVpiBm4l-M43ZzjU,27
+tccli/__init__.py,sha256=61bNU-8THxbtSSFESKi3wEmyZZQUIBdoBCtzT8jz44g,27
 tccli/argparser.py,sha256=iFaw_iIMdyVwUdcv2_2OHQfe7-7j9yGzoOgXgXswoBo,5555
 tccli/argument.py,sha256=ZtVo3AySpzM-Hw6_hPdU27FjUsc8QPB2fIuLy7JSBAk,8091
 tccli/base_command.py,sha256=rFWNAwfS0GA6LLGNOM-iPI0RV81Jag5cZn536ZQN0pw,2859
@@ -6798,6 +6798,7 @@ tccli/examples/oceanus/v20190422/DeleteResources.md,sha256=kI7G8G35KgpKkLsVuSlzm
 tccli/examples/oceanus/v20190422/DeleteTableConfig.md,sha256=RC1KGZMGyoKtEynnSlbCP_P6UBtENCA15X_up4lqKJw,294
 tccli/examples/oceanus/v20190422/DeleteWorkSpace.md,sha256=eNdP1MYFY-CpYON_r6ekhdcZb2SKIsnJ7Oh4gP5hjwk,229
 tccli/examples/oceanus/v20190422/DescribeClusters.md,sha256=iz7ajadyjSg8q_TE7gKhsroPTzCbyplZ_YVn21vgDOI,4684
+tccli/examples/oceanus/v20190422/DescribeFolder.md,sha256=J_00VE_odnQ7eVcu1eWjwaI5XR6c-y8awPjn2QufyeI,1119
 tccli/examples/oceanus/v20190422/DescribeJobConfigs.md,sha256=p7PawufuZXXTHetys0EVXa42-arxjiQ-2VlDCnbS1tw,2465
 tccli/examples/oceanus/v20190422/DescribeJobSavepoint.md,sha256=_dO0sKVtxmbkeUxDQ_B5cC6dM_SJAcrkK9wYJi4kE0k,1318
 tccli/examples/oceanus/v20190422/DescribeJobSubmissionLog.md,sha256=xdRg5vSoEG23TuPGhQ9ZiYpYOoqYMCGZu5DJ_1s8BGg,3477
@@ -11893,9 +11894,9 @@ tccli/services/npp/npp_client.py,sha256=t2aT-HKgt1N92lDv1oCz9olouswahUOkaFC-df20
 tccli/services/npp/v20190823/api.json,sha256=PDUAkhWDtol-4RI5QbMIqzY3Zxt69VxCGnPAhfplId0,39200
 tccli/services/npp/v20190823/examples.json,sha256=azmnTGdIEPJnXLrmF44witGE720MeKXlXeWNghXPP4s,5164
 tccli/services/oceanus/__init__.py,sha256=u6C9EuoVN4BwKu4JcesnJbyrIeTq4ijrJ-tUdublrRc,93
-tccli/services/oceanus/oceanus_client.py,sha256=dS9k9sk095cr0OrfYM6k34dsjUsWuMNjAbA1NCaLAJE,112055
-tccli/services/oceanus/v20190422/api.json,sha256=RPM8M_wi-RwV7fw9VqgYGjJUcIbIForECzBuq_7L5xk,219176
-tccli/services/oceanus/v20190422/examples.json,sha256=ycO1TmnYQJWt0XiIplpOnlLG_QGJ5j3Dc5kKgGIsA_o,46186
+tccli/services/oceanus/oceanus_client.py,sha256=vfALlm6XbcZDysbR-7RJMrAhW9CMeYyVp8MzFIMvH0w,115087
+tccli/services/oceanus/v20190422/api.json,sha256=5oUIzJnKEercQsKffQSrZRovy5PBXoh18bL_5xyiD0g,223141
+tccli/services/oceanus/v20190422/examples.json,sha256=90Xe7rAkPDXHeDbYFr0ueNKcUdd7Z_8UmhperdVIGik,47585
 tccli/services/ocr/__init__.py,sha256=1UdHN9VtB5qVwAn2FMefSi4BhMTJOjmFgYZT-zTEVBM,85
 tccli/services/ocr/ocr_client.py,sha256=w8fVHmxlg0mkc6cQNDJaPC7f828QG3aXbAbYJvCbJlQ,251895
 tccli/services/ocr/v20181119/api.json,sha256=RfUG97cUeIKZGBDC-gwvDFb2wis0mIg52Fbccb8E7Ak,679609
@@ -12278,8 +12279,8 @@ tccli/services/yunsou/v20180504/api.json,sha256=2808fil5p3pTEJ3SqXEEq7eSrASZOiv8
 tccli/services/yunsou/v20180504/examples.json,sha256=Jg4WuqS_Wxl7eTBMbzjem65FuUZQi3qq3xtlBNFZlTU,11870
 tccli/services/yunsou/v20191115/api.json,sha256=Dyfl3mC3NXGFINdyU_vxC-86gQe40YLOWjKkSK7XA2U,15708
 tccli/services/yunsou/v20191115/examples.json,sha256=vN5MzexHVPMckm4MbnXNiOe3KKiVchvf4_uLpjOskuk,3983
-tccli-3.0.1015.1.dist-info/METADATA,sha256=TK8AktajxF2A3XN1K6va_2ZBhUfPmu1uFVIGnxoZc9M,16172
-tccli-3.0.1015.1.dist-info/WHEEL,sha256=HyPWovjK_wfsxZqVnw7Bu5rgKxNh3Nm__lHm0ALDcb4,101
-tccli-3.0.1015.1.dist-info/entry_points.txt,sha256=9ZzsXxi7Xj3ZneT7VxRVJpFvnmdEOeysh999_0gWVvo,85
-tccli-3.0.1015.1.dist-info/license_files/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-tccli-3.0.1015.1.dist-info/RECORD,,
+tccli-3.0.1016.1.dist-info/METADATA,sha256=ywOu-u6BBfUhpVa0XQ4xCljs_CoE7kTw5amPisbezG8,16172
+tccli-3.0.1016.1.dist-info/WHEEL,sha256=HyPWovjK_wfsxZqVnw7Bu5rgKxNh3Nm__lHm0ALDcb4,101
+tccli-3.0.1016.1.dist-info/entry_points.txt,sha256=9ZzsXxi7Xj3ZneT7VxRVJpFvnmdEOeysh999_0gWVvo,85
+tccli-3.0.1016.1.dist-info/license_files/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+tccli-3.0.1016.1.dist-info/RECORD,,