pulumi-alicloud 3.71.0a1735362939__py3-none-any.whl → 3.72.0__py3-none-any.whl

pulumi_alicloud/get_msc_sub_subscriptions.py

@@ -54,6 +54,9 @@ class GetMscSubSubscriptionsResult:
     @property
     @pulumi.getter
     def subscriptions(self) -> Sequence['outputs.GetMscSubSubscriptionsSubscriptionResult']:
+        """
+        A list of Msc Sub Subscriptions. Each element contains the following attributes:
+        """
         return pulumi.get(self, "subscriptions")
 
 
@@ -73,7 +76,7 @@ def get_msc_sub_subscriptions(output_file: Optional[str] = None,
     """
     This data source provides the Message Center Subscriptions of the current Alibaba Cloud user.
 
-    > **NOTE:** Available in v1.135.0+.
+    > **NOTE:** Available since v1.135.0.
 
     ## Example Usage
 
@@ -104,7 +107,7 @@ def get_msc_sub_subscriptions_output(output_file: Optional[pulumi.Input[Optional
     """
     This data source provides the Message Center Subscriptions of the current Alibaba Cloud user.
 
-    > **NOTE:** Available in v1.135.0+.
+    > **NOTE:** Available since v1.135.0.
 
     ## Example Usage
 

pulumi_alicloud/get_msc_sub_webhooks.py

@@ -68,6 +68,9 @@ class GetMscSubWebhooksResult:
     @property
     @pulumi.getter
     def names(self) -> Sequence[str]:
+        """
+        A list of Webhook names.
+        """
         return pulumi.get(self, "names")
 
     @property
@@ -78,6 +81,9 @@ class GetMscSubWebhooksResult:
     @property
     @pulumi.getter
     def webhooks(self) -> Sequence['outputs.GetMscSubWebhooksWebhookResult']:
+        """
+        A list of Msc Sub Webhooks. Each element contains the following attributes:
+        """
         return pulumi.get(self, "webhooks")
 
 
@@ -102,7 +108,7 @@ def get_msc_sub_webhooks(ids: Optional[Sequence[str]] = None,
     """
     This data source provides the Msc Sub Webhooks of the current Alibaba Cloud user.
 
-    > **NOTE:** Available in v1.141.0+.
+    > **NOTE:** Available since v1.141.0.
 
     ## Example Usage
 
@@ -144,7 +150,7 @@ def get_msc_sub_webhooks_output(ids: Optional[pulumi.Input[Optional[Sequence[str
     """
     This data source provides the Msc Sub Webhooks of the current Alibaba Cloud user.
 
-    > **NOTE:** Available in v1.141.0+.
+    > **NOTE:** Available since v1.141.0.
 
     ## Example Usage
 

pulumi_alicloud/kms/key.py

@@ -20,6 +20,8 @@ __all__ = ['KeyArgs', 'Key']
 class KeyArgs:
     def __init__(__self__, *,
                  automatic_rotation: Optional[pulumi.Input[str]] = None,
+                 deletion_protection: Optional[pulumi.Input[str]] = None,
+                 deletion_protection_description: Optional[pulumi.Input[str]] = None,
                  deletion_window_in_days: Optional[pulumi.Input[int]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  dkms_instance_id: Optional[pulumi.Input[str]] = None,
@@ -37,6 +39,8 @@ class KeyArgs:
         """
         The set of arguments for constructing a Key resource.
         :param pulumi.Input[str] automatic_rotation: Specifies whether to enable automatic key rotation. Default value: `Disabled`. Valid values: `Enabled`, `Disabled`.
+        :param pulumi.Input[str] deletion_protection: Specifies whether to enable deletion protection. Default value: `Disabled`. Valid values: `Enabled`, `Disabled`.
+        :param pulumi.Input[str] deletion_protection_description: The description of deletion protection. **NOTE:** `deletion_protection_description` takes effect only if `deletion_protection` is set to `Enabled`.
         :param pulumi.Input[int] deletion_window_in_days: Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.
         :param pulumi.Input[str] description: The description of the key.
         :param pulumi.Input[str] dkms_instance_id: The ID of the KMS instance.
@@ -53,17 +57,19 @@ class KeyArgs:
                - `ENCRYPT/DECRYPT`: Encrypts or decrypts data.
                - `SIGN/VERIFY`: Generates or verifies a digital signature.
         :param pulumi.Input[str] origin: The key material origin. Default value: `Aliyun_KMS`. Valid values: `Aliyun_KMS`, `EXTERNAL`.
-        :param pulumi.Input[int] pending_window_in_days: The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`.
-               **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
+        :param pulumi.Input[int] pending_window_in_days: The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`. **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
         :param pulumi.Input[str] policy: The content of the key policy. The value is in the JSON format. The value can be up to 32,768 bytes in length. For more information, see [How to use it](https://www.alibabacloud.com/help/en/kms/developer-reference/api-setkeypolicy).
         :param pulumi.Input[str] protection_level: The protection level of the key. Default value: `SOFTWARE`. Valid values: `SOFTWARE`, `HSM`.
-        :param pulumi.Input[str] rotation_interval: The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval.
-               **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
+        :param pulumi.Input[str] rotation_interval: The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval. **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
         :param pulumi.Input[str] status: The status of key. Default value: `Enabled`. Valid values: `Enabled`, `Disabled`, `PendingDeletion`.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
         """
         if automatic_rotation is not None:
             pulumi.set(__self__, "automatic_rotation", automatic_rotation)
+        if deletion_protection is not None:
+            pulumi.set(__self__, "deletion_protection", deletion_protection)
+        if deletion_protection_description is not None:
+            pulumi.set(__self__, "deletion_protection_description", deletion_protection_description)
         if deletion_window_in_days is not None:
             warnings.warn("""Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.""", DeprecationWarning)
             pulumi.log.warn("""deletion_window_in_days is deprecated: Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.""")
@@ -114,6 +120,30 @@ class KeyArgs:
     def automatic_rotation(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "automatic_rotation", value)
 
+    @property
+    @pulumi.getter(name="deletionProtection")
+    def deletion_protection(self) -> Optional[pulumi.Input[str]]:
+        """
+        Specifies whether to enable deletion protection. Default value: `Disabled`. Valid values: `Enabled`, `Disabled`.
+        """
+        return pulumi.get(self, "deletion_protection")
+
+    @deletion_protection.setter
+    def deletion_protection(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "deletion_protection", value)
+
+    @property
+    @pulumi.getter(name="deletionProtectionDescription")
+    def deletion_protection_description(self) -> Optional[pulumi.Input[str]]:
+        """
+        The description of deletion protection. **NOTE:** `deletion_protection_description` takes effect only if `deletion_protection` is set to `Enabled`.
+        """
+        return pulumi.get(self, "deletion_protection_description")
+
+    @deletion_protection_description.setter
+    def deletion_protection_description(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "deletion_protection_description", value)
+
     @property
     @pulumi.getter(name="deletionWindowInDays")
     @_utilities.deprecated("""Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.""")
@@ -225,8 +255,7 @@ class KeyArgs:
     @pulumi.getter(name="pendingWindowInDays")
     def pending_window_in_days(self) -> Optional[pulumi.Input[int]]:
         """
-        The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`.
-        **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
+        The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`. **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
         """
         return pulumi.get(self, "pending_window_in_days")
 
@@ -262,8 +291,7 @@ class KeyArgs:
     @pulumi.getter(name="rotationInterval")
     def rotation_interval(self) -> Optional[pulumi.Input[str]]:
         """
-        The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval.
-        **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
+        The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval. **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
         """
         return pulumi.get(self, "rotation_interval")
 
@@ -304,6 +332,8 @@ class _KeyState:
                  creation_date: Optional[pulumi.Input[str]] = None,
                  creator: Optional[pulumi.Input[str]] = None,
                  delete_date: Optional[pulumi.Input[str]] = None,
+                 deletion_protection: Optional[pulumi.Input[str]] = None,
+                 deletion_protection_description: Optional[pulumi.Input[str]] = None,
                  deletion_window_in_days: Optional[pulumi.Input[int]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  dkms_instance_id: Optional[pulumi.Input[str]] = None,
@@ -329,6 +359,8 @@ class _KeyState:
         :param pulumi.Input[str] creation_date: The time when the CMK was created.
         :param pulumi.Input[str] creator: The creator of the CMK.
         :param pulumi.Input[str] delete_date: The time at which the CMK is scheduled for deletion.
+        :param pulumi.Input[str] deletion_protection: Specifies whether to enable deletion protection. Default value: `Disabled`. Valid values: `Enabled`, `Disabled`.
+        :param pulumi.Input[str] deletion_protection_description: The description of deletion protection. **NOTE:** `deletion_protection_description` takes effect only if `deletion_protection` is set to `Enabled`.
         :param pulumi.Input[int] deletion_window_in_days: Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.
         :param pulumi.Input[str] description: The description of the key.
         :param pulumi.Input[str] dkms_instance_id: The ID of the KMS instance.
@@ -348,13 +380,11 @@ class _KeyState:
         :param pulumi.Input[str] material_expire_time: The time when the key material expires.
         :param pulumi.Input[str] next_rotation_date: The time when the next rotation will be performed.
         :param pulumi.Input[str] origin: The key material origin. Default value: `Aliyun_KMS`. Valid values: `Aliyun_KMS`, `EXTERNAL`.
-        :param pulumi.Input[int] pending_window_in_days: The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`.
-               **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
+        :param pulumi.Input[int] pending_window_in_days: The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`. **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
         :param pulumi.Input[str] policy: The content of the key policy. The value is in the JSON format. The value can be up to 32,768 bytes in length. For more information, see [How to use it](https://www.alibabacloud.com/help/en/kms/developer-reference/api-setkeypolicy).
         :param pulumi.Input[str] primary_key_version: The ID of the current primary key version of the symmetric CMK.
         :param pulumi.Input[str] protection_level: The protection level of the key. Default value: `SOFTWARE`. Valid values: `SOFTWARE`, `HSM`.
-        :param pulumi.Input[str] rotation_interval: The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval.
-               **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
+        :param pulumi.Input[str] rotation_interval: The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval. **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
         :param pulumi.Input[str] status: The status of key. Default value: `Enabled`. Valid values: `Enabled`, `Disabled`, `PendingDeletion`.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
         """
@@ -368,6 +398,10 @@ class _KeyState:
             pulumi.set(__self__, "creator", creator)
         if delete_date is not None:
             pulumi.set(__self__, "delete_date", delete_date)
+        if deletion_protection is not None:
+            pulumi.set(__self__, "deletion_protection", deletion_protection)
+        if deletion_protection_description is not None:
+            pulumi.set(__self__, "deletion_protection_description", deletion_protection_description)
         if deletion_window_in_days is not None:
             warnings.warn("""Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.""", DeprecationWarning)
             pulumi.log.warn("""deletion_window_in_days is deprecated: Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.""")
@@ -474,6 +508,30 @@ class _KeyState:
     def delete_date(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "delete_date", value)
 
+    @property
+    @pulumi.getter(name="deletionProtection")
+    def deletion_protection(self) -> Optional[pulumi.Input[str]]:
+        """
+        Specifies whether to enable deletion protection. Default value: `Disabled`. Valid values: `Enabled`, `Disabled`.
+        """
+        return pulumi.get(self, "deletion_protection")
+
+    @deletion_protection.setter
+    def deletion_protection(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "deletion_protection", value)
+
+    @property
+    @pulumi.getter(name="deletionProtectionDescription")
+    def deletion_protection_description(self) -> Optional[pulumi.Input[str]]:
+        """
+        The description of deletion protection. **NOTE:** `deletion_protection_description` takes effect only if `deletion_protection` is set to `Enabled`.
+        """
+        return pulumi.get(self, "deletion_protection_description")
+
+    @deletion_protection_description.setter
+    def deletion_protection_description(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "deletion_protection_description", value)
+
     @property
     @pulumi.getter(name="deletionWindowInDays")
     @_utilities.deprecated("""Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.""")
@@ -621,8 +679,7 @@ class _KeyState:
     @pulumi.getter(name="pendingWindowInDays")
     def pending_window_in_days(self) -> Optional[pulumi.Input[int]]:
         """
-        The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`.
-        **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
+        The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`. **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
         """
         return pulumi.get(self, "pending_window_in_days")
 
@@ -670,8 +727,7 @@ class _KeyState:
     @pulumi.getter(name="rotationInterval")
     def rotation_interval(self) -> Optional[pulumi.Input[str]]:
         """
-        The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval.
-        **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
+        The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval. **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
         """
         return pulumi.get(self, "rotation_interval")
 
@@ -710,6 +766,8 @@ class Key(pulumi.CustomResource):
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  automatic_rotation: Optional[pulumi.Input[str]] = None,
+                 deletion_protection: Optional[pulumi.Input[str]] = None,
+                 deletion_protection_description: Optional[pulumi.Input[str]] = None,
                  deletion_window_in_days: Optional[pulumi.Input[int]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  dkms_instance_id: Optional[pulumi.Input[str]] = None,
@@ -757,6 +815,8 @@ class Key(pulumi.CustomResource):
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[str] automatic_rotation: Specifies whether to enable automatic key rotation. Default value: `Disabled`. Valid values: `Enabled`, `Disabled`.
+        :param pulumi.Input[str] deletion_protection: Specifies whether to enable deletion protection. Default value: `Disabled`. Valid values: `Enabled`, `Disabled`.
+        :param pulumi.Input[str] deletion_protection_description: The description of deletion protection. **NOTE:** `deletion_protection_description` takes effect only if `deletion_protection` is set to `Enabled`.
         :param pulumi.Input[int] deletion_window_in_days: Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.
         :param pulumi.Input[str] description: The description of the key.
         :param pulumi.Input[str] dkms_instance_id: The ID of the KMS instance.
@@ -773,12 +833,10 @@ class Key(pulumi.CustomResource):
                - `ENCRYPT/DECRYPT`: Encrypts or decrypts data.
                - `SIGN/VERIFY`: Generates or verifies a digital signature.
         :param pulumi.Input[str] origin: The key material origin. Default value: `Aliyun_KMS`. Valid values: `Aliyun_KMS`, `EXTERNAL`.
-        :param pulumi.Input[int] pending_window_in_days: The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`.
-               **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
+        :param pulumi.Input[int] pending_window_in_days: The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`. **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
         :param pulumi.Input[str] policy: The content of the key policy. The value is in the JSON format. The value can be up to 32,768 bytes in length. For more information, see [How to use it](https://www.alibabacloud.com/help/en/kms/developer-reference/api-setkeypolicy).
         :param pulumi.Input[str] protection_level: The protection level of the key. Default value: `SOFTWARE`. Valid values: `SOFTWARE`, `HSM`.
-        :param pulumi.Input[str] rotation_interval: The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval.
-               **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
+        :param pulumi.Input[str] rotation_interval: The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval. **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
         :param pulumi.Input[str] status: The status of key. Default value: `Enabled`. Valid values: `Enabled`, `Disabled`, `PendingDeletion`.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
         """
@@ -833,6 +891,8 @@ class Key(pulumi.CustomResource):
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  automatic_rotation: Optional[pulumi.Input[str]] = None,
+                 deletion_protection: Optional[pulumi.Input[str]] = None,
+                 deletion_protection_description: Optional[pulumi.Input[str]] = None,
                  deletion_window_in_days: Optional[pulumi.Input[int]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  dkms_instance_id: Optional[pulumi.Input[str]] = None,
@@ -857,6 +917,8 @@ class Key(pulumi.CustomResource):
             __props__ = KeyArgs.__new__(KeyArgs)
 
             __props__.__dict__["automatic_rotation"] = automatic_rotation
+            __props__.__dict__["deletion_protection"] = deletion_protection
+            __props__.__dict__["deletion_protection_description"] = deletion_protection_description
             __props__.__dict__["deletion_window_in_days"] = deletion_window_in_days
             __props__.__dict__["description"] = description
             __props__.__dict__["dkms_instance_id"] = dkms_instance_id
@@ -894,6 +956,8 @@ class Key(pulumi.CustomResource):
             creation_date: Optional[pulumi.Input[str]] = None,
             creator: Optional[pulumi.Input[str]] = None,
             delete_date: Optional[pulumi.Input[str]] = None,
+            deletion_protection: Optional[pulumi.Input[str]] = None,
+            deletion_protection_description: Optional[pulumi.Input[str]] = None,
             deletion_window_in_days: Optional[pulumi.Input[int]] = None,
             description: Optional[pulumi.Input[str]] = None,
             dkms_instance_id: Optional[pulumi.Input[str]] = None,
@@ -924,6 +988,8 @@ class Key(pulumi.CustomResource):
         :param pulumi.Input[str] creation_date: The time when the CMK was created.
         :param pulumi.Input[str] creator: The creator of the CMK.
         :param pulumi.Input[str] delete_date: The time at which the CMK is scheduled for deletion.
+        :param pulumi.Input[str] deletion_protection: Specifies whether to enable deletion protection. Default value: `Disabled`. Valid values: `Enabled`, `Disabled`.
+        :param pulumi.Input[str] deletion_protection_description: The description of deletion protection. **NOTE:** `deletion_protection_description` takes effect only if `deletion_protection` is set to `Enabled`.
         :param pulumi.Input[int] deletion_window_in_days: Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.
         :param pulumi.Input[str] description: The description of the key.
         :param pulumi.Input[str] dkms_instance_id: The ID of the KMS instance.
@@ -943,13 +1009,11 @@ class Key(pulumi.CustomResource):
         :param pulumi.Input[str] material_expire_time: The time when the key material expires.
         :param pulumi.Input[str] next_rotation_date: The time when the next rotation will be performed.
         :param pulumi.Input[str] origin: The key material origin. Default value: `Aliyun_KMS`. Valid values: `Aliyun_KMS`, `EXTERNAL`.
-        :param pulumi.Input[int] pending_window_in_days: The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`.
-               **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
+        :param pulumi.Input[int] pending_window_in_days: The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`. **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
         :param pulumi.Input[str] policy: The content of the key policy. The value is in the JSON format. The value can be up to 32,768 bytes in length. For more information, see [How to use it](https://www.alibabacloud.com/help/en/kms/developer-reference/api-setkeypolicy).
         :param pulumi.Input[str] primary_key_version: The ID of the current primary key version of the symmetric CMK.
         :param pulumi.Input[str] protection_level: The protection level of the key. Default value: `SOFTWARE`. Valid values: `SOFTWARE`, `HSM`.
-        :param pulumi.Input[str] rotation_interval: The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval.
-               **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
+        :param pulumi.Input[str] rotation_interval: The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval. **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
         :param pulumi.Input[str] status: The status of key. Default value: `Enabled`. Valid values: `Enabled`, `Disabled`, `PendingDeletion`.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
         """
@@ -962,6 +1026,8 @@ class Key(pulumi.CustomResource):
         __props__.__dict__["creation_date"] = creation_date
         __props__.__dict__["creator"] = creator
         __props__.__dict__["delete_date"] = delete_date
+        __props__.__dict__["deletion_protection"] = deletion_protection
+        __props__.__dict__["deletion_protection_description"] = deletion_protection_description
         __props__.__dict__["deletion_window_in_days"] = deletion_window_in_days
         __props__.__dict__["description"] = description
         __props__.__dict__["dkms_instance_id"] = dkms_instance_id
@@ -1022,6 +1088,22 @@ class Key(pulumi.CustomResource):
         """
         return pulumi.get(self, "delete_date")
 
+    @property
+    @pulumi.getter(name="deletionProtection")
+    def deletion_protection(self) -> pulumi.Output[str]:
+        """
+        Specifies whether to enable deletion protection. Default value: `Disabled`. Valid values: `Enabled`, `Disabled`.
+        """
+        return pulumi.get(self, "deletion_protection")
+
+    @property
+    @pulumi.getter(name="deletionProtectionDescription")
+    def deletion_protection_description(self) -> pulumi.Output[Optional[str]]:
+        """
+        The description of deletion protection. **NOTE:** `deletion_protection_description` takes effect only if `deletion_protection` is set to `Enabled`.
+        """
+        return pulumi.get(self, "deletion_protection_description")
+
     @property
     @pulumi.getter(name="deletionWindowInDays")
     @_utilities.deprecated("""Field `deletion_window_in_days` has been deprecated from provider version 1.85.0. New field `pending_window_in_days` instead.""")
@@ -1125,8 +1207,7 @@ class Key(pulumi.CustomResource):
     @pulumi.getter(name="pendingWindowInDays")
     def pending_window_in_days(self) -> pulumi.Output[Optional[int]]:
         """
-        The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`.
-        **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
+        The number of days before the CMK is deleted. During this period, the CMK is in the PendingDeletion state. After this period ends, you cannot cancel the deletion. Unit: days. Valid values: `7` to `366`. **NOTE:** From version 1.184.0, `pending_window_in_days` can be set to `366`.
         """
         return pulumi.get(self, "pending_window_in_days")
 
@@ -1158,8 +1239,7 @@ class Key(pulumi.CustomResource):
     @pulumi.getter(name="rotationInterval")
     def rotation_interval(self) -> pulumi.Output[Optional[str]]:
         """
-        The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval.
-        **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
+        The period of automatic key rotation. The following units are supported: d (day), h (hour), m (minute), and s (second). For example, you can use either 7d or 604800s to specify a seven-day interval. **NOTE**: If `automatic_rotation` is set to `Enabled`, `rotation_interval` is required.
         """
         return pulumi.get(self, "rotation_interval")
 

pulumi_alicloud/kvstore/backup_policy.py

@@ -25,8 +25,8 @@ class BackupPolicyArgs:
         """
         The set of arguments for constructing a BackupPolicy resource.
         :param pulumi.Input[str] instance_id: The id of Tair (Redis OSS-Compatible) And Memcache (KVStore) Instance.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] backup_periods: Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday
-        :param pulumi.Input[str] backup_time: Backup time, in the format of HH:mmZ- HH:mm Z
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] backup_periods: Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday.
+        :param pulumi.Input[str] backup_time: Backup time, in the format of HH:mmZ- HH:mm Z.
         """
         pulumi.set(__self__, "instance_id", instance_id)
         if backup_periods is not None:
@@ -50,7 +50,7 @@ class BackupPolicyArgs:
     @pulumi.getter(name="backupPeriods")
     def backup_periods(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
-        Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday
+        Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday.
         """
         return pulumi.get(self, "backup_periods")
 
@@ -62,7 +62,7 @@ class BackupPolicyArgs:
     @pulumi.getter(name="backupTime")
     def backup_time(self) -> Optional[pulumi.Input[str]]:
         """
-        Backup time, in the format of HH:mmZ- HH:mm Z
+        Backup time, in the format of HH:mmZ- HH:mm Z.
         """
         return pulumi.get(self, "backup_time")
 
@@ -79,8 +79,8 @@ class _BackupPolicyState:
                  instance_id: Optional[pulumi.Input[str]] = None):
         """
         Input properties used for looking up and filtering BackupPolicy resources.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] backup_periods: Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday
-        :param pulumi.Input[str] backup_time: Backup time, in the format of HH:mmZ- HH:mm Z
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] backup_periods: Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday.
+        :param pulumi.Input[str] backup_time: Backup time, in the format of HH:mmZ- HH:mm Z.
         :param pulumi.Input[str] instance_id: The id of Tair (Redis OSS-Compatible) And Memcache (KVStore) Instance.
         """
         if backup_periods is not None:
@@ -94,7 +94,7 @@ class _BackupPolicyState:
     @pulumi.getter(name="backupPeriods")
     def backup_periods(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
-        Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday
+        Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday.
         """
         return pulumi.get(self, "backup_periods")
 
@@ -106,7 +106,7 @@ class _BackupPolicyState:
     @pulumi.getter(name="backupTime")
     def backup_time(self) -> Optional[pulumi.Input[str]]:
         """
-        Backup time, in the format of HH:mmZ- HH:mm Z
+        Backup time, in the format of HH:mmZ- HH:mm Z.
         """
         return pulumi.get(self, "backup_time")
 
@@ -137,9 +137,13 @@ class BackupPolicy(pulumi.CustomResource):
                  instance_id: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         """
-        > **DEPRECATED:**  This resource  has been deprecated from version `1.104.0`. Please use resource alicloud_kvstore_instance.
+        Provides a Backup Policy for Tair (Redis OSS-Compatible) And Memcache (KVStore) resource.
+
+        For information about Backup Policy for Tair (Redis OSS-Compatible) And Memcache (KVStore) and how to use it, see [What is Backup Policy](https://www.alibabacloud.com/help/en/redis/developer-reference/api-r-kvstore-2015-01-01-modifybackuppolicy-redis).
 
-        Provides a backup policy for Tair (Redis OSS-Compatible) And Memcache (KVStore) resource.
+        > **NOTE:** Available since v1.15.0.
+
+        > **DEPRECATED:**  This resource  has been deprecated from version `1.104.0`. Please use resource alicloud_kvstore_instance.
 
         ## Example Usage
 
@@ -152,7 +156,7 @@ class BackupPolicy(pulumi.CustomResource):
         config = pulumi.Config()
         name = config.get("name")
         if name is None:
-            name = "kvstorebackuppolicyvpc"
+            name = "terraform-example"
         default = alicloud.kvstore.get_zones()
         default_network = alicloud.vpc.Network("default",
             vpc_name=name,
@@ -189,16 +193,16 @@ class BackupPolicy(pulumi.CustomResource):
 
         ## Import
 
-        Tair (Redis OSS-Compatible) And Memcache (KVStore) backup policy can be imported using the id, e.g.
+        Tair (Redis OSS-Compatible) And Memcache (KVStore) Backup Policy can be imported using the id, e.g.
 
         ```sh
-        $ pulumi import alicloud:kvstore/backupPolicy:BackupPolicy example r-abc12345678
+        $ pulumi import alicloud:kvstore/backupPolicy:BackupPolicy example <id>
         ```
 
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] backup_periods: Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday
-        :param pulumi.Input[str] backup_time: Backup time, in the format of HH:mmZ- HH:mm Z
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] backup_periods: Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday.
+        :param pulumi.Input[str] backup_time: Backup time, in the format of HH:mmZ- HH:mm Z.
         :param pulumi.Input[str] instance_id: The id of Tair (Redis OSS-Compatible) And Memcache (KVStore) Instance.
         """
         ...
@@ -208,9 +212,13 @@ class BackupPolicy(pulumi.CustomResource):
                  args: BackupPolicyArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        > **DEPRECATED:**  This resource  has been deprecated from version `1.104.0`. Please use resource alicloud_kvstore_instance.
+        Provides a Backup Policy for Tair (Redis OSS-Compatible) And Memcache (KVStore) resource.
+
+        For information about Backup Policy for Tair (Redis OSS-Compatible) And Memcache (KVStore) and how to use it, see [What is Backup Policy](https://www.alibabacloud.com/help/en/redis/developer-reference/api-r-kvstore-2015-01-01-modifybackuppolicy-redis).
 
-        Provides a backup policy for Tair (Redis OSS-Compatible) And Memcache (KVStore) resource.
+        > **NOTE:** Available since v1.15.0.
+
+        > **DEPRECATED:**  This resource  has been deprecated from version `1.104.0`. Please use resource alicloud_kvstore_instance.
 
         ## Example Usage
 
@@ -223,7 +231,7 @@ class BackupPolicy(pulumi.CustomResource):
         config = pulumi.Config()
         name = config.get("name")
         if name is None:
-            name = "kvstorebackuppolicyvpc"
+            name = "terraform-example"
         default = alicloud.kvstore.get_zones()
         default_network = alicloud.vpc.Network("default",
             vpc_name=name,
@@ -260,10 +268,10 @@ class BackupPolicy(pulumi.CustomResource):
 
         ## Import
 
-        Tair (Redis OSS-Compatible) And Memcache (KVStore) backup policy can be imported using the id, e.g.
+        Tair (Redis OSS-Compatible) And Memcache (KVStore) Backup Policy can be imported using the id, e.g.
 
         ```sh
-        $ pulumi import alicloud:kvstore/backupPolicy:BackupPolicy example r-abc12345678
+        $ pulumi import alicloud:kvstore/backupPolicy:BackupPolicy example <id>
         ```
 
         :param str resource_name: The name of the resource.
@@ -318,8 +326,8 @@ class BackupPolicy(pulumi.CustomResource):
         :param str resource_name: The unique name of the resulting resource.
         :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] backup_periods: Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday
-        :param pulumi.Input[str] backup_time: Backup time, in the format of HH:mmZ- HH:mm Z
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] backup_periods: Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday.
+        :param pulumi.Input[str] backup_time: Backup time, in the format of HH:mmZ- HH:mm Z.
         :param pulumi.Input[str] instance_id: The id of Tair (Redis OSS-Compatible) And Memcache (KVStore) Instance.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
@@ -335,7 +343,7 @@ class BackupPolicy(pulumi.CustomResource):
     @pulumi.getter(name="backupPeriods")
     def backup_periods(self) -> pulumi.Output[Sequence[str]]:
         """
-        Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday
+        Backup Cycle. Allowed values: Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday.
         """
         return pulumi.get(self, "backup_periods")
 
@@ -343,7 +351,7 @@ class BackupPolicy(pulumi.CustomResource):
     @pulumi.getter(name="backupTime")
     def backup_time(self) -> pulumi.Output[Optional[str]]:
         """
-        Backup time, in the format of HH:mmZ- HH:mm Z
+        Backup time, in the format of HH:mmZ- HH:mm Z.
         """
         return pulumi.get(self, "backup_time")
 

pulumi_alicloud/kvstore/get_instances.py

@@ -101,6 +101,9 @@ class GetInstancesResult:
     @property
     @pulumi.getter(name="architectureType")
     def architecture_type(self) -> Optional[str]:
+        """
+        The architecture type of the instance.
+        """
         return pulumi.get(self, "architecture_type")
 
     @property
@@ -151,8 +154,7 @@ class GetInstancesResult:
     @pulumi.getter(name="instanceClass")
     def instance_class(self) -> Optional[str]:
         """
-        (Optional) Type of the applied Tair (Redis OSS-Compatible) And Memcache (KVStore) Classic Instance.
-        For more information, see [Instance type table](https://www.alibabacloud.com/help/en/redis/product-overview/overview-4).
+        Type of the applied Tair (Redis OSS-Compatible) And Memcached (KVStore) Classic Instance. For more information, see [Instance type table](https://www.alibabacloud.com/help/en/redis/product-overview/overview-4).
         """
         return pulumi.get(self, "instance_class")
 
@@ -160,7 +162,7 @@ class GetInstancesResult:
     @pulumi.getter(name="instanceType")
     def instance_type(self) -> Optional[str]:
         """
-        (Optional) Database type. Valid Values: `Memcache`, `Redis`. If no value is specified, all types are returned.
+        Database type. Valid Values: `Memcache`, `Redis`. If no value is specified, all types are returned.
         """
         return pulumi.get(self, "instance_type")
 
@@ -209,11 +211,17 @@ class GetInstancesResult:
     @property
     @pulumi.getter(name="resourceGroupId")
     def resource_group_id(self) -> Optional[str]:
+        """
+        The ID of the resource group to which the instance belongs.
+        """
         return pulumi.get(self, "resource_group_id")
 
     @property
     @pulumi.getter(name="searchKey")
     def search_key(self) -> Optional[str]:
+        """
+        The keyword used for fuzzy search. The keyword can be based on an instance name or an instance ID.
+        """
         return pulumi.get(self, "search_key")
 
     @property
@@ -227,6 +235,9 @@ class GetInstancesResult:
     @property
     @pulumi.getter
     def tags(self) -> Optional[Mapping[str, str]]:
+        """
+        A mapping of tags to assign to the resource.
+        """
         return pulumi.get(self, "tags")
 
     @property