pulumi-alicloud 3.70.0a1734412500__py3-none-any.whl → 3.71.0__py3-none-any.whl

pulumi_alicloud/ecs/snapshot.py

@@ -193,12 +193,14 @@ class SnapshotArgs:
 class _SnapshotState:
     def __init__(__self__, *,
                  category: Optional[pulumi.Input[str]] = None,
+                 create_time: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  disk_id: Optional[pulumi.Input[str]] = None,
                  force: Optional[pulumi.Input[bool]] = None,
                  instant_access: Optional[pulumi.Input[bool]] = None,
                  instant_access_retention_days: Optional[pulumi.Input[int]] = None,
                  name: Optional[pulumi.Input[str]] = None,
+                 region_id: Optional[pulumi.Input[str]] = None,
                  resource_group_id: Optional[pulumi.Input[str]] = None,
                  retention_days: Optional[pulumi.Input[int]] = None,
                  snapshot_name: Optional[pulumi.Input[str]] = None,
@@ -215,6 +217,8 @@ class _SnapshotState:
         """
         if category is not None:
             pulumi.set(__self__, "category", category)
+        if create_time is not None:
+            pulumi.set(__self__, "create_time", create_time)
         if description is not None:
             pulumi.set(__self__, "description", description)
         if disk_id is not None:
@@ -236,6 +240,8 @@ class _SnapshotState:
             pulumi.log.warn("""name is deprecated: Field `name` has been deprecated from provider version 1.120.0. New field `snapshot_name` instead.""")
         if name is not None:
             pulumi.set(__self__, "name", name)
+        if region_id is not None:
+            pulumi.set(__self__, "region_id", region_id)
         if resource_group_id is not None:
             pulumi.set(__self__, "resource_group_id", resource_group_id)
         if retention_days is not None:
@@ -256,6 +262,15 @@ class _SnapshotState:
     def category(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "category", value)
 
+    @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
     def description(self) -> Optional[pulumi.Input[str]]:
@@ -323,6 +338,15 @@ class _SnapshotState:
     def name(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "name", value)
 
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> Optional[pulumi.Input[str]]:
+        return pulumi.get(self, "region_id")
+
+    @region_id.setter
+    def region_id(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "region_id", value)
+
     @property
     @pulumi.getter(name="resourceGroupId")
     def resource_group_id(self) -> Optional[pulumi.Input[str]]:
@@ -515,6 +539,8 @@ class Snapshot(pulumi.CustomResource):
             __props__.__dict__["retention_days"] = retention_days
             __props__.__dict__["snapshot_name"] = snapshot_name
             __props__.__dict__["tags"] = tags
+            __props__.__dict__["create_time"] = None
+            __props__.__dict__["region_id"] = None
             __props__.__dict__["status"] = None
         super(Snapshot, __self__).__init__(
             'alicloud:ecs/snapshot:Snapshot',
@@ -527,12 +553,14 @@ class Snapshot(pulumi.CustomResource):
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
             category: Optional[pulumi.Input[str]] = None,
+            create_time: Optional[pulumi.Input[str]] = None,
             description: Optional[pulumi.Input[str]] = None,
             disk_id: Optional[pulumi.Input[str]] = None,
             force: Optional[pulumi.Input[bool]] = None,
             instant_access: Optional[pulumi.Input[bool]] = None,
             instant_access_retention_days: Optional[pulumi.Input[int]] = None,
             name: Optional[pulumi.Input[str]] = None,
+            region_id: Optional[pulumi.Input[str]] = None,
             resource_group_id: Optional[pulumi.Input[str]] = None,
             retention_days: Optional[pulumi.Input[int]] = None,
             snapshot_name: Optional[pulumi.Input[str]] = None,
@@ -557,12 +585,14 @@ class Snapshot(pulumi.CustomResource):
         __props__ = _SnapshotState.__new__(_SnapshotState)
 
         __props__.__dict__["category"] = category
+        __props__.__dict__["create_time"] = create_time
         __props__.__dict__["description"] = description
         __props__.__dict__["disk_id"] = disk_id
         __props__.__dict__["force"] = force
         __props__.__dict__["instant_access"] = instant_access
         __props__.__dict__["instant_access_retention_days"] = instant_access_retention_days
         __props__.__dict__["name"] = name
+        __props__.__dict__["region_id"] = region_id
         __props__.__dict__["resource_group_id"] = resource_group_id
         __props__.__dict__["retention_days"] = retention_days
         __props__.__dict__["snapshot_name"] = snapshot_name
@@ -575,6 +605,11 @@ class Snapshot(pulumi.CustomResource):
     def category(self) -> pulumi.Output[str]:
         return pulumi.get(self, "category")
 
+    @property
+    @pulumi.getter(name="createTime")
+    def create_time(self) -> pulumi.Output[str]:
+        return pulumi.get(self, "create_time")
+
     @property
     @pulumi.getter
     def description(self) -> pulumi.Output[Optional[str]]:
@@ -618,6 +653,11 @@ class Snapshot(pulumi.CustomResource):
         """
         return pulumi.get(self, "name")
 
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> pulumi.Output[str]:
+        return pulumi.get(self, "region_id")
+
     @property
     @pulumi.getter(name="resourceGroupId")
     def resource_group_id(self) -> pulumi.Output[Optional[str]]:

pulumi_alicloud/eds/ram_directory.py

@@ -224,6 +224,8 @@ class RamDirectory(pulumi.CustomResource):
 
         > **NOTE:** Available since v1.174.0.
 
+        > **DEPRECATED:** This resource has been deprecated from version `1.239.0`.
+
         ## Example Usage
 
         Basic Usage
@@ -281,6 +283,8 @@ class RamDirectory(pulumi.CustomResource):
 
         > **NOTE:** Available since v1.174.0.
 
+        > **DEPRECATED:** This resource has been deprecated from version `1.239.0`.
+
         ## Example Usage
 
         Basic Usage

pulumi_alicloud/ess/_inputs.py

@@ -47,6 +47,8 @@ __all__ = [
     'EciScalingConfigurationVolumeArgsDict',
     'EciScalingConfigurationVolumeConfigFileVolumeConfigFileToPathArgs',
     'EciScalingConfigurationVolumeConfigFileVolumeConfigFileToPathArgsDict',
+    'ScalingConfigurationCustomPriorityArgs',
+    'ScalingConfigurationCustomPriorityArgsDict',
     'ScalingConfigurationDataDiskArgs',
     'ScalingConfigurationDataDiskArgsDict',
     'ScalingConfigurationInstancePatternInfoArgs',
@@ -2390,6 +2392,58 @@ class EciScalingConfigurationVolumeConfigFileVolumeConfigFileToPathArgs:
         pulumi.set(self, "path", value)
 
 
+if not MYPY:
+    class ScalingConfigurationCustomPriorityArgsDict(TypedDict):
+        instance_type: NotRequired[pulumi.Input[str]]
+        """
+        This parameter takes effect only if you set Scaling Policy to Priority Policy and the instance type specified by CustomPriorities.N.InstanceType is contained in the scaling configuration.
+        """
+        vswitch_id: NotRequired[pulumi.Input[str]]
+        """
+        This parameter takes effect only if you set Scaling Policy to Priority Policy and the vSwitch specified by CustomPriorities.N.VswitchId is included in the vSwitch list of your scaling group.
+        """
+elif False:
+    ScalingConfigurationCustomPriorityArgsDict: TypeAlias = Mapping[str, Any]
+
+@pulumi.input_type
+class ScalingConfigurationCustomPriorityArgs:
+    def __init__(__self__, *,
+                 instance_type: Optional[pulumi.Input[str]] = None,
+                 vswitch_id: Optional[pulumi.Input[str]] = None):
+        """
+        :param pulumi.Input[str] instance_type: This parameter takes effect only if you set Scaling Policy to Priority Policy and the instance type specified by CustomPriorities.N.InstanceType is contained in the scaling configuration.
+        :param pulumi.Input[str] vswitch_id: This parameter takes effect only if you set Scaling Policy to Priority Policy and the vSwitch specified by CustomPriorities.N.VswitchId is included in the vSwitch list of your scaling group.
+        """
+        if instance_type is not None:
+            pulumi.set(__self__, "instance_type", instance_type)
+        if vswitch_id is not None:
+            pulumi.set(__self__, "vswitch_id", vswitch_id)
+
+    @property
+    @pulumi.getter(name="instanceType")
+    def instance_type(self) -> Optional[pulumi.Input[str]]:
+        """
+        This parameter takes effect only if you set Scaling Policy to Priority Policy and the instance type specified by CustomPriorities.N.InstanceType is contained in the scaling configuration.
+        """
+        return pulumi.get(self, "instance_type")
+
+    @instance_type.setter
+    def instance_type(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "instance_type", value)
+
+    @property
+    @pulumi.getter(name="vswitchId")
+    def vswitch_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        This parameter takes effect only if you set Scaling Policy to Priority Policy and the vSwitch specified by CustomPriorities.N.VswitchId is included in the vSwitch list of your scaling group.
+        """
+        return pulumi.get(self, "vswitch_id")
+
+    @vswitch_id.setter
+    def vswitch_id(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "vswitch_id", value)
+
+
 if not MYPY:
     class ScalingConfigurationDataDiskArgsDict(TypedDict):
         auto_snapshot_policy_id: NotRequired[pulumi.Input[str]]

pulumi_alicloud/ess/outputs.py

@@ -32,6 +32,7 @@ __all__ = [
     'EciScalingConfigurationSecurityContextSysctl',
     'EciScalingConfigurationVolume',
     'EciScalingConfigurationVolumeConfigFileVolumeConfigFileToPath',
+    'ScalingConfigurationCustomPriority',
     'ScalingConfigurationDataDisk',
     'ScalingConfigurationInstancePatternInfo',
     'ScalingConfigurationInstanceTypeOverride',
@@ -1709,6 +1710,56 @@ class EciScalingConfigurationVolumeConfigFileVolumeConfigFileToPath(dict):
         return pulumi.get(self, "path")
 
 
+@pulumi.output_type
+class ScalingConfigurationCustomPriority(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "instanceType":
+            suggest = "instance_type"
+        elif key == "vswitchId":
+            suggest = "vswitch_id"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in ScalingConfigurationCustomPriority. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        ScalingConfigurationCustomPriority.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        ScalingConfigurationCustomPriority.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 instance_type: Optional[str] = None,
+                 vswitch_id: Optional[str] = None):
+        """
+        :param str instance_type: This parameter takes effect only if you set Scaling Policy to Priority Policy and the instance type specified by CustomPriorities.N.InstanceType is contained in the scaling configuration.
+        :param str vswitch_id: This parameter takes effect only if you set Scaling Policy to Priority Policy and the vSwitch specified by CustomPriorities.N.VswitchId is included in the vSwitch list of your scaling group.
+        """
+        if instance_type is not None:
+            pulumi.set(__self__, "instance_type", instance_type)
+        if vswitch_id is not None:
+            pulumi.set(__self__, "vswitch_id", vswitch_id)
+
+    @property
+    @pulumi.getter(name="instanceType")
+    def instance_type(self) -> Optional[str]:
+        """
+        This parameter takes effect only if you set Scaling Policy to Priority Policy and the instance type specified by CustomPriorities.N.InstanceType is contained in the scaling configuration.
+        """
+        return pulumi.get(self, "instance_type")
+
+    @property
+    @pulumi.getter(name="vswitchId")
+    def vswitch_id(self) -> Optional[str]:
+        """
+        This parameter takes effect only if you set Scaling Policy to Priority Policy and the vSwitch specified by CustomPriorities.N.VswitchId is included in the vSwitch list of your scaling group.
+        """
+        return pulumi.get(self, "vswitch_id")
+
+
 @pulumi.output_type
 class ScalingConfigurationDataDisk(dict):
     @staticmethod

pulumi_alicloud/ess/scaling_configuration.py

@@ -24,6 +24,7 @@ class ScalingConfigurationArgs:
                  scaling_group_id: pulumi.Input[str],
                  active: Optional[pulumi.Input[bool]] = None,
                  credit_specification: Optional[pulumi.Input[str]] = None,
+                 custom_priorities: Optional[pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationCustomPriorityArgs']]]] = None,
                  data_disks: Optional[pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationDataDiskArgs']]]] = None,
                  deletion_protection: Optional[pulumi.Input[bool]] = None,
                  enable: Optional[pulumi.Input[bool]] = None,
@@ -78,6 +79,7 @@ class ScalingConfigurationArgs:
         :param pulumi.Input[str] scaling_group_id: ID of the scaling group of a scaling configuration.
         :param pulumi.Input[bool] active: Whether active current scaling configuration in the specified scaling group. Default to `false`.
         :param pulumi.Input[str] credit_specification: Performance mode of the t5 burstable instance. Valid values: 'Standard', 'Unlimited'.
+        :param pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationCustomPriorityArgs']]] custom_priorities: You can use CustomPriorities to specify the priority of a custom ECS instance type + vSwitch combination. See `custom_priorities` below for details.
         :param pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationDataDiskArgs']]] data_disks: DataDisk mappings to attach to ecs instance. See `data_disk` below for details.
         :param pulumi.Input[bool] deletion_protection: Specifies whether to enable the Release Protection feature for ECS instances. This parameter is applicable to only pay-as-you-go instances. You can use this parameter to specify whether an ECS instance can be directly released by using the ECS console or calling the DeleteInstance operation. Valid values: true, false. Default value: false.
         :param pulumi.Input[bool] enable: Whether enable the specified scaling group(make it active) to which the current scaling configuration belongs.
@@ -149,6 +151,8 @@ class ScalingConfigurationArgs:
             pulumi.set(__self__, "active", active)
         if credit_specification is not None:
             pulumi.set(__self__, "credit_specification", credit_specification)
+        if custom_priorities is not None:
+            pulumi.set(__self__, "custom_priorities", custom_priorities)
         if data_disks is not None:
             pulumi.set(__self__, "data_disks", data_disks)
         if deletion_protection is not None:
@@ -290,6 +294,18 @@ class ScalingConfigurationArgs:
     def credit_specification(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "credit_specification", value)
 
+    @property
+    @pulumi.getter(name="customPriorities")
+    def custom_priorities(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationCustomPriorityArgs']]]]:
+        """
+        You can use CustomPriorities to specify the priority of a custom ECS instance type + vSwitch combination. See `custom_priorities` below for details.
+        """
+        return pulumi.get(self, "custom_priorities")
+
+    @custom_priorities.setter
+    def custom_priorities(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationCustomPriorityArgs']]]]):
+        pulumi.set(self, "custom_priorities", value)
+
     @property
     @pulumi.getter(name="dataDisks")
     def data_disks(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationDataDiskArgs']]]]:
@@ -902,6 +918,7 @@ class _ScalingConfigurationState:
     def __init__(__self__, *,
                  active: Optional[pulumi.Input[bool]] = None,
                  credit_specification: Optional[pulumi.Input[str]] = None,
+                 custom_priorities: Optional[pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationCustomPriorityArgs']]]] = None,
                  data_disks: Optional[pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationDataDiskArgs']]]] = None,
                  deletion_protection: Optional[pulumi.Input[bool]] = None,
                  enable: Optional[pulumi.Input[bool]] = None,
@@ -956,6 +973,7 @@ class _ScalingConfigurationState:
         Input properties used for looking up and filtering ScalingConfiguration resources.
         :param pulumi.Input[bool] active: Whether active current scaling configuration in the specified scaling group. Default to `false`.
         :param pulumi.Input[str] credit_specification: Performance mode of the t5 burstable instance. Valid values: 'Standard', 'Unlimited'.
+        :param pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationCustomPriorityArgs']]] custom_priorities: You can use CustomPriorities to specify the priority of a custom ECS instance type + vSwitch combination. See `custom_priorities` below for details.
         :param pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationDataDiskArgs']]] data_disks: DataDisk mappings to attach to ecs instance. See `data_disk` below for details.
         :param pulumi.Input[bool] deletion_protection: Specifies whether to enable the Release Protection feature for ECS instances. This parameter is applicable to only pay-as-you-go instances. You can use this parameter to specify whether an ECS instance can be directly released by using the ECS console or calling the DeleteInstance operation. Valid values: true, false. Default value: false.
         :param pulumi.Input[bool] enable: Whether enable the specified scaling group(make it active) to which the current scaling configuration belongs.
@@ -1027,6 +1045,8 @@ class _ScalingConfigurationState:
             pulumi.set(__self__, "active", active)
         if credit_specification is not None:
             pulumi.set(__self__, "credit_specification", credit_specification)
+        if custom_priorities is not None:
+            pulumi.set(__self__, "custom_priorities", custom_priorities)
         if data_disks is not None:
             pulumi.set(__self__, "data_disks", data_disks)
         if deletion_protection is not None:
@@ -1158,6 +1178,18 @@ class _ScalingConfigurationState:
     def credit_specification(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "credit_specification", value)
 
+    @property
+    @pulumi.getter(name="customPriorities")
+    def custom_priorities(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationCustomPriorityArgs']]]]:
+        """
+        You can use CustomPriorities to specify the priority of a custom ECS instance type + vSwitch combination. See `custom_priorities` below for details.
+        """
+        return pulumi.get(self, "custom_priorities")
+
+    @custom_priorities.setter
+    def custom_priorities(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationCustomPriorityArgs']]]]):
+        pulumi.set(self, "custom_priorities", value)
+
     @property
     @pulumi.getter(name="dataDisks")
     def data_disks(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ScalingConfigurationDataDiskArgs']]]]:
@@ -1784,6 +1816,7 @@ class ScalingConfiguration(pulumi.CustomResource):
                  opts: Optional[pulumi.ResourceOptions] = None,
                  active: Optional[pulumi.Input[bool]] = None,
                  credit_specification: Optional[pulumi.Input[str]] = None,
+                 custom_priorities: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ScalingConfigurationCustomPriorityArgs', 'ScalingConfigurationCustomPriorityArgsDict']]]]] = None,
                  data_disks: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ScalingConfigurationDataDiskArgs', 'ScalingConfigurationDataDiskArgsDict']]]]] = None,
                  deletion_protection: Optional[pulumi.Input[bool]] = None,
                  enable: Optional[pulumi.Input[bool]] = None,
@@ -1920,6 +1953,7 @@ class ScalingConfiguration(pulumi.CustomResource):
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[bool] active: Whether active current scaling configuration in the specified scaling group. Default to `false`.
         :param pulumi.Input[str] credit_specification: Performance mode of the t5 burstable instance. Valid values: 'Standard', 'Unlimited'.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ScalingConfigurationCustomPriorityArgs', 'ScalingConfigurationCustomPriorityArgsDict']]]] custom_priorities: You can use CustomPriorities to specify the priority of a custom ECS instance type + vSwitch combination. See `custom_priorities` below for details.
         :param pulumi.Input[Sequence[pulumi.Input[Union['ScalingConfigurationDataDiskArgs', 'ScalingConfigurationDataDiskArgsDict']]]] data_disks: DataDisk mappings to attach to ecs instance. See `data_disk` below for details.
         :param pulumi.Input[bool] deletion_protection: Specifies whether to enable the Release Protection feature for ECS instances. This parameter is applicable to only pay-as-you-go instances. You can use this parameter to specify whether an ECS instance can be directly released by using the ECS console or calling the DeleteInstance operation. Valid values: true, false. Default value: false.
         :param pulumi.Input[bool] enable: Whether enable the specified scaling group(make it active) to which the current scaling configuration belongs.
@@ -2091,6 +2125,7 @@ class ScalingConfiguration(pulumi.CustomResource):
                  opts: Optional[pulumi.ResourceOptions] = None,
                  active: Optional[pulumi.Input[bool]] = None,
                  credit_specification: Optional[pulumi.Input[str]] = None,
+                 custom_priorities: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ScalingConfigurationCustomPriorityArgs', 'ScalingConfigurationCustomPriorityArgsDict']]]]] = None,
                  data_disks: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ScalingConfigurationDataDiskArgs', 'ScalingConfigurationDataDiskArgsDict']]]]] = None,
                  deletion_protection: Optional[pulumi.Input[bool]] = None,
                  enable: Optional[pulumi.Input[bool]] = None,
@@ -2152,6 +2187,7 @@ class ScalingConfiguration(pulumi.CustomResource):
 
             __props__.__dict__["active"] = active
             __props__.__dict__["credit_specification"] = credit_specification
+            __props__.__dict__["custom_priorities"] = custom_priorities
             __props__.__dict__["data_disks"] = data_disks
             __props__.__dict__["deletion_protection"] = deletion_protection
             __props__.__dict__["enable"] = enable
@@ -2216,6 +2252,7 @@ class ScalingConfiguration(pulumi.CustomResource):
             opts: Optional[pulumi.ResourceOptions] = None,
             active: Optional[pulumi.Input[bool]] = None,
             credit_specification: Optional[pulumi.Input[str]] = None,
+            custom_priorities: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ScalingConfigurationCustomPriorityArgs', 'ScalingConfigurationCustomPriorityArgsDict']]]]] = None,
             data_disks: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ScalingConfigurationDataDiskArgs', 'ScalingConfigurationDataDiskArgsDict']]]]] = None,
             deletion_protection: Optional[pulumi.Input[bool]] = None,
             enable: Optional[pulumi.Input[bool]] = None,
@@ -2275,6 +2312,7 @@ class ScalingConfiguration(pulumi.CustomResource):
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[bool] active: Whether active current scaling configuration in the specified scaling group. Default to `false`.
         :param pulumi.Input[str] credit_specification: Performance mode of the t5 burstable instance. Valid values: 'Standard', 'Unlimited'.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ScalingConfigurationCustomPriorityArgs', 'ScalingConfigurationCustomPriorityArgsDict']]]] custom_priorities: You can use CustomPriorities to specify the priority of a custom ECS instance type + vSwitch combination. See `custom_priorities` below for details.
         :param pulumi.Input[Sequence[pulumi.Input[Union['ScalingConfigurationDataDiskArgs', 'ScalingConfigurationDataDiskArgsDict']]]] data_disks: DataDisk mappings to attach to ecs instance. See `data_disk` below for details.
         :param pulumi.Input[bool] deletion_protection: Specifies whether to enable the Release Protection feature for ECS instances. This parameter is applicable to only pay-as-you-go instances. You can use this parameter to specify whether an ECS instance can be directly released by using the ECS console or calling the DeleteInstance operation. Valid values: true, false. Default value: false.
         :param pulumi.Input[bool] enable: Whether enable the specified scaling group(make it active) to which the current scaling configuration belongs.
@@ -2348,6 +2386,7 @@ class ScalingConfiguration(pulumi.CustomResource):
 
         __props__.__dict__["active"] = active
         __props__.__dict__["credit_specification"] = credit_specification
+        __props__.__dict__["custom_priorities"] = custom_priorities
         __props__.__dict__["data_disks"] = data_disks
         __props__.__dict__["deletion_protection"] = deletion_protection
         __props__.__dict__["enable"] = enable
@@ -2416,6 +2455,14 @@ class ScalingConfiguration(pulumi.CustomResource):
         """
         return pulumi.get(self, "credit_specification")
 
+    @property
+    @pulumi.getter(name="customPriorities")
+    def custom_priorities(self) -> pulumi.Output[Optional[Sequence['outputs.ScalingConfigurationCustomPriority']]]:
+        """
+        You can use CustomPriorities to specify the priority of a custom ECS instance type + vSwitch combination. See `custom_priorities` below for details.
+        """
+        return pulumi.get(self, "custom_priorities")
+
     @property
     @pulumi.getter(name="dataDisks")
     def data_disks(self) -> pulumi.Output[Optional[Sequence['outputs.ScalingConfigurationDataDisk']]]:

pulumi_alicloud/ess/scaling_group.py

@@ -51,6 +51,7 @@ class ScalingGroupArgs:
                  spot_allocation_strategy: Optional[pulumi.Input[str]] = None,
                  spot_instance_pools: Optional[pulumi.Input[int]] = None,
                  spot_instance_remedy: Optional[pulumi.Input[bool]] = None,
+                 stop_instance_timeout: Optional[pulumi.Input[int]] = None,
                  tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
                  vswitch_id: Optional[pulumi.Input[str]] = None,
                  vswitch_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None):
@@ -99,6 +100,7 @@ class ScalingGroupArgs:
         :param pulumi.Input[str] spot_allocation_strategy: The allocation policy of preemptible instances. You can use this parameter to individually specify the allocation policy for preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
         :param pulumi.Input[int] spot_instance_pools: The number of Spot pools to use to allocate your Spot capacity. The Spot pools is composed of instance types of lowest price.
         :param pulumi.Input[bool] spot_instance_remedy: Whether to replace spot instances with newly created spot/onDemand instance when receive a spot recycling message.
+        :param pulumi.Input[int] stop_instance_timeout: The period of time required by the ECS instance to enter the Stopped state. Unit: seconds. Valid values: 30 to 240.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
                - Key: It can be up to 64 characters in length. It cannot begin with "aliyun", "acs:", "http://", or "https://". It cannot be a null string.
                - Value: It can be up to 128 characters in length. It cannot begin with "aliyun", "acs:", "http://", or "https://". It can be a null string.
@@ -163,6 +165,8 @@ class ScalingGroupArgs:
             pulumi.set(__self__, "spot_instance_pools", spot_instance_pools)
         if spot_instance_remedy is not None:
             pulumi.set(__self__, "spot_instance_remedy", spot_instance_remedy)
+        if stop_instance_timeout is not None:
+            pulumi.set(__self__, "stop_instance_timeout", stop_instance_timeout)
         if tags is not None:
             pulumi.set(__self__, "tags", tags)
         if vswitch_id is not None:
@@ -546,6 +550,18 @@ class ScalingGroupArgs:
     def spot_instance_remedy(self, value: Optional[pulumi.Input[bool]]):
         pulumi.set(self, "spot_instance_remedy", value)
 
+    @property
+    @pulumi.getter(name="stopInstanceTimeout")
+    def stop_instance_timeout(self) -> Optional[pulumi.Input[int]]:
+        """
+        The period of time required by the ECS instance to enter the Stopped state. Unit: seconds. Valid values: 30 to 240.
+        """
+        return pulumi.get(self, "stop_instance_timeout")
+
+    @stop_instance_timeout.setter
+    def stop_instance_timeout(self, value: Optional[pulumi.Input[int]]):
+        pulumi.set(self, "stop_instance_timeout", value)
+
     @property
     @pulumi.getter
     def tags(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
@@ -619,6 +635,7 @@ class _ScalingGroupState:
                  spot_allocation_strategy: Optional[pulumi.Input[str]] = None,
                  spot_instance_pools: Optional[pulumi.Input[int]] = None,
                  spot_instance_remedy: Optional[pulumi.Input[bool]] = None,
+                 stop_instance_timeout: Optional[pulumi.Input[int]] = None,
                  tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
                  vswitch_id: Optional[pulumi.Input[str]] = None,
                  vswitch_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None):
@@ -667,6 +684,7 @@ class _ScalingGroupState:
         :param pulumi.Input[str] spot_allocation_strategy: The allocation policy of preemptible instances. You can use this parameter to individually specify the allocation policy for preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
         :param pulumi.Input[int] spot_instance_pools: The number of Spot pools to use to allocate your Spot capacity. The Spot pools is composed of instance types of lowest price.
         :param pulumi.Input[bool] spot_instance_remedy: Whether to replace spot instances with newly created spot/onDemand instance when receive a spot recycling message.
+        :param pulumi.Input[int] stop_instance_timeout: The period of time required by the ECS instance to enter the Stopped state. Unit: seconds. Valid values: 30 to 240.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
                - Key: It can be up to 64 characters in length. It cannot begin with "aliyun", "acs:", "http://", or "https://". It cannot be a null string.
                - Value: It can be up to 128 characters in length. It cannot begin with "aliyun", "acs:", "http://", or "https://". It can be a null string.
@@ -733,6 +751,8 @@ class _ScalingGroupState:
             pulumi.set(__self__, "spot_instance_pools", spot_instance_pools)
         if spot_instance_remedy is not None:
             pulumi.set(__self__, "spot_instance_remedy", spot_instance_remedy)
+        if stop_instance_timeout is not None:
+            pulumi.set(__self__, "stop_instance_timeout", stop_instance_timeout)
         if tags is not None:
             pulumi.set(__self__, "tags", tags)
         if vswitch_id is not None:
@@ -1116,6 +1136,18 @@ class _ScalingGroupState:
     def spot_instance_remedy(self, value: Optional[pulumi.Input[bool]]):
         pulumi.set(self, "spot_instance_remedy", value)
 
+    @property
+    @pulumi.getter(name="stopInstanceTimeout")
+    def stop_instance_timeout(self) -> Optional[pulumi.Input[int]]:
+        """
+        The period of time required by the ECS instance to enter the Stopped state. Unit: seconds. Valid values: 30 to 240.
+        """
+        return pulumi.get(self, "stop_instance_timeout")
+
+    @stop_instance_timeout.setter
+    def stop_instance_timeout(self, value: Optional[pulumi.Input[int]]):
+        pulumi.set(self, "stop_instance_timeout", value)
+
     @property
     @pulumi.getter
     def tags(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
@@ -1191,6 +1223,7 @@ class ScalingGroup(pulumi.CustomResource):
                  spot_allocation_strategy: Optional[pulumi.Input[str]] = None,
                  spot_instance_pools: Optional[pulumi.Input[int]] = None,
                  spot_instance_remedy: Optional[pulumi.Input[bool]] = None,
+                 stop_instance_timeout: Optional[pulumi.Input[int]] = None,
                  tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
                  vswitch_id: Optional[pulumi.Input[str]] = None,
                  vswitch_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
@@ -1327,6 +1360,7 @@ class ScalingGroup(pulumi.CustomResource):
         :param pulumi.Input[str] spot_allocation_strategy: The allocation policy of preemptible instances. You can use this parameter to individually specify the allocation policy for preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
         :param pulumi.Input[int] spot_instance_pools: The number of Spot pools to use to allocate your Spot capacity. The Spot pools is composed of instance types of lowest price.
         :param pulumi.Input[bool] spot_instance_remedy: Whether to replace spot instances with newly created spot/onDemand instance when receive a spot recycling message.
+        :param pulumi.Input[int] stop_instance_timeout: The period of time required by the ECS instance to enter the Stopped state. Unit: seconds. Valid values: 30 to 240.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
                - Key: It can be up to 64 characters in length. It cannot begin with "aliyun", "acs:", "http://", or "https://". It cannot be a null string.
                - Value: It can be up to 128 characters in length. It cannot begin with "aliyun", "acs:", "http://", or "https://". It can be a null string.
@@ -1471,6 +1505,7 @@ class ScalingGroup(pulumi.CustomResource):
                  spot_allocation_strategy: Optional[pulumi.Input[str]] = None,
                  spot_instance_pools: Optional[pulumi.Input[int]] = None,
                  spot_instance_remedy: Optional[pulumi.Input[bool]] = None,
+                 stop_instance_timeout: Optional[pulumi.Input[int]] = None,
                  tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
                  vswitch_id: Optional[pulumi.Input[str]] = None,
                  vswitch_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
@@ -1517,6 +1552,7 @@ class ScalingGroup(pulumi.CustomResource):
             __props__.__dict__["spot_allocation_strategy"] = spot_allocation_strategy
             __props__.__dict__["spot_instance_pools"] = spot_instance_pools
             __props__.__dict__["spot_instance_remedy"] = spot_instance_remedy
+            __props__.__dict__["stop_instance_timeout"] = stop_instance_timeout
             __props__.__dict__["tags"] = tags
             __props__.__dict__["vswitch_id"] = vswitch_id
             __props__.__dict__["vswitch_ids"] = vswitch_ids
@@ -1560,6 +1596,7 @@ class ScalingGroup(pulumi.CustomResource):
             spot_allocation_strategy: Optional[pulumi.Input[str]] = None,
             spot_instance_pools: Optional[pulumi.Input[int]] = None,
             spot_instance_remedy: Optional[pulumi.Input[bool]] = None,
+            stop_instance_timeout: Optional[pulumi.Input[int]] = None,
             tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
             vswitch_id: Optional[pulumi.Input[str]] = None,
             vswitch_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None) -> 'ScalingGroup':
@@ -1613,6 +1650,7 @@ class ScalingGroup(pulumi.CustomResource):
         :param pulumi.Input[str] spot_allocation_strategy: The allocation policy of preemptible instances. You can use this parameter to individually specify the allocation policy for preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
         :param pulumi.Input[int] spot_instance_pools: The number of Spot pools to use to allocate your Spot capacity. The Spot pools is composed of instance types of lowest price.
         :param pulumi.Input[bool] spot_instance_remedy: Whether to replace spot instances with newly created spot/onDemand instance when receive a spot recycling message.
+        :param pulumi.Input[int] stop_instance_timeout: The period of time required by the ECS instance to enter the Stopped state. Unit: seconds. Valid values: 30 to 240.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] tags: A mapping of tags to assign to the resource.
                - Key: It can be up to 64 characters in length. It cannot begin with "aliyun", "acs:", "http://", or "https://". It cannot be a null string.
                - Value: It can be up to 128 characters in length. It cannot begin with "aliyun", "acs:", "http://", or "https://". It can be a null string.
@@ -1653,6 +1691,7 @@ class ScalingGroup(pulumi.CustomResource):
         __props__.__dict__["spot_allocation_strategy"] = spot_allocation_strategy
         __props__.__dict__["spot_instance_pools"] = spot_instance_pools
         __props__.__dict__["spot_instance_remedy"] = spot_instance_remedy
+        __props__.__dict__["stop_instance_timeout"] = stop_instance_timeout
         __props__.__dict__["tags"] = tags
         __props__.__dict__["vswitch_id"] = vswitch_id
         __props__.__dict__["vswitch_ids"] = vswitch_ids
@@ -1911,6 +1950,14 @@ class ScalingGroup(pulumi.CustomResource):
         """
         return pulumi.get(self, "spot_instance_remedy")
 
+    @property
+    @pulumi.getter(name="stopInstanceTimeout")
+    def stop_instance_timeout(self) -> pulumi.Output[Optional[int]]:
+        """
+        The period of time required by the ECS instance to enter the Stopped state. Unit: seconds. Valid values: 30 to 240.
+        """
+        return pulumi.get(self, "stop_instance_timeout")
+
     @property
     @pulumi.getter
     def tags(self) -> pulumi.Output[Optional[Mapping[str, str]]]:

pulumi_alicloud/expressconnect/__init__.py

@@ -17,6 +17,7 @@ from .get_virtual_physical_connections import *
 from .grant_rule_to_cen import *
 from .physical_connection import *
 from .router_express_connect_router import *
+from .router_grant_association import *
 from .router_interface import *
 from .router_tr_association import *
 from .router_vbr_child_instance import *