pulumi-alicloud 3.60.0a1723455033__py3-none-any.whl → 3.60.0a1723462134__py3-none-any.whl

pulumi_alicloud/ecs/ecs_image_pipeline.py

@@ -551,7 +551,7 @@ class EcsImagePipeline(pulumi.CustomResource):
 
         default = alicloud.resourcemanager.get_resource_groups(name_regex="default")
         default_get_zones = alicloud.get_zones(available_resource_creation="VSwitch")
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             most_recent=True,
             owners="system")
         default_get_instance_types = alicloud.ecs.get_instance_types(image_id=default_get_images.ids[0])
@@ -639,7 +639,7 @@ class EcsImagePipeline(pulumi.CustomResource):
 
         default = alicloud.resourcemanager.get_resource_groups(name_regex="default")
         default_get_zones = alicloud.get_zones(available_resource_creation="VSwitch")
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             most_recent=True,
             owners="system")
         default_get_instance_types = alicloud.ecs.get_instance_types(image_id=default_get_images.ids[0])

pulumi_alicloud/ecs/ecs_instance_set.py

@@ -1564,7 +1564,7 @@ class EcsInstanceSet(pulumi.CustomResource):
         default_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=default.zones[0].id,
             cpu_core_count=1,
             memory_size=2)
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             most_recent=True,
             owners="system")
         default_network = alicloud.vpc.Network("default",
@@ -1682,7 +1682,7 @@ class EcsInstanceSet(pulumi.CustomResource):
         default_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=default.zones[0].id,
             cpu_core_count=1,
             memory_size=2)
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             most_recent=True,
             owners="system")
         default_network = alicloud.vpc.Network("default",

pulumi_alicloud/ecs/ecs_invocation.py

@@ -357,7 +357,7 @@ class EcsInvocation(pulumi.CustomResource):
         default = alicloud.get_zones(available_disk_category="cloud_efficiency",
             available_resource_creation="VSwitch")
         default_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=default.zones[0].id)
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             most_recent=True,
             owners="system")
         default_network = alicloud.vpc.Network("default",
@@ -454,7 +454,7 @@ class EcsInvocation(pulumi.CustomResource):
         default = alicloud.get_zones(available_disk_category="cloud_efficiency",
             available_resource_creation="VSwitch")
         default_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=default.zones[0].id)
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             most_recent=True,
             owners="system")
         default_network = alicloud.vpc.Network("default",

pulumi_alicloud/ecs/ecs_key_pair_attachment.py

@@ -192,7 +192,7 @@ class EcsKeyPairAttachment(pulumi.CustomResource):
         example_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=example.zones[0].id,
             cpu_core_count=1,
             memory_size=2)
-        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             owners="system")
         example_network = alicloud.vpc.Network("example",
             vpc_name="terraform-example",
@@ -263,7 +263,7 @@ class EcsKeyPairAttachment(pulumi.CustomResource):
         example_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=example.zones[0].id,
             cpu_core_count=1,
             memory_size=2)
-        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             owners="system")
         example_network = alicloud.vpc.Network("example",
             vpc_name="terraform-example",

pulumi_alicloud/ecs/ecs_launch_template.py

@@ -77,7 +77,7 @@ class EcsLaunchTemplateArgs:
         :param pulumi.Input[str] image_id: The Image ID.
         :param pulumi.Input[str] image_owner_alias: Mirror source. Valid values: `system`, `self`, `others`, `marketplace`, `""`. Default to: `""`.
         :param pulumi.Input[str] instance_charge_type: Billing methods. Valid values: `PostPaid`, `PrePaid`.
-        :param pulumi.Input[str] instance_name: The name of the instance. The name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-).
+        :param pulumi.Input[str] instance_name: The name of the instance. The name must be `2` to `128` characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), periods (.), commas (,), brackets ([]), and hyphens (-).
         :param pulumi.Input[str] instance_type: Instance type. For more information, call resource_alicloud_instances to obtain the latest instance type list.
         :param pulumi.Input[str] internet_charge_type: Internet bandwidth billing method. Valid values: `PayByTraffic`, `PayByBandwidth`.
         :param pulumi.Input[int] internet_max_bandwidth_in: The maximum inbound bandwidth from the Internet network, measured in Mbit/s. Value range: [1, 200].
@@ -372,7 +372,7 @@ class EcsLaunchTemplateArgs:
     @pulumi.getter(name="instanceName")
     def instance_name(self) -> Optional[pulumi.Input[str]]:
         """
-        The name of the instance. The name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-).
+        The name of the instance. The name must be `2` to `128` characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), periods (.), commas (,), brackets ([]), and hyphens (-).
         """
         return pulumi.get(self, "instance_name")
 
@@ -889,7 +889,7 @@ class _EcsLaunchTemplateState:
         :param pulumi.Input[str] image_id: The Image ID.
         :param pulumi.Input[str] image_owner_alias: Mirror source. Valid values: `system`, `self`, `others`, `marketplace`, `""`. Default to: `""`.
         :param pulumi.Input[str] instance_charge_type: Billing methods. Valid values: `PostPaid`, `PrePaid`.
-        :param pulumi.Input[str] instance_name: The name of the instance. The name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-).
+        :param pulumi.Input[str] instance_name: The name of the instance. The name must be `2` to `128` characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), periods (.), commas (,), brackets ([]), and hyphens (-).
         :param pulumi.Input[str] instance_type: Instance type. For more information, call resource_alicloud_instances to obtain the latest instance type list.
         :param pulumi.Input[str] internet_charge_type: Internet bandwidth billing method. Valid values: `PayByTraffic`, `PayByBandwidth`.
         :param pulumi.Input[int] internet_max_bandwidth_in: The maximum inbound bandwidth from the Internet network, measured in Mbit/s. Value range: [1, 200].
@@ -1184,7 +1184,7 @@ class _EcsLaunchTemplateState:
     @pulumi.getter(name="instanceName")
     def instance_name(self) -> Optional[pulumi.Input[str]]:
         """
-        The name of the instance. The name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-).
+        The name of the instance. The name must be `2` to `128` characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), periods (.), commas (,), brackets ([]), and hyphens (-).
         """
         return pulumi.get(self, "instance_name")
 
@@ -1709,7 +1709,7 @@ class EcsLaunchTemplate(pulumi.CustomResource):
         default = alicloud.get_zones(available_disk_category="cloud_efficiency",
             available_resource_creation="VSwitch")
         default_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=default.zones[0].id)
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             owners="system")
         default_network = alicloud.vpc.Network("default",
             vpc_name="terraform-example",
@@ -1806,7 +1806,7 @@ class EcsLaunchTemplate(pulumi.CustomResource):
         :param pulumi.Input[str] image_id: The Image ID.
         :param pulumi.Input[str] image_owner_alias: Mirror source. Valid values: `system`, `self`, `others`, `marketplace`, `""`. Default to: `""`.
         :param pulumi.Input[str] instance_charge_type: Billing methods. Valid values: `PostPaid`, `PrePaid`.
-        :param pulumi.Input[str] instance_name: The name of the instance. The name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-).
+        :param pulumi.Input[str] instance_name: The name of the instance. The name must be `2` to `128` characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), periods (.), commas (,), brackets ([]), and hyphens (-).
         :param pulumi.Input[str] instance_type: Instance type. For more information, call resource_alicloud_instances to obtain the latest instance type list.
         :param pulumi.Input[str] internet_charge_type: Internet bandwidth billing method. Valid values: `PayByTraffic`, `PayByBandwidth`.
         :param pulumi.Input[int] internet_max_bandwidth_in: The maximum inbound bandwidth from the Internet network, measured in Mbit/s. Value range: [1, 200].
@@ -1874,7 +1874,7 @@ class EcsLaunchTemplate(pulumi.CustomResource):
         default = alicloud.get_zones(available_disk_category="cloud_efficiency",
             available_resource_creation="VSwitch")
         default_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=default.zones[0].id)
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             owners="system")
         default_network = alicloud.vpc.Network("default",
             vpc_name="terraform-example",
@@ -2154,7 +2154,7 @@ class EcsLaunchTemplate(pulumi.CustomResource):
         :param pulumi.Input[str] image_id: The Image ID.
         :param pulumi.Input[str] image_owner_alias: Mirror source. Valid values: `system`, `self`, `others`, `marketplace`, `""`. Default to: `""`.
         :param pulumi.Input[str] instance_charge_type: Billing methods. Valid values: `PostPaid`, `PrePaid`.
-        :param pulumi.Input[str] instance_name: The name of the instance. The name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-).
+        :param pulumi.Input[str] instance_name: The name of the instance. The name must be `2` to `128` characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), periods (.), commas (,), brackets ([]), and hyphens (-).
         :param pulumi.Input[str] instance_type: Instance type. For more information, call resource_alicloud_instances to obtain the latest instance type list.
         :param pulumi.Input[str] internet_charge_type: Internet bandwidth billing method. Valid values: `PayByTraffic`, `PayByBandwidth`.
         :param pulumi.Input[int] internet_max_bandwidth_in: The maximum inbound bandwidth from the Internet network, measured in Mbit/s. Value range: [1, 200].
@@ -2344,7 +2344,7 @@ class EcsLaunchTemplate(pulumi.CustomResource):
     @pulumi.getter(name="instanceName")
     def instance_name(self) -> pulumi.Output[Optional[str]]:
         """
-        The name of the instance. The name must be 2 to 128 characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), and hyphens (-).
+        The name of the instance. The name must be `2` to `128` characters in length. It must start with a letter and cannot start with http:// or https://. It can contain letters, digits, colons (:), underscores (_), periods (.), commas (,), brackets ([]), and hyphens (-).
         """
         return pulumi.get(self, "instance_name")
 

pulumi_alicloud/ecs/ecs_network_interface_attachment.py

@@ -230,7 +230,7 @@ class EcsNetworkInterfaceAttachment(pulumi.CustomResource):
             name=name,
             description="New security group",
             vpc_id=default_network.id)
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             most_recent=True,
             owners="system")
         default_instance = alicloud.ecs.Instance("default",
@@ -314,7 +314,7 @@ class EcsNetworkInterfaceAttachment(pulumi.CustomResource):
             name=name,
             description="New security group",
             vpc_id=default_network.id)
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             most_recent=True,
             owners="system")
         default_instance = alicloud.ecs.Instance("default",

pulumi_alicloud/ecs/eip_association.py

@@ -376,9 +376,8 @@ class EipAssociation(pulumi.CustomResource):
         example_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=example.zones[0].id,
             cpu_core_count=1,
             memory_size=2)
-        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
-            owners="system",
-            instance_type=example_get_instance_types.instance_types[0].id)
+        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
+            owners="system")
         example_network = alicloud.vpc.Network("example",
             vpc_name=name,
             cidr_block="10.4.0.0/16")
@@ -482,9 +481,8 @@ class EipAssociation(pulumi.CustomResource):
         example_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=example.zones[0].id,
             cpu_core_count=1,
             memory_size=2)
-        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
-            owners="system",
-            instance_type=example_get_instance_types.instance_types[0].id)
+        example_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
+            owners="system")
         example_network = alicloud.vpc.Network("example",
             vpc_name=name,
             cidr_block="10.4.0.0/16")

pulumi_alicloud/ecs/get_ecs_network_interfaces.py

@@ -97,17 +97,26 @@ class GetEcsNetworkInterfacesResult:
     @property
     @pulumi.getter(name="instanceId")
     def instance_id(self) -> Optional[str]:
+        """
+        The instance id.
+        """
         return pulumi.get(self, "instance_id")
 
     @property
     @pulumi.getter
     def interfaces(self) -> Sequence['outputs.GetEcsNetworkInterfacesInterfaceResult']:
+        """
+        A list of Ecs Network Interfaces. Each element contains the following attributes:
+        """
         return pulumi.get(self, "interfaces")
 
     @property
     @pulumi.getter
     @_utilities.deprecated("""Field 'name' has been deprecated from provider version 1.123.1. New field 'network_interface_name' instead""")
     def name(self) -> Optional[str]:
+        """
+        The network interface name.
+        """
         return pulumi.get(self, "name")
 
     @property
@@ -118,11 +127,17 @@ class GetEcsNetworkInterfacesResult:
     @property
     @pulumi.getter
     def names(self) -> Sequence[str]:
+        """
+        A list of Network Interface names.
+        """
         return pulumi.get(self, "names")
 
     @property
     @pulumi.getter(name="networkInterfaceName")
     def network_interface_name(self) -> Optional[str]:
+        """
+        The network interface name.
+        """
         return pulumi.get(self, "network_interface_name")
 
     @property
@@ -133,17 +148,26 @@ class GetEcsNetworkInterfacesResult:
     @property
     @pulumi.getter(name="primaryIpAddress")
     def primary_ip_address(self) -> Optional[str]:
+        """
+        The primary private IP address of the ENI.
+        """
         return pulumi.get(self, "primary_ip_address")
 
     @property
     @pulumi.getter(name="privateIp")
     @_utilities.deprecated("""Field 'private_ip' has been deprecated from provider version 1.123.1. New field 'primary_ip_address' instead""")
     def private_ip(self) -> Optional[str]:
+        """
+        The primary private IP address of the ENI.
+        """
         return pulumi.get(self, "private_ip")
 
     @property
     @pulumi.getter(name="resourceGroupId")
     def resource_group_id(self) -> Optional[str]:
+        """
+        The resource group id.
+        """
         return pulumi.get(self, "resource_group_id")
 
     @property
@@ -154,31 +178,49 @@ class GetEcsNetworkInterfacesResult:
     @property
     @pulumi.getter(name="serviceManaged")
     def service_managed(self) -> Optional[bool]:
+        """
+        Whether the user of the elastic network card is a cloud product or a virtual vendor.
+        """
         return pulumi.get(self, "service_managed")
 
     @property
     @pulumi.getter
     def status(self) -> Optional[str]:
+        """
+        The status of the ENI.
+        """
         return pulumi.get(self, "status")
 
     @property
     @pulumi.getter
     def tags(self) -> Optional[Mapping[str, Any]]:
+        """
+        The tags.
+        """
         return pulumi.get(self, "tags")
 
     @property
     @pulumi.getter
     def type(self) -> Optional[str]:
+        """
+        The type of the ENI.
+        """
         return pulumi.get(self, "type")
 
     @property
     @pulumi.getter(name="vpcId")
     def vpc_id(self) -> Optional[str]:
+        """
+        The Vpc Id.
+        """
         return pulumi.get(self, "vpc_id")
 
     @property
     @pulumi.getter(name="vswitchId")
     def vswitch_id(self) -> Optional[str]:
+        """
+        The vswitch id.
+        """
         return pulumi.get(self, "vswitch_id")
 
 
@@ -229,7 +271,7 @@ def get_ecs_network_interfaces(ids: Optional[Sequence[str]] = None,
     """
     This data source provides the Ecs Network Interfaces of the current Alibaba Cloud user.
 
-    > **NOTE:** Available in v1.123.1+.
+    > **NOTE:** Available since v1.123.1.
 
     ## Example Usage
 
@@ -239,8 +281,7 @@ def get_ecs_network_interfaces(ids: Optional[Sequence[str]] = None,
     import pulumi
     import pulumi_alicloud as alicloud
 
-    example = alicloud.ecs.get_ecs_network_interfaces(ids=["eni-abcd1234"],
-        name_regex="tf-testAcc")
+    example = alicloud.ecs.get_ecs_network_interfaces(name_regex="eni-ipv6")
     pulumi.export("firstEcsNetworkInterfaceId", example.interfaces[0].id)
     ```
 
@@ -325,7 +366,7 @@ def get_ecs_network_interfaces_output(ids: Optional[pulumi.Input[Optional[Sequen
     """
     This data source provides the Ecs Network Interfaces of the current Alibaba Cloud user.
 
-    > **NOTE:** Available in v1.123.1+.
+    > **NOTE:** Available since v1.123.1.
 
     ## Example Usage
 
@@ -335,8 +376,7 @@ def get_ecs_network_interfaces_output(ids: Optional[pulumi.Input[Optional[Sequen
     import pulumi
     import pulumi_alicloud as alicloud
 
-    example = alicloud.ecs.get_ecs_network_interfaces(ids=["eni-abcd1234"],
-        name_regex="tf-testAcc")
+    example = alicloud.ecs.get_ecs_network_interfaces(name_regex="eni-ipv6")
     pulumi.export("firstEcsNetworkInterfaceId", example.interfaces[0].id)
     ```
 

pulumi_alicloud/ecs/get_instances.py

@@ -208,7 +208,7 @@ class GetInstancesResult:
     @pulumi.getter(name="vswitchId")
     def vswitch_id(self) -> Optional[str]:
         """
-        ID of the VSwitch the instance belongs to.
+        ID of the vSwitch the instance belongs to.
         """
         return pulumi.get(self, "vswitch_id")
 
@@ -293,7 +293,7 @@ def get_instances(availability_zone: Optional[str] = None,
            })
            ```
     :param str vpc_id: ID of the VPC linked to the instances.
-    :param str vswitch_id: ID of the VSwitch linked to the instances.
+    :param str vswitch_id: ID of the vSwitch linked to the instances.
     """
     __args__ = dict()
     __args__['availabilityZone'] = availability_zone
@@ -390,6 +390,6 @@ def get_instances_output(availability_zone: Optional[pulumi.Input[Optional[str]]
            })
            ```
     :param str vpc_id: ID of the VPC linked to the instances.
-    :param str vswitch_id: ID of the VSwitch linked to the instances.
+    :param str vswitch_id: ID of the vSwitch linked to the instances.
     """
     ...

pulumi_alicloud/ecs/get_network_interfaces.py

@@ -204,7 +204,7 @@ class GetNetworkInterfacesResult:
     @pulumi.getter(name="vswitchId")
     def vswitch_id(self) -> Optional[str]:
         """
-        ID of the VSwitch that the ENI is linked to.
+        ID of the vSwitch that the ENI is linked to.
         """
         return pulumi.get(self, "vswitch_id")
 
@@ -324,7 +324,7 @@ def get_network_interfaces(ids: Optional[Sequence[str]] = None,
     * `ids` - (Optional)  A list of ENI IDs.
     * `name_regex` - (Optional) A regex string to filter results by ENI name.
     * `vpc_id` - (Optional) The VPC ID linked to ENIs.
-    * `vswitch_id` - (Optional) The VSwitch ID linked to ENIs.
+    * `vswitch_id` - (Optional) The vSwitch ID linked to ENIs.
     * `private_ip` - (Optional) The primary private IP address of the ENI.
     * `security_group_id` - (Optional) The security group ID linked to ENIs.
     * `name` - (Optional) The name of the ENIs.
@@ -342,7 +342,7 @@ def get_network_interfaces(ids: Optional[Sequence[str]] = None,
     :param str status: Current status of the ENI.
     :param Mapping[str, Any] tags: A map of tags assigned to the ENI.
     :param str vpc_id: ID of the VPC that the ENI belongs to.
-    :param str vswitch_id: ID of the VSwitch that the ENI is linked to.
+    :param str vswitch_id: ID of the vSwitch that the ENI is linked to.
     """
     __args__ = dict()
     __args__['ids'] = ids
@@ -475,7 +475,7 @@ def get_network_interfaces_output(ids: Optional[pulumi.Input[Optional[Sequence[s
     * `ids` - (Optional)  A list of ENI IDs.
     * `name_regex` - (Optional) A regex string to filter results by ENI name.
     * `vpc_id` - (Optional) The VPC ID linked to ENIs.
-    * `vswitch_id` - (Optional) The VSwitch ID linked to ENIs.
+    * `vswitch_id` - (Optional) The vSwitch ID linked to ENIs.
     * `private_ip` - (Optional) The primary private IP address of the ENI.
     * `security_group_id` - (Optional) The security group ID linked to ENIs.
     * `name` - (Optional) The name of the ENIs.
@@ -493,6 +493,6 @@ def get_network_interfaces_output(ids: Optional[pulumi.Input[Optional[Sequence[s
     :param str status: Current status of the ENI.
     :param Mapping[str, Any] tags: A map of tags assigned to the ENI.
     :param str vpc_id: ID of the VPC that the ENI belongs to.
-    :param str vswitch_id: ID of the VSwitch that the ENI is linked to.
+    :param str vswitch_id: ID of the vSwitch that the ENI is linked to.
     """
     ...

pulumi_alicloud/ecs/image.py

@@ -781,9 +781,8 @@ class Image(pulumi.CustomResource):
 
         default = alicloud.get_zones(available_resource_creation="Instance")
         default_get_instance_types = alicloud.ecs.get_instance_types(instance_type_family="ecs.sn1ne")
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
-            owners="system",
-            instance_type=default_get_instance_types.ids[0])
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
+            owners="system")
         default_network = alicloud.vpc.Network("default",
             vpc_name="terraform-example",
             cidr_block="172.17.3.0/24")
@@ -899,9 +898,8 @@ class Image(pulumi.CustomResource):
 
         default = alicloud.get_zones(available_resource_creation="Instance")
         default_get_instance_types = alicloud.ecs.get_instance_types(instance_type_family="ecs.sn1ne")
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
-            owners="system",
-            instance_type=default_get_instance_types.ids[0])
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
+            owners="system")
         default_network = alicloud.vpc.Network("default",
             vpc_name="terraform-example",
             cidr_block="172.17.3.0/24")

pulumi_alicloud/ecs/image_copy.py

@@ -380,7 +380,7 @@ class ImageCopy(pulumi.CustomResource):
 
         default = alicloud.get_zones(available_resource_creation="Instance")
         default_get_instance_types = alicloud.ecs.get_instance_types(instance_type_family="ecs.sn1ne")
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             owners="system")
         default_network = alicloud.vpc.Network("default",
             vpc_name="terraform-example",
@@ -467,7 +467,7 @@ class ImageCopy(pulumi.CustomResource):
 
         default = alicloud.get_zones(available_resource_creation="Instance")
         default_get_instance_types = alicloud.ecs.get_instance_types(instance_type_family="ecs.sn1ne")
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             owners="system")
         default_network = alicloud.vpc.Network("default",
             vpc_name="terraform-example",

pulumi_alicloud/ecs/image_export.py

@@ -150,7 +150,7 @@ class ImageExport(pulumi.CustomResource):
 
         default = alicloud.get_zones(available_resource_creation="Instance")
         default_get_instance_types = alicloud.ecs.get_instance_types(instance_type_family="ecs.sn1ne")
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             owners="system")
         default_network = alicloud.vpc.Network("default",
             vpc_name="terraform-example",
@@ -217,7 +217,7 @@ class ImageExport(pulumi.CustomResource):
 
         default = alicloud.get_zones(available_resource_creation="Instance")
         default_get_instance_types = alicloud.ecs.get_instance_types(instance_type_family="ecs.sn1ne")
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             owners="system")
         default_network = alicloud.vpc.Network("default",
             vpc_name="terraform-example",

pulumi_alicloud/ecs/image_import.py

@@ -320,14 +320,18 @@ class ImageImport(pulumi.CustomResource):
         ```python
         import pulumi
         import pulumi_alicloud as alicloud
+        import pulumi_random as random
 
         config = pulumi.Config()
         name = config.get("name")
         if name is None:
             name = "terraform-image-import-example"
-        default = alicloud.oss.Bucket("default", bucket=name)
+        default = random.index.Integer("default",
+            min=10000,
+            max=99999)
+        default_bucket = alicloud.oss.Bucket("default", bucket=f"{name}-{default['result']}")
         default_bucket_object = alicloud.oss.BucketObject("default",
-            bucket=default.id,
+            bucket=default_bucket.id,
             key="fc/hello.zip",
             content=\"\"\"    # -*- coding: utf-8 -*-
             def handler(event, context):
@@ -342,7 +346,7 @@ class ImageImport(pulumi.CustomResource):
             image_name=name,
             description=name,
             disk_device_mappings=[{
-                "oss_bucket": default.id,
+                "oss_bucket": default_bucket.id,
                 "oss_object": default_bucket_object.id,
                 "disk_image_size": 5,
             }])
@@ -392,14 +396,18 @@ class ImageImport(pulumi.CustomResource):
         ```python
         import pulumi
         import pulumi_alicloud as alicloud
+        import pulumi_random as random
 
         config = pulumi.Config()
         name = config.get("name")
         if name is None:
             name = "terraform-image-import-example"
-        default = alicloud.oss.Bucket("default", bucket=name)
+        default = random.index.Integer("default",
+            min=10000,
+            max=99999)
+        default_bucket = alicloud.oss.Bucket("default", bucket=f"{name}-{default['result']}")
         default_bucket_object = alicloud.oss.BucketObject("default",
-            bucket=default.id,
+            bucket=default_bucket.id,
             key="fc/hello.zip",
             content=\"\"\"    # -*- coding: utf-8 -*-
             def handler(event, context):
@@ -414,7 +422,7 @@ class ImageImport(pulumi.CustomResource):
             image_name=name,
             description=name,
             disk_device_mappings=[{
-                "oss_bucket": default.id,
+                "oss_bucket": default_bucket.id,
                 "oss_object": default_bucket_object.id,
                 "disk_image_size": 5,
             }])

pulumi_alicloud/ecs/image_share_permission.py

@@ -117,7 +117,7 @@ class ImageSharePermission(pulumi.CustomResource):
 
         default = alicloud.get_zones(available_resource_creation="Instance")
         default_get_instance_types = alicloud.ecs.get_instance_types(instance_type_family="ecs.sn1ne")
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             owners="system")
         default_network = alicloud.vpc.Network("default",
             vpc_name="terraform-example",
@@ -199,7 +199,7 @@ class ImageSharePermission(pulumi.CustomResource):
 
         default = alicloud.get_zones(available_resource_creation="Instance")
         default_get_instance_types = alicloud.ecs.get_instance_types(instance_type_family="ecs.sn1ne")
-        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_18.*64",
             owners="system")
         default_network = alicloud.vpc.Network("default",
             vpc_name="terraform-example",

pulumi_alicloud/ecs/instance.py

@@ -183,7 +183,7 @@ class InstanceArgs:
         :param pulumi.Input[str] resource_group_id: The Id of resource group which the instance belongs.
         :param pulumi.Input[str] role_name: Instance RAM role name. The name is provided and maintained by RAM. You can use `ram.Role` to create a new one.
         :param pulumi.Input[int] secondary_private_ip_address_count: The number of private IP addresses to be automatically assigned from within the CIDR block of the vswitch. **NOTE:** To assign secondary private IP addresses, you must specify `secondary_private_ips` or `secondary_private_ip_address_count` but not both.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] secondary_private_ips: A list of Secondary private IP addresses which is selected from within the CIDR block of the VSwitch.
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] secondary_private_ips: A list of Secondary private IP addresses which is selected from within the CIDR block of the vSwitch.
         :param pulumi.Input[str] security_enhancement_strategy: The security enhancement strategy.
                - Active: Enable security enhancement strategy, it only works on system images.
                - Deactive: Disable security enhancement strategy, it works on all images.
@@ -1034,7 +1034,7 @@ class InstanceArgs:
     @pulumi.getter(name="secondaryPrivateIps")
     def secondary_private_ips(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
-        A list of Secondary private IP addresses which is selected from within the CIDR block of the VSwitch.
+        A list of Secondary private IP addresses which is selected from within the CIDR block of the vSwitch.
         """
         return pulumi.get(self, "secondary_private_ips")
 
@@ -1510,7 +1510,7 @@ class _InstanceState:
         :param pulumi.Input[str] resource_group_id: The Id of resource group which the instance belongs.
         :param pulumi.Input[str] role_name: Instance RAM role name. The name is provided and maintained by RAM. You can use `ram.Role` to create a new one.
         :param pulumi.Input[int] secondary_private_ip_address_count: The number of private IP addresses to be automatically assigned from within the CIDR block of the vswitch. **NOTE:** To assign secondary private IP addresses, you must specify `secondary_private_ips` or `secondary_private_ip_address_count` but not both.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] secondary_private_ips: A list of Secondary private IP addresses which is selected from within the CIDR block of the VSwitch.
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] secondary_private_ips: A list of Secondary private IP addresses which is selected from within the CIDR block of the vSwitch.
         :param pulumi.Input[str] security_enhancement_strategy: The security enhancement strategy.
                - Active: Enable security enhancement strategy, it only works on system images.
                - Deactive: Disable security enhancement strategy, it works on all images.
@@ -2476,7 +2476,7 @@ class _InstanceState:
     @pulumi.getter(name="secondaryPrivateIps")
     def secondary_private_ips(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
-        A list of Secondary private IP addresses which is selected from within the CIDR block of the VSwitch.
+        A list of Secondary private IP addresses which is selected from within the CIDR block of the vSwitch.
         """
         return pulumi.get(self, "secondary_private_ips")
 
@@ -3028,7 +3028,7 @@ class Instance(pulumi.CustomResource):
         :param pulumi.Input[str] resource_group_id: The Id of resource group which the instance belongs.
         :param pulumi.Input[str] role_name: Instance RAM role name. The name is provided and maintained by RAM. You can use `ram.Role` to create a new one.
         :param pulumi.Input[int] secondary_private_ip_address_count: The number of private IP addresses to be automatically assigned from within the CIDR block of the vswitch. **NOTE:** To assign secondary private IP addresses, you must specify `secondary_private_ips` or `secondary_private_ip_address_count` but not both.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] secondary_private_ips: A list of Secondary private IP addresses which is selected from within the CIDR block of the VSwitch.
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] secondary_private_ips: A list of Secondary private IP addresses which is selected from within the CIDR block of the vSwitch.
         :param pulumi.Input[str] security_enhancement_strategy: The security enhancement strategy.
                - Active: Enable security enhancement strategy, it only works on system images.
                - Deactive: Disable security enhancement strategy, it works on all images.
@@ -3534,7 +3534,7 @@ class Instance(pulumi.CustomResource):
         :param pulumi.Input[str] resource_group_id: The Id of resource group which the instance belongs.
         :param pulumi.Input[str] role_name: Instance RAM role name. The name is provided and maintained by RAM. You can use `ram.Role` to create a new one.
         :param pulumi.Input[int] secondary_private_ip_address_count: The number of private IP addresses to be automatically assigned from within the CIDR block of the vswitch. **NOTE:** To assign secondary private IP addresses, you must specify `secondary_private_ips` or `secondary_private_ip_address_count` but not both.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] secondary_private_ips: A list of Secondary private IP addresses which is selected from within the CIDR block of the VSwitch.
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] secondary_private_ips: A list of Secondary private IP addresses which is selected from within the CIDR block of the vSwitch.
         :param pulumi.Input[str] security_enhancement_strategy: The security enhancement strategy.
                - Active: Enable security enhancement strategy, it only works on system images.
                - Deactive: Disable security enhancement strategy, it works on all images.
@@ -4180,7 +4180,7 @@ class Instance(pulumi.CustomResource):
     @pulumi.getter(name="secondaryPrivateIps")
     def secondary_private_ips(self) -> pulumi.Output[Sequence[str]]:
         """
-        A list of Secondary private IP addresses which is selected from within the CIDR block of the VSwitch.
+        A list of Secondary private IP addresses which is selected from within the CIDR block of the vSwitch.
         """
         return pulumi.get(self, "secondary_private_ips")