pulumi-alicloud 3.53.0a1713354491__py3-none-any.whl → 3.73.0__py3-none-any.whl

pulumi_alicloud/ecs/get_instance_types.py

@@ -4,9 +4,14 @@
 
 import copy
 import warnings
+import sys
 import pulumi
 import pulumi.runtime
 from typing import Any, Mapping, Optional, Sequence, Union, overload
+if sys.version_info >= (3, 11):
+    from typing import NotRequired, TypedDict, TypeAlias
+else:
+    from typing_extensions import NotRequired, TypedDict, TypeAlias
 from .. import _utilities
 from . import outputs
 
@@ -22,7 +27,7 @@ class GetInstanceTypesResult:
     """
     A collection of values returned by getInstanceTypes.
     """
-    def __init__(__self__, availability_zone=None, cpu_core_count=None, eni_amount=None, gpu_amount=None, gpu_spec=None, id=None, ids=None, image_id=None, instance_charge_type=None, instance_type_family=None, instance_types=None, is_outdated=None, kubernetes_node_role=None, memory_size=None, minimum_eni_ipv6_address_quantity=None, network_type=None, output_file=None, sorted_by=None, spot_strategy=None, system_disk_category=None):
+    def __init__(__self__, availability_zone=None, cpu_core_count=None, eni_amount=None, gpu_amount=None, gpu_spec=None, id=None, ids=None, image_id=None, instance_charge_type=None, instance_type=None, instance_type_family=None, instance_types=None, is_outdated=None, kubernetes_node_role=None, memory_size=None, minimum_eni_ipv6_address_quantity=None, minimum_eni_private_ip_address_quantity=None, network_type=None, output_file=None, sorted_by=None, spot_strategy=None, system_disk_category=None):
         if availability_zone and not isinstance(availability_zone, str):
             raise TypeError("Expected argument 'availability_zone' to be a str")
         pulumi.set(__self__, "availability_zone", availability_zone)
@@ -50,6 +55,9 @@ class GetInstanceTypesResult:
         if instance_charge_type and not isinstance(instance_charge_type, str):
             raise TypeError("Expected argument 'instance_charge_type' to be a str")
         pulumi.set(__self__, "instance_charge_type", instance_charge_type)
+        if instance_type and not isinstance(instance_type, str):
+            raise TypeError("Expected argument 'instance_type' to be a str")
+        pulumi.set(__self__, "instance_type", instance_type)
         if instance_type_family and not isinstance(instance_type_family, str):
             raise TypeError("Expected argument 'instance_type_family' to be a str")
         pulumi.set(__self__, "instance_type_family", instance_type_family)
@@ -68,6 +76,9 @@ class GetInstanceTypesResult:
         if minimum_eni_ipv6_address_quantity and not isinstance(minimum_eni_ipv6_address_quantity, int):
             raise TypeError("Expected argument 'minimum_eni_ipv6_address_quantity' to be a int")
         pulumi.set(__self__, "minimum_eni_ipv6_address_quantity", minimum_eni_ipv6_address_quantity)
+        if minimum_eni_private_ip_address_quantity and not isinstance(minimum_eni_private_ip_address_quantity, int):
+            raise TypeError("Expected argument 'minimum_eni_private_ip_address_quantity' to be a int")
+        pulumi.set(__self__, "minimum_eni_private_ip_address_quantity", minimum_eni_private_ip_address_quantity)
         if network_type and not isinstance(network_type, str):
             raise TypeError("Expected argument 'network_type' to be a str")
         pulumi.set(__self__, "network_type", network_type)
@@ -101,7 +112,7 @@ class GetInstanceTypesResult:
     @pulumi.getter(name="eniAmount")
     def eni_amount(self) -> Optional[int]:
         """
-        The maximum number of network interfaces that an instance type can be attached to.
+        (Deprecated since v1.239.0) The maximum number of ENIs per instance. It sames as `eni_quantity`.
         """
         return pulumi.get(self, "eni_amount")
 
@@ -141,6 +152,11 @@ class GetInstanceTypesResult:
     def instance_charge_type(self) -> Optional[str]:
         return pulumi.get(self, "instance_charge_type")
 
+    @property
+    @pulumi.getter(name="instanceType")
+    def instance_type(self) -> Optional[str]:
+        return pulumi.get(self, "instance_type")
+
     @property
     @pulumi.getter(name="instanceTypeFamily")
     def instance_type_family(self) -> Optional[str]:
@@ -177,6 +193,11 @@ class GetInstanceTypesResult:
     def minimum_eni_ipv6_address_quantity(self) -> Optional[int]:
         return pulumi.get(self, "minimum_eni_ipv6_address_quantity")
 
+    @property
+    @pulumi.getter(name="minimumEniPrivateIpAddressQuantity")
+    def minimum_eni_private_ip_address_quantity(self) -> Optional[int]:
+        return pulumi.get(self, "minimum_eni_private_ip_address_quantity")
+
     @property
     @pulumi.getter(name="networkType")
     def network_type(self) -> Optional[str]:
@@ -218,12 +239,14 @@ class AwaitableGetInstanceTypesResult(GetInstanceTypesResult):
             ids=self.ids,
             image_id=self.image_id,
             instance_charge_type=self.instance_charge_type,
+            instance_type=self.instance_type,
             instance_type_family=self.instance_type_family,
             instance_types=self.instance_types,
             is_outdated=self.is_outdated,
             kubernetes_node_role=self.kubernetes_node_role,
             memory_size=self.memory_size,
             minimum_eni_ipv6_address_quantity=self.minimum_eni_ipv6_address_quantity,
+            minimum_eni_private_ip_address_quantity=self.minimum_eni_private_ip_address_quantity,
             network_type=self.network_type,
             output_file=self.output_file,
             sorted_by=self.sorted_by,
@@ -238,11 +261,13 @@ def get_instance_types(availability_zone: Optional[str] = None,
                        gpu_spec: Optional[str] = None,
                        image_id: Optional[str] = None,
                        instance_charge_type: Optional[str] = None,
+                       instance_type: Optional[str] = None,
                        instance_type_family: Optional[str] = None,
                        is_outdated: Optional[bool] = None,
                        kubernetes_node_role: Optional[str] = None,
                        memory_size: Optional[float] = None,
                        minimum_eni_ipv6_address_quantity: Optional[int] = None,
+                       minimum_eni_private_ip_address_quantity: Optional[int] = None,
                        network_type: Optional[str] = None,
                        output_file: Optional[str] = None,
                        sorted_by: Optional[str] = None,
@@ -256,18 +281,54 @@ def get_instance_types(availability_zone: Optional[str] = None,
 
     > **NOTE:** If one instance type is sold out, it will not be exported.
 
+    > **NOTE:** Available since v1.0.0.
+
     ## Example Usage
 
-    <!--Start PulumiCodeChooser -->
     ```python
     import pulumi
     import pulumi_alicloud as alicloud
 
-    types_ds = alicloud.ecs.get_instance_types(cpu_core_count=1,
-        memory_size=2)
-    instance = alicloud.ecs.Instance("instance", instance_type=types_ds.instance_types[0].id)
+    config = pulumi.Config()
+    name = config.get("name")
+    if name is None:
+        name = "terraform-example"
+    default = alicloud.get_zones(available_resource_creation="VSwitch")
+    # Declare the data source
+    default_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=default.zones[0].id,
+        instance_type_family="ecs.sn1ne")
+    default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        most_recent=True,
+        owners="system")
+    default_network = alicloud.vpc.Network("default",
+        vpc_name=name,
+        cidr_block="192.168.0.0/16")
+    default_switch = alicloud.vpc.Switch("default",
+        vswitch_name=name,
+        vpc_id=default_network.id,
+        cidr_block="192.168.192.0/24",
+        zone_id=default.zones[0].id)
+    default_security_group = alicloud.ecs.SecurityGroup("default",
+        name=name,
+        vpc_id=default_network.id)
+    default_ecs_network_interface = alicloud.ecs.EcsNetworkInterface("default",
+        network_interface_name=name,
+        vswitch_id=default_switch.id,
+        security_group_ids=[default_security_group.id])
+    default_instance = []
+    for range in [{"value": i} for i in range(0, 14)]:
+        default_instance.append(alicloud.ecs.Instance(f"default-{range['value']}",
+            image_id=default_get_images.images[0].id,
+            instance_type=default_get_instance_types.instance_types[0].id,
+            instance_name=name,
+            security_groups=[__item.id for __item in [default_security_group]],
+            internet_charge_type="PayByTraffic",
+            internet_max_bandwidth_out=10,
+            availability_zone=default.zones[0].id,
+            instance_charge_type="PostPaid",
+            system_disk_category="cloud_efficiency",
+            vswitch_id=default_switch.id))
     ```
-    <!--End PulumiCodeChooser -->
 
 
     :param str availability_zone: The zone where instance types are supported.
@@ -277,16 +338,19 @@ def get_instance_types(availability_zone: Optional[str] = None,
     :param str gpu_spec: The GPU spec of an instance type.
     :param str image_id: The ID of the image.
     :param str instance_charge_type: Filter the results by charge type. Valid values: `PrePaid` and `PostPaid`. Default to `PostPaid`.
+    :param str instance_type: Instance specifications. For more information, see instance Specification Family, or you can call the describe instance types interface to get the latest specification table.
     :param str instance_type_family: Filter the results based on their family name. For example: 'ecs.n4'.
     :param bool is_outdated: If true, outdated instance types are included in the results. Default to false.
     :param str kubernetes_node_role: Filter the result which is used to create a kubernetes cluster
            and managed kubernetes cluster. Optional Values: `Master` and `Worker`.
     :param float memory_size: Filter the results to a specific memory size in GB.
     :param int minimum_eni_ipv6_address_quantity: The minimum number of IPv6 addresses per ENI. **Note:** If an instance type supports fewer IPv6 addresses per ENI than the specified value, information about the instance type is not queried.
+    :param int minimum_eni_private_ip_address_quantity: The minimum expected IPv4 address upper limit of a single ENI when querying instance specifications. **Note:** If an instance type supports fewer IPv4 addresses per ENI than the specified value, information about the instance type is not queried.
     :param str network_type: Filter the results by network type. Valid values: `Classic` and `Vpc`.
     :param str output_file: File name where to save data source results (after running `pulumi preview`).
+    :param str sorted_by: Sort mode, valid values: `CPU`, `Memory`, `Price`.
     :param str spot_strategy: Filter the results by ECS spot type. Valid values: `NoSpot`, `SpotWithPriceLimit` and `SpotAsPriceGo`. Default to `NoSpot`.
-    :param str system_disk_category: Filter the results by system disk category. Valid values: `cloud`, `ephemeral_ssd`, `cloud_essd`, `cloud_efficiency`, `cloud_ssd`, `cloud_essd_entry`. 
+    :param str system_disk_category: Filter the results by system disk category. Valid values: `cloud`, `ephemeral_ssd`, `cloud_essd`, `cloud_efficiency`, `cloud_ssd`, `cloud_essd_entry`, `cloud_auto`. 
            **NOTE**: Its default value `cloud_efficiency` has been removed from the version v1.150.0.
     """
     __args__ = dict()
@@ -297,11 +361,13 @@ def get_instance_types(availability_zone: Optional[str] = None,
     __args__['gpuSpec'] = gpu_spec
     __args__['imageId'] = image_id
     __args__['instanceChargeType'] = instance_charge_type
+    __args__['instanceType'] = instance_type
     __args__['instanceTypeFamily'] = instance_type_family
     __args__['isOutdated'] = is_outdated
     __args__['kubernetesNodeRole'] = kubernetes_node_role
     __args__['memorySize'] = memory_size
     __args__['minimumEniIpv6AddressQuantity'] = minimum_eni_ipv6_address_quantity
+    __args__['minimumEniPrivateIpAddressQuantity'] = minimum_eni_private_ip_address_quantity
     __args__['networkType'] = network_type
     __args__['outputFile'] = output_file
     __args__['sortedBy'] = sorted_by
@@ -320,20 +386,19 @@ def get_instance_types(availability_zone: Optional[str] = None,
         ids=pulumi.get(__ret__, 'ids'),
         image_id=pulumi.get(__ret__, 'image_id'),
         instance_charge_type=pulumi.get(__ret__, 'instance_charge_type'),
+        instance_type=pulumi.get(__ret__, 'instance_type'),
         instance_type_family=pulumi.get(__ret__, 'instance_type_family'),
         instance_types=pulumi.get(__ret__, 'instance_types'),
         is_outdated=pulumi.get(__ret__, 'is_outdated'),
         kubernetes_node_role=pulumi.get(__ret__, 'kubernetes_node_role'),
         memory_size=pulumi.get(__ret__, 'memory_size'),
         minimum_eni_ipv6_address_quantity=pulumi.get(__ret__, 'minimum_eni_ipv6_address_quantity'),
+        minimum_eni_private_ip_address_quantity=pulumi.get(__ret__, 'minimum_eni_private_ip_address_quantity'),
         network_type=pulumi.get(__ret__, 'network_type'),
         output_file=pulumi.get(__ret__, 'output_file'),
         sorted_by=pulumi.get(__ret__, 'sorted_by'),
         spot_strategy=pulumi.get(__ret__, 'spot_strategy'),
         system_disk_category=pulumi.get(__ret__, 'system_disk_category'))
-
-
-@_utilities.lift_output_func(get_instance_types)
 def get_instance_types_output(availability_zone: Optional[pulumi.Input[Optional[str]]] = None,
                               cpu_core_count: Optional[pulumi.Input[Optional[int]]] = None,
                               eni_amount: Optional[pulumi.Input[Optional[int]]] = None,
@@ -341,17 +406,19 @@ def get_instance_types_output(availability_zone: Optional[pulumi.Input[Optional[
                               gpu_spec: Optional[pulumi.Input[Optional[str]]] = None,
                               image_id: Optional[pulumi.Input[Optional[str]]] = None,
                               instance_charge_type: Optional[pulumi.Input[Optional[str]]] = None,
+                              instance_type: Optional[pulumi.Input[Optional[str]]] = None,
                               instance_type_family: Optional[pulumi.Input[Optional[str]]] = None,
                               is_outdated: Optional[pulumi.Input[Optional[bool]]] = None,
                               kubernetes_node_role: Optional[pulumi.Input[Optional[str]]] = None,
                               memory_size: Optional[pulumi.Input[Optional[float]]] = None,
                               minimum_eni_ipv6_address_quantity: Optional[pulumi.Input[Optional[int]]] = None,
+                              minimum_eni_private_ip_address_quantity: Optional[pulumi.Input[Optional[int]]] = None,
                               network_type: Optional[pulumi.Input[Optional[str]]] = None,
                               output_file: Optional[pulumi.Input[Optional[str]]] = None,
                               sorted_by: Optional[pulumi.Input[Optional[str]]] = None,
                               spot_strategy: Optional[pulumi.Input[Optional[str]]] = None,
                               system_disk_category: Optional[pulumi.Input[Optional[str]]] = None,
-                              opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetInstanceTypesResult]:
+                              opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetInstanceTypesResult]:
     """
     This data source provides the ECS instance types of Alibaba Cloud.
 
@@ -359,18 +426,54 @@ def get_instance_types_output(availability_zone: Optional[pulumi.Input[Optional[
 
     > **NOTE:** If one instance type is sold out, it will not be exported.
 
+    > **NOTE:** Available since v1.0.0.
+
     ## Example Usage
 
-    <!--Start PulumiCodeChooser -->
     ```python
     import pulumi
     import pulumi_alicloud as alicloud
 
-    types_ds = alicloud.ecs.get_instance_types(cpu_core_count=1,
-        memory_size=2)
-    instance = alicloud.ecs.Instance("instance", instance_type=types_ds.instance_types[0].id)
+    config = pulumi.Config()
+    name = config.get("name")
+    if name is None:
+        name = "terraform-example"
+    default = alicloud.get_zones(available_resource_creation="VSwitch")
+    # Declare the data source
+    default_get_instance_types = alicloud.ecs.get_instance_types(availability_zone=default.zones[0].id,
+        instance_type_family="ecs.sn1ne")
+    default_get_images = alicloud.ecs.get_images(name_regex="^ubuntu_[0-9]+_[0-9]+_x64*",
+        most_recent=True,
+        owners="system")
+    default_network = alicloud.vpc.Network("default",
+        vpc_name=name,
+        cidr_block="192.168.0.0/16")
+    default_switch = alicloud.vpc.Switch("default",
+        vswitch_name=name,
+        vpc_id=default_network.id,
+        cidr_block="192.168.192.0/24",
+        zone_id=default.zones[0].id)
+    default_security_group = alicloud.ecs.SecurityGroup("default",
+        name=name,
+        vpc_id=default_network.id)
+    default_ecs_network_interface = alicloud.ecs.EcsNetworkInterface("default",
+        network_interface_name=name,
+        vswitch_id=default_switch.id,
+        security_group_ids=[default_security_group.id])
+    default_instance = []
+    for range in [{"value": i} for i in range(0, 14)]:
+        default_instance.append(alicloud.ecs.Instance(f"default-{range['value']}",
+            image_id=default_get_images.images[0].id,
+            instance_type=default_get_instance_types.instance_types[0].id,
+            instance_name=name,
+            security_groups=[__item.id for __item in [default_security_group]],
+            internet_charge_type="PayByTraffic",
+            internet_max_bandwidth_out=10,
+            availability_zone=default.zones[0].id,
+            instance_charge_type="PostPaid",
+            system_disk_category="cloud_efficiency",
+            vswitch_id=default_switch.id))
     ```
-    <!--End PulumiCodeChooser -->
 
 
     :param str availability_zone: The zone where instance types are supported.
@@ -380,16 +483,63 @@ def get_instance_types_output(availability_zone: Optional[pulumi.Input[Optional[
     :param str gpu_spec: The GPU spec of an instance type.
     :param str image_id: The ID of the image.
     :param str instance_charge_type: Filter the results by charge type. Valid values: `PrePaid` and `PostPaid`. Default to `PostPaid`.
+    :param str instance_type: Instance specifications. For more information, see instance Specification Family, or you can call the describe instance types interface to get the latest specification table.
     :param str instance_type_family: Filter the results based on their family name. For example: 'ecs.n4'.
     :param bool is_outdated: If true, outdated instance types are included in the results. Default to false.
     :param str kubernetes_node_role: Filter the result which is used to create a kubernetes cluster
            and managed kubernetes cluster. Optional Values: `Master` and `Worker`.
     :param float memory_size: Filter the results to a specific memory size in GB.
     :param int minimum_eni_ipv6_address_quantity: The minimum number of IPv6 addresses per ENI. **Note:** If an instance type supports fewer IPv6 addresses per ENI than the specified value, information about the instance type is not queried.
+    :param int minimum_eni_private_ip_address_quantity: The minimum expected IPv4 address upper limit of a single ENI when querying instance specifications. **Note:** If an instance type supports fewer IPv4 addresses per ENI than the specified value, information about the instance type is not queried.
     :param str network_type: Filter the results by network type. Valid values: `Classic` and `Vpc`.
     :param str output_file: File name where to save data source results (after running `pulumi preview`).
+    :param str sorted_by: Sort mode, valid values: `CPU`, `Memory`, `Price`.
     :param str spot_strategy: Filter the results by ECS spot type. Valid values: `NoSpot`, `SpotWithPriceLimit` and `SpotAsPriceGo`. Default to `NoSpot`.
-    :param str system_disk_category: Filter the results by system disk category. Valid values: `cloud`, `ephemeral_ssd`, `cloud_essd`, `cloud_efficiency`, `cloud_ssd`, `cloud_essd_entry`. 
+    :param str system_disk_category: Filter the results by system disk category. Valid values: `cloud`, `ephemeral_ssd`, `cloud_essd`, `cloud_efficiency`, `cloud_ssd`, `cloud_essd_entry`, `cloud_auto`. 
            **NOTE**: Its default value `cloud_efficiency` has been removed from the version v1.150.0.
     """
-    ...
+    __args__ = dict()
+    __args__['availabilityZone'] = availability_zone
+    __args__['cpuCoreCount'] = cpu_core_count
+    __args__['eniAmount'] = eni_amount
+    __args__['gpuAmount'] = gpu_amount
+    __args__['gpuSpec'] = gpu_spec
+    __args__['imageId'] = image_id
+    __args__['instanceChargeType'] = instance_charge_type
+    __args__['instanceType'] = instance_type
+    __args__['instanceTypeFamily'] = instance_type_family
+    __args__['isOutdated'] = is_outdated
+    __args__['kubernetesNodeRole'] = kubernetes_node_role
+    __args__['memorySize'] = memory_size
+    __args__['minimumEniIpv6AddressQuantity'] = minimum_eni_ipv6_address_quantity
+    __args__['minimumEniPrivateIpAddressQuantity'] = minimum_eni_private_ip_address_quantity
+    __args__['networkType'] = network_type
+    __args__['outputFile'] = output_file
+    __args__['sortedBy'] = sorted_by
+    __args__['spotStrategy'] = spot_strategy
+    __args__['systemDiskCategory'] = system_disk_category
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    __ret__ = pulumi.runtime.invoke_output('alicloud:ecs/getInstanceTypes:getInstanceTypes', __args__, opts=opts, typ=GetInstanceTypesResult)
+    return __ret__.apply(lambda __response__: GetInstanceTypesResult(
+        availability_zone=pulumi.get(__response__, 'availability_zone'),
+        cpu_core_count=pulumi.get(__response__, 'cpu_core_count'),
+        eni_amount=pulumi.get(__response__, 'eni_amount'),
+        gpu_amount=pulumi.get(__response__, 'gpu_amount'),
+        gpu_spec=pulumi.get(__response__, 'gpu_spec'),
+        id=pulumi.get(__response__, 'id'),
+        ids=pulumi.get(__response__, 'ids'),
+        image_id=pulumi.get(__response__, 'image_id'),
+        instance_charge_type=pulumi.get(__response__, 'instance_charge_type'),
+        instance_type=pulumi.get(__response__, 'instance_type'),
+        instance_type_family=pulumi.get(__response__, 'instance_type_family'),
+        instance_types=pulumi.get(__response__, 'instance_types'),
+        is_outdated=pulumi.get(__response__, 'is_outdated'),
+        kubernetes_node_role=pulumi.get(__response__, 'kubernetes_node_role'),
+        memory_size=pulumi.get(__response__, 'memory_size'),
+        minimum_eni_ipv6_address_quantity=pulumi.get(__response__, 'minimum_eni_ipv6_address_quantity'),
+        minimum_eni_private_ip_address_quantity=pulumi.get(__response__, 'minimum_eni_private_ip_address_quantity'),
+        network_type=pulumi.get(__response__, 'network_type'),
+        output_file=pulumi.get(__response__, 'output_file'),
+        sorted_by=pulumi.get(__response__, 'sorted_by'),
+        spot_strategy=pulumi.get(__response__, 'spot_strategy'),
+        system_disk_category=pulumi.get(__response__, 'system_disk_category')))

pulumi_alicloud/ecs/get_instances.py

@@ -4,9 +4,14 @@
 
 import copy
 import warnings
+import sys
 import pulumi
 import pulumi.runtime
 from typing import Any, Mapping, Optional, Sequence, Union, overload
+if sys.version_info >= (3, 11):
+    from typing import NotRequired, TypedDict, TypeAlias
+else:
+    from typing_extensions import NotRequired, TypedDict, TypeAlias
 from .. import _utilities
 from . import outputs
 
@@ -185,7 +190,7 @@ class GetInstancesResult:
 
     @property
     @pulumi.getter
-    def tags(self) -> Optional[Mapping[str, Any]]:
+    def tags(self) -> Optional[Mapping[str, str]]:
         """
         A map of tags assigned to the ECS instance.
         """
@@ -208,7 +213,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")
 
@@ -252,7 +257,7 @@ def get_instances(availability_zone: Optional[str] = None,
                   ram_role_name: Optional[str] = None,
                   resource_group_id: Optional[str] = None,
                   status: Optional[str] = None,
-                  tags: Optional[Mapping[str, Any]] = None,
+                  tags: Optional[Mapping[str, str]] = None,
                   vpc_id: Optional[str] = None,
                   vswitch_id: Optional[str] = None,
                   opts: Optional[pulumi.InvokeOptions] = None) -> AwaitableGetInstancesResult:
@@ -261,7 +266,6 @@ def get_instances(availability_zone: Optional[str] = None,
 
     ## Example Usage
 
-    <!--Start PulumiCodeChooser -->
     ```python
     import pulumi
     import pulumi_alicloud as alicloud
@@ -271,7 +275,6 @@ def get_instances(availability_zone: Optional[str] = None,
     pulumi.export("firstInstanceId", instances_ds.instances[0].id)
     pulumi.export("instanceIds", instances_ds.ids)
     ```
-    <!--End PulumiCodeChooser -->
 
 
     :param str availability_zone: Availability zone where instances are located.
@@ -284,8 +287,7 @@ def get_instances(availability_zone: Optional[str] = None,
     :param str ram_role_name: The RAM role name which the instance attaches.
     :param str resource_group_id: The ID of resource group which the instance belongs.
     :param str status: Instance status. Valid values: "Creating", "Starting", "Running", "Stopping" and "Stopped". If undefined, all statuses are considered.
-    :param Mapping[str, Any] tags: A map of tags assigned to the ECS instances. It must be in the format:
-           <!--Start PulumiCodeChooser -->
+    :param Mapping[str, str] tags: A map of tags assigned to the ECS instances. It must be in the format:
            ```python
            import pulumi
            import pulumi_alicloud as alicloud
@@ -295,9 +297,8 @@ def get_instances(availability_zone: Optional[str] = None,
                "tagKey2": "tagValue2",
            })
            ```
-           <!--End PulumiCodeChooser -->
     :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
@@ -338,9 +339,6 @@ def get_instances(availability_zone: Optional[str] = None,
         total_count=pulumi.get(__ret__, 'total_count'),
         vpc_id=pulumi.get(__ret__, 'vpc_id'),
         vswitch_id=pulumi.get(__ret__, 'vswitch_id'))
-
-
-@_utilities.lift_output_func(get_instances)
 def get_instances_output(availability_zone: Optional[pulumi.Input[Optional[str]]] = None,
                          enable_details: Optional[pulumi.Input[Optional[bool]]] = None,
                          ids: Optional[pulumi.Input[Optional[Sequence[str]]]] = None,
@@ -353,16 +351,15 @@ def get_instances_output(availability_zone: Optional[pulumi.Input[Optional[str]]
                          ram_role_name: Optional[pulumi.Input[Optional[str]]] = None,
                          resource_group_id: Optional[pulumi.Input[Optional[str]]] = None,
                          status: Optional[pulumi.Input[Optional[str]]] = None,
-                         tags: Optional[pulumi.Input[Optional[Mapping[str, Any]]]] = None,
+                         tags: Optional[pulumi.Input[Optional[Mapping[str, str]]]] = None,
                          vpc_id: Optional[pulumi.Input[Optional[str]]] = None,
                          vswitch_id: Optional[pulumi.Input[Optional[str]]] = None,
-                         opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetInstancesResult]:
+                         opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetInstancesResult]:
     """
     The Instances data source list ECS instance resources according to their ID, name regex, image id, status and other fields.
 
     ## Example Usage
 
-    <!--Start PulumiCodeChooser -->
     ```python
     import pulumi
     import pulumi_alicloud as alicloud
@@ -372,7 +369,6 @@ def get_instances_output(availability_zone: Optional[pulumi.Input[Optional[str]]
     pulumi.export("firstInstanceId", instances_ds.instances[0].id)
     pulumi.export("instanceIds", instances_ds.ids)
     ```
-    <!--End PulumiCodeChooser -->
 
 
     :param str availability_zone: Availability zone where instances are located.
@@ -385,8 +381,7 @@ def get_instances_output(availability_zone: Optional[pulumi.Input[Optional[str]]
     :param str ram_role_name: The RAM role name which the instance attaches.
     :param str resource_group_id: The ID of resource group which the instance belongs.
     :param str status: Instance status. Valid values: "Creating", "Starting", "Running", "Stopping" and "Stopped". If undefined, all statuses are considered.
-    :param Mapping[str, Any] tags: A map of tags assigned to the ECS instances. It must be in the format:
-           <!--Start PulumiCodeChooser -->
+    :param Mapping[str, str] tags: A map of tags assigned to the ECS instances. It must be in the format:
            ```python
            import pulumi
            import pulumi_alicloud as alicloud
@@ -396,8 +391,44 @@ def get_instances_output(availability_zone: Optional[pulumi.Input[Optional[str]]
                "tagKey2": "tagValue2",
            })
            ```
-           <!--End PulumiCodeChooser -->
     :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
+    __args__['enableDetails'] = enable_details
+    __args__['ids'] = ids
+    __args__['imageId'] = image_id
+    __args__['instanceName'] = instance_name
+    __args__['nameRegex'] = name_regex
+    __args__['outputFile'] = output_file
+    __args__['pageNumber'] = page_number
+    __args__['pageSize'] = page_size
+    __args__['ramRoleName'] = ram_role_name
+    __args__['resourceGroupId'] = resource_group_id
+    __args__['status'] = status
+    __args__['tags'] = tags
+    __args__['vpcId'] = vpc_id
+    __args__['vswitchId'] = vswitch_id
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    __ret__ = pulumi.runtime.invoke_output('alicloud:ecs/getInstances:getInstances', __args__, opts=opts, typ=GetInstancesResult)
+    return __ret__.apply(lambda __response__: GetInstancesResult(
+        availability_zone=pulumi.get(__response__, 'availability_zone'),
+        enable_details=pulumi.get(__response__, 'enable_details'),
+        id=pulumi.get(__response__, 'id'),
+        ids=pulumi.get(__response__, 'ids'),
+        image_id=pulumi.get(__response__, 'image_id'),
+        instance_name=pulumi.get(__response__, 'instance_name'),
+        instances=pulumi.get(__response__, 'instances'),
+        name_regex=pulumi.get(__response__, 'name_regex'),
+        names=pulumi.get(__response__, 'names'),
+        output_file=pulumi.get(__response__, 'output_file'),
+        page_number=pulumi.get(__response__, 'page_number'),
+        page_size=pulumi.get(__response__, 'page_size'),
+        ram_role_name=pulumi.get(__response__, 'ram_role_name'),
+        resource_group_id=pulumi.get(__response__, 'resource_group_id'),
+        status=pulumi.get(__response__, 'status'),
+        tags=pulumi.get(__response__, 'tags'),
+        total_count=pulumi.get(__response__, 'total_count'),
+        vpc_id=pulumi.get(__response__, 'vpc_id'),
+        vswitch_id=pulumi.get(__response__, 'vswitch_id')))