pulumi-alicloud 3.76.0a1743571220__py3-none-any.whl → 3.76.0a1744139894__py3-none-any.whl

pulumi_alicloud/rocketmq/client_user.py

@@ -285,7 +285,12 @@ class _ClientUserState:
         pulumi.set(self, "user_name", value)
 
 
+warnings.warn("""alicloud.rocketmq/clientuser.ClientUser has been deprecated in favor of alicloud.sag/clientuser.ClientUser""", DeprecationWarning)
+
+
 class ClientUser(pulumi.CustomResource):
+    warnings.warn("""alicloud.rocketmq/clientuser.ClientUser has been deprecated in favor of alicloud.sag/clientuser.ClientUser""", DeprecationWarning)
+
     @overload
     def __init__(__self__,
                  resource_name: str,
@@ -323,7 +328,7 @@ class ClientUser(pulumi.CustomResource):
         sag_id = config.get("sagId")
         if sag_id is None:
             sag_id = "sag-9bifkfaz4fg***"
-        default = alicloud.rocketmq.ClientUser("default",
+        default = alicloud.sag.ClientUser("default",
             sag_id=sag_id,
             bandwidth=20,
             user_mail="tf-example@abc.com",
@@ -381,7 +386,7 @@ class ClientUser(pulumi.CustomResource):
         sag_id = config.get("sagId")
         if sag_id is None:
             sag_id = "sag-9bifkfaz4fg***"
-        default = alicloud.rocketmq.ClientUser("default",
+        default = alicloud.sag.ClientUser("default",
             sag_id=sag_id,
             bandwidth=20,
             user_mail="tf-example@abc.com",
@@ -422,6 +427,7 @@ class ClientUser(pulumi.CustomResource):
                  user_mail: Optional[pulumi.Input[str]] = None,
                  user_name: Optional[pulumi.Input[str]] = None,
                  __props__=None):
+        pulumi.log.warn("""ClientUser is deprecated: alicloud.rocketmq/clientuser.ClientUser has been deprecated in favor of alicloud.sag/clientuser.ClientUser""")
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
         if not isinstance(opts, pulumi.ResourceOptions):
             raise TypeError('Expected resource options to be a ResourceOptions instance')

pulumi_alicloud/rocketmq/consumer_group.py

@@ -25,6 +25,7 @@ class ConsumerGroupArgs:
                  consumer_group_id: pulumi.Input[str],
                  instance_id: pulumi.Input[str],
                  delivery_order_type: Optional[pulumi.Input[str]] = None,
+                 max_receive_tps: Optional[pulumi.Input[int]] = None,
                  remark: Optional[pulumi.Input[str]] = None):
         """
         The set of arguments for constructing a ConsumerGroup resource.
@@ -32,6 +33,7 @@ class ConsumerGroupArgs:
         :param pulumi.Input[str] consumer_group_id: The first ID of the resource.
         :param pulumi.Input[str] instance_id: Instance ID.
         :param pulumi.Input[str] delivery_order_type: Delivery order.
+        :param pulumi.Input[int] max_receive_tps: Maximum received message tps.
         :param pulumi.Input[str] remark: Custom remarks.
         """
         pulumi.set(__self__, "consume_retry_policy", consume_retry_policy)
@@ -39,6 +41,8 @@ class ConsumerGroupArgs:
         pulumi.set(__self__, "instance_id", instance_id)
         if delivery_order_type is not None:
             pulumi.set(__self__, "delivery_order_type", delivery_order_type)
+        if max_receive_tps is not None:
+            pulumi.set(__self__, "max_receive_tps", max_receive_tps)
         if remark is not None:
             pulumi.set(__self__, "remark", remark)
 
@@ -90,6 +94,18 @@ class ConsumerGroupArgs:
     def delivery_order_type(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "delivery_order_type", value)
 
+    @property
+    @pulumi.getter(name="maxReceiveTps")
+    def max_receive_tps(self) -> Optional[pulumi.Input[int]]:
+        """
+        Maximum received message tps.
+        """
+        return pulumi.get(self, "max_receive_tps")
+
+    @max_receive_tps.setter
+    def max_receive_tps(self, value: Optional[pulumi.Input[int]]):
+        pulumi.set(self, "max_receive_tps", value)
+
     @property
     @pulumi.getter
     def remark(self) -> Optional[pulumi.Input[str]]:
@@ -111,6 +127,8 @@ class _ConsumerGroupState:
                  create_time: Optional[pulumi.Input[str]] = None,
                  delivery_order_type: Optional[pulumi.Input[str]] = None,
                  instance_id: Optional[pulumi.Input[str]] = None,
+                 max_receive_tps: Optional[pulumi.Input[int]] = None,
+                 region_id: Optional[pulumi.Input[str]] = None,
                  remark: Optional[pulumi.Input[str]] = None,
                  status: Optional[pulumi.Input[str]] = None):
         """
@@ -120,6 +138,8 @@ class _ConsumerGroupState:
         :param pulumi.Input[str] create_time: The creation time of the resource.
         :param pulumi.Input[str] delivery_order_type: Delivery order.
         :param pulumi.Input[str] instance_id: Instance ID.
+        :param pulumi.Input[int] max_receive_tps: Maximum received message tps.
+        :param pulumi.Input[str] region_id: (Available since v1.247.0) The ID of the region in which the instance resides.
         :param pulumi.Input[str] remark: Custom remarks.
         :param pulumi.Input[str] status: The status of the resource.
         """
@@ -133,6 +153,10 @@ class _ConsumerGroupState:
             pulumi.set(__self__, "delivery_order_type", delivery_order_type)
         if instance_id is not None:
             pulumi.set(__self__, "instance_id", instance_id)
+        if max_receive_tps is not None:
+            pulumi.set(__self__, "max_receive_tps", max_receive_tps)
+        if region_id is not None:
+            pulumi.set(__self__, "region_id", region_id)
         if remark is not None:
             pulumi.set(__self__, "remark", remark)
         if status is not None:
@@ -198,6 +222,30 @@ class _ConsumerGroupState:
     def instance_id(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "instance_id", value)
 
+    @property
+    @pulumi.getter(name="maxReceiveTps")
+    def max_receive_tps(self) -> Optional[pulumi.Input[int]]:
+        """
+        Maximum received message tps.
+        """
+        return pulumi.get(self, "max_receive_tps")
+
+    @max_receive_tps.setter
+    def max_receive_tps(self, value: Optional[pulumi.Input[int]]):
+        pulumi.set(self, "max_receive_tps", value)
+
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        (Available since v1.247.0) The ID of the region in which the instance resides.
+        """
+        return pulumi.get(self, "region_id")
+
+    @region_id.setter
+    def region_id(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "region_id", value)
+
     @property
     @pulumi.getter
     def remark(self) -> Optional[pulumi.Input[str]]:
@@ -232,6 +280,7 @@ class ConsumerGroup(pulumi.CustomResource):
                  consumer_group_id: Optional[pulumi.Input[str]] = None,
                  delivery_order_type: Optional[pulumi.Input[str]] = None,
                  instance_id: Optional[pulumi.Input[str]] = None,
+                 max_receive_tps: Optional[pulumi.Input[int]] = None,
                  remark: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         """
@@ -265,31 +314,42 @@ class ConsumerGroup(pulumi.CustomResource):
             cidr_block="172.16.0.0/24",
             vswitch_name=name)
         create_instance = alicloud.rocketmq.RocketMQInstance("createInstance",
-            auto_renew_period=1,
             product_info={
-                "msg_process_spec": "rmq.p2.4xlarge",
+                "msg_process_spec": "rmq.u2.10xlarge",
                 "send_receive_ratio": 0.3,
                 "message_retention_time": 70,
             },
+            service_code="rmq",
+            payment_type="PayAsYouGo",
+            instance_name=name,
+            sub_series_code="cluster_ha",
+            remark="example",
+            ip_whitelists=[
+                "192.168.0.0/16",
+                "10.10.0.0/16",
+                "172.168.0.0/16",
+            ],
+            software={
+                "maintain_time": "02:00-06:00",
+            },
+            tags={
+                "Created": "TF",
+                "For": "example",
+            },
+            series_code="ultimate",
             network_info={
                 "vpc_info": {
                     "vpc_id": create_vpc.id,
-                    "vswitch_id": create_vswitch.id,
+                    "vswitches": [{
+                        "vswitch_id": create_vswitch.id,
+                    }],
                 },
                 "internet_info": {
                     "internet_spec": "enable",
                     "flow_out_type": "payByBandwidth",
                     "flow_out_bandwidth": 30,
                 },
-            },
-            period=1,
-            sub_series_code="cluster_ha",
-            remark="example",
-            instance_name=name,
-            service_code="rmq",
-            series_code="professional",
-            payment_type="PayAsYouGo",
-            period_unit="Month")
+            })
         default_consumer_group = alicloud.rocketmq.ConsumerGroup("default",
             consumer_group_id=name,
             instance_id=create_instance.id,
@@ -315,6 +375,7 @@ class ConsumerGroup(pulumi.CustomResource):
         :param pulumi.Input[str] consumer_group_id: The first ID of the resource.
         :param pulumi.Input[str] delivery_order_type: Delivery order.
         :param pulumi.Input[str] instance_id: Instance ID.
+        :param pulumi.Input[int] max_receive_tps: Maximum received message tps.
         :param pulumi.Input[str] remark: Custom remarks.
         """
         ...
@@ -354,31 +415,42 @@ class ConsumerGroup(pulumi.CustomResource):
             cidr_block="172.16.0.0/24",
             vswitch_name=name)
         create_instance = alicloud.rocketmq.RocketMQInstance("createInstance",
-            auto_renew_period=1,
             product_info={
-                "msg_process_spec": "rmq.p2.4xlarge",
+                "msg_process_spec": "rmq.u2.10xlarge",
                 "send_receive_ratio": 0.3,
                 "message_retention_time": 70,
             },
+            service_code="rmq",
+            payment_type="PayAsYouGo",
+            instance_name=name,
+            sub_series_code="cluster_ha",
+            remark="example",
+            ip_whitelists=[
+                "192.168.0.0/16",
+                "10.10.0.0/16",
+                "172.168.0.0/16",
+            ],
+            software={
+                "maintain_time": "02:00-06:00",
+            },
+            tags={
+                "Created": "TF",
+                "For": "example",
+            },
+            series_code="ultimate",
             network_info={
                 "vpc_info": {
                     "vpc_id": create_vpc.id,
-                    "vswitch_id": create_vswitch.id,
+                    "vswitches": [{
+                        "vswitch_id": create_vswitch.id,
+                    }],
                 },
                 "internet_info": {
                     "internet_spec": "enable",
                     "flow_out_type": "payByBandwidth",
                     "flow_out_bandwidth": 30,
                 },
-            },
-            period=1,
-            sub_series_code="cluster_ha",
-            remark="example",
-            instance_name=name,
-            service_code="rmq",
-            series_code="professional",
-            payment_type="PayAsYouGo",
-            period_unit="Month")
+            })
         default_consumer_group = alicloud.rocketmq.ConsumerGroup("default",
             consumer_group_id=name,
             instance_id=create_instance.id,
@@ -417,6 +489,7 @@ class ConsumerGroup(pulumi.CustomResource):
                  consumer_group_id: Optional[pulumi.Input[str]] = None,
                  delivery_order_type: Optional[pulumi.Input[str]] = None,
                  instance_id: Optional[pulumi.Input[str]] = None,
+                 max_receive_tps: Optional[pulumi.Input[int]] = None,
                  remark: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
@@ -437,8 +510,10 @@ class ConsumerGroup(pulumi.CustomResource):
             if instance_id is None and not opts.urn:
                 raise TypeError("Missing required property 'instance_id'")
             __props__.__dict__["instance_id"] = instance_id
+            __props__.__dict__["max_receive_tps"] = max_receive_tps
             __props__.__dict__["remark"] = remark
             __props__.__dict__["create_time"] = None
+            __props__.__dict__["region_id"] = None
             __props__.__dict__["status"] = None
         super(ConsumerGroup, __self__).__init__(
             'alicloud:rocketmq/consumerGroup:ConsumerGroup',
@@ -455,6 +530,8 @@ class ConsumerGroup(pulumi.CustomResource):
             create_time: Optional[pulumi.Input[str]] = None,
             delivery_order_type: Optional[pulumi.Input[str]] = None,
             instance_id: Optional[pulumi.Input[str]] = None,
+            max_receive_tps: Optional[pulumi.Input[int]] = None,
+            region_id: Optional[pulumi.Input[str]] = None,
             remark: Optional[pulumi.Input[str]] = None,
             status: Optional[pulumi.Input[str]] = None) -> 'ConsumerGroup':
         """
@@ -469,6 +546,8 @@ class ConsumerGroup(pulumi.CustomResource):
         :param pulumi.Input[str] create_time: The creation time of the resource.
         :param pulumi.Input[str] delivery_order_type: Delivery order.
         :param pulumi.Input[str] instance_id: Instance ID.
+        :param pulumi.Input[int] max_receive_tps: Maximum received message tps.
+        :param pulumi.Input[str] region_id: (Available since v1.247.0) The ID of the region in which the instance resides.
         :param pulumi.Input[str] remark: Custom remarks.
         :param pulumi.Input[str] status: The status of the resource.
         """
@@ -481,6 +560,8 @@ class ConsumerGroup(pulumi.CustomResource):
         __props__.__dict__["create_time"] = create_time
         __props__.__dict__["delivery_order_type"] = delivery_order_type
         __props__.__dict__["instance_id"] = instance_id
+        __props__.__dict__["max_receive_tps"] = max_receive_tps
+        __props__.__dict__["region_id"] = region_id
         __props__.__dict__["remark"] = remark
         __props__.__dict__["status"] = status
         return ConsumerGroup(resource_name, opts=opts, __props__=__props__)
@@ -525,6 +606,22 @@ class ConsumerGroup(pulumi.CustomResource):
         """
         return pulumi.get(self, "instance_id")
 
+    @property
+    @pulumi.getter(name="maxReceiveTps")
+    def max_receive_tps(self) -> pulumi.Output[Optional[int]]:
+        """
+        Maximum received message tps.
+        """
+        return pulumi.get(self, "max_receive_tps")
+
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> pulumi.Output[str]:
+        """
+        (Available since v1.247.0) The ID of the region in which the instance resides.
+        """
+        return pulumi.get(self, "region_id")
+
     @property
     @pulumi.getter
     def remark(self) -> pulumi.Output[Optional[str]]:

pulumi_alicloud/rocketmq/dnat_entry.py

@@ -250,7 +250,12 @@ class _DnatEntryState:
         pulumi.set(self, "type", value)
 
 
+warnings.warn("""alicloud.rocketmq/dnatentry.DnatEntry has been deprecated in favor of alicloud.sag/dnatentry.DnatEntry""", DeprecationWarning)
+
+
 class DnatEntry(pulumi.CustomResource):
+    warnings.warn("""alicloud.rocketmq/dnatentry.DnatEntry has been deprecated in favor of alicloud.sag/dnatentry.DnatEntry""", DeprecationWarning)
+
     @overload
     def __init__(__self__,
                  resource_name: str,
@@ -284,7 +289,7 @@ class DnatEntry(pulumi.CustomResource):
         sag_id = config.get("sagId")
         if sag_id is None:
             sag_id = "sag-9bifkfaz***"
-        default = alicloud.rocketmq.DnatEntry("default",
+        default = alicloud.sag.DnatEntry("default",
             sag_id=sag_id,
             type="Intranet",
             ip_protocol="any",
@@ -339,7 +344,7 @@ class DnatEntry(pulumi.CustomResource):
         sag_id = config.get("sagId")
         if sag_id is None:
             sag_id = "sag-9bifkfaz***"
-        default = alicloud.rocketmq.DnatEntry("default",
+        default = alicloud.sag.DnatEntry("default",
             sag_id=sag_id,
             type="Intranet",
             ip_protocol="any",
@@ -380,6 +385,7 @@ class DnatEntry(pulumi.CustomResource):
                  sag_id: Optional[pulumi.Input[str]] = None,
                  type: Optional[pulumi.Input[str]] = None,
                  __props__=None):
+        pulumi.log.warn("""DnatEntry is deprecated: alicloud.rocketmq/dnatentry.DnatEntry has been deprecated in favor of alicloud.sag/dnatentry.DnatEntry""")
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
         if not isinstance(opts, pulumi.ResourceOptions):
             raise TypeError('Expected resource options to be a ResourceOptions instance')

pulumi_alicloud/rocketmq/outputs.py

@@ -17,6 +17,7 @@ from . import outputs
 
 __all__ = [
     'ConsumerGroupConsumeRetryPolicy',
+    'RocketMQInstanceAclInfo',
     'RocketMQInstanceNetworkInfo',
     'RocketMQInstanceNetworkInfoEndpoint',
     'RocketMQInstanceNetworkInfoInternetInfo',
@@ -34,7 +35,9 @@ class ConsumerGroupConsumeRetryPolicy(dict):
     @staticmethod
     def __key_warning(key: str):
         suggest = None
-        if key == "maxRetryTimes":
+        if key == "deadLetterTargetTopic":
+            suggest = "dead_letter_target_topic"
+        elif key == "maxRetryTimes":
             suggest = "max_retry_times"
         elif key == "retryPolicy":
             suggest = "retry_policy"
@@ -51,17 +54,29 @@ class ConsumerGroupConsumeRetryPolicy(dict):
         return super().get(key, default)
 
     def __init__(__self__, *,
+                 dead_letter_target_topic: Optional[str] = None,
                  max_retry_times: Optional[int] = None,
                  retry_policy: Optional[str] = None):
         """
+        :param str dead_letter_target_topic: The dead-letter topic. If the consumer fails to consume a message in an abnormal situation and the message is still unsuccessful after retrying, the message will be delivered to the dead letter Topic for subsequent business recovery or backtracking.
         :param int max_retry_times: Maximum number of retries.
         :param str retry_policy: Consume retry policy.
         """
+        if dead_letter_target_topic is not None:
+            pulumi.set(__self__, "dead_letter_target_topic", dead_letter_target_topic)
         if max_retry_times is not None:
             pulumi.set(__self__, "max_retry_times", max_retry_times)
         if retry_policy is not None:
             pulumi.set(__self__, "retry_policy", retry_policy)
 
+    @property
+    @pulumi.getter(name="deadLetterTargetTopic")
+    def dead_letter_target_topic(self) -> Optional[str]:
+        """
+        The dead-letter topic. If the consumer fails to consume a message in an abnormal situation and the message is still unsuccessful after retrying, the message will be delivered to the dead letter Topic for subsequent business recovery or backtracking.
+        """
+        return pulumi.get(self, "dead_letter_target_topic")
+
     @property
     @pulumi.getter(name="maxRetryTimes")
     def max_retry_times(self) -> Optional[int]:
@@ -79,6 +94,56 @@ class ConsumerGroupConsumeRetryPolicy(dict):
         return pulumi.get(self, "retry_policy")
 
 
+@pulumi.output_type
+class RocketMQInstanceAclInfo(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "aclTypes":
+            suggest = "acl_types"
+        elif key == "defaultVpcAuthFree":
+            suggest = "default_vpc_auth_free"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in RocketMQInstanceAclInfo. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        RocketMQInstanceAclInfo.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        RocketMQInstanceAclInfo.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 acl_types: Optional[Sequence[str]] = None,
+                 default_vpc_auth_free: Optional[bool] = None):
+        """
+        :param Sequence[str] acl_types: The authentication type of the instance. Valid values:
+        :param bool default_vpc_auth_free: Indicates whether the authentication-free in VPCs feature is enabled. Indicates whether the authentication-free in VPCs feature is enabled. Valid values:
+        """
+        if acl_types is not None:
+            pulumi.set(__self__, "acl_types", acl_types)
+        if default_vpc_auth_free is not None:
+            pulumi.set(__self__, "default_vpc_auth_free", default_vpc_auth_free)
+
+    @property
+    @pulumi.getter(name="aclTypes")
+    def acl_types(self) -> Optional[Sequence[str]]:
+        """
+        The authentication type of the instance. Valid values:
+        """
+        return pulumi.get(self, "acl_types")
+
+    @property
+    @pulumi.getter(name="defaultVpcAuthFree")
+    def default_vpc_auth_free(self) -> Optional[bool]:
+        """
+        Indicates whether the authentication-free in VPCs feature is enabled. Indicates whether the authentication-free in VPCs feature is enabled. Valid values:
+        """
+        return pulumi.get(self, "default_vpc_auth_free")
+
+
 @pulumi.output_type
 class RocketMQInstanceNetworkInfo(dict):
     @staticmethod
@@ -241,7 +306,7 @@ class RocketMQInstanceNetworkInfoInternetInfo(dict):
                - enable: Enable public network access
                - disable: Disable public network access   Instances by default support VPC access. If public network access is enabled, Alibaba Cloud Message Queue RocketMQ version will incur charges for public network outbound bandwidth. For specific billing information, please refer to [Public Network Access Fees](https://help.aliyun.com/zh/apsaramq-for-rocketmq/cloud-message-queue-rocketmq-5-x-series/product-overview/internet-access-fee).
         :param int flow_out_bandwidth: Public network bandwidth specification. Unit: Mb/s.  This field should only be filled when the public network billing type is set to payByBandwidth.  The value range is [1 - 1000].
-        :param Sequence[str] ip_whitelists: internet ip whitelist.
+        :param Sequence[str] ip_whitelists: Field `ip_whitelist` has been deprecated from provider version 1.245.0. New field `ip_whitelists` instead.
         """
         pulumi.set(__self__, "flow_out_type", flow_out_type)
         pulumi.set(__self__, "internet_spec", internet_spec)
@@ -280,9 +345,10 @@ class RocketMQInstanceNetworkInfoInternetInfo(dict):
 
     @property
     @pulumi.getter(name="ipWhitelists")
+    @_utilities.deprecated("""Field 'ip_whitelist' has been deprecated from provider version 1.245.0. New field 'ip_whitelists' instead.""")
     def ip_whitelists(self) -> Optional[Sequence[str]]:
         """
-        internet ip whitelist.
+        Field `ip_whitelist` has been deprecated from provider version 1.245.0. New field `ip_whitelists` instead.
         """
         return pulumi.get(self, "ip_whitelists")
 
@@ -347,6 +413,7 @@ class RocketMQInstanceNetworkInfoVpcInfo(dict):
 
     @property
     @pulumi.getter(name="vswitchId")
+    @_utilities.deprecated("""Field 'vswitch_id' has been deprecated from provider version 1.231.0. New field 'vswitches' instead.""")
     def vswitch_id(self) -> Optional[str]:
         """
         VPC switch id.
@@ -411,8 +478,14 @@ class RocketMQInstanceProductInfo(dict):
             suggest = "message_retention_time"
         elif key == "sendReceiveRatio":
             suggest = "send_receive_ratio"
+        elif key == "storageEncryption":
+            suggest = "storage_encryption"
+        elif key == "storageSecretKey":
+            suggest = "storage_secret_key"
         elif key == "supportAutoScaling":
             suggest = "support_auto_scaling"
+        elif key == "traceOn":
+            suggest = "trace_on"
 
         if suggest:
             pulumi.log.warn(f"Key '{key}' not found in RocketMQInstanceProductInfo. Access the value via the '{suggest}' property getter instead.")
@@ -430,13 +503,19 @@ class RocketMQInstanceProductInfo(dict):
                  auto_scaling: Optional[bool] = None,
                  message_retention_time: Optional[int] = None,
                  send_receive_ratio: Optional[float] = None,
-                 support_auto_scaling: Optional[bool] = None):
+                 storage_encryption: Optional[bool] = None,
+                 storage_secret_key: Optional[str] = None,
+                 support_auto_scaling: Optional[bool] = None,
+                 trace_on: Optional[bool] = None):
         """
         :param str msg_process_spec: Message sending and receiving calculation specifications. For details about the upper limit for sending and receiving messages, see [Instance Specifications](https://help.aliyun.com/zh/apsaramq-for-rocketmq/cloud-message-queue-rocketmq-5-x-series/product-overview/instance-specifications).
         :param bool auto_scaling: is open auto scaling.
         :param int message_retention_time: Duration of message retention. Unit: hours.  For the range of values, please refer to [Usage Limits](https://help.aliyun.com/zh/apsaramq-for-rocketmq/cloud-message-queue-rocketmq-5-x-series/product-overview/usage-limits)>Resource Quotas>Limitations on Message Retention.  The message storage in AlibabaCloud RocketMQ is fully implemented in a serverless and elastic manner, with charges based on the actual storage space. You can control the storage capacity of messages by adjusting the duration of message retention. For more information, please see [Storage Fees](https://help.aliyun.com/zh/apsaramq-for-rocketmq/cloud-message-queue-rocketmq-5-x-series/product-overview/storage-fees).
         :param float send_receive_ratio: message send receive ratio.  Value range: [0.2, 0.5].
+        :param bool storage_encryption: Specifies whether to enable the encryption at rest feature. Valid values: `true`, `false`.
+        :param str storage_secret_key: The key for encryption at rest.
         :param bool support_auto_scaling: is support auto scaling.
+        :param bool trace_on: Whether to enable the message trace function. Valid values: `true`, `false`.
         """
         pulumi.set(__self__, "msg_process_spec", msg_process_spec)
         if auto_scaling is not None:
@@ -445,8 +524,14 @@ class RocketMQInstanceProductInfo(dict):
             pulumi.set(__self__, "message_retention_time", message_retention_time)
         if send_receive_ratio is not None:
             pulumi.set(__self__, "send_receive_ratio", send_receive_ratio)
+        if storage_encryption is not None:
+            pulumi.set(__self__, "storage_encryption", storage_encryption)
+        if storage_secret_key is not None:
+            pulumi.set(__self__, "storage_secret_key", storage_secret_key)
         if support_auto_scaling is not None:
             pulumi.set(__self__, "support_auto_scaling", support_auto_scaling)
+        if trace_on is not None:
+            pulumi.set(__self__, "trace_on", trace_on)
 
     @property
     @pulumi.getter(name="msgProcessSpec")
@@ -480,6 +565,22 @@ class RocketMQInstanceProductInfo(dict):
         """
         return pulumi.get(self, "send_receive_ratio")
 
+    @property
+    @pulumi.getter(name="storageEncryption")
+    def storage_encryption(self) -> Optional[bool]:
+        """
+        Specifies whether to enable the encryption at rest feature. Valid values: `true`, `false`.
+        """
+        return pulumi.get(self, "storage_encryption")
+
+    @property
+    @pulumi.getter(name="storageSecretKey")
+    def storage_secret_key(self) -> Optional[str]:
+        """
+        The key for encryption at rest.
+        """
+        return pulumi.get(self, "storage_secret_key")
+
     @property
     @pulumi.getter(name="supportAutoScaling")
     def support_auto_scaling(self) -> Optional[bool]:
@@ -488,6 +589,14 @@ class RocketMQInstanceProductInfo(dict):
         """
         return pulumi.get(self, "support_auto_scaling")
 
+    @property
+    @pulumi.getter(name="traceOn")
+    def trace_on(self) -> Optional[bool]:
+        """
+        Whether to enable the message trace function. Valid values: `true`, `false`.
+        """
+        return pulumi.get(self, "trace_on")
+
 
 @pulumi.output_type
 class RocketMQInstanceSoftware(dict):

pulumi_alicloud/rocketmq/qos.py

@@ -64,7 +64,12 @@ class _QosState:
         pulumi.set(self, "name", value)
 
 
+warnings.warn("""alicloud.rocketmq/qos.Qos has been deprecated in favor of alicloud.sag/qos.Qos""", DeprecationWarning)
+
+
 class Qos(pulumi.CustomResource):
+    warnings.warn("""alicloud.rocketmq/qos.Qos has been deprecated in favor of alicloud.sag/qos.Qos""", DeprecationWarning)
+
     @overload
     def __init__(__self__,
                  resource_name: str,
@@ -88,7 +93,7 @@ class Qos(pulumi.CustomResource):
         import pulumi
         import pulumi_alicloud as alicloud
 
-        default = alicloud.rocketmq.Qos("default", name="terraform-example")
+        default = alicloud.sag.Qos("default", name="terraform-example")
         ```
 
         ## Import
@@ -126,7 +131,7 @@ class Qos(pulumi.CustomResource):
         import pulumi
         import pulumi_alicloud as alicloud
 
-        default = alicloud.rocketmq.Qos("default", name="terraform-example")
+        default = alicloud.sag.Qos("default", name="terraform-example")
         ```
 
         ## Import
@@ -154,6 +159,7 @@ class Qos(pulumi.CustomResource):
                  opts: Optional[pulumi.ResourceOptions] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  __props__=None):
+        pulumi.log.warn("""Qos is deprecated: alicloud.rocketmq/qos.Qos has been deprecated in favor of alicloud.sag/qos.Qos""")
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
         if not isinstance(opts, pulumi.ResourceOptions):
             raise TypeError('Expected resource options to be a ResourceOptions instance')

pulumi_alicloud/rocketmq/qos_car.py

@@ -349,7 +349,12 @@ class _QosCarState:
         pulumi.set(self, "qos_id", value)
 
 
+warnings.warn("""alicloud.rocketmq/qoscar.QosCar has been deprecated in favor of alicloud.sag/qoscar.QosCar""", DeprecationWarning)
+
+
 class QosCar(pulumi.CustomResource):
+    warnings.warn("""alicloud.rocketmq/qoscar.QosCar has been deprecated in favor of alicloud.sag/qoscar.QosCar""", DeprecationWarning)
+
     @overload
     def __init__(__self__,
                  resource_name: str,
@@ -386,8 +391,8 @@ class QosCar(pulumi.CustomResource):
         name = config.get("name")
         if name is None:
             name = "tf_example"
-        default = alicloud.rocketmq.Qos("default", name=name)
-        default_qos_car = alicloud.rocketmq.QosCar("default",
+        default = alicloud.sag.Qos("default", name=name)
+        default_qos_car = alicloud.sag.QosCar("default",
             qos_id=default.id,
             name=name,
             description=name,
@@ -446,8 +451,8 @@ class QosCar(pulumi.CustomResource):
         name = config.get("name")
         if name is None:
             name = "tf_example"
-        default = alicloud.rocketmq.Qos("default", name=name)
-        default_qos_car = alicloud.rocketmq.QosCar("default",
+        default = alicloud.sag.Qos("default", name=name)
+        default_qos_car = alicloud.sag.QosCar("default",
             qos_id=default.id,
             name=name,
             description=name,
@@ -492,6 +497,7 @@ class QosCar(pulumi.CustomResource):
                  priority: Optional[pulumi.Input[int]] = None,
                  qos_id: Optional[pulumi.Input[str]] = None,
                  __props__=None):
+        pulumi.log.warn("""QosCar is deprecated: alicloud.rocketmq/qoscar.QosCar has been deprecated in favor of alicloud.sag/qoscar.QosCar""")
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
         if not isinstance(opts, pulumi.ResourceOptions):
             raise TypeError('Expected resource options to be a ResourceOptions instance')