Skip to content

Commit 25a9bdd

Browse files
tencentcloudapitencentcloudapi
committed
release 3.0.1016.1
1 parent e2a688a commit 25a9bdd

File tree

9 files changed

+296
-30
lines changed

9 files changed

+296
-30
lines changed

‎CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# Release 3.0.1016.1
2+
3+
## 流计算 Oceanus(oceanus) 版本：2019-04-22
4+
5+
### 第 49 次发布
6+
7+
发布时间：2023-12-04 15:28:57
8+
9+
本次发布包含了以下内容：
10+
11+
改善已有的文档。
12+
13+
新增接口：
14+
15+
* [DescribeFolder](https://cloud.tencent.com/document/api/849/102187)
16+
17+
新增数据结构：
18+
19+
* [SubFolderInfo](https://cloud.tencent.com/document/api/849/52010#SubFolderInfo)
20+
21+
22+
123
# Release 3.0.1015.1
224

325
## 流计算 Oceanus(oceanus) 版本：2019-04-22

‎SERVICE_CHANGELOG.md

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,21 @@
22

33
## 流计算 Oceanus(oceanus) 版本：2019-04-22
44

5-
### 第 48 次发布
6-
7-
发布时间：2023-12-04 00:15:25
8-
9-
本次发布包含了以下内容：
10-
11-
改善已有的文档。
12-
13-
修改数据结构：
14-
15-
* [JobV1](https://cloud.tencent.com/document/api/849/52010#JobV1)
16-
17-
* <font color="#dd0000">**修改成员**：</font>Tags
18-
19-
20-
21-
22-
## 云点播(vod) 版本：2018-07-17
23-
24-
### 第 175 次发布
5+
### 第 49 次发布
256

26-
发布时间：2023-12-04 00:22:12
7+
发布时间：2023-12-04 15:28:57
278

289
本次发布包含了以下内容：
2910

3011
改善已有的文档。
3112

32-
修改数据结构：
33-
34-
* [EventContent](https://cloud.tencent.com/document/api/266/31773#EventContent)
13+
新增接口：
3514

36-
* 新增成员：QualityEnhanceCompleteEvent
15+
* [DescribeFolder](https://cloud.tencent.com/document/api/849/102187)
3716

38-
* <font color="#dd0000">**修改成员**：</font>ExtractCopyRightWatermarkCompleteEvent, QualityInspectCompleteEvent
17+
新增数据结构：
3918

19+
* [SubFolderInfo](https://cloud.tencent.com/document/api/849/52010#SubFolderInfo)
4020

4121

4222

@@ -87033,6 +87013,22 @@
8703387013

8703487014
## 流计算 Oceanus(oceanus) 版本：2019-04-22
8703587015

87016+
### 第 49 次发布
87017+
87018+
发布时间：2023-12-04 15:28:57
87019+
87020+
本次发布包含了以下内容：
87021+
87022+
改善已有的文档。
87023+
87024+
新增接口：
87025+
87026+
* [[DescribeFolder](https://cloud.tencent.com/document/api/849/102187)](https://cloud.tencent.com/document/api/#/#)
87027+
87028+
新增数据结构：
87029+
87030+
* [[SubFolderInfo](https://cloud.tencent.com/document/api/849/52010#SubFolderInfo)](https://cloud.tencent.com/document/api/849/52010#[SubFolderInfo](https://cloud.tencent.com/document/api/849/52010#SubFolderInfo))
87031+
8703687032
### 第 48 次发布
8703787033

8703887034
发布时间：2023-12-04 00:15:25

‎products.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
| mvj | [营销价值判断](https://cloud.tencent.com/document/product) | 2020-03-19 08:11:44 |
152152
| nlp | [NLP 服务](https://cloud.tencent.com/document/product/271) | 2023-09-15 02:14:19 |
153153
| npp | [号码保护](https://cloud.tencent.com/document/product) | 2020-04-22 08:00:22 |
154-
| oceanus | [流计算 Oceanus](https://cloud.tencent.com/document/product/849) | 2023-12-04 00:15:25 |
154+
| oceanus | [流计算 Oceanus](https://cloud.tencent.com/document/product/849) | 2023-12-04 15:28:57 |
155155
| ocr | [文字识别](https://cloud.tencent.com/document/product/866) | 2023-11-30 05:24:08 |
156156
| omics | [腾讯健康组学平台](https://cloud.tencent.com/document/product/1643) | 2023-12-01 01:21:15 |
157157
| organization | [集团账号管理](https://cloud.tencent.com/document/product/850) | 2023-11-08 02:00:11 |

‎pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
44

55
[project]
66
name = "tccli"
7-
version = "3.0.1015.1"
7+
version = "3.0.1016.1"
88
authors = [
99
{ name="tencentcloudapi", email="tencentcloudapi@tencent.com" },
1010
]
@@ -21,7 +21,7 @@ classifiers = [
2121
dependencies = [
2222
"jmespath==0.10.0",
2323
"six==1.16.0",
24-
"tencentcloud-sdk-python>=3.0.1015",
24+
"tencentcloud-sdk-python>=3.0.1016",
2525
]
2626

2727
[project.urls]

‎tccli/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '3.0.1015.1'
1+
__version__ = '3.0.1016.1'

‎tccli/examples/oceanus/v20190422/DescribeFolder.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
**Example 1: 查询文件夹**
2+
3+
查询文件夹
4+
5+
Input:
6+
7+
```
8+
tccli oceanus DescribeFolder --cli-unfold-argument \
9+
--FolderId folder-bnjsm2sb \
10+
--WorkSpaceId space-7rfcnslf \
11+
--FolderType 1
12+
```
13+
14+
Output:
15+
```
16+
{
17+
"Response": {
18+
"FolderId": "folder-bnjsm2sb",
19+
"FolderName": "6.9_connector",
20+
"FolderType": 1,
21+
"ParentId": "root",
22+
"RequestId": "3ca249e8-b742-4e97-856d-1fca5a95d6a5",
23+
"SubFolderInfo": [
24+
{
25+
"FolderId": "folder-gbtcphg0",
26+
"FolderName": "hive_catalog_config_311"
27+
},
28+
{
29+
"FolderId": "folder-79b2dxuc",
30+
"FolderName": "sql_server"
31+
},
32+
{
33+
"FolderId": "folder-oc406jen",
34+
"FolderName": "doris"
35+
},
36+
{
37+
"FolderId": "folder-3ldo2w3g",
38+
"FolderName": "mysql_cdc"
39+
},
40+
{
41+
"FolderId": "folder-nodi86tq",
42+
"FolderName": "kudu"
43+
}
44+
],
45+
"WorkSpaceId": "space-7rfcnslf"
46+
}
47+
}
48+
```
49+

‎tccli/services/oceanus/oceanus_client.py

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,58 @@ def doCreateJob(args, parsed_globals):
433433
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
434434

435435

436+
def doDescribeFolder(args, parsed_globals):
437+
g_param = parse_global_arg(parsed_globals)
438+
439+
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
440+
cred = credential.CVMRoleCredential()
441+
elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
442+
cred = credential.STSAssumeRoleCredential(
443+
g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
444+
g_param[OptionsDefine.RoleSessionName.replace('-', '_')]
445+
)
446+
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):
447+
cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
448+
else:
449+
cred = credential.Credential(
450+
g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
451+
)
452+
http_profile = HttpProfile(
453+
reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
454+
reqMethod="POST",
455+
endpoint=g_param[OptionsDefine.Endpoint],
456+
proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
457+
)
458+
profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
459+
if g_param[OptionsDefine.Language]:
460+
profile.language = g_param[OptionsDefine.Language]
461+
mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
462+
client = mod.OceanusClient(cred, g_param[OptionsDefine.Region], profile)
463+
client._sdkVersion += ("_CLI_" + __version__)
464+
models = MODELS_MAP[g_param[OptionsDefine.Version]]
465+
model = models.DescribeFolderRequest()
466+
model.from_json_string(json.dumps(args))
467+
start_time = time.time()
468+
while True:
469+
rsp = client.DescribeFolder(model)
470+
result = rsp.to_json_string()
471+
try:
472+
json_obj = json.loads(result)
473+
except TypeError as e:
474+
json_obj = json.loads(result.decode('utf-8')) # python3.3
475+
if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
476+
break
477+
cur_time = time.time()
478+
if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
479+
raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
480+
(g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
481+
search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
482+
else:
483+
print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
484+
time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
485+
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
486+
487+
436488
def doDescribeResourceConfigs(args, parsed_globals):
437489
g_param = parse_global_arg(parsed_globals)
438490

@@ -1856,6 +1908,7 @@ def doDescribeJobConfigs(args, parsed_globals):
18561908
"CreateWorkSpace": doCreateWorkSpace,
18571909
"CreateResourceConfig": doCreateResourceConfig,
18581910
"CreateJob": doCreateJob,
1911+
"DescribeFolder": doDescribeFolder,
18591912
"DescribeResourceConfigs": doDescribeResourceConfigs,
18601913
"ModifyFolder": doModifyFolder,
18611914
"DescribeJobSavepoint": doDescribeJobSavepoint,

0 commit comments

Comments
 (0)