Skip to content

Commit bd64404

Browse files
authored
sdk: rolling update for 0.11.113 (#342)
1 parent fb748d6 commit bd64404

4 files changed

Lines changed: 36 additions & 11 deletions

File tree

‎ucloud/services/ukms/client.py‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -626,10 +626,13 @@ def list_aliases(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
626626
627627
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子账号必须填写。
628628
- **Region** (str) - (Config) 地域。参见地域和可用区列表。
629+
- **Alias** (str) - 按完整别名(含 alias/ 前缀)进行子串模糊匹配
629630
- **KeyId** (str) - 可选:筛选指定密钥资源长 ID 的别名。
630631
- **Limit** (int) - 返回数据长度。
631632
- **Offset** (int) - 列表起始位置偏移量。
633+
- **OrderBy** (str) - 排序字段
632634
- **ResourceId** (str) - UKMS 实例资源 ID。
635+
- **Sort** (str) - 排序方向,默认 desc
633636
634637
**Response**
635638
@@ -667,7 +670,10 @@ def list_keys(self, req: typing.Optional[dict] = None, **kwargs) -> dict:
667670
- **Alias** (str) - 按密钥 ID 或别名模糊过滤。
668671
- **Limit** (int) - 返回数据长度。最大1000
669672
- **Offset** (int) - 列表起始位置偏移量。
673+
- **OrderBy** (str) - 排序字段
670674
- **ResourceId** (str) - UKMS 实例资源 ID。
675+
- **Sort** (str) - 排序方向,默认 desc
676+
- **Status** (str) - 状态筛选:Active、Deactivated、PendingDeletion
671677
672678
**Response**
673679
@@ -711,10 +717,13 @@ def list_schedule_deletion_keys(
711717
712718
**Request**
713719
714-
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list.html>`_
720+
- **ProjectId** (str) - (Config) 项目ID。不填写为默认项目,子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
721+
- **Alias** (str) - 按密钥 ID 或别名模糊过滤
715722
- **Limit** (int) - 输出列表数量,默认返回200个
716723
- **Offset** (int) - 输出列表起始位置,默认从0开始
717724
- **OrderBy** (str) - 列表排序方式, 可选项: "-created_time", "created_time","plan_delete_time","-plan_delete_time";默认按-plan_delete_time 计划删除时间升序返回
725+
- **ResourceId** (str) - UKMS 实例资源 ID
726+
- **Sort** (str) - 排序方向,默认 desc
718727
719728
**Response**
720729
@@ -727,13 +736,13 @@ def list_schedule_deletion_keys(
727736
728737
**CMK**
729738
- **Alias** (str) - 别名,与CMK一一对应
730-
- **CreatedTime** (int) - 创建时间 时间戳
739+
- **CreatedTime** (int) - 创建时间
731740
- **Description** (str) - 对密钥的描述说明
732-
- **Enabled** (bool) - 是否启用
733741
- **KeyId** (str) - CMK 的唯一标识符
734-
- **LastModifiedTime** (int) - 最后修改时间 时间戳
742+
- **KeyType** (str) - 密钥类型,如RSA、EC、DES
735743
- **PlanDeleteTime** (int) - 计划删除时间 时间戳
736-
- **Type** (str) - 密钥类型,仅支持UCloudManagedKeys、CustomerManagedKeys。默认值CustomerManagedKeys
744+
- **Status** (str) - 密钥状态 "Pre-Active", "Active", "Deactivated", "Compromised", "Destroyed", "Destroyed Compromised"
745+
- **UpdateTime** (int) - 更新时间
737746
738747
739748
"""

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,12 +584,15 @@ class ListAliasesRequestSchema(schema.RequestSchema):
584584
"""ListAliases - 获取 UKMS 实例下的别名列表。"""
585585

586586
fields = {
587+
"Alias": fields.Str(required=False, dump_to="Alias"),
587588
"KeyId": fields.Str(required=False, dump_to="KeyId"),
588589
"Limit": fields.Int(required=False, dump_to="Limit"),
589590
"Offset": fields.Int(required=False, dump_to="Offset"),
591+
"OrderBy": fields.Str(required=False, dump_to="OrderBy"),
590592
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
591593
"Region": fields.Str(required=True, dump_to="Region"),
592594
"ResourceId": fields.Str(required=False, dump_to="ResourceId"),
595+
"Sort": fields.Str(required=False, dump_to="Sort"),
593596
}
594597

595598

@@ -618,9 +621,12 @@ class ListKeysRequestSchema(schema.RequestSchema):
618621
"Alias": fields.Str(required=False, dump_to="Alias"),
619622
"Limit": fields.Int(required=False, dump_to="Limit"),
620623
"Offset": fields.Int(required=False, dump_to="Offset"),
624+
"OrderBy": fields.Str(required=False, dump_to="OrderBy"),
621625
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
622626
"Region": fields.Str(required=True, dump_to="Region"),
623627
"ResourceId": fields.Str(required=False, dump_to="ResourceId"),
628+
"Sort": fields.Str(required=False, dump_to="Sort"),
629+
"Status": fields.Str(required=False, dump_to="Status"),
624630
}
625631

626632

@@ -646,10 +652,13 @@ class ListScheduleDeletionKeysRequestSchema(schema.RequestSchema):
646652
"""ListScheduleDeletionKeys - 获取计划删除密钥列表,调用ScheduleKeyDeletion命令后进入此列表, 默认30天后正式删除。正式删除前可调用CancelScheduleKeyDeletion恢复"""
647653

648654
fields = {
655+
"Alias": fields.Str(required=False, dump_to="Alias"),
649656
"Limit": fields.Int(required=False, dump_to="Limit"),
650657
"Offset": fields.Int(required=False, dump_to="Offset"),
651658
"OrderBy": fields.Str(required=False, dump_to="OrderBy"),
652659
"ProjectId": fields.Str(required=False, dump_to="ProjectId"),
660+
"ResourceId": fields.Str(required=False, dump_to="ResourceId"),
661+
"Sort": fields.Str(required=False, dump_to="Sort"),
653662
}
654663

655664

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,23 @@ class CMKSchema(schema.ResponseSchema):
6969
"""CMK - 用户主密钥 (Customer Master Key), 用于生成数据密钥 (Data Encryption Key), 加解密数据密钥."""
7070

7171
fields = {
72-
"Alias": fields.Str(required=False, load_from="Alias"),
72+
"Alias": fields.Str(required=True, load_from="Alias"),
7373
"CreatedTime": fields.Int(required=True, load_from="CreatedTime"),
74-
"Description": fields.Str(required=True, load_from="Description"),
75-
"Enabled": fields.Bool(required=True, load_from="Enabled"),
74+
"Description": fields.Str(required=False, load_from="Description"),
75+
"Enabled": fields.Bool(
76+
required=True, load_from="Enabled"
77+
), # Deprecated, will be removed at 1.0
7678
"KeyId": fields.Str(required=True, load_from="KeyId"),
79+
"KeyType": fields.Str(required=True, load_from="KeyType"),
7780
"LastModifiedTime": fields.Int(
7881
required=True, load_from="LastModifiedTime"
79-
),
82+
), # Deprecated, will be removed at 1.0
8083
"PlanDeleteTime": fields.Int(
8184
required=False, load_from="PlanDeleteTime"
8285
),
83-
"Type": fields.Str(required=True, load_from="Type"),
86+
"Status": fields.Str(required=True, load_from="Status"),
87+
"Type": fields.Str(
88+
required=True, load_from="Type"
89+
), # Deprecated, will be removed at 1.0
90+
"UpdateTime": fields.Int(required=True, load_from="UpdateTime"),
8491
}

‎ucloud/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = "0.11.112"
1+
version = "0.11.113"

0 commit comments

Comments
 (0)