pulumi-alicloud 3.69.0a1733375908__py3-none-any.whl → 3.70.0__py3-none-any.whl

pulumi_alicloud/ecs/instance.py

@@ -40,6 +40,7 @@ class InstanceArgs:
                  http_put_response_hop_limit: Optional[pulumi.Input[int]] = None,
                  http_tokens: Optional[pulumi.Input[str]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
+                 image_options: Optional[pulumi.Input['InstanceImageOptionsArgs']] = None,
                  include_data_disks: Optional[pulumi.Input[bool]] = None,
                  instance_charge_type: Optional[pulumi.Input[str]] = None,
                  instance_name: Optional[pulumi.Input[str]] = None,
@@ -129,6 +130,21 @@ class InstanceArgs:
                - optional: does not forcefully use the security-enhanced mode (IMDSv2).
                - required: forcefully uses the security-enhanced mode (IMDSv2). After you set this parameter to required, you cannot access instance metadata in normal mode.
         :param pulumi.Input[str] image_id: The Image to use for the instance. ECS instance's image can be replaced via changing `image_id`. When it is changed, the instance will reboot to make the change take effect. If you do not use `launch_template_id` or `launch_template_name` to specify a launch template, you must specify `image_id`.
+        :param pulumi.Input['InstanceImageOptionsArgs'] image_options: The options of images. See `image_options` below.
+               
+               > **NOTE:** System disk category `cloud` has been outdated and it only can be used none I/O Optimized ECS instances. Recommend `cloud_efficiency` and `cloud_ssd` disk.
+               
+               > **NOTE:** From version 1.5.0, instance's charge type can be changed to "PrePaid" by specifying `period` and `period_unit`, but it is irreversible.
+               
+               > **NOTE:** From version 1.5.0, instance's private IP address can be specified when creating VPC network instance.
+               
+               > **NOTE:** From version 1.5.0, instance's vswitch and private IP can be changed in the same availability zone. When they are changed, the instance will reboot to make the change take effect.
+               
+               > **NOTE:** From version 1.7.0, setting "internet_max_bandwidth_out" larger than 0 can allocate a public IP for an instance.
+               Setting "internet_max_bandwidth_out" to 0 can release allocated public IP for VPC instance(For Classic instnace, its public IP cannot be release once it allocated, even thougth its bandwidth out is 0).
+               However, at present, 'PrePaid' instance cannot narrow its max bandwidth out when its 'internet_charge_type' is "PayByBandwidth".
+               
+               > **NOTE:** From version 1.7.0, instance's type can be changed. When it is changed, the instance will reboot to make the change take effect.
         :param pulumi.Input[bool] include_data_disks: Whether to change instance disks charge type when changing instance charge type.
         :param pulumi.Input[str] instance_charge_type: Valid values are `PrePaid`, `PostPaid`, The default is `PostPaid`.
                **NOTE:** Since 1.9.6, it can be changed each other between `PostPaid` and `PrePaid`.
@@ -257,6 +273,8 @@ class InstanceArgs:
             pulumi.set(__self__, "http_tokens", http_tokens)
         if image_id is not None:
             pulumi.set(__self__, "image_id", image_id)
+        if image_options is not None:
+            pulumi.set(__self__, "image_options", image_options)
         if include_data_disks is not None:
             pulumi.set(__self__, "include_data_disks", include_data_disks)
         if instance_charge_type is not None:
@@ -614,6 +632,32 @@ class InstanceArgs:
     def image_id(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "image_id", value)
 
+    @property
+    @pulumi.getter(name="imageOptions")
+    def image_options(self) -> Optional[pulumi.Input['InstanceImageOptionsArgs']]:
+        """
+        The options of images. See `image_options` below.
+
+        > **NOTE:** System disk category `cloud` has been outdated and it only can be used none I/O Optimized ECS instances. Recommend `cloud_efficiency` and `cloud_ssd` disk.
+
+        > **NOTE:** From version 1.5.0, instance's charge type can be changed to "PrePaid" by specifying `period` and `period_unit`, but it is irreversible.
+
+        > **NOTE:** From version 1.5.0, instance's private IP address can be specified when creating VPC network instance.
+
+        > **NOTE:** From version 1.5.0, instance's vswitch and private IP can be changed in the same availability zone. When they are changed, the instance will reboot to make the change take effect.
+
+        > **NOTE:** From version 1.7.0, setting "internet_max_bandwidth_out" larger than 0 can allocate a public IP for an instance.
+        Setting "internet_max_bandwidth_out" to 0 can release allocated public IP for VPC instance(For Classic instnace, its public IP cannot be release once it allocated, even thougth its bandwidth out is 0).
+        However, at present, 'PrePaid' instance cannot narrow its max bandwidth out when its 'internet_charge_type' is "PayByBandwidth".
+
+        > **NOTE:** From version 1.7.0, instance's type can be changed. When it is changed, the instance will reboot to make the change take effect.
+        """
+        return pulumi.get(self, "image_options")
+
+    @image_options.setter
+    def image_options(self, value: Optional[pulumi.Input['InstanceImageOptionsArgs']]):
+        pulumi.set(self, "image_options", value)
+
     @property
     @pulumi.getter(name="includeDataDisks")
     def include_data_disks(self) -> Optional[pulumi.Input[bool]]:
@@ -1342,6 +1386,7 @@ class _InstanceState:
                  http_put_response_hop_limit: Optional[pulumi.Input[int]] = None,
                  http_tokens: Optional[pulumi.Input[str]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
+                 image_options: Optional[pulumi.Input['InstanceImageOptionsArgs']] = None,
                  include_data_disks: Optional[pulumi.Input[bool]] = None,
                  instance_charge_type: Optional[pulumi.Input[str]] = None,
                  instance_name: Optional[pulumi.Input[str]] = None,
@@ -1443,6 +1488,21 @@ class _InstanceState:
                - optional: does not forcefully use the security-enhanced mode (IMDSv2).
                - required: forcefully uses the security-enhanced mode (IMDSv2). After you set this parameter to required, you cannot access instance metadata in normal mode.
         :param pulumi.Input[str] image_id: The Image to use for the instance. ECS instance's image can be replaced via changing `image_id`. When it is changed, the instance will reboot to make the change take effect. If you do not use `launch_template_id` or `launch_template_name` to specify a launch template, you must specify `image_id`.
+        :param pulumi.Input['InstanceImageOptionsArgs'] image_options: The options of images. See `image_options` below.
+               
+               > **NOTE:** System disk category `cloud` has been outdated and it only can be used none I/O Optimized ECS instances. Recommend `cloud_efficiency` and `cloud_ssd` disk.
+               
+               > **NOTE:** From version 1.5.0, instance's charge type can be changed to "PrePaid" by specifying `period` and `period_unit`, but it is irreversible.
+               
+               > **NOTE:** From version 1.5.0, instance's private IP address can be specified when creating VPC network instance.
+               
+               > **NOTE:** From version 1.5.0, instance's vswitch and private IP can be changed in the same availability zone. When they are changed, the instance will reboot to make the change take effect.
+               
+               > **NOTE:** From version 1.7.0, setting "internet_max_bandwidth_out" larger than 0 can allocate a public IP for an instance.
+               Setting "internet_max_bandwidth_out" to 0 can release allocated public IP for VPC instance(For Classic instnace, its public IP cannot be release once it allocated, even thougth its bandwidth out is 0).
+               However, at present, 'PrePaid' instance cannot narrow its max bandwidth out when its 'internet_charge_type' is "PayByBandwidth".
+               
+               > **NOTE:** From version 1.7.0, instance's type can be changed. When it is changed, the instance will reboot to make the change take effect.
         :param pulumi.Input[bool] include_data_disks: Whether to change instance disks charge type when changing instance charge type.
         :param pulumi.Input[str] instance_charge_type: Valid values are `PrePaid`, `PostPaid`, The default is `PostPaid`.
                **NOTE:** Since 1.9.6, it can be changed each other between `PostPaid` and `PrePaid`.
@@ -1587,6 +1647,8 @@ class _InstanceState:
             pulumi.set(__self__, "http_tokens", http_tokens)
         if image_id is not None:
             pulumi.set(__self__, "image_id", image_id)
+        if image_options is not None:
+            pulumi.set(__self__, "image_options", image_options)
         if include_data_disks is not None:
             pulumi.set(__self__, "include_data_disks", include_data_disks)
         if instance_charge_type is not None:
@@ -2008,6 +2070,32 @@ class _InstanceState:
     def image_id(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "image_id", value)
 
+    @property
+    @pulumi.getter(name="imageOptions")
+    def image_options(self) -> Optional[pulumi.Input['InstanceImageOptionsArgs']]:
+        """
+        The options of images. See `image_options` below.
+
+        > **NOTE:** System disk category `cloud` has been outdated and it only can be used none I/O Optimized ECS instances. Recommend `cloud_efficiency` and `cloud_ssd` disk.
+
+        > **NOTE:** From version 1.5.0, instance's charge type can be changed to "PrePaid" by specifying `period` and `period_unit`, but it is irreversible.
+
+        > **NOTE:** From version 1.5.0, instance's private IP address can be specified when creating VPC network instance.
+
+        > **NOTE:** From version 1.5.0, instance's vswitch and private IP can be changed in the same availability zone. When they are changed, the instance will reboot to make the change take effect.
+
+        > **NOTE:** From version 1.7.0, setting "internet_max_bandwidth_out" larger than 0 can allocate a public IP for an instance.
+        Setting "internet_max_bandwidth_out" to 0 can release allocated public IP for VPC instance(For Classic instnace, its public IP cannot be release once it allocated, even thougth its bandwidth out is 0).
+        However, at present, 'PrePaid' instance cannot narrow its max bandwidth out when its 'internet_charge_type' is "PayByBandwidth".
+
+        > **NOTE:** From version 1.7.0, instance's type can be changed. When it is changed, the instance will reboot to make the change take effect.
+        """
+        return pulumi.get(self, "image_options")
+
+    @image_options.setter
+    def image_options(self, value: Optional[pulumi.Input['InstanceImageOptionsArgs']]):
+        pulumi.set(self, "image_options", value)
+
     @property
     @pulumi.getter(name="includeDataDisks")
     def include_data_disks(self) -> Optional[pulumi.Input[bool]]:
@@ -2830,6 +2918,7 @@ class Instance(pulumi.CustomResource):
                  http_put_response_hop_limit: Optional[pulumi.Input[int]] = None,
                  http_tokens: Optional[pulumi.Input[str]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
+                 image_options: Optional[pulumi.Input[Union['InstanceImageOptionsArgs', 'InstanceImageOptionsArgsDict']]] = None,
                  include_data_disks: Optional[pulumi.Input[bool]] = None,
                  instance_charge_type: Optional[pulumi.Input[str]] = None,
                  instance_name: Optional[pulumi.Input[str]] = None,
@@ -2998,6 +3087,21 @@ class Instance(pulumi.CustomResource):
                - optional: does not forcefully use the security-enhanced mode (IMDSv2).
                - required: forcefully uses the security-enhanced mode (IMDSv2). After you set this parameter to required, you cannot access instance metadata in normal mode.
         :param pulumi.Input[str] image_id: The Image to use for the instance. ECS instance's image can be replaced via changing `image_id`. When it is changed, the instance will reboot to make the change take effect. If you do not use `launch_template_id` or `launch_template_name` to specify a launch template, you must specify `image_id`.
+        :param pulumi.Input[Union['InstanceImageOptionsArgs', 'InstanceImageOptionsArgsDict']] image_options: The options of images. See `image_options` below.
+               
+               > **NOTE:** System disk category `cloud` has been outdated and it only can be used none I/O Optimized ECS instances. Recommend `cloud_efficiency` and `cloud_ssd` disk.
+               
+               > **NOTE:** From version 1.5.0, instance's charge type can be changed to "PrePaid" by specifying `period` and `period_unit`, but it is irreversible.
+               
+               > **NOTE:** From version 1.5.0, instance's private IP address can be specified when creating VPC network instance.
+               
+               > **NOTE:** From version 1.5.0, instance's vswitch and private IP can be changed in the same availability zone. When they are changed, the instance will reboot to make the change take effect.
+               
+               > **NOTE:** From version 1.7.0, setting "internet_max_bandwidth_out" larger than 0 can allocate a public IP for an instance.
+               Setting "internet_max_bandwidth_out" to 0 can release allocated public IP for VPC instance(For Classic instnace, its public IP cannot be release once it allocated, even thougth its bandwidth out is 0).
+               However, at present, 'PrePaid' instance cannot narrow its max bandwidth out when its 'internet_charge_type' is "PayByBandwidth".
+               
+               > **NOTE:** From version 1.7.0, instance's type can be changed. When it is changed, the instance will reboot to make the change take effect.
         :param pulumi.Input[bool] include_data_disks: Whether to change instance disks charge type when changing instance charge type.
         :param pulumi.Input[str] instance_charge_type: Valid values are `PrePaid`, `PostPaid`, The default is `PostPaid`.
                **NOTE:** Since 1.9.6, it can be changed each other between `PostPaid` and `PrePaid`.
@@ -3203,6 +3307,7 @@ class Instance(pulumi.CustomResource):
                  http_put_response_hop_limit: Optional[pulumi.Input[int]] = None,
                  http_tokens: Optional[pulumi.Input[str]] = None,
                  image_id: Optional[pulumi.Input[str]] = None,
+                 image_options: Optional[pulumi.Input[Union['InstanceImageOptionsArgs', 'InstanceImageOptionsArgsDict']]] = None,
                  include_data_disks: Optional[pulumi.Input[bool]] = None,
                  instance_charge_type: Optional[pulumi.Input[str]] = None,
                  instance_name: Optional[pulumi.Input[str]] = None,
@@ -3287,6 +3392,7 @@ class Instance(pulumi.CustomResource):
             __props__.__dict__["http_put_response_hop_limit"] = http_put_response_hop_limit
             __props__.__dict__["http_tokens"] = http_tokens
             __props__.__dict__["image_id"] = image_id
+            __props__.__dict__["image_options"] = image_options
             __props__.__dict__["include_data_disks"] = include_data_disks
             __props__.__dict__["instance_charge_type"] = instance_charge_type
             __props__.__dict__["instance_name"] = instance_name
@@ -3390,6 +3496,7 @@ class Instance(pulumi.CustomResource):
             http_put_response_hop_limit: Optional[pulumi.Input[int]] = None,
             http_tokens: Optional[pulumi.Input[str]] = None,
             image_id: Optional[pulumi.Input[str]] = None,
+            image_options: Optional[pulumi.Input[Union['InstanceImageOptionsArgs', 'InstanceImageOptionsArgsDict']]] = None,
             include_data_disks: Optional[pulumi.Input[bool]] = None,
             instance_charge_type: Optional[pulumi.Input[str]] = None,
             instance_name: Optional[pulumi.Input[str]] = None,
@@ -3496,6 +3603,21 @@ class Instance(pulumi.CustomResource):
                - optional: does not forcefully use the security-enhanced mode (IMDSv2).
                - required: forcefully uses the security-enhanced mode (IMDSv2). After you set this parameter to required, you cannot access instance metadata in normal mode.
         :param pulumi.Input[str] image_id: The Image to use for the instance. ECS instance's image can be replaced via changing `image_id`. When it is changed, the instance will reboot to make the change take effect. If you do not use `launch_template_id` or `launch_template_name` to specify a launch template, you must specify `image_id`.
+        :param pulumi.Input[Union['InstanceImageOptionsArgs', 'InstanceImageOptionsArgsDict']] image_options: The options of images. See `image_options` below.
+               
+               > **NOTE:** System disk category `cloud` has been outdated and it only can be used none I/O Optimized ECS instances. Recommend `cloud_efficiency` and `cloud_ssd` disk.
+               
+               > **NOTE:** From version 1.5.0, instance's charge type can be changed to "PrePaid" by specifying `period` and `period_unit`, but it is irreversible.
+               
+               > **NOTE:** From version 1.5.0, instance's private IP address can be specified when creating VPC network instance.
+               
+               > **NOTE:** From version 1.5.0, instance's vswitch and private IP can be changed in the same availability zone. When they are changed, the instance will reboot to make the change take effect.
+               
+               > **NOTE:** From version 1.7.0, setting "internet_max_bandwidth_out" larger than 0 can allocate a public IP for an instance.
+               Setting "internet_max_bandwidth_out" to 0 can release allocated public IP for VPC instance(For Classic instnace, its public IP cannot be release once it allocated, even thougth its bandwidth out is 0).
+               However, at present, 'PrePaid' instance cannot narrow its max bandwidth out when its 'internet_charge_type' is "PayByBandwidth".
+               
+               > **NOTE:** From version 1.7.0, instance's type can be changed. When it is changed, the instance will reboot to make the change take effect.
         :param pulumi.Input[bool] include_data_disks: Whether to change instance disks charge type when changing instance charge type.
         :param pulumi.Input[str] instance_charge_type: Valid values are `PrePaid`, `PostPaid`, The default is `PostPaid`.
                **NOTE:** Since 1.9.6, it can be changed each other between `PostPaid` and `PrePaid`.
@@ -3618,6 +3740,7 @@ class Instance(pulumi.CustomResource):
         __props__.__dict__["http_put_response_hop_limit"] = http_put_response_hop_limit
         __props__.__dict__["http_tokens"] = http_tokens
         __props__.__dict__["image_id"] = image_id
+        __props__.__dict__["image_options"] = image_options
         __props__.__dict__["include_data_disks"] = include_data_disks
         __props__.__dict__["instance_charge_type"] = instance_charge_type
         __props__.__dict__["instance_name"] = instance_name
@@ -3881,6 +4004,28 @@ class Instance(pulumi.CustomResource):
         """
         return pulumi.get(self, "image_id")
 
+    @property
+    @pulumi.getter(name="imageOptions")
+    def image_options(self) -> pulumi.Output['outputs.InstanceImageOptions']:
+        """
+        The options of images. See `image_options` below.
+
+        > **NOTE:** System disk category `cloud` has been outdated and it only can be used none I/O Optimized ECS instances. Recommend `cloud_efficiency` and `cloud_ssd` disk.
+
+        > **NOTE:** From version 1.5.0, instance's charge type can be changed to "PrePaid" by specifying `period` and `period_unit`, but it is irreversible.
+
+        > **NOTE:** From version 1.5.0, instance's private IP address can be specified when creating VPC network instance.
+
+        > **NOTE:** From version 1.5.0, instance's vswitch and private IP can be changed in the same availability zone. When they are changed, the instance will reboot to make the change take effect.
+
+        > **NOTE:** From version 1.7.0, setting "internet_max_bandwidth_out" larger than 0 can allocate a public IP for an instance.
+        Setting "internet_max_bandwidth_out" to 0 can release allocated public IP for VPC instance(For Classic instnace, its public IP cannot be release once it allocated, even thougth its bandwidth out is 0).
+        However, at present, 'PrePaid' instance cannot narrow its max bandwidth out when its 'internet_charge_type' is "PayByBandwidth".
+
+        > **NOTE:** From version 1.7.0, instance's type can be changed. When it is changed, the instance will reboot to make the change take effect.
+        """
+        return pulumi.get(self, "image_options")
+
     @property
     @pulumi.getter(name="includeDataDisks")
     def include_data_disks(self) -> pulumi.Output[Optional[bool]]:

pulumi_alicloud/ecs/key_pair.py

@@ -36,8 +36,8 @@ class KeyPairArgs:
         if key_file is not None:
             pulumi.set(__self__, "key_file", key_file)
         if key_name is not None:
-            warnings.warn("""Field 'key_name' has been deprecated from provider version 1.121.0. New field 'key_pair_name' instead.""", DeprecationWarning)
-            pulumi.log.warn("""key_name is deprecated: Field 'key_name' has been deprecated from provider version 1.121.0. New field 'key_pair_name' instead.""")
+            warnings.warn("""Field `key_name` has been deprecated from provider version 1.121.0. New field `key_pair_name` instead.""", DeprecationWarning)
+            pulumi.log.warn("""key_name is deprecated: Field `key_name` has been deprecated from provider version 1.121.0. New field `key_pair_name` instead.""")
         if key_name is not None:
             pulumi.set(__self__, "key_name", key_name)
         if key_name_prefix is not None:
@@ -65,7 +65,7 @@ class KeyPairArgs:
 
     @property
     @pulumi.getter(name="keyName")
-    @_utilities.deprecated("""Field 'key_name' has been deprecated from provider version 1.121.0. New field 'key_pair_name' instead.""")
+    @_utilities.deprecated("""Field `key_name` has been deprecated from provider version 1.121.0. New field `key_pair_name` instead.""")
     def key_name(self) -> Optional[pulumi.Input[str]]:
         """
         The key pair's name. It is the only in one Alicloud account.
@@ -131,6 +131,7 @@ class KeyPairArgs:
 @pulumi.input_type
 class _KeyPairState:
     def __init__(__self__, *,
+                 create_time: Optional[pulumi.Input[str]] = None,
                  finger_print: Optional[pulumi.Input[str]] = None,
                  key_file: Optional[pulumi.Input[str]] = None,
                  key_name: Optional[pulumi.Input[str]] = None,
@@ -146,13 +147,15 @@ class _KeyPairState:
         :param pulumi.Input[str] public_key: You can import an existing public key and using Alicloud key pair to manage it. If this parameter is specified, `resource_group_id` is the key pair belongs.
         :param pulumi.Input[str] resource_group_id: The Id of resource group which the key pair belongs.
         """
+        if create_time is not None:
+            pulumi.set(__self__, "create_time", create_time)
         if finger_print is not None:
             pulumi.set(__self__, "finger_print", finger_print)
         if key_file is not None:
             pulumi.set(__self__, "key_file", key_file)
         if key_name is not None:
-            warnings.warn("""Field 'key_name' has been deprecated from provider version 1.121.0. New field 'key_pair_name' instead.""", DeprecationWarning)
-            pulumi.log.warn("""key_name is deprecated: Field 'key_name' has been deprecated from provider version 1.121.0. New field 'key_pair_name' instead.""")
+            warnings.warn("""Field `key_name` has been deprecated from provider version 1.121.0. New field `key_pair_name` instead.""", DeprecationWarning)
+            pulumi.log.warn("""key_name is deprecated: Field `key_name` has been deprecated from provider version 1.121.0. New field `key_pair_name` instead.""")
         if key_name is not None:
             pulumi.set(__self__, "key_name", key_name)
         if key_name_prefix is not None:
@@ -166,6 +169,15 @@ class _KeyPairState:
         if tags is not None:
             pulumi.set(__self__, "tags", tags)
 
+    @property
+    @pulumi.getter(name="createTime")
+    def create_time(self) -> Optional[pulumi.Input[str]]:
+        return pulumi.get(self, "create_time")
+
+    @create_time.setter
+    def create_time(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "create_time", value)
+
     @property
     @pulumi.getter(name="fingerPrint")
     def finger_print(self) -> Optional[pulumi.Input[str]]:
@@ -189,7 +201,7 @@ class _KeyPairState:
 
     @property
     @pulumi.getter(name="keyName")
-    @_utilities.deprecated("""Field 'key_name' has been deprecated from provider version 1.121.0. New field 'key_pair_name' instead.""")
+    @_utilities.deprecated("""Field `key_name` has been deprecated from provider version 1.121.0. New field `key_pair_name` instead.""")
     def key_name(self) -> Optional[pulumi.Input[str]]:
         """
         The key pair's name. It is the only in one Alicloud account.
@@ -376,6 +388,7 @@ class KeyPair(pulumi.CustomResource):
             __props__.__dict__["public_key"] = public_key
             __props__.__dict__["resource_group_id"] = resource_group_id
             __props__.__dict__["tags"] = tags
+            __props__.__dict__["create_time"] = None
             __props__.__dict__["finger_print"] = None
         super(KeyPair, __self__).__init__(
             'alicloud:ecs/keyPair:KeyPair',
@@ -387,6 +400,7 @@ class KeyPair(pulumi.CustomResource):
     def get(resource_name: str,
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
+            create_time: Optional[pulumi.Input[str]] = None,
             finger_print: Optional[pulumi.Input[str]] = None,
             key_file: Optional[pulumi.Input[str]] = None,
             key_name: Optional[pulumi.Input[str]] = None,
@@ -411,6 +425,7 @@ class KeyPair(pulumi.CustomResource):
 
         __props__ = _KeyPairState.__new__(_KeyPairState)
 
+        __props__.__dict__["create_time"] = create_time
         __props__.__dict__["finger_print"] = finger_print
         __props__.__dict__["key_file"] = key_file
         __props__.__dict__["key_name"] = key_name
@@ -421,6 +436,11 @@ class KeyPair(pulumi.CustomResource):
         __props__.__dict__["tags"] = tags
         return KeyPair(resource_name, opts=opts, __props__=__props__)
 
+    @property
+    @pulumi.getter(name="createTime")
+    def create_time(self) -> pulumi.Output[str]:
+        return pulumi.get(self, "create_time")
+
     @property
     @pulumi.getter(name="fingerPrint")
     def finger_print(self) -> pulumi.Output[str]:
@@ -436,7 +456,7 @@ class KeyPair(pulumi.CustomResource):
 
     @property
     @pulumi.getter(name="keyName")
-    @_utilities.deprecated("""Field 'key_name' has been deprecated from provider version 1.121.0. New field 'key_pair_name' instead.""")
+    @_utilities.deprecated("""Field `key_name` has been deprecated from provider version 1.121.0. New field `key_pair_name` instead.""")
     def key_name(self) -> pulumi.Output[str]:
         """
         The key pair's name. It is the only in one Alicloud account.

pulumi_alicloud/ecs/outputs.py

@@ -30,6 +30,7 @@ __all__ = [
     'ImageFeatures',
     'ImageImportDiskDeviceMapping',
     'InstanceDataDisk',
+    'InstanceImageOptions',
     'InstanceMaintenanceTime',
     'InstanceNetworkInterfaces',
     'LaunchTemplateDataDisk',
@@ -1417,6 +1418,42 @@ class InstanceDataDisk(dict):
         return pulumi.get(self, "snapshot_id")
 
 
+@pulumi.output_type
+class InstanceImageOptions(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "loginAsNonRoot":
+            suggest = "login_as_non_root"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in InstanceImageOptions. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        InstanceImageOptions.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        InstanceImageOptions.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 login_as_non_root: Optional[bool] = None):
+        """
+        :param bool login_as_non_root: Whether to allow the instance logging in with the ecs-user user.
+        """
+        if login_as_non_root is not None:
+            pulumi.set(__self__, "login_as_non_root", login_as_non_root)
+
+    @property
+    @pulumi.getter(name="loginAsNonRoot")
+    def login_as_non_root(self) -> Optional[bool]:
+        """
+        Whether to allow the instance logging in with the ecs-user user.
+        """
+        return pulumi.get(self, "login_as_non_root")
+
+
 @pulumi.output_type
 class InstanceMaintenanceTime(dict):
     @staticmethod

pulumi_alicloud/edas/get_applications.py

@@ -146,7 +146,7 @@ def get_applications(ids: Optional[Sequence[str]] = None,
 def get_applications_output(ids: Optional[pulumi.Input[Optional[Sequence[str]]]] = None,
                             name_regex: Optional[pulumi.Input[Optional[str]]] = None,
                             output_file: Optional[pulumi.Input[Optional[str]]] = None,
-                            opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetApplicationsResult]:
+                            opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetApplicationsResult]:
     """
     This data source provides a list of EDAS application in an Alibaba Cloud account according to the specified filters.
 
@@ -172,7 +172,7 @@ def get_applications_output(ids: Optional[pulumi.Input[Optional[Sequence[str]]]]
     __args__['ids'] = ids
     __args__['nameRegex'] = name_regex
     __args__['outputFile'] = output_file
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:edas/getApplications:getApplications', __args__, opts=opts, typ=GetApplicationsResult)
     return __ret__.apply(lambda __response__: GetApplicationsResult(
         applications=pulumi.get(__response__, 'applications'),

pulumi_alicloud/edas/get_clusters.py

@@ -161,7 +161,7 @@ def get_clusters_output(ids: Optional[pulumi.Input[Optional[Sequence[str]]]] = N
                         logical_region_id: Optional[pulumi.Input[str]] = None,
                         name_regex: Optional[pulumi.Input[Optional[str]]] = None,
                         output_file: Optional[pulumi.Input[Optional[str]]] = None,
-                        opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetClustersResult]:
+                        opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetClustersResult]:
     """
     This data source provides a list of EDAS clusters in an Alibaba Cloud account according to the specified filters.
 
@@ -190,7 +190,7 @@ def get_clusters_output(ids: Optional[pulumi.Input[Optional[Sequence[str]]]] = N
     __args__['logicalRegionId'] = logical_region_id
     __args__['nameRegex'] = name_regex
     __args__['outputFile'] = output_file
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:edas/getClusters:getClusters', __args__, opts=opts, typ=GetClustersResult)
     return __ret__.apply(lambda __response__: GetClustersResult(
         clusters=pulumi.get(__response__, 'clusters'),

pulumi_alicloud/edas/get_deploy_groups.py

@@ -135,7 +135,7 @@ def get_deploy_groups(app_id: Optional[str] = None,
 def get_deploy_groups_output(app_id: Optional[pulumi.Input[str]] = None,
                              name_regex: Optional[pulumi.Input[Optional[str]]] = None,
                              output_file: Optional[pulumi.Input[Optional[str]]] = None,
-                             opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetDeployGroupsResult]:
+                             opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetDeployGroupsResult]:
     """
     This data source provides a list of EDAS deploy groups in an Alibaba Cloud account according to the specified filters.
 
@@ -150,7 +150,7 @@ def get_deploy_groups_output(app_id: Optional[pulumi.Input[str]] = None,
     __args__['appId'] = app_id
     __args__['nameRegex'] = name_regex
     __args__['outputFile'] = output_file
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:edas/getDeployGroups:getDeployGroups', __args__, opts=opts, typ=GetDeployGroupsResult)
     return __ret__.apply(lambda __response__: GetDeployGroupsResult(
         app_id=pulumi.get(__response__, 'app_id'),

pulumi_alicloud/edas/get_namespaces.py

@@ -140,7 +140,7 @@ def get_namespaces(ids: Optional[Sequence[str]] = None,
 def get_namespaces_output(ids: Optional[pulumi.Input[Optional[Sequence[str]]]] = None,
                           name_regex: Optional[pulumi.Input[Optional[str]]] = None,
                           output_file: Optional[pulumi.Input[Optional[str]]] = None,
-                          opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetNamespacesResult]:
+                          opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetNamespacesResult]:
     """
     This data source provides the Edas Namespaces of the current Alibaba Cloud user.
 
@@ -169,7 +169,7 @@ def get_namespaces_output(ids: Optional[pulumi.Input[Optional[Sequence[str]]]] =
     __args__['ids'] = ids
     __args__['nameRegex'] = name_regex
     __args__['outputFile'] = output_file
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:edas/getNamespaces:getNamespaces', __args__, opts=opts, typ=GetNamespacesResult)
     return __ret__.apply(lambda __response__: GetNamespacesResult(
         id=pulumi.get(__response__, 'id'),

pulumi_alicloud/edas/get_service.py

@@ -105,7 +105,7 @@ def get_service(enable: Optional[str] = None,
         id=pulumi.get(__ret__, 'id'),
         status=pulumi.get(__ret__, 'status'))
 def get_service_output(enable: Optional[pulumi.Input[Optional[str]]] = None,
-                       opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetServiceResult]:
+                       opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetServiceResult]:
     """
     Using this data source can open EDAS service automatically. If the service has been opened, it will return opened.
 
@@ -131,7 +131,7 @@ def get_service_output(enable: Optional[pulumi.Input[Optional[str]]] = None,
     """
     __args__ = dict()
     __args__['enable'] = enable
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:edas/getService:getService', __args__, opts=opts, typ=GetServiceResult)
     return __ret__.apply(lambda __response__: GetServiceResult(
         enable=pulumi.get(__response__, 'enable'),

pulumi_alicloud/eds/get_ad_connector_directories.py

@@ -152,7 +152,7 @@ def get_ad_connector_directories_output(ids: Optional[pulumi.Input[Optional[Sequ
                                         name_regex: Optional[pulumi.Input[Optional[str]]] = None,
                                         output_file: Optional[pulumi.Input[Optional[str]]] = None,
                                         status: Optional[pulumi.Input[Optional[str]]] = None,
-                                        opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetAdConnectorDirectoriesResult]:
+                                        opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetAdConnectorDirectoriesResult]:
     """
     This data source provides the Ecd Ad Connector Directories of the current Alibaba Cloud user.
 
@@ -181,7 +181,7 @@ def get_ad_connector_directories_output(ids: Optional[pulumi.Input[Optional[Sequ
     __args__['nameRegex'] = name_regex
     __args__['outputFile'] = output_file
     __args__['status'] = status
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:eds/getAdConnectorDirectories:getAdConnectorDirectories', __args__, opts=opts, typ=GetAdConnectorDirectoriesResult)
     return __ret__.apply(lambda __response__: GetAdConnectorDirectoriesResult(
         directories=pulumi.get(__response__, 'directories'),

pulumi_alicloud/eds/get_ad_connector_office_sites.py

@@ -163,7 +163,7 @@ def get_ad_connector_office_sites_output(ids: Optional[pulumi.Input[Optional[Seq
                                          name_regex: Optional[pulumi.Input[Optional[str]]] = None,
                                          output_file: Optional[pulumi.Input[Optional[str]]] = None,
                                          status: Optional[pulumi.Input[Optional[str]]] = None,
-                                         opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetAdConnectorOfficeSitesResult]:
+                                         opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetAdConnectorOfficeSitesResult]:
     """
     This data source provides the Ecd Ad Connector Office Sites of the current Alibaba Cloud user.
 
@@ -203,7 +203,7 @@ def get_ad_connector_office_sites_output(ids: Optional[pulumi.Input[Optional[Seq
     __args__['nameRegex'] = name_regex
     __args__['outputFile'] = output_file
     __args__['status'] = status
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:eds/getAdConnectorOfficeSites:getAdConnectorOfficeSites', __args__, opts=opts, typ=GetAdConnectorOfficeSitesResult)
     return __ret__.apply(lambda __response__: GetAdConnectorOfficeSitesResult(
         id=pulumi.get(__response__, 'id'),

pulumi_alicloud/eds/get_bundles.py

@@ -164,7 +164,7 @@ def get_bundles_output(bundle_ids: Optional[pulumi.Input[Optional[Sequence[str]]
                        ids: Optional[pulumi.Input[Optional[Sequence[str]]]] = None,
                        name_regex: Optional[pulumi.Input[Optional[str]]] = None,
                        output_file: Optional[pulumi.Input[Optional[str]]] = None,
-                       opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetBundlesResult]:
+                       opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetBundlesResult]:
     """
     This data source provides the Ecd bundles of the current Alibaba Cloud user.
 
@@ -193,7 +193,7 @@ def get_bundles_output(bundle_ids: Optional[pulumi.Input[Optional[Sequence[str]]
     __args__['ids'] = ids
     __args__['nameRegex'] = name_regex
     __args__['outputFile'] = output_file
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:eds/getBundles:getBundles', __args__, opts=opts, typ=GetBundlesResult)
     return __ret__.apply(lambda __response__: GetBundlesResult(
         bundle_ids=pulumi.get(__response__, 'bundle_ids'),

pulumi_alicloud/eds/get_commands.py

@@ -202,7 +202,7 @@ def get_commands_output(command_type: Optional[pulumi.Input[Optional[str]]] = No
                         ids: Optional[pulumi.Input[Optional[Sequence[str]]]] = None,
                         output_file: Optional[pulumi.Input[Optional[str]]] = None,
                         status: Optional[pulumi.Input[Optional[str]]] = None,
-                        opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetCommandsResult]:
+                        opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetCommandsResult]:
     """
     This data source provides the Ecd Commands of the current Alibaba Cloud user.
 
@@ -267,7 +267,7 @@ def get_commands_output(command_type: Optional[pulumi.Input[Optional[str]]] = No
     __args__['ids'] = ids
     __args__['outputFile'] = output_file
     __args__['status'] = status
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:eds/getCommands:getCommands', __args__, opts=opts, typ=GetCommandsResult)
     return __ret__.apply(lambda __response__: GetCommandsResult(
         command_type=pulumi.get(__response__, 'command_type'),

pulumi_alicloud/eds/get_custom_properties.py

@@ -114,7 +114,7 @@ def get_custom_properties(ids: Optional[Sequence[str]] = None,
         properties=pulumi.get(__ret__, 'properties'))
 def get_custom_properties_output(ids: Optional[pulumi.Input[Optional[Sequence[str]]]] = None,
                                  output_file: Optional[pulumi.Input[Optional[str]]] = None,
-                                 opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetCustomPropertiesResult]:
+                                 opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetCustomPropertiesResult]:
     """
     This data source provides the Ecd Custom Properties of the current Alibaba Cloud user.
 
@@ -139,7 +139,7 @@ def get_custom_properties_output(ids: Optional[pulumi.Input[Optional[Sequence[st
     __args__ = dict()
     __args__['ids'] = ids
     __args__['outputFile'] = output_file
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:eds/getCustomProperties:getCustomProperties', __args__, opts=opts, typ=GetCustomPropertiesResult)
     return __ret__.apply(lambda __response__: GetCustomPropertiesResult(
         id=pulumi.get(__response__, 'id'),

pulumi_alicloud/eds/get_desktop_types.py

@@ -184,7 +184,7 @@ def get_desktop_types_output(cpu_count: Optional[pulumi.Input[Optional[int]]] =
                              memory_size: Optional[pulumi.Input[Optional[int]]] = None,
                              output_file: Optional[pulumi.Input[Optional[str]]] = None,
                              status: Optional[pulumi.Input[Optional[str]]] = None,
-                             opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetDesktopTypesResult]:
+                             opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetDesktopTypesResult]:
     """
     This data source provides the Ecd Desktop Types of the current Alibaba Cloud user.
 
@@ -219,7 +219,7 @@ def get_desktop_types_output(cpu_count: Optional[pulumi.Input[Optional[int]]] =
     __args__['memorySize'] = memory_size
     __args__['outputFile'] = output_file
     __args__['status'] = status
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:eds/getDesktopTypes:getDesktopTypes', __args__, opts=opts, typ=GetDesktopTypesResult)
     return __ret__.apply(lambda __response__: GetDesktopTypesResult(
         cpu_count=pulumi.get(__response__, 'cpu_count'),