pulumi-alicloud 3.57.0a1718428539__py3-none-any.whl → 3.57.1__py3-none-any.whl

pulumi_alicloud/ess/scaling_group.py

@@ -19,6 +19,8 @@ class ScalingGroupArgs:
                  max_size: pulumi.Input[int],
                  min_size: pulumi.Input[int],
                  alb_server_groups: Optional[pulumi.Input[Sequence[pulumi.Input['ScalingGroupAlbServerGroupArgs']]]] = None,
+                 allocation_strategy: Optional[pulumi.Input[str]] = None,
+                 az_balance: Optional[pulumi.Input[bool]] = None,
                  db_instance_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  default_cooldown: Optional[pulumi.Input[int]] = None,
                  desired_capacity: Optional[pulumi.Input[int]] = None,
@@ -36,6 +38,7 @@ class ScalingGroupArgs:
                  removal_policies: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  resource_group_id: Optional[pulumi.Input[str]] = None,
                  scaling_group_name: Optional[pulumi.Input[str]] = None,
+                 spot_allocation_strategy: Optional[pulumi.Input[str]] = None,
                  spot_instance_pools: Optional[pulumi.Input[int]] = None,
                  spot_instance_remedy: Optional[pulumi.Input[bool]] = None,
                  tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
@@ -48,6 +51,8 @@ class ScalingGroupArgs:
         :param pulumi.Input[int] min_size: Minimum number of ECS instances in the scaling group. Value range: [0, 2000].
                **NOTE:** From version 1.204.1, `min_size` can be set to `2000`.
         :param pulumi.Input[Sequence[pulumi.Input['ScalingGroupAlbServerGroupArgs']]] alb_server_groups: If a Serve ALB instance is specified in the scaling group, the scaling group automatically attaches its ECS instances to the Server ALB instance.  See `alb_server_group` below for details.
+        :param pulumi.Input[str] allocation_strategy: The allocation policy of instances. Auto Scaling selects instance types based on the allocation policy to create instances. The policy can be applied to pay-as-you-go instances and preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
+        :param pulumi.Input[bool] az_balance: Specifies whether to evenly distribute instances in the scaling group across multiple zones. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] db_instance_ids: If an RDS instance is specified in the scaling group, the scaling group automatically attaches the Intranet IP addresses of its ECS instances to the RDS access whitelist.
                - The specified RDS instance must be in running status.
                - The specified RDS instance’s whitelist must have room for more IP addresses.
@@ -65,7 +70,7 @@ class ScalingGroupArgs:
                targeting your `slb.Listener` in order to make sure the listener with its HealthCheck configuration is ready before creating your scaling group).
                - The Server Load Balancer instance attached with VPC-type ECS instances cannot be attached to the scaling group.
                - The default weight of an ECS instance attached to the Server Load Balancer instance is 50.
-        :param pulumi.Input[str] multi_az_policy: Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
+        :param pulumi.Input[str] multi_az_policy: Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, COMPOSABLE, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
         :param pulumi.Input[int] on_demand_base_capacity: The minimum amount of the Auto Scaling group's capacity that must be fulfilled by On-Demand Instances. This base portion is provisioned first as your group scales.
         :param pulumi.Input[int] on_demand_percentage_above_base_capacity: Controls the percentages of On-Demand Instances and Spot Instances for your additional capacity beyond OnDemandBaseCapacity.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] protected_instances: Set or unset instances within group into protected status.
@@ -76,6 +81,7 @@ class ScalingGroupArgs:
                - Default values: Default value of RemovalPolicy.1: OldestScalingConfiguration. Default value of RemovalPolicy.2: OldestInstance.
         :param pulumi.Input[str] resource_group_id: The ID of the resource group to which you want to add the scaling group.
         :param pulumi.Input[str] scaling_group_name: Name shown for the scaling group, which must contain 2-64 characters (English or Chinese), starting with numbers, English letters or Chinese characters, and can contain numbers, underscores `_`, hyphens `-`, and decimal points `.`. If this parameter is not specified, the default value is ScalingGroupId.
+        :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[Mapping[str, Any]] tags: A mapping of tags to assign to the resource.
@@ -88,6 +94,10 @@ class ScalingGroupArgs:
         pulumi.set(__self__, "min_size", min_size)
         if alb_server_groups is not None:
             pulumi.set(__self__, "alb_server_groups", alb_server_groups)
+        if allocation_strategy is not None:
+            pulumi.set(__self__, "allocation_strategy", allocation_strategy)
+        if az_balance is not None:
+            pulumi.set(__self__, "az_balance", az_balance)
         if db_instance_ids is not None:
             pulumi.set(__self__, "db_instance_ids", db_instance_ids)
         if default_cooldown is not None:
@@ -122,6 +132,8 @@ class ScalingGroupArgs:
             pulumi.set(__self__, "resource_group_id", resource_group_id)
         if scaling_group_name is not None:
             pulumi.set(__self__, "scaling_group_name", scaling_group_name)
+        if spot_allocation_strategy is not None:
+            pulumi.set(__self__, "spot_allocation_strategy", spot_allocation_strategy)
         if spot_instance_pools is not None:
             pulumi.set(__self__, "spot_instance_pools", spot_instance_pools)
         if spot_instance_remedy is not None:
@@ -174,6 +186,30 @@ class ScalingGroupArgs:
     def alb_server_groups(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['ScalingGroupAlbServerGroupArgs']]]]):
         pulumi.set(self, "alb_server_groups", value)
 
+    @property
+    @pulumi.getter(name="allocationStrategy")
+    def allocation_strategy(self) -> Optional[pulumi.Input[str]]:
+        """
+        The allocation policy of instances. Auto Scaling selects instance types based on the allocation policy to create instances. The policy can be applied to pay-as-you-go instances and preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
+        """
+        return pulumi.get(self, "allocation_strategy")
+
+    @allocation_strategy.setter
+    def allocation_strategy(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "allocation_strategy", value)
+
+    @property
+    @pulumi.getter(name="azBalance")
+    def az_balance(self) -> Optional[pulumi.Input[bool]]:
+        """
+        Specifies whether to evenly distribute instances in the scaling group across multiple zones. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
+        """
+        return pulumi.get(self, "az_balance")
+
+    @az_balance.setter
+    def az_balance(self, value: Optional[pulumi.Input[bool]]):
+        pulumi.set(self, "az_balance", value)
+
     @property
     @pulumi.getter(name="dbInstanceIds")
     def db_instance_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
@@ -305,7 +341,7 @@ class ScalingGroupArgs:
     @pulumi.getter(name="multiAzPolicy")
     def multi_az_policy(self) -> Optional[pulumi.Input[str]]:
         """
-        Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
+        Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, COMPOSABLE, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
         """
         return pulumi.get(self, "multi_az_policy")
 
@@ -389,6 +425,18 @@ class ScalingGroupArgs:
     def scaling_group_name(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "scaling_group_name", value)
 
+    @property
+    @pulumi.getter(name="spotAllocationStrategy")
+    def spot_allocation_strategy(self) -> Optional[pulumi.Input[str]]:
+        """
+        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.
+        """
+        return pulumi.get(self, "spot_allocation_strategy")
+
+    @spot_allocation_strategy.setter
+    def spot_allocation_strategy(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "spot_allocation_strategy", value)
+
     @property
     @pulumi.getter(name="spotInstancePools")
     def spot_instance_pools(self) -> Optional[pulumi.Input[int]]:
@@ -429,13 +477,11 @@ class ScalingGroupArgs:
 
     @property
     @pulumi.getter(name="vswitchId")
+    @_utilities.deprecated("""Field 'vswitch_id' has been deprecated from provider version 1.7.1, and new field 'vswitch_ids' can replace it.""")
     def vswitch_id(self) -> Optional[pulumi.Input[str]]:
         """
         It has been deprecated from version 1.7.1 and new field 'vswitch_ids' replaces it.
         """
-        warnings.warn("""Field 'vswitch_id' has been deprecated from provider version 1.7.1, and new field 'vswitch_ids' can replace it.""", DeprecationWarning)
-        pulumi.log.warn("""vswitch_id is deprecated: Field 'vswitch_id' has been deprecated from provider version 1.7.1, and new field 'vswitch_ids' can replace it.""")
-
         return pulumi.get(self, "vswitch_id")
 
     @vswitch_id.setter
@@ -459,6 +505,8 @@ class ScalingGroupArgs:
 class _ScalingGroupState:
     def __init__(__self__, *,
                  alb_server_groups: Optional[pulumi.Input[Sequence[pulumi.Input['ScalingGroupAlbServerGroupArgs']]]] = None,
+                 allocation_strategy: Optional[pulumi.Input[str]] = None,
+                 az_balance: Optional[pulumi.Input[bool]] = None,
                  db_instance_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  default_cooldown: Optional[pulumi.Input[int]] = None,
                  desired_capacity: Optional[pulumi.Input[int]] = None,
@@ -478,6 +526,7 @@ class _ScalingGroupState:
                  removal_policies: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  resource_group_id: Optional[pulumi.Input[str]] = None,
                  scaling_group_name: Optional[pulumi.Input[str]] = None,
+                 spot_allocation_strategy: Optional[pulumi.Input[str]] = None,
                  spot_instance_pools: Optional[pulumi.Input[int]] = None,
                  spot_instance_remedy: Optional[pulumi.Input[bool]] = None,
                  tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
@@ -486,6 +535,8 @@ class _ScalingGroupState:
         """
         Input properties used for looking up and filtering ScalingGroup resources.
         :param pulumi.Input[Sequence[pulumi.Input['ScalingGroupAlbServerGroupArgs']]] alb_server_groups: If a Serve ALB instance is specified in the scaling group, the scaling group automatically attaches its ECS instances to the Server ALB instance.  See `alb_server_group` below for details.
+        :param pulumi.Input[str] allocation_strategy: The allocation policy of instances. Auto Scaling selects instance types based on the allocation policy to create instances. The policy can be applied to pay-as-you-go instances and preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
+        :param pulumi.Input[bool] az_balance: Specifies whether to evenly distribute instances in the scaling group across multiple zones. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] db_instance_ids: If an RDS instance is specified in the scaling group, the scaling group automatically attaches the Intranet IP addresses of its ECS instances to the RDS access whitelist.
                - The specified RDS instance must be in running status.
                - The specified RDS instance’s whitelist must have room for more IP addresses.
@@ -507,7 +558,7 @@ class _ScalingGroupState:
                **NOTE:** From version 1.204.1, `max_size` can be set to `2000`.
         :param pulumi.Input[int] min_size: Minimum number of ECS instances in the scaling group. Value range: [0, 2000].
                **NOTE:** From version 1.204.1, `min_size` can be set to `2000`.
-        :param pulumi.Input[str] multi_az_policy: Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
+        :param pulumi.Input[str] multi_az_policy: Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, COMPOSABLE, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
         :param pulumi.Input[int] on_demand_base_capacity: The minimum amount of the Auto Scaling group's capacity that must be fulfilled by On-Demand Instances. This base portion is provisioned first as your group scales.
         :param pulumi.Input[int] on_demand_percentage_above_base_capacity: Controls the percentages of On-Demand Instances and Spot Instances for your additional capacity beyond OnDemandBaseCapacity.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] protected_instances: Set or unset instances within group into protected status.
@@ -518,6 +569,7 @@ class _ScalingGroupState:
                - Default values: Default value of RemovalPolicy.1: OldestScalingConfiguration. Default value of RemovalPolicy.2: OldestInstance.
         :param pulumi.Input[str] resource_group_id: The ID of the resource group to which you want to add the scaling group.
         :param pulumi.Input[str] scaling_group_name: Name shown for the scaling group, which must contain 2-64 characters (English or Chinese), starting with numbers, English letters or Chinese characters, and can contain numbers, underscores `_`, hyphens `-`, and decimal points `.`. If this parameter is not specified, the default value is ScalingGroupId.
+        :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[Mapping[str, Any]] tags: A mapping of tags to assign to the resource.
@@ -528,6 +580,10 @@ class _ScalingGroupState:
         """
         if alb_server_groups is not None:
             pulumi.set(__self__, "alb_server_groups", alb_server_groups)
+        if allocation_strategy is not None:
+            pulumi.set(__self__, "allocation_strategy", allocation_strategy)
+        if az_balance is not None:
+            pulumi.set(__self__, "az_balance", az_balance)
         if db_instance_ids is not None:
             pulumi.set(__self__, "db_instance_ids", db_instance_ids)
         if default_cooldown is not None:
@@ -566,6 +622,8 @@ class _ScalingGroupState:
             pulumi.set(__self__, "resource_group_id", resource_group_id)
         if scaling_group_name is not None:
             pulumi.set(__self__, "scaling_group_name", scaling_group_name)
+        if spot_allocation_strategy is not None:
+            pulumi.set(__self__, "spot_allocation_strategy", spot_allocation_strategy)
         if spot_instance_pools is not None:
             pulumi.set(__self__, "spot_instance_pools", spot_instance_pools)
         if spot_instance_remedy is not None:
@@ -592,6 +650,30 @@ class _ScalingGroupState:
     def alb_server_groups(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['ScalingGroupAlbServerGroupArgs']]]]):
         pulumi.set(self, "alb_server_groups", value)
 
+    @property
+    @pulumi.getter(name="allocationStrategy")
+    def allocation_strategy(self) -> Optional[pulumi.Input[str]]:
+        """
+        The allocation policy of instances. Auto Scaling selects instance types based on the allocation policy to create instances. The policy can be applied to pay-as-you-go instances and preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
+        """
+        return pulumi.get(self, "allocation_strategy")
+
+    @allocation_strategy.setter
+    def allocation_strategy(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "allocation_strategy", value)
+
+    @property
+    @pulumi.getter(name="azBalance")
+    def az_balance(self) -> Optional[pulumi.Input[bool]]:
+        """
+        Specifies whether to evenly distribute instances in the scaling group across multiple zones. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
+        """
+        return pulumi.get(self, "az_balance")
+
+    @az_balance.setter
+    def az_balance(self, value: Optional[pulumi.Input[bool]]):
+        pulumi.set(self, "az_balance", value)
+
     @property
     @pulumi.getter(name="dbInstanceIds")
     def db_instance_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
@@ -749,7 +831,7 @@ class _ScalingGroupState:
     @pulumi.getter(name="multiAzPolicy")
     def multi_az_policy(self) -> Optional[pulumi.Input[str]]:
         """
-        Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
+        Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, COMPOSABLE, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
         """
         return pulumi.get(self, "multi_az_policy")
 
@@ -833,6 +915,18 @@ class _ScalingGroupState:
     def scaling_group_name(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "scaling_group_name", value)
 
+    @property
+    @pulumi.getter(name="spotAllocationStrategy")
+    def spot_allocation_strategy(self) -> Optional[pulumi.Input[str]]:
+        """
+        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.
+        """
+        return pulumi.get(self, "spot_allocation_strategy")
+
+    @spot_allocation_strategy.setter
+    def spot_allocation_strategy(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "spot_allocation_strategy", value)
+
     @property
     @pulumi.getter(name="spotInstancePools")
     def spot_instance_pools(self) -> Optional[pulumi.Input[int]]:
@@ -873,13 +967,11 @@ class _ScalingGroupState:
 
     @property
     @pulumi.getter(name="vswitchId")
+    @_utilities.deprecated("""Field 'vswitch_id' has been deprecated from provider version 1.7.1, and new field 'vswitch_ids' can replace it.""")
     def vswitch_id(self) -> Optional[pulumi.Input[str]]:
         """
         It has been deprecated from version 1.7.1 and new field 'vswitch_ids' replaces it.
         """
-        warnings.warn("""Field 'vswitch_id' has been deprecated from provider version 1.7.1, and new field 'vswitch_ids' can replace it.""", DeprecationWarning)
-        pulumi.log.warn("""vswitch_id is deprecated: Field 'vswitch_id' has been deprecated from provider version 1.7.1, and new field 'vswitch_ids' can replace it.""")
-
         return pulumi.get(self, "vswitch_id")
 
     @vswitch_id.setter
@@ -905,6 +997,8 @@ class ScalingGroup(pulumi.CustomResource):
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  alb_server_groups: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ScalingGroupAlbServerGroupArgs']]]]] = None,
+                 allocation_strategy: Optional[pulumi.Input[str]] = None,
+                 az_balance: Optional[pulumi.Input[bool]] = None,
                  db_instance_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  default_cooldown: Optional[pulumi.Input[int]] = None,
                  desired_capacity: Optional[pulumi.Input[int]] = None,
@@ -924,6 +1018,7 @@ class ScalingGroup(pulumi.CustomResource):
                  removal_policies: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  resource_group_id: Optional[pulumi.Input[str]] = None,
                  scaling_group_name: Optional[pulumi.Input[str]] = None,
+                 spot_allocation_strategy: Optional[pulumi.Input[str]] = None,
                  spot_instance_pools: Optional[pulumi.Input[int]] = None,
                  spot_instance_remedy: Optional[pulumi.Input[bool]] = None,
                  tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
@@ -1020,6 +1115,8 @@ class ScalingGroup(pulumi.CustomResource):
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ScalingGroupAlbServerGroupArgs']]]] alb_server_groups: If a Serve ALB instance is specified in the scaling group, the scaling group automatically attaches its ECS instances to the Server ALB instance.  See `alb_server_group` below for details.
+        :param pulumi.Input[str] allocation_strategy: The allocation policy of instances. Auto Scaling selects instance types based on the allocation policy to create instances. The policy can be applied to pay-as-you-go instances and preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
+        :param pulumi.Input[bool] az_balance: Specifies whether to evenly distribute instances in the scaling group across multiple zones. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] db_instance_ids: If an RDS instance is specified in the scaling group, the scaling group automatically attaches the Intranet IP addresses of its ECS instances to the RDS access whitelist.
                - The specified RDS instance must be in running status.
                - The specified RDS instance’s whitelist must have room for more IP addresses.
@@ -1041,7 +1138,7 @@ class ScalingGroup(pulumi.CustomResource):
                **NOTE:** From version 1.204.1, `max_size` can be set to `2000`.
         :param pulumi.Input[int] min_size: Minimum number of ECS instances in the scaling group. Value range: [0, 2000].
                **NOTE:** From version 1.204.1, `min_size` can be set to `2000`.
-        :param pulumi.Input[str] multi_az_policy: Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
+        :param pulumi.Input[str] multi_az_policy: Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, COMPOSABLE, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
         :param pulumi.Input[int] on_demand_base_capacity: The minimum amount of the Auto Scaling group's capacity that must be fulfilled by On-Demand Instances. This base portion is provisioned first as your group scales.
         :param pulumi.Input[int] on_demand_percentage_above_base_capacity: Controls the percentages of On-Demand Instances and Spot Instances for your additional capacity beyond OnDemandBaseCapacity.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] protected_instances: Set or unset instances within group into protected status.
@@ -1052,6 +1149,7 @@ class ScalingGroup(pulumi.CustomResource):
                - Default values: Default value of RemovalPolicy.1: OldestScalingConfiguration. Default value of RemovalPolicy.2: OldestInstance.
         :param pulumi.Input[str] resource_group_id: The ID of the resource group to which you want to add the scaling group.
         :param pulumi.Input[str] scaling_group_name: Name shown for the scaling group, which must contain 2-64 characters (English or Chinese), starting with numbers, English letters or Chinese characters, and can contain numbers, underscores `_`, hyphens `-`, and decimal points `.`. If this parameter is not specified, the default value is ScalingGroupId.
+        :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[Mapping[str, Any]] tags: A mapping of tags to assign to the resource.
@@ -1169,6 +1267,8 @@ class ScalingGroup(pulumi.CustomResource):
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  alb_server_groups: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ScalingGroupAlbServerGroupArgs']]]]] = None,
+                 allocation_strategy: Optional[pulumi.Input[str]] = None,
+                 az_balance: Optional[pulumi.Input[bool]] = None,
                  db_instance_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  default_cooldown: Optional[pulumi.Input[int]] = None,
                  desired_capacity: Optional[pulumi.Input[int]] = None,
@@ -1188,6 +1288,7 @@ class ScalingGroup(pulumi.CustomResource):
                  removal_policies: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  resource_group_id: Optional[pulumi.Input[str]] = None,
                  scaling_group_name: Optional[pulumi.Input[str]] = None,
+                 spot_allocation_strategy: Optional[pulumi.Input[str]] = None,
                  spot_instance_pools: Optional[pulumi.Input[int]] = None,
                  spot_instance_remedy: Optional[pulumi.Input[bool]] = None,
                  tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
@@ -1203,6 +1304,8 @@ class ScalingGroup(pulumi.CustomResource):
             __props__ = ScalingGroupArgs.__new__(ScalingGroupArgs)
 
             __props__.__dict__["alb_server_groups"] = alb_server_groups
+            __props__.__dict__["allocation_strategy"] = allocation_strategy
+            __props__.__dict__["az_balance"] = az_balance
             __props__.__dict__["db_instance_ids"] = db_instance_ids
             __props__.__dict__["default_cooldown"] = default_cooldown
             __props__.__dict__["desired_capacity"] = desired_capacity
@@ -1226,6 +1329,7 @@ class ScalingGroup(pulumi.CustomResource):
             __props__.__dict__["removal_policies"] = removal_policies
             __props__.__dict__["resource_group_id"] = resource_group_id
             __props__.__dict__["scaling_group_name"] = scaling_group_name
+            __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__["tags"] = tags
@@ -1242,6 +1346,8 @@ class ScalingGroup(pulumi.CustomResource):
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
             alb_server_groups: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ScalingGroupAlbServerGroupArgs']]]]] = None,
+            allocation_strategy: Optional[pulumi.Input[str]] = None,
+            az_balance: Optional[pulumi.Input[bool]] = None,
             db_instance_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             default_cooldown: Optional[pulumi.Input[int]] = None,
             desired_capacity: Optional[pulumi.Input[int]] = None,
@@ -1261,6 +1367,7 @@ class ScalingGroup(pulumi.CustomResource):
             removal_policies: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             resource_group_id: Optional[pulumi.Input[str]] = None,
             scaling_group_name: Optional[pulumi.Input[str]] = None,
+            spot_allocation_strategy: Optional[pulumi.Input[str]] = None,
             spot_instance_pools: Optional[pulumi.Input[int]] = None,
             spot_instance_remedy: Optional[pulumi.Input[bool]] = None,
             tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
@@ -1274,6 +1381,8 @@ class ScalingGroup(pulumi.CustomResource):
         :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ScalingGroupAlbServerGroupArgs']]]] alb_server_groups: If a Serve ALB instance is specified in the scaling group, the scaling group automatically attaches its ECS instances to the Server ALB instance.  See `alb_server_group` below for details.
+        :param pulumi.Input[str] allocation_strategy: The allocation policy of instances. Auto Scaling selects instance types based on the allocation policy to create instances. The policy can be applied to pay-as-you-go instances and preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
+        :param pulumi.Input[bool] az_balance: Specifies whether to evenly distribute instances in the scaling group across multiple zones. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] db_instance_ids: If an RDS instance is specified in the scaling group, the scaling group automatically attaches the Intranet IP addresses of its ECS instances to the RDS access whitelist.
                - The specified RDS instance must be in running status.
                - The specified RDS instance’s whitelist must have room for more IP addresses.
@@ -1295,7 +1404,7 @@ class ScalingGroup(pulumi.CustomResource):
                **NOTE:** From version 1.204.1, `max_size` can be set to `2000`.
         :param pulumi.Input[int] min_size: Minimum number of ECS instances in the scaling group. Value range: [0, 2000].
                **NOTE:** From version 1.204.1, `min_size` can be set to `2000`.
-        :param pulumi.Input[str] multi_az_policy: Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
+        :param pulumi.Input[str] multi_az_policy: Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, COMPOSABLE, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
         :param pulumi.Input[int] on_demand_base_capacity: The minimum amount of the Auto Scaling group's capacity that must be fulfilled by On-Demand Instances. This base portion is provisioned first as your group scales.
         :param pulumi.Input[int] on_demand_percentage_above_base_capacity: Controls the percentages of On-Demand Instances and Spot Instances for your additional capacity beyond OnDemandBaseCapacity.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] protected_instances: Set or unset instances within group into protected status.
@@ -1306,6 +1415,7 @@ class ScalingGroup(pulumi.CustomResource):
                - Default values: Default value of RemovalPolicy.1: OldestScalingConfiguration. Default value of RemovalPolicy.2: OldestInstance.
         :param pulumi.Input[str] resource_group_id: The ID of the resource group to which you want to add the scaling group.
         :param pulumi.Input[str] scaling_group_name: Name shown for the scaling group, which must contain 2-64 characters (English or Chinese), starting with numbers, English letters or Chinese characters, and can contain numbers, underscores `_`, hyphens `-`, and decimal points `.`. If this parameter is not specified, the default value is ScalingGroupId.
+        :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[Mapping[str, Any]] tags: A mapping of tags to assign to the resource.
@@ -1319,6 +1429,8 @@ class ScalingGroup(pulumi.CustomResource):
         __props__ = _ScalingGroupState.__new__(_ScalingGroupState)
 
         __props__.__dict__["alb_server_groups"] = alb_server_groups
+        __props__.__dict__["allocation_strategy"] = allocation_strategy
+        __props__.__dict__["az_balance"] = az_balance
         __props__.__dict__["db_instance_ids"] = db_instance_ids
         __props__.__dict__["default_cooldown"] = default_cooldown
         __props__.__dict__["desired_capacity"] = desired_capacity
@@ -1338,6 +1450,7 @@ class ScalingGroup(pulumi.CustomResource):
         __props__.__dict__["removal_policies"] = removal_policies
         __props__.__dict__["resource_group_id"] = resource_group_id
         __props__.__dict__["scaling_group_name"] = scaling_group_name
+        __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__["tags"] = tags
@@ -1353,6 +1466,22 @@ class ScalingGroup(pulumi.CustomResource):
         """
         return pulumi.get(self, "alb_server_groups")
 
+    @property
+    @pulumi.getter(name="allocationStrategy")
+    def allocation_strategy(self) -> pulumi.Output[str]:
+        """
+        The allocation policy of instances. Auto Scaling selects instance types based on the allocation policy to create instances. The policy can be applied to pay-as-you-go instances and preemptible instances. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
+        """
+        return pulumi.get(self, "allocation_strategy")
+
+    @property
+    @pulumi.getter(name="azBalance")
+    def az_balance(self) -> pulumi.Output[Optional[bool]]:
+        """
+        Specifies whether to evenly distribute instances in the scaling group across multiple zones. This parameter takes effect only if you set MultiAZPolicy to COMPOSABLE.
+        """
+        return pulumi.get(self, "az_balance")
+
     @property
     @pulumi.getter(name="dbInstanceIds")
     def db_instance_ids(self) -> pulumi.Output[Optional[Sequence[str]]]:
@@ -1462,7 +1591,7 @@ class ScalingGroup(pulumi.CustomResource):
     @pulumi.getter(name="multiAzPolicy")
     def multi_az_policy(self) -> pulumi.Output[Optional[str]]:
         """
-        Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
+        Multi-AZ scaling group ECS instance expansion and contraction strategy. PRIORITY, COMPOSABLE, BALANCE or COST_OPTIMIZED(Available since v1.54.0).
         """
         return pulumi.get(self, "multi_az_policy")
 
@@ -1518,6 +1647,14 @@ class ScalingGroup(pulumi.CustomResource):
         """
         return pulumi.get(self, "scaling_group_name")
 
+    @property
+    @pulumi.getter(name="spotAllocationStrategy")
+    def spot_allocation_strategy(self) -> pulumi.Output[str]:
+        """
+        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.
+        """
+        return pulumi.get(self, "spot_allocation_strategy")
+
     @property
     @pulumi.getter(name="spotInstancePools")
     def spot_instance_pools(self) -> pulumi.Output[int]:
@@ -1546,13 +1683,11 @@ class ScalingGroup(pulumi.CustomResource):
 
     @property
     @pulumi.getter(name="vswitchId")
+    @_utilities.deprecated("""Field 'vswitch_id' has been deprecated from provider version 1.7.1, and new field 'vswitch_ids' can replace it.""")
     def vswitch_id(self) -> pulumi.Output[Optional[str]]:
         """
         It has been deprecated from version 1.7.1 and new field 'vswitch_ids' replaces it.
         """
-        warnings.warn("""Field 'vswitch_id' has been deprecated from provider version 1.7.1, and new field 'vswitch_ids' can replace it.""", DeprecationWarning)
-        pulumi.log.warn("""vswitch_id is deprecated: Field 'vswitch_id' has been deprecated from provider version 1.7.1, and new field 'vswitch_ids' can replace it.""")
-
         return pulumi.get(self, "vswitch_id")
 
     @property

pulumi_alicloud/expressconnect/__init__.py

@@ -16,7 +16,15 @@ from .get_virtual_border_routers import *
 from .get_virtual_physical_connections import *
 from .grant_rule_to_cen import *
 from .physical_connection import *
+from .router_express_connect_router import *
 from .router_interface import *
+from .router_tr_association import *
+from .router_vbr_child_instance import *
+from .router_vpc_association import *
+from .traffic_qos import *
+from .traffic_qos_association import *
+from .traffic_qos_queue import *
+from .traffic_qos_rule import *
 from .vbr_pconn_association import *
 from .virtual_border_router import *
 from .virtual_physical_connection import *

pulumi_alicloud/expressconnect/_inputs.py

@@ -10,10 +10,50 @@ from typing import Any, Mapping, Optional, Sequence, Union, overload
 from .. import _utilities
 
 __all__ = [
+    'RouterExpressConnectRouterRegionArgs',
     'GetRouterInterfacesFilterArgs',
     'GetVirtualBorderRoutersFilterArgs',
 ]
 
+@pulumi.input_type
+class RouterExpressConnectRouterRegionArgs:
+    def __init__(__self__, *,
+                 region_id: Optional[pulumi.Input[str]] = None,
+                 transit_mode: Optional[pulumi.Input[str]] = None):
+        """
+        :param pulumi.Input[str] region_id: Representative region ID.
+        :param pulumi.Input[str] transit_mode: Represents the forwarding mode of the current region.
+        """
+        if region_id is not None:
+            pulumi.set(__self__, "region_id", region_id)
+        if transit_mode is not None:
+            pulumi.set(__self__, "transit_mode", transit_mode)
+
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        Representative region ID.
+        """
+        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="transitMode")
+    def transit_mode(self) -> Optional[pulumi.Input[str]]:
+        """
+        Represents the forwarding mode of the current region.
+        """
+        return pulumi.get(self, "transit_mode")
+
+    @transit_mode.setter
+    def transit_mode(self, value: Optional[pulumi.Input[str]]):
+        pulumi.set(self, "transit_mode", value)
+
+
 @pulumi.input_type
 class GetRouterInterfacesFilterArgs:
     def __init__(__self__, *,

pulumi_alicloud/expressconnect/outputs.py

@@ -11,6 +11,7 @@ from .. import _utilities
 from . import outputs
 
 __all__ = [
+    'RouterExpressConnectRouterRegion',
     'GetAccessPointsPointResult',
     'GetAccessPointsPointAccessPointFeatureModelResult',
     'GetGrantRuleToCensCenResult',
@@ -23,6 +24,56 @@ __all__ = [
     'GetVirtualPhysicalConnectionsConnectionResult',
 ]
 
+@pulumi.output_type
+class RouterExpressConnectRouterRegion(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "regionId":
+            suggest = "region_id"
+        elif key == "transitMode":
+            suggest = "transit_mode"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in RouterExpressConnectRouterRegion. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        RouterExpressConnectRouterRegion.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        RouterExpressConnectRouterRegion.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 region_id: Optional[str] = None,
+                 transit_mode: Optional[str] = None):
+        """
+        :param str region_id: Representative region ID.
+        :param str transit_mode: Represents the forwarding mode of the current region.
+        """
+        if region_id is not None:
+            pulumi.set(__self__, "region_id", region_id)
+        if transit_mode is not None:
+            pulumi.set(__self__, "transit_mode", transit_mode)
+
+    @property
+    @pulumi.getter(name="regionId")
+    def region_id(self) -> Optional[str]:
+        """
+        Representative region ID.
+        """
+        return pulumi.get(self, "region_id")
+
+    @property
+    @pulumi.getter(name="transitMode")
+    def transit_mode(self) -> Optional[str]:
+        """
+        Represents the forwarding mode of the current region.
+        """
+        return pulumi.get(self, "transit_mode")
+
+
 @pulumi.output_type
 class GetAccessPointsPointResult(dict):
     def __init__(__self__, *,