pulumi-alicloud 3.73.0a1736850863__py3-none-any.whl → 3.74.0__py3-none-any.whl

pulumi_alicloud/dcdn/waf_rule.py

@@ -40,7 +40,7 @@ class WafRuleArgs:
         The set of arguments for constructing a WafRule resource.
         :param pulumi.Input[str] policy_id: The protection policy ID.
         :param pulumi.Input[str] rule_name: The name of the protection rule. The name can be up to 64 characters in length and can contain letters, digits, and underscores (_). **NOTE:** This parameter cannot be modified when policy is of type `region_block`.
-        :param pulumi.Input[str] action: Specifies the action of the rule. Valid values: `block`, `monitor`, `js`.
+        :param pulumi.Input[str] action: Specifies the action of the rule. Valid values: `block`, `monitor`, `js`, `deny`.
         :param pulumi.Input[str] cc_status: Specifies whether to enable rate limiting. Valid values: `on` and `off`. **NOTE:** This parameter is required when policy is of type `custom_acl`.
         :param pulumi.Input[str] cn_region_list: The blocked regions in the Chinese mainland, separated by commas (,).
         :param pulumi.Input[Sequence[pulumi.Input['WafRuleConditionArgs']]] conditions: Conditions that trigger the rule. See `conditions` below. **NOTE:** This parameter is required when policy is of type `custom_acl` or `whitelist`.
@@ -52,7 +52,7 @@ class WafRuleArgs:
         :param pulumi.Input[Sequence[pulumi.Input[str]]] remote_addrs: Filter by IP address.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] scenes: The types of the protection policies.
         :param pulumi.Input[str] status: The status of the waf rule. Valid values: `on` and `off`. Default value: on.
-        :param pulumi.Input[str] waf_group_ids: The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas.
+        :param pulumi.Input[str] waf_group_ids: The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas. **NOTE:** This parameter is valid only when policy is of type `waf_group`.
         """
         pulumi.set(__self__, "policy_id", policy_id)
         pulumi.set(__self__, "rule_name", rule_name)
@@ -111,7 +111,7 @@ class WafRuleArgs:
     @pulumi.getter
     def action(self) -> Optional[pulumi.Input[str]]:
         """
-        Specifies the action of the rule. Valid values: `block`, `monitor`, `js`.
+        Specifies the action of the rule. Valid values: `block`, `monitor`, `js`, `deny`.
         """
         return pulumi.get(self, "action")
 
@@ -255,7 +255,7 @@ class WafRuleArgs:
     @pulumi.getter(name="wafGroupIds")
     def waf_group_ids(self) -> Optional[pulumi.Input[str]]:
         """
-        The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas.
+        The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas. **NOTE:** This parameter is valid only when policy is of type `waf_group`.
         """
         return pulumi.get(self, "waf_group_ids")
 
@@ -286,7 +286,7 @@ class _WafRuleState:
                  waf_group_ids: Optional[pulumi.Input[str]] = None):
         """
         Input properties used for looking up and filtering WafRule resources.
-        :param pulumi.Input[str] action: Specifies the action of the rule. Valid values: `block`, `monitor`, `js`.
+        :param pulumi.Input[str] action: Specifies the action of the rule. Valid values: `block`, `monitor`, `js`, `deny`.
         :param pulumi.Input[str] cc_status: Specifies whether to enable rate limiting. Valid values: `on` and `off`. **NOTE:** This parameter is required when policy is of type `custom_acl`.
         :param pulumi.Input[str] cn_region_list: The blocked regions in the Chinese mainland, separated by commas (,).
         :param pulumi.Input[Sequence[pulumi.Input['WafRuleConditionArgs']]] conditions: Conditions that trigger the rule. See `conditions` below. **NOTE:** This parameter is required when policy is of type `custom_acl` or `whitelist`.
@@ -302,7 +302,7 @@ class _WafRuleState:
         :param pulumi.Input[str] rule_name: The name of the protection rule. The name can be up to 64 characters in length and can contain letters, digits, and underscores (_). **NOTE:** This parameter cannot be modified when policy is of type `region_block`.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] scenes: The types of the protection policies.
         :param pulumi.Input[str] status: The status of the waf rule. Valid values: `on` and `off`. Default value: on.
-        :param pulumi.Input[str] waf_group_ids: The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas.
+        :param pulumi.Input[str] waf_group_ids: The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas. **NOTE:** This parameter is valid only when policy is of type `waf_group`.
         """
         if action is not None:
             pulumi.set(__self__, "action", action)
@@ -343,7 +343,7 @@ class _WafRuleState:
     @pulumi.getter
     def action(self) -> Optional[pulumi.Input[str]]:
         """
-        Specifies the action of the rule. Valid values: `block`, `monitor`, `js`.
+        Specifies the action of the rule. Valid values: `block`, `monitor`, `js`, `deny`.
         """
         return pulumi.get(self, "action")
 
@@ -535,7 +535,7 @@ class _WafRuleState:
     @pulumi.getter(name="wafGroupIds")
     def waf_group_ids(self) -> Optional[pulumi.Input[str]]:
         """
-        The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas.
+        The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas. **NOTE:** This parameter is valid only when policy is of type `waf_group`.
         """
         return pulumi.get(self, "waf_group_ids")
 
@@ -633,7 +633,7 @@ class WafRule(pulumi.CustomResource):
 
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[str] action: Specifies the action of the rule. Valid values: `block`, `monitor`, `js`.
+        :param pulumi.Input[str] action: Specifies the action of the rule. Valid values: `block`, `monitor`, `js`, `deny`.
         :param pulumi.Input[str] cc_status: Specifies whether to enable rate limiting. Valid values: `on` and `off`. **NOTE:** This parameter is required when policy is of type `custom_acl`.
         :param pulumi.Input[str] cn_region_list: The blocked regions in the Chinese mainland, separated by commas (,).
         :param pulumi.Input[Sequence[pulumi.Input[Union['WafRuleConditionArgs', 'WafRuleConditionArgsDict']]]] conditions: Conditions that trigger the rule. See `conditions` below. **NOTE:** This parameter is required when policy is of type `custom_acl` or `whitelist`.
@@ -647,7 +647,7 @@ class WafRule(pulumi.CustomResource):
         :param pulumi.Input[str] rule_name: The name of the protection rule. The name can be up to 64 characters in length and can contain letters, digits, and underscores (_). **NOTE:** This parameter cannot be modified when policy is of type `region_block`.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] scenes: The types of the protection policies.
         :param pulumi.Input[str] status: The status of the waf rule. Valid values: `on` and `off`. Default value: on.
-        :param pulumi.Input[str] waf_group_ids: The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas.
+        :param pulumi.Input[str] waf_group_ids: The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas. **NOTE:** This parameter is valid only when policy is of type `waf_group`.
         """
         ...
     @overload
@@ -815,7 +815,7 @@ class WafRule(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[str] action: Specifies the action of the rule. Valid values: `block`, `monitor`, `js`.
+        :param pulumi.Input[str] action: Specifies the action of the rule. Valid values: `block`, `monitor`, `js`, `deny`.
         :param pulumi.Input[str] cc_status: Specifies whether to enable rate limiting. Valid values: `on` and `off`. **NOTE:** This parameter is required when policy is of type `custom_acl`.
         :param pulumi.Input[str] cn_region_list: The blocked regions in the Chinese mainland, separated by commas (,).
         :param pulumi.Input[Sequence[pulumi.Input[Union['WafRuleConditionArgs', 'WafRuleConditionArgsDict']]]] conditions: Conditions that trigger the rule. See `conditions` below. **NOTE:** This parameter is required when policy is of type `custom_acl` or `whitelist`.
@@ -831,7 +831,7 @@ class WafRule(pulumi.CustomResource):
         :param pulumi.Input[str] rule_name: The name of the protection rule. The name can be up to 64 characters in length and can contain letters, digits, and underscores (_). **NOTE:** This parameter cannot be modified when policy is of type `region_block`.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] scenes: The types of the protection policies.
         :param pulumi.Input[str] status: The status of the waf rule. Valid values: `on` and `off`. Default value: on.
-        :param pulumi.Input[str] waf_group_ids: The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas.
+        :param pulumi.Input[str] waf_group_ids: The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas. **NOTE:** This parameter is valid only when policy is of type `waf_group`.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
 
@@ -860,7 +860,7 @@ class WafRule(pulumi.CustomResource):
     @pulumi.getter
     def action(self) -> pulumi.Output[Optional[str]]:
         """
-        Specifies the action of the rule. Valid values: `block`, `monitor`, `js`.
+        Specifies the action of the rule. Valid values: `block`, `monitor`, `js`, `deny`.
         """
         return pulumi.get(self, "action")
 
@@ -988,7 +988,7 @@ class WafRule(pulumi.CustomResource):
     @pulumi.getter(name="wafGroupIds")
     def waf_group_ids(self) -> pulumi.Output[Optional[str]]:
         """
-        The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas.
+        The id of the waf rule group. The default value is "1012". Multiple rules are separated by commas. **NOTE:** This parameter is valid only when policy is of type `waf_group`.
         """
         return pulumi.get(self, "waf_group_ids")
 

pulumi_alicloud/dfs/file_system.py

@@ -34,12 +34,13 @@ class FileSystemArgs:
         """
         The set of arguments for constructing a FileSystem resource.
         :param pulumi.Input[str] file_system_name: The file system name. The naming rules are as follows: The length is 6~64 characters. Globally unique and cannot be an empty string. English letters are supported and can contain numbers, underscores (_), and dashes (-).
-        :param pulumi.Input[str] protocol_type: The protocol type.  Only HDFS(Hadoop Distributed File System) is supported.
+        :param pulumi.Input[str] protocol_type: The protocol type. Value: `HDFS`, `PANGU`.
         :param pulumi.Input[int] space_capacity: File system capacity.  When the actual amount of data stored reaches the capacity of the file system, data cannot be written.  Unit: GiB.
         :param pulumi.Input[str] storage_type: The storage media type. Value: STANDARD (default): STANDARD PERFORMANCE: PERFORMANCE type.
         :param pulumi.Input[str] data_redundancy_type: Redundancy mode of the file system. Value:
                - LRS (default): Local redundancy.
                - ZRS: Same-City redundancy. When ZRS is selected, zoneId is a string consisting of multiple zones that are expected to be redundant in the same city, for example,  'zoneId1,zoneId2 '.
+        :param pulumi.Input[str] dedicated_cluster_id: Dedicated cluster id, which is used to support scenarios such as group cloud migration.
         :param pulumi.Input[str] description: The description of the file system resource. No more than 32 characters in length.
         :param pulumi.Input[int] partition_number: Save set sequence number, the user selects the content of the specified sequence number in the Save set.
         :param pulumi.Input[int] provisioned_throughput_in_mi_bps: Provisioned throughput. This parameter is required when ThroughputMode is set to Provisioned. Unit: MB/s Value range: 1~5120.
@@ -84,7 +85,7 @@ class FileSystemArgs:
     @pulumi.getter(name="protocolType")
     def protocol_type(self) -> pulumi.Input[str]:
         """
-        The protocol type.  Only HDFS(Hadoop Distributed File System) is supported.
+        The protocol type. Value: `HDFS`, `PANGU`.
         """
         return pulumi.get(self, "protocol_type")
 
@@ -133,6 +134,9 @@ class FileSystemArgs:
     @property
     @pulumi.getter(name="dedicatedClusterId")
     def dedicated_cluster_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        Dedicated cluster id, which is used to support scenarios such as group cloud migration.
+        """
         return pulumi.get(self, "dedicated_cluster_id")
 
     @dedicated_cluster_id.setter
@@ -223,6 +227,7 @@ class _FileSystemState:
                  partition_number: Optional[pulumi.Input[int]] = None,
                  protocol_type: Optional[pulumi.Input[str]] = None,
                  provisioned_throughput_in_mi_bps: Optional[pulumi.Input[int]] = None,
+                 region_id: Optional[pulumi.Input[str]] = None,
                  space_capacity: Optional[pulumi.Input[int]] = None,
                  storage_set_name: Optional[pulumi.Input[str]] = None,
                  storage_type: Optional[pulumi.Input[str]] = None,
@@ -234,11 +239,13 @@ class _FileSystemState:
         :param pulumi.Input[str] data_redundancy_type: Redundancy mode of the file system. Value:
                - LRS (default): Local redundancy.
                - ZRS: Same-City redundancy. When ZRS is selected, zoneId is a string consisting of multiple zones that are expected to be redundant in the same city, for example,  'zoneId1,zoneId2 '.
+        :param pulumi.Input[str] dedicated_cluster_id: Dedicated cluster id, which is used to support scenarios such as group cloud migration.
         :param pulumi.Input[str] description: The description of the file system resource. No more than 32 characters in length.
         :param pulumi.Input[str] file_system_name: The file system name. The naming rules are as follows: The length is 6~64 characters. Globally unique and cannot be an empty string. English letters are supported and can contain numbers, underscores (_), and dashes (-).
         :param pulumi.Input[int] partition_number: Save set sequence number, the user selects the content of the specified sequence number in the Save set.
-        :param pulumi.Input[str] protocol_type: The protocol type.  Only HDFS(Hadoop Distributed File System) is supported.
+        :param pulumi.Input[str] protocol_type: The protocol type. Value: `HDFS`, `PANGU`.
         :param pulumi.Input[int] provisioned_throughput_in_mi_bps: Provisioned throughput. This parameter is required when ThroughputMode is set to Provisioned. Unit: MB/s Value range: 1~5120.
+        :param pulumi.Input[str] region_id: (Available since v1.242.0) The region ID of the File System.
         :param pulumi.Input[int] space_capacity: File system capacity.  When the actual amount of data stored reaches the capacity of the file system, data cannot be written.  Unit: GiB.
         :param pulumi.Input[str] storage_set_name: Save set identity, used to select a user-specified save set.
         :param pulumi.Input[str] storage_type: The storage media type. Value: STANDARD (default): STANDARD PERFORMANCE: PERFORMANCE type.
@@ -261,6 +268,8 @@ class _FileSystemState:
             pulumi.set(__self__, "protocol_type", protocol_type)
         if provisioned_throughput_in_mi_bps is not None:
             pulumi.set(__self__, "provisioned_throughput_in_mi_bps", provisioned_throughput_in_mi_bps)
+        if region_id is not None:
+            pulumi.set(__self__, "region_id", region_id)
         if space_capacity is not None:
             pulumi.set(__self__, "space_capacity", space_capacity)
         if storage_set_name is not None:
@@ -301,6 +310,9 @@ class _FileSystemState:
     @property
     @pulumi.getter(name="dedicatedClusterId")
     def dedicated_cluster_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        Dedicated cluster id, which is used to support scenarios such as group cloud migration.
+        """
         return pulumi.get(self, "dedicated_cluster_id")
 
     @dedicated_cluster_id.setter
@@ -347,7 +359,7 @@ class _FileSystemState:
     @pulumi.getter(name="protocolType")
     def protocol_type(self) -> Optional[pulumi.Input[str]]:
         """
-        The protocol type.  Only HDFS(Hadoop Distributed File System) is supported.
+        The protocol type. Value: `HDFS`, `PANGU`.
         """
         return pulumi.get(self, "protocol_type")
 
@@ -367,6 +379,18 @@ class _FileSystemState:
     def provisioned_throughput_in_mi_bps(self, value: Optional[pulumi.Input[int]]):
         pulumi.set(self, "provisioned_throughput_in_mi_bps", value)
 
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        (Available since v1.242.0) The region ID of the File System.
+        """
+        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(name="spaceCapacity")
     def space_capacity(self) -> Optional[pulumi.Input[int]]:
@@ -447,9 +471,9 @@ class FileSystem(pulumi.CustomResource):
                  zone_id: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         """
-        Provides a DFS File System resource.
+        Provides a Apsara File Storage for HDFS (DFS) File System resource.
 
-        For information about DFS File System and how to use it, see [What is File System](https://www.alibabacloud.com/help/en/aibaba-cloud-storage-services/latest/apsara-file-storage-for-hdfs).
+        For information about Apsara File Storage for HDFS (DFS) File System and how to use it, see [What is File System](https://www.alibabacloud.com/help/en/aibaba-cloud-storage-services/latest/apsara-file-storage-for-hdfs).
 
         > **NOTE:** Available since v1.140.0.
 
@@ -465,11 +489,10 @@ class FileSystem(pulumi.CustomResource):
         name = config.get("name")
         if name is None:
             name = "tf-example"
-        default = alicloud.dfs.get_zones()
-        default_file_system = alicloud.dfs.FileSystem("default",
-            storage_type=default.zones[0].options[0].storage_type,
-            zone_id=default.zones[0].zone_id,
-            protocol_type="HDFS",
+        default = alicloud.dfs.FileSystem("default",
+            storage_type="PERFORMANCE",
+            zone_id="cn-hangzhou-b",
+            protocol_type="PANGU",
             description=name,
             file_system_name=name,
             throughput_mode="Provisioned",
@@ -479,7 +502,7 @@ class FileSystem(pulumi.CustomResource):
 
         ## Import
 
-        DFS File System can be imported using the id, e.g.
+        Apsara File Storage for HDFS (DFS) File System can be imported using the id, e.g.
 
         ```sh
         $ pulumi import alicloud:dfs/fileSystem:FileSystem example <id>
@@ -490,10 +513,11 @@ class FileSystem(pulumi.CustomResource):
         :param pulumi.Input[str] data_redundancy_type: Redundancy mode of the file system. Value:
                - LRS (default): Local redundancy.
                - ZRS: Same-City redundancy. When ZRS is selected, zoneId is a string consisting of multiple zones that are expected to be redundant in the same city, for example,  'zoneId1,zoneId2 '.
+        :param pulumi.Input[str] dedicated_cluster_id: Dedicated cluster id, which is used to support scenarios such as group cloud migration.
         :param pulumi.Input[str] description: The description of the file system resource. No more than 32 characters in length.
         :param pulumi.Input[str] file_system_name: The file system name. The naming rules are as follows: The length is 6~64 characters. Globally unique and cannot be an empty string. English letters are supported and can contain numbers, underscores (_), and dashes (-).
         :param pulumi.Input[int] partition_number: Save set sequence number, the user selects the content of the specified sequence number in the Save set.
-        :param pulumi.Input[str] protocol_type: The protocol type.  Only HDFS(Hadoop Distributed File System) is supported.
+        :param pulumi.Input[str] protocol_type: The protocol type. Value: `HDFS`, `PANGU`.
         :param pulumi.Input[int] provisioned_throughput_in_mi_bps: Provisioned throughput. This parameter is required when ThroughputMode is set to Provisioned. Unit: MB/s Value range: 1~5120.
         :param pulumi.Input[int] space_capacity: File system capacity.  When the actual amount of data stored reaches the capacity of the file system, data cannot be written.  Unit: GiB.
         :param pulumi.Input[str] storage_set_name: Save set identity, used to select a user-specified save set.
@@ -508,9 +532,9 @@ class FileSystem(pulumi.CustomResource):
                  args: FileSystemArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        Provides a DFS File System resource.
+        Provides a Apsara File Storage for HDFS (DFS) File System resource.
 
-        For information about DFS File System and how to use it, see [What is File System](https://www.alibabacloud.com/help/en/aibaba-cloud-storage-services/latest/apsara-file-storage-for-hdfs).
+        For information about Apsara File Storage for HDFS (DFS) File System and how to use it, see [What is File System](https://www.alibabacloud.com/help/en/aibaba-cloud-storage-services/latest/apsara-file-storage-for-hdfs).
 
         > **NOTE:** Available since v1.140.0.
 
@@ -526,11 +550,10 @@ class FileSystem(pulumi.CustomResource):
         name = config.get("name")
         if name is None:
             name = "tf-example"
-        default = alicloud.dfs.get_zones()
-        default_file_system = alicloud.dfs.FileSystem("default",
-            storage_type=default.zones[0].options[0].storage_type,
-            zone_id=default.zones[0].zone_id,
-            protocol_type="HDFS",
+        default = alicloud.dfs.FileSystem("default",
+            storage_type="PERFORMANCE",
+            zone_id="cn-hangzhou-b",
+            protocol_type="PANGU",
             description=name,
             file_system_name=name,
             throughput_mode="Provisioned",
@@ -540,7 +563,7 @@ class FileSystem(pulumi.CustomResource):
 
         ## Import
 
-        DFS File System can be imported using the id, e.g.
+        Apsara File Storage for HDFS (DFS) File System can be imported using the id, e.g.
 
         ```sh
         $ pulumi import alicloud:dfs/fileSystem:FileSystem example <id>
@@ -603,6 +626,7 @@ class FileSystem(pulumi.CustomResource):
             __props__.__dict__["throughput_mode"] = throughput_mode
             __props__.__dict__["zone_id"] = zone_id
             __props__.__dict__["create_time"] = None
+            __props__.__dict__["region_id"] = None
         super(FileSystem, __self__).__init__(
             'alicloud:dfs/fileSystem:FileSystem',
             resource_name,
@@ -621,6 +645,7 @@ class FileSystem(pulumi.CustomResource):
             partition_number: Optional[pulumi.Input[int]] = None,
             protocol_type: Optional[pulumi.Input[str]] = None,
             provisioned_throughput_in_mi_bps: Optional[pulumi.Input[int]] = None,
+            region_id: Optional[pulumi.Input[str]] = None,
             space_capacity: Optional[pulumi.Input[int]] = None,
             storage_set_name: Optional[pulumi.Input[str]] = None,
             storage_type: Optional[pulumi.Input[str]] = None,
@@ -637,11 +662,13 @@ class FileSystem(pulumi.CustomResource):
         :param pulumi.Input[str] data_redundancy_type: Redundancy mode of the file system. Value:
                - LRS (default): Local redundancy.
                - ZRS: Same-City redundancy. When ZRS is selected, zoneId is a string consisting of multiple zones that are expected to be redundant in the same city, for example,  'zoneId1,zoneId2 '.
+        :param pulumi.Input[str] dedicated_cluster_id: Dedicated cluster id, which is used to support scenarios such as group cloud migration.
         :param pulumi.Input[str] description: The description of the file system resource. No more than 32 characters in length.
         :param pulumi.Input[str] file_system_name: The file system name. The naming rules are as follows: The length is 6~64 characters. Globally unique and cannot be an empty string. English letters are supported and can contain numbers, underscores (_), and dashes (-).
         :param pulumi.Input[int] partition_number: Save set sequence number, the user selects the content of the specified sequence number in the Save set.
-        :param pulumi.Input[str] protocol_type: The protocol type.  Only HDFS(Hadoop Distributed File System) is supported.
+        :param pulumi.Input[str] protocol_type: The protocol type. Value: `HDFS`, `PANGU`.
         :param pulumi.Input[int] provisioned_throughput_in_mi_bps: Provisioned throughput. This parameter is required when ThroughputMode is set to Provisioned. Unit: MB/s Value range: 1~5120.
+        :param pulumi.Input[str] region_id: (Available since v1.242.0) The region ID of the File System.
         :param pulumi.Input[int] space_capacity: File system capacity.  When the actual amount of data stored reaches the capacity of the file system, data cannot be written.  Unit: GiB.
         :param pulumi.Input[str] storage_set_name: Save set identity, used to select a user-specified save set.
         :param pulumi.Input[str] storage_type: The storage media type. Value: STANDARD (default): STANDARD PERFORMANCE: PERFORMANCE type.
@@ -660,6 +687,7 @@ class FileSystem(pulumi.CustomResource):
         __props__.__dict__["partition_number"] = partition_number
         __props__.__dict__["protocol_type"] = protocol_type
         __props__.__dict__["provisioned_throughput_in_mi_bps"] = provisioned_throughput_in_mi_bps
+        __props__.__dict__["region_id"] = region_id
         __props__.__dict__["space_capacity"] = space_capacity
         __props__.__dict__["storage_set_name"] = storage_set_name
         __props__.__dict__["storage_type"] = storage_type
@@ -688,6 +716,9 @@ class FileSystem(pulumi.CustomResource):
     @property
     @pulumi.getter(name="dedicatedClusterId")
     def dedicated_cluster_id(self) -> pulumi.Output[Optional[str]]:
+        """
+        Dedicated cluster id, which is used to support scenarios such as group cloud migration.
+        """
         return pulumi.get(self, "dedicated_cluster_id")
 
     @property
@@ -718,7 +749,7 @@ class FileSystem(pulumi.CustomResource):
     @pulumi.getter(name="protocolType")
     def protocol_type(self) -> pulumi.Output[str]:
         """
-        The protocol type.  Only HDFS(Hadoop Distributed File System) is supported.
+        The protocol type. Value: `HDFS`, `PANGU`.
         """
         return pulumi.get(self, "protocol_type")
 
@@ -730,6 +761,14 @@ class FileSystem(pulumi.CustomResource):
         """
         return pulumi.get(self, "provisioned_throughput_in_mi_bps")
 
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> pulumi.Output[str]:
+        """
+        (Available since v1.242.0) The region ID of the File System.
+        """
+        return pulumi.get(self, "region_id")
+
     @property
     @pulumi.getter(name="spaceCapacity")
     def space_capacity(self) -> pulumi.Output[int]:

pulumi_alicloud/dfs/mount_point.py

@@ -157,6 +157,7 @@ class _MountPointState:
                  file_system_id: Optional[pulumi.Input[str]] = None,
                  mount_point_id: Optional[pulumi.Input[str]] = None,
                  network_type: Optional[pulumi.Input[str]] = None,
+                 region_id: Optional[pulumi.Input[str]] = None,
                  status: Optional[pulumi.Input[str]] = None,
                  vpc_id: Optional[pulumi.Input[str]] = None,
                  vswitch_id: Optional[pulumi.Input[str]] = None):
@@ -169,6 +170,7 @@ class _MountPointState:
         :param pulumi.Input[str] file_system_id: Unique file system identifier, used to retrieve specified file system resources.
         :param pulumi.Input[str] mount_point_id: The unique identifier of the Mount point, which is used to retrieve the specified mount point resources.
         :param pulumi.Input[str] network_type: The network type of the Mount point.  Only VPC (VPC) is supported.
+        :param pulumi.Input[str] region_id: (Available since v1.242.0) The region ID of the Mount Point.
         :param pulumi.Input[str] status: Mount point status. Value: Inactive: Disable mount points Active: Activate the mount point.
         :param pulumi.Input[str] vpc_id: The ID of the VPC. Specifies the VPC environment to which the mount point belongs.
         :param pulumi.Input[str] vswitch_id: VSwitch ID, which specifies the VSwitch resource used to create the mount point.
@@ -187,6 +189,8 @@ class _MountPointState:
             pulumi.set(__self__, "mount_point_id", mount_point_id)
         if network_type is not None:
             pulumi.set(__self__, "network_type", network_type)
+        if region_id is not None:
+            pulumi.set(__self__, "region_id", region_id)
         if status is not None:
             pulumi.set(__self__, "status", status)
         if vpc_id is not None:
@@ -278,6 +282,18 @@ class _MountPointState:
     def network_type(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "network_type", value)
 
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        (Available since v1.242.0) The region ID of the Mount Point.
+        """
+        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 status(self) -> Optional[pulumi.Input[str]]:
@@ -330,9 +346,9 @@ class MountPoint(pulumi.CustomResource):
                  vswitch_id: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         """
-        Provides a DFS Mount Point resource.
+        Provides a Apsara File Storage for HDFS (DFS) Mount Point resource.
 
-        For information about DFS Mount Point and how to use it, see [What is Mount Point](https://www.alibabacloud.com/help/en/aibaba-cloud-storage-services/latest/apsara-file-storage-for-hdfs).
+        For information about Apsara File Storage for HDFS (DFS) Mount Point and how to use it, see [What is Mount Point](https://www.alibabacloud.com/help/en/aibaba-cloud-storage-services/latest/apsara-file-storage-for-hdfs).
 
         > **NOTE:** Available since v1.140.0.
 
@@ -348,19 +364,18 @@ class MountPoint(pulumi.CustomResource):
         name = config.get("name")
         if name is None:
             name = "tf-example"
-        default = alicloud.dfs.get_zones()
-        default_network = alicloud.vpc.Network("default",
+        default = alicloud.vpc.Network("default",
             vpc_name=name,
             cidr_block="10.4.0.0/16")
         default_switch = alicloud.vpc.Switch("default",
             vswitch_name=name,
             cidr_block="10.4.0.0/24",
-            vpc_id=default_network.id,
-            zone_id=default.zones[0].zone_id)
+            vpc_id=default.id,
+            zone_id="cn-hangzhou-e")
         default_file_system = alicloud.dfs.FileSystem("default",
-            storage_type=default.zones[0].options[0].storage_type,
-            zone_id=default.zones[0].zone_id,
-            protocol_type="HDFS",
+            storage_type="STANDARD",
+            zone_id="cn-hangzhou-e",
+            protocol_type="PANGU",
             description=name,
             file_system_name=name,
             throughput_mode="Provisioned",
@@ -372,7 +387,7 @@ class MountPoint(pulumi.CustomResource):
             network_type="VPC")
         default_mount_point = alicloud.dfs.MountPoint("default",
             description=name,
-            vpc_id=default_network.id,
+            vpc_id=default.id,
             file_system_id=default_file_system.id,
             access_group_id=default_access_group.id,
             network_type="VPC",
@@ -381,7 +396,7 @@ class MountPoint(pulumi.CustomResource):
 
         ## Import
 
-        DFS Mount Point can be imported using the id, e.g.
+        Apsara File Storage for HDFS (DFS) Mount Point can be imported using the id, e.g.
 
         ```sh
         $ pulumi import alicloud:dfs/mountPoint:MountPoint example <file_system_id>:<mount_point_id>
@@ -405,9 +420,9 @@ class MountPoint(pulumi.CustomResource):
                  args: MountPointArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        Provides a DFS Mount Point resource.
+        Provides a Apsara File Storage for HDFS (DFS) Mount Point resource.
 
-        For information about DFS Mount Point and how to use it, see [What is Mount Point](https://www.alibabacloud.com/help/en/aibaba-cloud-storage-services/latest/apsara-file-storage-for-hdfs).
+        For information about Apsara File Storage for HDFS (DFS) Mount Point and how to use it, see [What is Mount Point](https://www.alibabacloud.com/help/en/aibaba-cloud-storage-services/latest/apsara-file-storage-for-hdfs).
 
         > **NOTE:** Available since v1.140.0.
 
@@ -423,19 +438,18 @@ class MountPoint(pulumi.CustomResource):
         name = config.get("name")
         if name is None:
             name = "tf-example"
-        default = alicloud.dfs.get_zones()
-        default_network = alicloud.vpc.Network("default",
+        default = alicloud.vpc.Network("default",
             vpc_name=name,
             cidr_block="10.4.0.0/16")
         default_switch = alicloud.vpc.Switch("default",
             vswitch_name=name,
             cidr_block="10.4.0.0/24",
-            vpc_id=default_network.id,
-            zone_id=default.zones[0].zone_id)
+            vpc_id=default.id,
+            zone_id="cn-hangzhou-e")
         default_file_system = alicloud.dfs.FileSystem("default",
-            storage_type=default.zones[0].options[0].storage_type,
-            zone_id=default.zones[0].zone_id,
-            protocol_type="HDFS",
+            storage_type="STANDARD",
+            zone_id="cn-hangzhou-e",
+            protocol_type="PANGU",
             description=name,
             file_system_name=name,
             throughput_mode="Provisioned",
@@ -447,7 +461,7 @@ class MountPoint(pulumi.CustomResource):
             network_type="VPC")
         default_mount_point = alicloud.dfs.MountPoint("default",
             description=name,
-            vpc_id=default_network.id,
+            vpc_id=default.id,
             file_system_id=default_file_system.id,
             access_group_id=default_access_group.id,
             network_type="VPC",
@@ -456,7 +470,7 @@ class MountPoint(pulumi.CustomResource):
 
         ## Import
 
-        DFS Mount Point can be imported using the id, e.g.
+        Apsara File Storage for HDFS (DFS) Mount Point can be imported using the id, e.g.
 
         ```sh
         $ pulumi import alicloud:dfs/mountPoint:MountPoint example <file_system_id>:<mount_point_id>
@@ -514,6 +528,7 @@ class MountPoint(pulumi.CustomResource):
             __props__.__dict__["vswitch_id"] = vswitch_id
             __props__.__dict__["create_time"] = None
             __props__.__dict__["mount_point_id"] = None
+            __props__.__dict__["region_id"] = None
         super(MountPoint, __self__).__init__(
             'alicloud:dfs/mountPoint:MountPoint',
             resource_name,
@@ -531,6 +546,7 @@ class MountPoint(pulumi.CustomResource):
             file_system_id: Optional[pulumi.Input[str]] = None,
             mount_point_id: Optional[pulumi.Input[str]] = None,
             network_type: Optional[pulumi.Input[str]] = None,
+            region_id: Optional[pulumi.Input[str]] = None,
             status: Optional[pulumi.Input[str]] = None,
             vpc_id: Optional[pulumi.Input[str]] = None,
             vswitch_id: Optional[pulumi.Input[str]] = None) -> 'MountPoint':
@@ -548,6 +564,7 @@ class MountPoint(pulumi.CustomResource):
         :param pulumi.Input[str] file_system_id: Unique file system identifier, used to retrieve specified file system resources.
         :param pulumi.Input[str] mount_point_id: The unique identifier of the Mount point, which is used to retrieve the specified mount point resources.
         :param pulumi.Input[str] network_type: The network type of the Mount point.  Only VPC (VPC) is supported.
+        :param pulumi.Input[str] region_id: (Available since v1.242.0) The region ID of the Mount Point.
         :param pulumi.Input[str] status: Mount point status. Value: Inactive: Disable mount points Active: Activate the mount point.
         :param pulumi.Input[str] vpc_id: The ID of the VPC. Specifies the VPC environment to which the mount point belongs.
         :param pulumi.Input[str] vswitch_id: VSwitch ID, which specifies the VSwitch resource used to create the mount point.
@@ -563,6 +580,7 @@ class MountPoint(pulumi.CustomResource):
         __props__.__dict__["file_system_id"] = file_system_id
         __props__.__dict__["mount_point_id"] = mount_point_id
         __props__.__dict__["network_type"] = network_type
+        __props__.__dict__["region_id"] = region_id
         __props__.__dict__["status"] = status
         __props__.__dict__["vpc_id"] = vpc_id
         __props__.__dict__["vswitch_id"] = vswitch_id
@@ -624,6 +642,14 @@ class MountPoint(pulumi.CustomResource):
         """
         return pulumi.get(self, "network_type")
 
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> pulumi.Output[str]:
+        """
+        (Available since v1.242.0) The region ID of the Mount Point.
+        """
+        return pulumi.get(self, "region_id")
+
     @property
     @pulumi.getter
     def status(self) -> pulumi.Output[str]:

pulumi_alicloud/dns/get_alidns_domains.py

@@ -190,6 +190,9 @@ class GetAlidnsDomainsResult:
     @property
     @pulumi.getter
     def tags(self) -> Optional[Mapping[str, str]]:
+        """
+        Tags of the domain.
+        """
         return pulumi.get(self, "tags")
 
     @property
@@ -246,7 +249,7 @@ def get_alidns_domains(ali_domain: Optional[bool] = None,
     """
     This data source provides a list of Alidns Domains in an Alibaba Cloud account according to the specified filters.
 
-    > **NOTE:**  Available in 1.95.0+.
+    > **NOTE:** Available since v1.95.0.
 
     ## Example Usage
 
@@ -262,6 +265,7 @@ def get_alidns_domains(ali_domain: Optional[bool] = None,
 
     :param bool ali_domain: Specifies whether the domain is from Alibaba Cloud or not.
     :param str domain_name_regex: A regex string to filter results by the domain name.
+    :param bool enable_details: Default to `false`. Set it to `true` can output more details about resource attributes.
     :param str group_id: Domain group ID, if not filled, the default is all groups.
     :param str group_name_regex: A regex string to filter results by the group name.
     :param Sequence[str] ids: A list of domain IDs.
@@ -332,7 +336,7 @@ def get_alidns_domains_output(ali_domain: Optional[pulumi.Input[Optional[bool]]]
     """
     This data source provides a list of Alidns Domains in an Alibaba Cloud account according to the specified filters.
 
-    > **NOTE:**  Available in 1.95.0+.
+    > **NOTE:** Available since v1.95.0.
 
     ## Example Usage
 
@@ -348,6 +352,7 @@ def get_alidns_domains_output(ali_domain: Optional[pulumi.Input[Optional[bool]]]
 
     :param bool ali_domain: Specifies whether the domain is from Alibaba Cloud or not.
     :param str domain_name_regex: A regex string to filter results by the domain name.
+    :param bool enable_details: Default to `false`. Set it to `true` can output more details about resource attributes.
     :param str group_id: Domain group ID, if not filled, the default is all groups.
     :param str group_name_regex: A regex string to filter results by the group name.
     :param Sequence[str] ids: A list of domain IDs.