ucloud-sdk-python3 0.11.112__tar.gz → 0.11.114__tar.gz

{ucloud_sdk_python3-0.11.112 → ucloud_sdk_python3-0.11.114}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.112
+Version: 0.11.114
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -31,20 +31,20 @@ Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Provides-Extra: dev
-Requires-Dist: pytest>=4.6; extra == "dev"
-Requires-Dist: requests_mock; extra == "dev"
 Requires-Dist: requests; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: requests_mock; extra == "dev"
+Requires-Dist: pytest>=4.6; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: black; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: flake8>=3.6.0; extra == "dev"
 Provides-Extra: ci
-Requires-Dist: pytest>=4.6; extra == "ci"
-Requires-Dist: requests_mock; extra == "ci"
-Requires-Dist: flake8>=3.6.0; extra == "ci"
 Requires-Dist: requests; extra == "ci"
+Requires-Dist: requests_mock; extra == "ci"
+Requires-Dist: pytest>=4.6; extra == "ci"
 Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: pytest-cov; extra == "ci"
+Requires-Dist: flake8>=3.6.0; extra == "ci"
 
 <p align="center">
     <img src="https://ucloud-sdk.dl.ufileos.com/logos%2Flogo-mini.png" />

{ucloud_sdk_python3-0.11.112 → ucloud_sdk_python3-0.11.114}/ucloud/services/ukms/client.py

@@ -211,7 +211,9 @@ class UKMSClient(Client):
         - **KeyState** (str) - 密钥对外状态。取值：Enabled、Disabled、PendingDeletion、PendingImport、Unavailable。
         - **KeyUsage** (list) - 密钥用途。取值：ENCRYPT_DECRYPT、SIGN_VERIFY、GENERATE_VERIFY_MAC、KEY_AGREEMENT。
         - **KeyVersion** (int) - 当前密钥版本。
+        - **OrganizationId** (int) - 密钥所属组织的数字 ID，来源于密钥关联的资源交易记录。
         - **Origin** (str) - 密钥材料来源。取值：UCLOUD_KMS、EXTERNAL；当前 CreateKey 仅支持 UCLOUD_KMS。
+        - **ProjectId** (str) - 密钥所属项目的对外别名，格式为 org-xxx。该值由项目数字 ID 解析得到，可能因项目别名查询失败而为空。
         - **ResourceId** (str) - 密钥所属的 UKMS 实例资源 ID。
 
 
@@ -626,10 +628,13 @@ class UKMSClient(Client):
 
         - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子账号必须填写。
         - **Region** (str) - (Config) 地域。参见地域和可用区列表。
+        - **Alias** (str) - 按完整别名（含 alias/ 前缀）进行子串模糊匹配
         - **KeyId** (str) - 可选：筛选指定密钥资源长 ID 的别名。
         - **Limit** (int) - 返回数据长度。
         - **Offset** (int) - 列表起始位置偏移量。
+        - **OrderBy** (str) - 排序字段
         - **ResourceId** (str) - UKMS 实例资源 ID。
+        - **Sort** (str) - 排序方向，默认 desc
 
         **Response**
 
@@ -667,7 +672,10 @@ class UKMSClient(Client):
         - **Alias** (str) - 按密钥 ID 或别名模糊过滤。
         - **Limit** (int) - 返回数据长度。最大1000
         - **Offset** (int) - 列表起始位置偏移量。
+        - **OrderBy** (str) - 排序字段
         - **ResourceId** (str) - UKMS 实例资源 ID。
+        - **Sort** (str) - 排序方向，默认 desc
+        - **Status** (str) - 状态筛选：Active、Deactivated、PendingDeletion
 
         **Response**
 
@@ -684,8 +692,10 @@ class UKMSClient(Client):
         - **KeySpec** (str) - 密钥规格。取值：SYMMETRIC_DEFAULT、RSA_2048、RSA_3072、RSA_4096、ECC_NIST_P256、ECC_NIST_P384、ECC_NIST_P521、HMAC_256、HMAC_384、HMAC_512。
         - **KeyUsage** (list) - 按 KeySpec 派生的密钥用途。取值：ENCRYPT_DECRYPT、SIGN_VERIFY、GENERATE_VERIFY_MAC、KEY_AGREEMENT。
         - **NextRotationDate** (int) - 下次自动轮转时间（Unix 时间戳，秒）；仅在已开启自动轮转时返回。
+        - **OrganizationId** (int) - 密钥所属组织的数字 ID，来源于密钥关联的资源交易记录。
         - **Origin** (str) - 密钥来源，由 Origin 派生。取值：ucloud、import。当前 CreateKey 仅支持 ucloud。
         - **PlanDeleteTime** (int) - 计划删除时间，Unix 时间戳。
+        - **ProjectId** (str) - 密钥所属项目的对外别名，格式为 org-xxx。该值由项目数字 ID 解析得到，可能因项目别名查询失败而为空。
         - **ResourceId** (str) - 密钥所属的 UKMS 实例资源 ID。
         - **RotationPeriodInDays** (int) - 自动轮转周期(天)；未开启时为 0
         - **Status** (str) - 数据库密钥状态。常见取值：Active、Deactivated、PendingDeletion。
@@ -711,10 +721,13 @@ class UKMSClient(Client):
 
         **Request**
 
-        - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list.html>`_
+        - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
+        - **Alias** (str) - 按密钥 ID 或别名模糊过滤
         - **Limit** (int) - 输出列表数量，默认返回200个
         - **Offset** (int) - 输出列表起始位置，默认从0开始
         - **OrderBy** (str) - 列表排序方式, 可选项: "-created_time", "created_time","plan_delete_time","-plan_delete_time";默认按-plan_delete_time 计划删除时间升序返回
+        - **ResourceId** (str) - UKMS 实例资源 ID
+        - **Sort** (str) - 排序方向，默认 desc
 
         **Response**
 
@@ -727,13 +740,13 @@ class UKMSClient(Client):
 
         **CMK**
         - **Alias** (str) - 别名，与CMK一一对应
-        - **CreatedTime** (int) - 创建时间 时间戳
+        - **CreatedTime** (int) - 创建时间
         - **Description** (str) - 对密钥的描述说明
-        - **Enabled** (bool) - 是否启用
         - **KeyId** (str) - CMK 的唯一标识符
-        - **LastModifiedTime** (int) - 最后修改时间 时间戳
+        - **KeyType** (str) - 密钥类型，如RSA、EC、DES
         - **PlanDeleteTime** (int) - 计划删除时间 时间戳
-        - **Type** (str) - 密钥类型，仅支持UCloudManagedKeys、CustomerManagedKeys。默认值CustomerManagedKeys
+        - **Status** (str) - 密钥状态 "Pre-Active", "Active", "Deactivated", "Compromised", "Destroyed", "Destroyed Compromised"
+        - **UpdateTime** (int) - 更新时间
 
 
         """

{ucloud_sdk_python3-0.11.112 → ucloud_sdk_python3-0.11.114}/ucloud/services/ukms/schemas/apis.py

@@ -584,12 +584,15 @@ class ListAliasesRequestSchema(schema.RequestSchema):
     """ListAliases - 获取 UKMS 实例下的别名列表。"""
 
     fields = {
+        "Alias": fields.Str(required=False, dump_to="Alias"),
         "KeyId": fields.Str(required=False, dump_to="KeyId"),
         "Limit": fields.Int(required=False, dump_to="Limit"),
         "Offset": fields.Int(required=False, dump_to="Offset"),
+        "OrderBy": fields.Str(required=False, dump_to="OrderBy"),
         "ProjectId": fields.Str(required=False, dump_to="ProjectId"),
         "Region": fields.Str(required=True, dump_to="Region"),
         "ResourceId": fields.Str(required=False, dump_to="ResourceId"),
+        "Sort": fields.Str(required=False, dump_to="Sort"),
     }
 
 
@@ -618,9 +621,12 @@ class ListKeysRequestSchema(schema.RequestSchema):
         "Alias": fields.Str(required=False, dump_to="Alias"),
         "Limit": fields.Int(required=False, dump_to="Limit"),
         "Offset": fields.Int(required=False, dump_to="Offset"),
+        "OrderBy": fields.Str(required=False, dump_to="OrderBy"),
         "ProjectId": fields.Str(required=False, dump_to="ProjectId"),
         "Region": fields.Str(required=True, dump_to="Region"),
         "ResourceId": fields.Str(required=False, dump_to="ResourceId"),
+        "Sort": fields.Str(required=False, dump_to="Sort"),
+        "Status": fields.Str(required=False, dump_to="Status"),
     }
 
 
@@ -646,10 +652,13 @@ class ListScheduleDeletionKeysRequestSchema(schema.RequestSchema):
     """ListScheduleDeletionKeys - 获取计划删除密钥列表，调用ScheduleKeyDeletion命令后进入此列表， 默认30天后正式删除。正式删除前可调用CancelScheduleKeyDeletion恢复"""
 
     fields = {
+        "Alias": fields.Str(required=False, dump_to="Alias"),
         "Limit": fields.Int(required=False, dump_to="Limit"),
         "Offset": fields.Int(required=False, dump_to="Offset"),
         "OrderBy": fields.Str(required=False, dump_to="OrderBy"),
         "ProjectId": fields.Str(required=False, dump_to="ProjectId"),
+        "ResourceId": fields.Str(required=False, dump_to="ResourceId"),
+        "Sort": fields.Str(required=False, dump_to="Sort"),
     }
 
 

{ucloud_sdk_python3-0.11.112 → ucloud_sdk_python3-0.11.114}/ucloud/services/ukms/schemas/models.py

@@ -19,7 +19,11 @@ class KeyMetadataSchema(schema.ResponseSchema):
         "KeyState": fields.Str(required=True, load_from="KeyState"),
         "KeyUsage": fields.List(fields.Str()),
         "KeyVersion": fields.Int(required=True, load_from="KeyVersion"),
+        "OrganizationId": fields.Int(
+            required=False, load_from="OrganizationId"
+        ),
         "Origin": fields.Str(required=True, load_from="Origin"),
+        "ProjectId": fields.Str(required=False, load_from="ProjectId"),
         "ResourceId": fields.Str(required=True, load_from="ResourceId"),
     }
 
@@ -52,10 +56,14 @@ class DEKSchema(schema.ResponseSchema):
         "NextRotationDate": fields.Int(
             required=False, load_from="NextRotationDate"
         ),
+        "OrganizationId": fields.Int(
+            required=False, load_from="OrganizationId"
+        ),
         "Origin": fields.Str(required=True, load_from="Origin"),
         "PlanDeleteTime": fields.Int(
             required=False, load_from="PlanDeleteTime"
         ),
+        "ProjectId": fields.Str(required=False, load_from="ProjectId"),
         "ResourceId": fields.Str(required=True, load_from="ResourceId"),
         "RotationPeriodInDays": fields.Int(
             required=True, load_from="RotationPeriodInDays"
@@ -69,16 +77,23 @@ class CMKSchema(schema.ResponseSchema):
     """CMK - 用户主密钥 (Customer Master Key), 用于生成数据密钥 (Data Encryption Key), 加解密数据密钥."""
 
     fields = {
-        "Alias": fields.Str(required=False, load_from="Alias"),
+        "Alias": fields.Str(required=True, load_from="Alias"),
         "CreatedTime": fields.Int(required=True, load_from="CreatedTime"),
-        "Description": fields.Str(required=True, load_from="Description"),
-        "Enabled": fields.Bool(required=True, load_from="Enabled"),
+        "Description": fields.Str(required=False, load_from="Description"),
+        "Enabled": fields.Bool(
+            required=True, load_from="Enabled"
+        ),  # Deprecated, will be removed at 1.0
         "KeyId": fields.Str(required=True, load_from="KeyId"),
+        "KeyType": fields.Str(required=True, load_from="KeyType"),
         "LastModifiedTime": fields.Int(
             required=True, load_from="LastModifiedTime"
-        ),
+        ),  # Deprecated, will be removed at 1.0
         "PlanDeleteTime": fields.Int(
             required=False, load_from="PlanDeleteTime"
         ),
-        "Type": fields.Str(required=True, load_from="Type"),
+        "Status": fields.Str(required=True, load_from="Status"),
+        "Type": fields.Str(
+            required=True, load_from="Type"
+        ),  # Deprecated, will be removed at 1.0
+        "UpdateTime": fields.Int(required=True, load_from="UpdateTime"),
     }

ucloud_sdk_python3-0.11.114/ucloud/version.py

@@ -0,0 +1 @@
+version = "0.11.114"

{ucloud_sdk_python3-0.11.112 → ucloud_sdk_python3-0.11.114}/ucloud_sdk_python3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.112
+Version: 0.11.114
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -31,20 +31,20 @@ Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Provides-Extra: dev
-Requires-Dist: pytest>=4.6; extra == "dev"
-Requires-Dist: requests_mock; extra == "dev"
 Requires-Dist: requests; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: requests_mock; extra == "dev"
+Requires-Dist: pytest>=4.6; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: black; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: flake8>=3.6.0; extra == "dev"
 Provides-Extra: ci
-Requires-Dist: pytest>=4.6; extra == "ci"
-Requires-Dist: requests_mock; extra == "ci"
-Requires-Dist: flake8>=3.6.0; extra == "ci"
 Requires-Dist: requests; extra == "ci"
+Requires-Dist: requests_mock; extra == "ci"
+Requires-Dist: pytest>=4.6; extra == "ci"
 Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: pytest-cov; extra == "ci"
+Requires-Dist: flake8>=3.6.0; extra == "ci"
 
 <p align="center">
     <img src="https://ucloud-sdk.dl.ufileos.com/logos%2Flogo-mini.png" />

ucloud_sdk_python3-0.11.112/ucloud/version.py

@@ -1 +0,0 @@
-version = "0.11.112"