Skip to content

Commit 8a25042

Browse files
ucloud-botucloud-bot
authored
sdk: rolling update for 0.11.49 (ucloud#253)
1 parent 5cd9b4c commit 8a25042

File tree

23 files changed

+439
-260
lines changed

23 files changed

+439
-260
lines changed

‎docs/services.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,13 @@ ISMS
115115
:members:
116116

117117

118+
STS
119+
---
120+
121+
.. autoclass:: ucloud.services.sts.client.STSClient
122+
:members:
123+
124+
118125
TiDB
119126
----
120127

‎ucloud/client.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,16 @@ def isms(self):
6262
self.logger,
6363
)
6464

65+
def sts(self):
66+
from ucloud.services.sts.client import STSClient
67+
68+
return STSClient(
69+
self._auto_config("sts"),
70+
self.transport,
71+
self.middleware,
72+
self.logger,
73+
)
74+
6575
def stepflow(self):
6676
from ucloud.services.stepflow.client import StepFlowClient
6777

‎ucloud/services/pathx/schemas/models.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -146,22 +146,22 @@ class AccelerationAreaInfosSchema(schema.ResponseSchema):
146146
}
147147

148148

149-
class ForwardTaskSchema(schema.ResponseSchema):
150-
"""ForwardTask -"""
149+
class OutPublicIpInfoSchema(schema.ResponseSchema):
150+
"""OutPublicIpInfo - 线路回源IP信息"""
151151

152152
fields = {
153-
"Port": fields.Int(required=True, load_from="Port"),
154-
"Protocol": fields.Str(required=True, load_from="Protocol"),
155-
"RSPort": fields.Int(required=True, load_from="RSPort"),
153+
"Area": fields.Str(required=False, load_from="Area"),
154+
"IP": fields.Str(required=False, load_from="IP"),
156155
}
157156

158157

159-
class OutPublicIpInfoSchema(schema.ResponseSchema):
160-
"""OutPublicIpInfo - 线路回源IP信息"""
158+
class ForwardTaskSchema(schema.ResponseSchema):
159+
"""ForwardTask -"""
161160

162161
fields = {
163-
"Area": fields.Str(required=False, load_from="Area"),
164-
"IP": fields.Str(required=False, load_from="IP"),
162+
"Port": fields.Int(required=True, load_from="Port"),
163+
"Protocol": fields.Str(required=True, load_from="Protocol"),
164+
"RSPort": fields.Int(required=True, load_from="RSPort"),
165165
}
166166

167167

@@ -231,34 +231,34 @@ class AccelerationInfoSchema(schema.ResponseSchema):
231231
}
232232

233233

234-
class UGAL7ForwarderSchema(schema.ResponseSchema):
235-
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
234+
class UGAATaskSchema(schema.ResponseSchema):
235+
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""
236236

237237
fields = {
238238
"Port": fields.Int(required=True, load_from="Port"),
239239
"Protocol": fields.Str(required=True, load_from="Protocol"),
240-
"RSPort": fields.Int(required=True, load_from="RSPort"),
241-
"SSLId": fields.Str(required=False, load_from="SSLId"),
242-
"SSLName": fields.Str(required=False, load_from="SSLName"),
243240
}
244241

245242

246-
class UGAL4ForwarderSchema(schema.ResponseSchema):
247-
"""UGAL4Forwarder - UGA实例 4层转发器信息"""
243+
class UGAL7ForwarderSchema(schema.ResponseSchema):
244+
"""UGAL7Forwarder - UGA实例 7层转发器信息"""
248245

249246
fields = {
250247
"Port": fields.Int(required=True, load_from="Port"),
251248
"Protocol": fields.Str(required=True, load_from="Protocol"),
252249
"RSPort": fields.Int(required=True, load_from="RSPort"),
250+
"SSLId": fields.Str(required=False, load_from="SSLId"),
251+
"SSLName": fields.Str(required=False, load_from="SSLName"),
253252
}
254253

255254

256-
class UGAATaskSchema(schema.ResponseSchema):
257-
"""UGAATask - 用户在UGAA实例下配置的多端口任务"""
255+
class UGAL4ForwarderSchema(schema.ResponseSchema):
256+
"""UGAL4Forwarder - UGA实例 4层转发器信息"""
258257

259258
fields = {
260259
"Port": fields.Int(required=True, load_from="Port"),
261260
"Protocol": fields.Str(required=True, load_from="Protocol"),
261+
"RSPort": fields.Int(required=True, load_from="RSPort"),
262262
}
263263

264264

‎ucloud/services/sts/__init__.py‎

Whitespace-only changes.

‎ucloud/services/sts/client.py‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
""" Code is generated by ucloud-model, DO NOT EDIT IT. """
2+
3+
import typing
4+
5+
6+
from ucloud.core.client import Client
7+
from ucloud.services.sts.schemas import apis
8+
9+
10+
class STSClient(Client):
11+
def __init__(
12+
self, config: dict, transport=None, middleware=None, logger=None
13+
):
14+
super(STSClient, self).__init__(config, transport, middleware, logger)
15+
16+
def assume_role(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
17+
"""AssumeRole - 获取扮演角色的临时身份凭证
18+
19+
**Request**
20+
21+
- **RoleSessionName** (str) - (Required) 角色会话名称。
22+
- **RoleUrn** (str) - (Required) 要扮演的RAM角色URN。
23+
- **DurationSeconds** (int) - Token有效期。
24+
- **Policy** (str) - 为STS Token额外添加的一个权限策略，进一步限制STS Token的权限。
25+
26+
**Response**
27+
28+
- **Credentials** (dict) - 见 **Credentials** 模型定义
29+
30+
**Response Model**
31+
32+
**Credentials**
33+
- **AccessKeyId** (str) - 密钥ID。
34+
- **AccessKeySecret** (str) - 密钥Secret。
35+
- **Expiration** (str) - Token到期失效时间（UTC时间）。
36+
- **SecurityToken** (str) - 安全令牌。
37+
38+
39+
"""
40+
# build request
41+
d = {}
42+
req and d.update(req)
43+
d = apis.AssumeRoleRequestSchema().dumps(d)
44+
45+
resp = self.invoke("AssumeRole", d, **kwargs)
46+
return apis.AssumeRoleResponseSchema().loads(resp)

‎ucloud/services/sts/schemas/__init__.py‎

Whitespace-only changes.

‎ucloud/services/sts/schemas/apis.py‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
""" Code is generated by ucloud-model, DO NOT EDIT IT. """
2+
3+
4+
from ucloud.core.typesystem import schema, fields
5+
from ucloud.services.sts.schemas import models
6+
7+
""" STS API Schema
8+
"""
9+
10+
11+
"""
12+
API: AssumeRole
13+
14+
获取扮演角色的临时身份凭证
15+
"""
16+
17+
18+
class AssumeRoleRequestSchema(schema.RequestSchema):
19+
"""AssumeRole - 获取扮演角色的临时身份凭证"""
20+
21+
fields = {
22+
"DurationSeconds": fields.Int(
23+
required=False, dump_to="DurationSeconds"
24+
),
25+
"Policy": fields.Str(required=False, dump_to="Policy"),
26+
"RoleSessionName": fields.Str(required=True, dump_to="RoleSessionName"),
27+
"RoleUrn": fields.Str(required=True, dump_to="RoleUrn"),
28+
}
29+
30+
31+
class AssumeRoleResponseSchema(schema.ResponseSchema):
32+
"""AssumeRole - 获取扮演角色的临时身份凭证"""
33+
34+
fields = {
35+
"Credentials": models.CredentialsSchema(),
36+
}

‎ucloud/services/sts/schemas/models.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
""" Code is generated by ucloud-model, DO NOT EDIT IT. """
2+
3+
from ucloud.core.typesystem import schema, fields
4+
5+
6+
class CredentialsSchema(schema.ResponseSchema):
7+
"""Credentials -"""
8+
9+
fields = {
10+
"AccessKeyId": fields.Str(required=True, load_from="AccessKeyId"),
11+
"AccessKeySecret": fields.Str(
12+
required=True, load_from="AccessKeySecret"
13+
),
14+
"Expiration": fields.Str(required=True, load_from="Expiration"),
15+
"SecurityToken": fields.Str(required=True, load_from="SecurityToken"),
16+
}

‎ucloud/services/ucdn/schemas/models.py‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
from ucloud.core.typesystem import schema, fields
44

55

6-
class AccessConfSchema(schema.ResponseSchema):
7-
"""AccessConf - 访问控制"""
8-
9-
fields = {
10-
"IpBlacklist": fields.Str(required=False, load_from="IpBlacklist"),
11-
}
12-
13-
146
class CacheConfSchema(schema.ResponseSchema):
157
"""CacheConf - 缓存配置"""
168

@@ -29,6 +21,14 @@ class CacheConfSchema(schema.ResponseSchema):
2921
}
3022

3123

24+
class AccessConfSchema(schema.ResponseSchema):
25+
"""AccessConf - 访问控制"""
26+
27+
fields = {
28+
"IpBlacklist": fields.Str(required=False, load_from="IpBlacklist"),
29+
}
30+
31+
3232
class DomainInfoSchema(schema.ResponseSchema):
3333
"""DomainInfo - 域名配置"""
3434

@@ -314,6 +314,35 @@ class ReferConfSchema(schema.ResponseSchema):
314314
}
315315

316316

317+
class OriginConfSchema(schema.ResponseSchema):
318+
"""OriginConf - 回源配置"""
319+
320+
fields = {
321+
"BackupOriginEnable": fields.Bool(
322+
required=False, load_from="BackupOriginEnable"
323+
),
324+
"BackupOriginHost": fields.Str(
325+
required=False, load_from="BackupOriginHost"
326+
),
327+
"BackupOriginIpList": fields.List(fields.Str()),
328+
"OriginErrorCode": fields.Str(
329+
required=False, load_from="OriginErrorCode"
330+
),
331+
"OriginErrorNum": fields.Int(
332+
required=False, load_from="OriginErrorNum"
333+
),
334+
"OriginFollow301": fields.Int(
335+
required=False, load_from="OriginFollow301"
336+
),
337+
"OriginHost": fields.Str(required=False, load_from="OriginHost"),
338+
"OriginIpList": fields.List(fields.Str()),
339+
"OriginPort": fields.Int(required=False, load_from="OriginPort"),
340+
"OriginProtocol": fields.Str(
341+
required=False, load_from="OriginProtocol"
342+
),
343+
}
344+
345+
317346
class CacheAllConfigSchema(schema.ResponseSchema):
318347
"""CacheAllConfig - 缓存相关的配置"""
319348

@@ -325,15 +354,6 @@ class CacheAllConfigSchema(schema.ResponseSchema):
325354
}
326355

327356

328-
class AccessControlConfSchema(schema.ResponseSchema):
329-
"""AccessControlConf - 访问控制配置参数"""
330-
331-
fields = {
332-
"IpBlackList": fields.List(fields.Str()),
333-
"ReferConf": ReferConfSchema(),
334-
}
335-
336-
337357
class AdvancedConfSchema(schema.ResponseSchema):
338358
"""AdvancedConf - 域名高级配置"""
339359

@@ -348,32 +368,12 @@ class AdvancedConfSchema(schema.ResponseSchema):
348368
}
349369

350370

351-
class OriginConfSchema(schema.ResponseSchema):
352-
"""OriginConf - 回源配置"""
371+
class AccessControlConfSchema(schema.ResponseSchema):
372+
"""AccessControlConf - 访问控制配置参数"""
353373

354374
fields = {
355-
"BackupOriginEnable": fields.Bool(
356-
required=False, load_from="BackupOriginEnable"
357-
),
358-
"BackupOriginHost": fields.Str(
359-
required=False, load_from="BackupOriginHost"
360-
),
361-
"BackupOriginIpList": fields.List(fields.Str()),
362-
"OriginErrorCode": fields.Str(
363-
required=False, load_from="OriginErrorCode"
364-
),
365-
"OriginErrorNum": fields.Int(
366-
required=False, load_from="OriginErrorNum"
367-
),
368-
"OriginFollow301": fields.Int(
369-
required=False, load_from="OriginFollow301"
370-
),
371-
"OriginHost": fields.Str(required=False, load_from="OriginHost"),
372-
"OriginIpList": fields.List(fields.Str()),
373-
"OriginPort": fields.Int(required=False, load_from="OriginPort"),
374-
"OriginProtocol": fields.Str(
375-
required=False, load_from="OriginProtocol"
376-
),
375+
"IpBlackList": fields.List(fields.Str()),
376+
"ReferConf": ReferConfSchema(),
377377
}
378378

379379

‎ucloud/services/ucompshare/client.py‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ def describe_ul_host_instance(
110110
111111
**Response Model**
112112
113+
**ULHostInstanceSet**
114+
- **Apps** (list) - 【数组】镜像包含的应用列表。
115+
- **AutoRenew** (str) - 是否自动续费。枚举值：Yes/No
116+
- **CPU** (int) - CPU核数。
117+
- **ChargeType** (str) - 计费模式。枚举值：Month/Year
118+
- **CreateTime** (int) - 创建时间。Unix时间戳
119+
- **DiskSet** (list) - 见 **ULHostDiskSet** 模型定义
120+
- **ExpireTime** (int) - 过期时间。Unix时间戳
121+
- **IPSet** (list) - 见 **UHostIPSet** 模型定义
122+
- **ImageId** (str) - 镜像Id。
123+
- **ImageName** (str) - 镜像名称。
124+
- **IsExpire** (str) - 是否过期。枚举值：Yes/No
125+
- **Memory** (int) - 内存。单位：MB
126+
- **Name** (str) - 实例名称。默认套餐Id
127+
- **Remark** (str) - 备注。
128+
- **State** (str) - 实例状态。枚举值：\\ >初始化: Initializing; \\ >启动中: Starting; \\> 运行中: Running; \\> 关机中: Stopping; \\ >关机: Stopped \\ >安装失败: Install Fail; \\ >重启中: Rebooting; \\ > 未知(空字符串，获取状态超时或出错)：""
129+
- **Tag** (str) - 业务组。
130+
- **ULHostId** (str) - 实例Id。
131+
- **Zone** (str) - 可用区。
132+
133+
113134
**ULHostDiskSet**
114135
- **DiskId** (str) - 磁盘Id
115136
- **DiskType** (str) - 磁盘类型。如："CLOUD_RSSD"、"CLOUD_SSD"
@@ -133,27 +154,6 @@ def describe_ul_host_instance(
133154
- **Weight** (int) - 当前EIP的权重。权重最大的为当前的出口IP。
134155
135156
136-
**ULHostInstanceSet**
137-
- **Apps** (list) - 【数组】镜像包含的应用列表。
138-
- **AutoRenew** (str) - 是否自动续费。枚举值：Yes/No
139-
- **CPU** (int) - CPU核数。
140-
- **ChargeType** (str) - 计费模式。枚举值：Month/Year
141-
- **CreateTime** (int) - 创建时间。Unix时间戳
142-
- **DiskSet** (list) - 见 **ULHostDiskSet** 模型定义
143-
- **ExpireTime** (int) - 过期时间。Unix时间戳
144-
- **IPSet** (list) - 见 **UHostIPSet** 模型定义
145-
- **ImageId** (str) - 镜像Id。
146-
- **ImageName** (str) - 镜像名称。
147-
- **IsExpire** (str) - 是否过期。枚举值：Yes/No
148-
- **Memory** (int) - 内存。单位：MB
149-
- **Name** (str) - 实例名称。默认套餐Id
150-
- **Remark** (str) - 备注。
151-
- **State** (str) - 实例状态。枚举值：\\ >初始化: Initializing; \\ >启动中: Starting; \\> 运行中: Running; \\> 关机中: Stopping; \\ >关机: Stopped \\ >安装失败: Install Fail; \\ >重启中: Rebooting; \\ > 未知(空字符串，获取状态超时或出错)：""
152-
- **Tag** (str) - 业务组。
153-
- **ULHostId** (str) - 实例Id。
154-
- **Zone** (str) - 可用区。
155-
156-
157157
"""
158158
# build request
159159
d = {

0 commit comments

Comments
 (0)