pulumi-alicloud 3.74.0a1737782319__py3-none-any.whl → 3.75.0__py3-none-any.whl

pulumi_alicloud/vpc/ipv4_cidr_block.py

@@ -19,77 +19,136 @@ __all__ = ['Ipv4CidrBlockArgs', 'Ipv4CidrBlock']
 @pulumi.input_type
 class Ipv4CidrBlockArgs:
     def __init__(__self__, *,
-                 secondary_cidr_block: pulumi.Input[str],
-                 vpc_id: pulumi.Input[str]):
+                 vpc_id: pulumi.Input[str],
+                 ipv4_ipam_pool_id: Optional[pulumi.Input[str]] = None,
+                 secondary_cidr_block: Optional[pulumi.Input[str]] = None,
+                 secondary_cidr_mask: Optional[pulumi.Input[int]] = None):
         """
         The set of arguments for constructing a Ipv4CidrBlock resource.
-        :param pulumi.Input[str] secondary_cidr_block: The IPv4 CIDR block. Take note of the following requirements:
-               * You can specify one of the following standard IPv4 CIDR blocks or their subnets as the secondary IPv4 CIDR block: 192.168.0.0/16, 172.16.0.0/12, and 10.0.0.0/8.
-               * You can also use a custom CIDR block other than 100.64.0.0/10, 224.0.0.0/4, 127.0.0.0/8, 169.254.0.0/16, or their subnets as the secondary IPv4 CIDR block of the VPC.
-               * The CIDR block cannot start with 0. The subnet mask must be 8 to 28 bits in length.
-               * The secondary CIDR block cannot overlap with the primary CIDR block or an existing secondary CIDR block.
         :param pulumi.Input[str] vpc_id: The ID of the VPC.
+        :param pulumi.Input[str] ipv4_ipam_pool_id: The ID of the IP Address Manager (IPAM) pool that contains IPv4 addresses.
+        :param pulumi.Input[str] secondary_cidr_block: Additional network segment information.
+        :param pulumi.Input[int] secondary_cidr_mask: Add an additional CIDR block from the IPAM address pool to the VPC by entering a mask.
+               
+               > **NOTE:**  Specify the IPAM address pool to add an additional CIDR block to the VPC. Enter at least one of the SecondaryCidrBlock or SecondaryCidrMask parameters.
         """
-        pulumi.set(__self__, "secondary_cidr_block", secondary_cidr_block)
         pulumi.set(__self__, "vpc_id", vpc_id)
+        if ipv4_ipam_pool_id is not None:
+            pulumi.set(__self__, "ipv4_ipam_pool_id", ipv4_ipam_pool_id)
+        if secondary_cidr_block is not None:
+            pulumi.set(__self__, "secondary_cidr_block", secondary_cidr_block)
+        if secondary_cidr_mask is not None:
+            pulumi.set(__self__, "secondary_cidr_mask", secondary_cidr_mask)
+
+    @property
+    @pulumi.getter(name="vpcId")
+    def vpc_id(self) -> pulumi.Input[str]:
+        """
+        The ID of the VPC.
+        """
+        return pulumi.get(self, "vpc_id")
+
+    @vpc_id.setter
+    def vpc_id(self, value: pulumi.Input[str]):
+        pulumi.set(self, "vpc_id", value)
+
+    @property
+    @pulumi.getter(name="ipv4IpamPoolId")
+    def ipv4_ipam_pool_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        The ID of the IP Address Manager (IPAM) pool that contains IPv4 addresses.
+        """
+        return pulumi.get(self, "ipv4_ipam_pool_id")
+
+    @ipv4_ipam_pool_id.setter
+    def ipv4_ipam_pool_id(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "ipv4_ipam_pool_id", value)
 
     @property
     @pulumi.getter(name="secondaryCidrBlock")
-    def secondary_cidr_block(self) -> pulumi.Input[str]:
+    def secondary_cidr_block(self) -> Optional[pulumi.Input[str]]:
         """
-        The IPv4 CIDR block. Take note of the following requirements:
-        * You can specify one of the following standard IPv4 CIDR blocks or their subnets as the secondary IPv4 CIDR block: 192.168.0.0/16, 172.16.0.0/12, and 10.0.0.0/8.
-        * You can also use a custom CIDR block other than 100.64.0.0/10, 224.0.0.0/4, 127.0.0.0/8, 169.254.0.0/16, or their subnets as the secondary IPv4 CIDR block of the VPC.
-        * The CIDR block cannot start with 0. The subnet mask must be 8 to 28 bits in length.
-        * The secondary CIDR block cannot overlap with the primary CIDR block or an existing secondary CIDR block.
+        Additional network segment information.
         """
         return pulumi.get(self, "secondary_cidr_block")
 
     @secondary_cidr_block.setter
-    def secondary_cidr_block(self, value: pulumi.Input[str]):
+    def secondary_cidr_block(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "secondary_cidr_block", value)
 
     @property
-    @pulumi.getter(name="vpcId")
-    def vpc_id(self) -> pulumi.Input[str]:
+    @pulumi.getter(name="secondaryCidrMask")
+    def secondary_cidr_mask(self) -> Optional[pulumi.Input[int]]:
         """
-        The ID of the VPC.
+        Add an additional CIDR block from the IPAM address pool to the VPC by entering a mask.
+
+        > **NOTE:**  Specify the IPAM address pool to add an additional CIDR block to the VPC. Enter at least one of the SecondaryCidrBlock or SecondaryCidrMask parameters.
         """
-        return pulumi.get(self, "vpc_id")
+        return pulumi.get(self, "secondary_cidr_mask")
 
-    @vpc_id.setter
-    def vpc_id(self, value: pulumi.Input[str]):
-        pulumi.set(self, "vpc_id", value)
+    @secondary_cidr_mask.setter
+    def secondary_cidr_mask(self, value: Optional[pulumi.Input[int]]):
+        pulumi.set(self, "secondary_cidr_mask", value)
 
 
 @pulumi.input_type
 class _Ipv4CidrBlockState:
     def __init__(__self__, *,
+                 ipv4_ipam_pool_id: Optional[pulumi.Input[str]] = None,
+                 region_id: Optional[pulumi.Input[str]] = None,
                  secondary_cidr_block: Optional[pulumi.Input[str]] = None,
+                 secondary_cidr_mask: Optional[pulumi.Input[int]] = None,
                  vpc_id: Optional[pulumi.Input[str]] = None):
         """
         Input properties used for looking up and filtering Ipv4CidrBlock resources.
-        :param pulumi.Input[str] secondary_cidr_block: The IPv4 CIDR block. Take note of the following requirements:
-               * You can specify one of the following standard IPv4 CIDR blocks or their subnets as the secondary IPv4 CIDR block: 192.168.0.0/16, 172.16.0.0/12, and 10.0.0.0/8.
-               * You can also use a custom CIDR block other than 100.64.0.0/10, 224.0.0.0/4, 127.0.0.0/8, 169.254.0.0/16, or their subnets as the secondary IPv4 CIDR block of the VPC.
-               * The CIDR block cannot start with 0. The subnet mask must be 8 to 28 bits in length.
-               * The secondary CIDR block cannot overlap with the primary CIDR block or an existing secondary CIDR block.
+        :param pulumi.Input[str] ipv4_ipam_pool_id: The ID of the IP Address Manager (IPAM) pool that contains IPv4 addresses.
+        :param pulumi.Input[str] region_id: The ID of the region where the VPC resides.
+        :param pulumi.Input[str] secondary_cidr_block: Additional network segment information.
+        :param pulumi.Input[int] secondary_cidr_mask: Add an additional CIDR block from the IPAM address pool to the VPC by entering a mask.
+               
+               > **NOTE:**  Specify the IPAM address pool to add an additional CIDR block to the VPC. Enter at least one of the SecondaryCidrBlock or SecondaryCidrMask parameters.
         :param pulumi.Input[str] vpc_id: The ID of the VPC.
         """
+        if ipv4_ipam_pool_id is not None:
+            pulumi.set(__self__, "ipv4_ipam_pool_id", ipv4_ipam_pool_id)
+        if region_id is not None:
+            pulumi.set(__self__, "region_id", region_id)
         if secondary_cidr_block is not None:
             pulumi.set(__self__, "secondary_cidr_block", secondary_cidr_block)
+        if secondary_cidr_mask is not None:
+            pulumi.set(__self__, "secondary_cidr_mask", secondary_cidr_mask)
         if vpc_id is not None:
             pulumi.set(__self__, "vpc_id", vpc_id)
 
+    @property
+    @pulumi.getter(name="ipv4IpamPoolId")
+    def ipv4_ipam_pool_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        The ID of the IP Address Manager (IPAM) pool that contains IPv4 addresses.
+        """
+        return pulumi.get(self, "ipv4_ipam_pool_id")
+
+    @ipv4_ipam_pool_id.setter
+    def ipv4_ipam_pool_id(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "ipv4_ipam_pool_id", value)
+
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        The ID of the region where the VPC 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(name="secondaryCidrBlock")
     def secondary_cidr_block(self) -> Optional[pulumi.Input[str]]:
         """
-        The IPv4 CIDR block. Take note of the following requirements:
-        * You can specify one of the following standard IPv4 CIDR blocks or their subnets as the secondary IPv4 CIDR block: 192.168.0.0/16, 172.16.0.0/12, and 10.0.0.0/8.
-        * You can also use a custom CIDR block other than 100.64.0.0/10, 224.0.0.0/4, 127.0.0.0/8, 169.254.0.0/16, or their subnets as the secondary IPv4 CIDR block of the VPC.
-        * The CIDR block cannot start with 0. The subnet mask must be 8 to 28 bits in length.
-        * The secondary CIDR block cannot overlap with the primary CIDR block or an existing secondary CIDR block.
+        Additional network segment information.
         """
         return pulumi.get(self, "secondary_cidr_block")
 
@@ -97,6 +156,20 @@ class _Ipv4CidrBlockState:
     def secondary_cidr_block(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "secondary_cidr_block", value)
 
+    @property
+    @pulumi.getter(name="secondaryCidrMask")
+    def secondary_cidr_mask(self) -> Optional[pulumi.Input[int]]:
+        """
+        Add an additional CIDR block from the IPAM address pool to the VPC by entering a mask.
+
+        > **NOTE:**  Specify the IPAM address pool to add an additional CIDR block to the VPC. Enter at least one of the SecondaryCidrBlock or SecondaryCidrMask parameters.
+        """
+        return pulumi.get(self, "secondary_cidr_mask")
+
+    @secondary_cidr_mask.setter
+    def secondary_cidr_mask(self, value: Optional[pulumi.Input[int]]):
+        pulumi.set(self, "secondary_cidr_mask", value)
+
     @property
     @pulumi.getter(name="vpcId")
     def vpc_id(self) -> Optional[pulumi.Input[str]]:
@@ -115,11 +188,15 @@ class Ipv4CidrBlock(pulumi.CustomResource):
     def __init__(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
+                 ipv4_ipam_pool_id: Optional[pulumi.Input[str]] = None,
                  secondary_cidr_block: Optional[pulumi.Input[str]] = None,
+                 secondary_cidr_mask: Optional[pulumi.Input[int]] = None,
                  vpc_id: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         """
-        Provides a VPC Ipv4 Cidr Block resource. VPC IPv4 additional network segment.
+        Provides a VPC Ipv4 Cidr Block resource.
+
+        VPC IPv4 additional network segment.
 
         For information about VPC Ipv4 Cidr Block and how to use it, see [What is Ipv4 Cidr Block](https://www.alibabacloud.com/help/en/virtual-private-cloud/latest/associatevpccidrblock).
 
@@ -153,11 +230,11 @@ class Ipv4CidrBlock(pulumi.CustomResource):
 
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[str] secondary_cidr_block: The IPv4 CIDR block. Take note of the following requirements:
-               * You can specify one of the following standard IPv4 CIDR blocks or their subnets as the secondary IPv4 CIDR block: 192.168.0.0/16, 172.16.0.0/12, and 10.0.0.0/8.
-               * You can also use a custom CIDR block other than 100.64.0.0/10, 224.0.0.0/4, 127.0.0.0/8, 169.254.0.0/16, or their subnets as the secondary IPv4 CIDR block of the VPC.
-               * The CIDR block cannot start with 0. The subnet mask must be 8 to 28 bits in length.
-               * The secondary CIDR block cannot overlap with the primary CIDR block or an existing secondary CIDR block.
+        :param pulumi.Input[str] ipv4_ipam_pool_id: The ID of the IP Address Manager (IPAM) pool that contains IPv4 addresses.
+        :param pulumi.Input[str] secondary_cidr_block: Additional network segment information.
+        :param pulumi.Input[int] secondary_cidr_mask: Add an additional CIDR block from the IPAM address pool to the VPC by entering a mask.
+               
+               > **NOTE:**  Specify the IPAM address pool to add an additional CIDR block to the VPC. Enter at least one of the SecondaryCidrBlock or SecondaryCidrMask parameters.
         :param pulumi.Input[str] vpc_id: The ID of the VPC.
         """
         ...
@@ -167,7 +244,9 @@ class Ipv4CidrBlock(pulumi.CustomResource):
                  args: Ipv4CidrBlockArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        Provides a VPC Ipv4 Cidr Block resource. VPC IPv4 additional network segment.
+        Provides a VPC Ipv4 Cidr Block resource.
+
+        VPC IPv4 additional network segment.
 
         For information about VPC Ipv4 Cidr Block and how to use it, see [What is Ipv4 Cidr Block](https://www.alibabacloud.com/help/en/virtual-private-cloud/latest/associatevpccidrblock).
 
@@ -214,7 +293,9 @@ class Ipv4CidrBlock(pulumi.CustomResource):
     def _internal_init(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
+                 ipv4_ipam_pool_id: Optional[pulumi.Input[str]] = None,
                  secondary_cidr_block: Optional[pulumi.Input[str]] = None,
+                 secondary_cidr_mask: Optional[pulumi.Input[int]] = None,
                  vpc_id: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
@@ -225,12 +306,13 @@ class Ipv4CidrBlock(pulumi.CustomResource):
                 raise TypeError('__props__ is only valid when passed in combination with a valid opts.id to get an existing resource')
             __props__ = Ipv4CidrBlockArgs.__new__(Ipv4CidrBlockArgs)
 
-            if secondary_cidr_block is None and not opts.urn:
-                raise TypeError("Missing required property 'secondary_cidr_block'")
+            __props__.__dict__["ipv4_ipam_pool_id"] = ipv4_ipam_pool_id
             __props__.__dict__["secondary_cidr_block"] = secondary_cidr_block
+            __props__.__dict__["secondary_cidr_mask"] = secondary_cidr_mask
             if vpc_id is None and not opts.urn:
                 raise TypeError("Missing required property 'vpc_id'")
             __props__.__dict__["vpc_id"] = vpc_id
+            __props__.__dict__["region_id"] = None
         super(Ipv4CidrBlock, __self__).__init__(
             'alicloud:vpc/ipv4CidrBlock:Ipv4CidrBlock',
             resource_name,
@@ -241,7 +323,10 @@ class Ipv4CidrBlock(pulumi.CustomResource):
     def get(resource_name: str,
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
+            ipv4_ipam_pool_id: Optional[pulumi.Input[str]] = None,
+            region_id: Optional[pulumi.Input[str]] = None,
             secondary_cidr_block: Optional[pulumi.Input[str]] = None,
+            secondary_cidr_mask: Optional[pulumi.Input[int]] = None,
             vpc_id: Optional[pulumi.Input[str]] = None) -> 'Ipv4CidrBlock':
         """
         Get an existing Ipv4CidrBlock resource's state with the given name, id, and optional extra
@@ -250,33 +335,59 @@ class Ipv4CidrBlock(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] secondary_cidr_block: The IPv4 CIDR block. Take note of the following requirements:
-               * You can specify one of the following standard IPv4 CIDR blocks or their subnets as the secondary IPv4 CIDR block: 192.168.0.0/16, 172.16.0.0/12, and 10.0.0.0/8.
-               * You can also use a custom CIDR block other than 100.64.0.0/10, 224.0.0.0/4, 127.0.0.0/8, 169.254.0.0/16, or their subnets as the secondary IPv4 CIDR block of the VPC.
-               * The CIDR block cannot start with 0. The subnet mask must be 8 to 28 bits in length.
-               * The secondary CIDR block cannot overlap with the primary CIDR block or an existing secondary CIDR block.
+        :param pulumi.Input[str] ipv4_ipam_pool_id: The ID of the IP Address Manager (IPAM) pool that contains IPv4 addresses.
+        :param pulumi.Input[str] region_id: The ID of the region where the VPC resides.
+        :param pulumi.Input[str] secondary_cidr_block: Additional network segment information.
+        :param pulumi.Input[int] secondary_cidr_mask: Add an additional CIDR block from the IPAM address pool to the VPC by entering a mask.
+               
+               > **NOTE:**  Specify the IPAM address pool to add an additional CIDR block to the VPC. Enter at least one of the SecondaryCidrBlock or SecondaryCidrMask parameters.
         :param pulumi.Input[str] vpc_id: The ID of the VPC.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
 
         __props__ = _Ipv4CidrBlockState.__new__(_Ipv4CidrBlockState)
 
+        __props__.__dict__["ipv4_ipam_pool_id"] = ipv4_ipam_pool_id
+        __props__.__dict__["region_id"] = region_id
         __props__.__dict__["secondary_cidr_block"] = secondary_cidr_block
+        __props__.__dict__["secondary_cidr_mask"] = secondary_cidr_mask
         __props__.__dict__["vpc_id"] = vpc_id
         return Ipv4CidrBlock(resource_name, opts=opts, __props__=__props__)
 
+    @property
+    @pulumi.getter(name="ipv4IpamPoolId")
+    def ipv4_ipam_pool_id(self) -> pulumi.Output[Optional[str]]:
+        """
+        The ID of the IP Address Manager (IPAM) pool that contains IPv4 addresses.
+        """
+        return pulumi.get(self, "ipv4_ipam_pool_id")
+
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> pulumi.Output[str]:
+        """
+        The ID of the region where the VPC resides.
+        """
+        return pulumi.get(self, "region_id")
+
     @property
     @pulumi.getter(name="secondaryCidrBlock")
     def secondary_cidr_block(self) -> pulumi.Output[str]:
         """
-        The IPv4 CIDR block. Take note of the following requirements:
-        * You can specify one of the following standard IPv4 CIDR blocks or their subnets as the secondary IPv4 CIDR block: 192.168.0.0/16, 172.16.0.0/12, and 10.0.0.0/8.
-        * You can also use a custom CIDR block other than 100.64.0.0/10, 224.0.0.0/4, 127.0.0.0/8, 169.254.0.0/16, or their subnets as the secondary IPv4 CIDR block of the VPC.
-        * The CIDR block cannot start with 0. The subnet mask must be 8 to 28 bits in length.
-        * The secondary CIDR block cannot overlap with the primary CIDR block or an existing secondary CIDR block.
+        Additional network segment information.
         """
         return pulumi.get(self, "secondary_cidr_block")
 
+    @property
+    @pulumi.getter(name="secondaryCidrMask")
+    def secondary_cidr_mask(self) -> pulumi.Output[Optional[int]]:
+        """
+        Add an additional CIDR block from the IPAM address pool to the VPC by entering a mask.
+
+        > **NOTE:**  Specify the IPAM address pool to add an additional CIDR block to the VPC. Enter at least one of the SecondaryCidrBlock or SecondaryCidrMask parameters.
+        """
+        return pulumi.get(self, "secondary_cidr_mask")
+
     @property
     @pulumi.getter(name="vpcId")
     def vpc_id(self) -> pulumi.Output[str]:

pulumi_alicloud/vpc/nat_gateway.py

@@ -793,6 +793,10 @@ class NatGateway(pulumi.CustomResource):
         > **NOTE:** From version 1.7.1, this resource has deprecated bandwidth packages.
         But, in order to manage stock bandwidth packages, version 1.13.0 re-support configuring 'bandwidth_packages'.
 
+        > **NOTE:** When you create an enhanced NAT gateway for the first time, the system automatically creates the service-linked role AliyunServiceRoleForNatgw. Then, the system attaches the permission policy AliyunServiceRolePolicyForNatgw to the role. This allows the NAT gateway to access other resources on Alibaba Cloud. For more information, see Service-linked roles.
+
+        > **NOTE:** After you create an enhanced Internet NAT gateway, a route entry is automatically added to the route table of the VPC. The destination CIDR block of the route entry is 0.0.0.0/0 and the next hop is the NAT gateway. This ensures that traffic is routed to the NAT gateway.
+
         > **NOTE:** Available since v1.37.0.
 
         ## Example Usage
@@ -905,6 +909,10 @@ class NatGateway(pulumi.CustomResource):
         > **NOTE:** From version 1.7.1, this resource has deprecated bandwidth packages.
         But, in order to manage stock bandwidth packages, version 1.13.0 re-support configuring 'bandwidth_packages'.
 
+        > **NOTE:** When you create an enhanced NAT gateway for the first time, the system automatically creates the service-linked role AliyunServiceRoleForNatgw. Then, the system attaches the permission policy AliyunServiceRolePolicyForNatgw to the role. This allows the NAT gateway to access other resources on Alibaba Cloud. For more information, see Service-linked roles.
+
+        > **NOTE:** After you create an enhanced Internet NAT gateway, a route entry is automatically added to the route table of the VPC. The destination CIDR block of the route entry is 0.0.0.0/0 and the next hop is the NAT gateway. This ensures that traffic is routed to the NAT gateway.
+
         > **NOTE:** Available since v1.37.0.
 
         ## Example Usage

pulumi_alicloud/vpc/outputs.py

@@ -1956,17 +1956,27 @@ class GetEnhancedNatAvailableZonesZoneResult(dict):
     def __init__(__self__, *,
                  local_name: str,
                  zone_id: str):
+        """
+        :param str local_name: Name of the available zone.
+        :param str zone_id: The ID of the available zone.
+        """
         pulumi.set(__self__, "local_name", local_name)
         pulumi.set(__self__, "zone_id", zone_id)
 
     @property
     @pulumi.getter(name="localName")
     def local_name(self) -> str:
+        """
+        Name of the available zone.
+        """
         return pulumi.get(self, "local_name")
 
     @property
     @pulumi.getter(name="zoneId")
     def zone_id(self) -> str:
+        """
+        The ID of the available zone.
+        """
         return pulumi.get(self, "zone_id")
 
 
@@ -6629,7 +6639,7 @@ class GetTrafficMirrorFiltersFilterResult(dict):
         :param str status: The state of the filter. Valid values:`Creating`, `Created`, `Modifying` and `Deleting`. `Creating`: The filter is being created. `Created`: The filter is created. `Modifying`: The filter is being modified. `Deleting`: The filter is being deleted.
         :param str traffic_mirror_filter_description: The description of the filter.
         :param str traffic_mirror_filter_id: The ID of the filter.
-        :param str traffic_mirror_filter_name: The name of the filter.
+        :param str traffic_mirror_filter_name: The name of the filter. The name must be `2` to `128` characters in length, and can contain digits, periods (.), underscores (_), and hyphens (-). It must start with a letter and cannot start with `http://` or `https://`.
         """
         pulumi.set(__self__, "id", id)
         pulumi.set(__self__, "status", status)
@@ -6673,7 +6683,7 @@ class GetTrafficMirrorFiltersFilterResult(dict):
     @pulumi.getter(name="trafficMirrorFilterName")
     def traffic_mirror_filter_name(self) -> str:
         """
-        The name of the filter.
+        The name of the filter. The name must be `2` to `128` characters in length, and can contain digits, periods (.), underscores (_), and hyphens (-). It must start with a letter and cannot start with `http://` or `https://`.
         """
         return pulumi.get(self, "traffic_mirror_filter_name")
 

pulumi_alicloud/vpc/router_interface_connection.py

@@ -210,11 +210,11 @@ class RouterInterfaceConnection(pulumi.CustomResource):
                  opposite_router_type: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         """
+        > **DEPRECATED:**  This resource has been deprecated from version `1.199.0`. Please use new resource alicloud_express_connect_router_interface.
+
         Provides a VPC router interface connection resource to connect two router interfaces which are in two different VPCs.
         After that, all of the two router interfaces will be active.
 
-        > **DEPRECATED:**  This resource  has been deprecated from version `1.199.0`. Please use new resource alicloud_express_connect_router_interface.
-
         > **NOTE:** At present, Router interface does not support changing opposite router interface, the connection delete action is only deactivating it to inactive, not modifying the connection to empty.
 
         > **NOTE:** If you want to changing opposite router interface, you can delete router interface and re-build them.
@@ -294,11 +294,11 @@ class RouterInterfaceConnection(pulumi.CustomResource):
                  args: RouterInterfaceConnectionArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
+        > **DEPRECATED:**  This resource has been deprecated from version `1.199.0`. Please use new resource alicloud_express_connect_router_interface.
+
         Provides a VPC router interface connection resource to connect two router interfaces which are in two different VPCs.
         After that, all of the two router interfaces will be active.
 
-        > **DEPRECATED:**  This resource  has been deprecated from version `1.199.0`. Please use new resource alicloud_express_connect_router_interface.
-
         > **NOTE:** At present, Router interface does not support changing opposite router interface, the connection delete action is only deactivating it to inactive, not modifying the connection to empty.
 
         > **NOTE:** If you want to changing opposite router interface, you can delete router interface and re-build them.

pulumi_alicloud/vpc/traffic_mirror_filter.py

@@ -300,7 +300,7 @@ class TrafficMirrorFilter(pulumi.CustomResource):
 
         For information about VPC Traffic Mirror Filter and how to use it, see [What is Traffic Mirror Filter](https://www.alibabacloud.com/help/doc-detail/207513.htm).
 
-        > **NOTE:** Available in v1.140.0+.
+        > **NOTE:** Available since v1.140.0.
 
         ## Example Usage
 
@@ -375,7 +375,7 @@ class TrafficMirrorFilter(pulumi.CustomResource):
 
         For information about VPC Traffic Mirror Filter and how to use it, see [What is Traffic Mirror Filter](https://www.alibabacloud.com/help/doc-detail/207513.htm).
 
-        > **NOTE:** Available in v1.140.0+.
+        > **NOTE:** Available since v1.140.0.
 
         ## Example Usage
 

pulumi_alicloud/vpn/get_gateway_vco_routes.py

@@ -92,16 +92,25 @@ class GetGatewayVcoRoutesResult:
     @property
     @pulumi.getter
     def routes(self) -> Sequence['outputs.GetGatewayVcoRoutesRouteResult']:
+        """
+        A list of Vpn Gateway Vco Routes. Each element contains the following attributes:
+        """
         return pulumi.get(self, "routes")
 
     @property
     @pulumi.getter
     def status(self) -> Optional[str]:
+        """
+        The status of the vpn route entry.
+        """
         return pulumi.get(self, "status")
 
     @property
     @pulumi.getter(name="vpnConnectionId")
     def vpn_connection_id(self) -> str:
+        """
+        The id of the vpn connection.
+        """
         return pulumi.get(self, "vpn_connection_id")
 
 
@@ -133,7 +142,7 @@ def get_gateway_vco_routes(ids: Optional[Sequence[str]] = None,
     """
     This data source provides the Vpn Gateway Vco Routes of the current Alibaba Cloud user.
 
-    > **NOTE:** Available in v1.183.0+.
+    > **NOTE:** Available since v1.183.0.
 
     ## Example Usage
 
@@ -252,7 +261,7 @@ def get_gateway_vco_routes_output(ids: Optional[pulumi.Input[Optional[Sequence[s
     """
     This data source provides the Vpn Gateway Vco Routes of the current Alibaba Cloud user.
 
-    > **NOTE:** Available in v1.183.0+.
+    > **NOTE:** Available since v1.183.0.
 
     ## Example Usage
 

pulumi_alicloud/vpn/get_gateway_vpn_attachments.py

@@ -62,6 +62,9 @@ class GetGatewayVpnAttachmentsResult:
     @property
     @pulumi.getter
     def attachments(self) -> Sequence['outputs.GetGatewayVpnAttachmentsAttachmentResult']:
+        """
+        A list of Vpn Gateway Vpn Attachments. Each element contains the following attributes:
+        """
         return pulumi.get(self, "attachments")
 
     @property
@@ -85,6 +88,9 @@ class GetGatewayVpnAttachmentsResult:
     @property
     @pulumi.getter
     def names(self) -> Sequence[str]:
+        """
+        A list of Vpn Attachment names.
+        """
         return pulumi.get(self, "names")
 
     @property
@@ -105,6 +111,9 @@ class GetGatewayVpnAttachmentsResult:
     @property
     @pulumi.getter
     def status(self) -> Optional[str]:
+        """
+        The status of the resource.
+        """
         return pulumi.get(self, "status")
 
     @property
@@ -143,7 +152,7 @@ def get_gateway_vpn_attachments(ids: Optional[Sequence[str]] = None,
     """
     This data source provides the Vpn Gateway Vpn Attachments of the current Alibaba Cloud user.
 
-    > **NOTE:** Available in v1.181.0+.
+    > **NOTE:** Available since v1.181.0+.
 
     ## Example Usage
 
@@ -201,7 +210,7 @@ def get_gateway_vpn_attachments_output(ids: Optional[pulumi.Input[Optional[Seque
     """
     This data source provides the Vpn Gateway Vpn Attachments of the current Alibaba Cloud user.
 
-    > **NOTE:** Available in v1.181.0+.
+    > **NOTE:** Available since v1.181.0+.
 
     ## Example Usage