resource/alicloud_ess_scaling_group: add attributes of compensate_with_on_demand, capacity_options_on_demand_base_capacity, capacity_options_on_demand_percentage_above_base_capacity, capacity_options_compensate_with_on_demand and capacity_options_spot_auto_replace_on_demand. #8320

fuliu-zln · 2025-02-11T06:23:18Z

resource/alicloud_ess_scaling_group: add attributes of compensate_with_on_demand, capacity_options_on_demand_base_capacity, capacity_options_on_demand_percentage_above_base_capacity, capacity_options_compensate_with_on_demand and capacity_options_spot_auto_replace_on_demand.

ChenHanZhang · 2025-02-21T02:52:52Z

website/docs/r/ess_scaling_group.html.markdown

@@ -140,6 +140,11 @@ The following arguments are supported:
 * `spot_allocation_strategy` - (Optional, Available since v1.225.1) 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.
 * `allocation_strategy` - (Optional, Available since v1.225.1) 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.
 * `on_demand_base_capacity` - (Optional, Available since v1.54.0) 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.
+* `compensate_with_on_demand` - (Optional, Available since v1.243.0) Specifies whether to automatically create pay-as-you-go instances to meet the requirement on the number of ECS instances when the expected capacity of preemptible instances cannot be provided due to reasons such as cost-related issues and insufficient resources. This parameter is supported only if you set MultiAZPolicy to COST_OPTIMIZED. Valid values: true, false.


MrWolong · 2025-02-25T09:33:41Z

alicloud/resource_alicloud_ess_scaling_group.go

@@ -186,6 +186,33 @@ func resourceAlicloudEssScalingGroup() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"compensate_with_on_demand": {


compensate_with_on_demand，capacity_options_compensate_with_on_demand，capacity_options_spot_auto_replace_on_demand这三个bool类型的字段默认值都是true吗？capacity_options_on_demand_base_capacity和capacity_options_on_demand_percentage_above_base_capacity的默认值是非0的吗？

ompensate_with_on_demand，capacity_options_compensate_with_on_demand，capacity_options_spot_auto_replace_on_demand这三个bool类型的字段默认值都是true吗？不是某些情况用户没有设置，对应的属性，在后端服务是不会被设置上值的

capacity_options_on_demand_base_capacity和capacity_options_on_demand_percentage_above_base_capacity的默认值是非0的吗？
不是，不同情况，默认值不同

既然没有默认值就不要加computed！将computed注释掉，多跑几次第0步不设置这5个字段的单测，哪些字段报diff就加，不报diff不加。

和衫也确认过，存在不设置有默认值的情况，因此，加computed符合预期

MrWolong · 2025-02-25T09:35:18Z

alicloud/resource_alicloud_ess_scaling_group.go

@@ -540,10 +585,30 @@ func resourceAliyunEssScalingGroupUpdate(d *schema.ResourceData, meta interface{
 		request["SpotInstancePools"] = requests.NewInteger(d.Get("spot_instance_pools").(int))
 	}

+	if d.HasChange("capacity_options_on_demand_base_capacity") {


之前说过很多次，针对bool和int类型的字段，不要用d.Get直接获取，要用d.GetOkExists判断获取，改！

MrWolong · 2025-02-25T09:35:41Z

alicloud/resource_alicloud_ess_scaling_group.go

@@ -765,10 +830,30 @@ func buildAlicloudEssScalingGroupArgs(d *schema.ResourceData, meta interface{})
 		request["SpotInstancePools"] = v
 	}

+	if v, ok := d.GetOk("capacity_options_on_demand_base_capacity"); ok {


MrWolong · 2025-02-25T09:43:57Z

alicloud/resource_alicloud_ess_scaling_group_test.go

@@ -984,6 +992,227 @@ func TestAccAliCloudEssScalingGroup_costoptimized(t *testing.T) {

 }

+func TestAccAliCloudEssScalingGroup_costoptimized_capacityOptions(t *testing.T) {


compensate_with_on_demand缺少第0步，也就是只有创建操作设置的单测。capacity_options_compensate_with_on_demand，capacity_options_spot_auto_replace_on_demand，capacity_options_on_demand_base_capacity和capacity_options_on_demand_percentage_above_base_capacity缺少第0步不设置，只在更新操作设置的单测

MrWolong · 2025-02-25T09:47:58Z

website/docs/r/ess_scaling_group.html.markdown

@@ -140,6 +140,11 @@ The following arguments are supported:
 * `spot_allocation_strategy` - (Optional, Available since v1.225.1) 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.
 * `allocation_strategy` - (Optional, Available since v1.225.1) 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.
 * `on_demand_base_capacity` - (Optional, Available since v1.54.0) 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.
+* `compensate_with_on_demand` - (Optional, Available since v1.244.0) Specifies whether to automatically create pay-as-you-go instances to meet the requirement on the number of ECS instances when the expected capacity of preemptible instances cannot be provided due to reasons such as cost-related issues and insufficient resources. This parameter is supported only if you set MultiAZPolicy to COST_OPTIMIZED. Valid values: true, false.


这个资源里面有字段名字是MultiAZPolicy的吗？改成tf中的字段名，用单引号着重显示。下面几个字段都一样，改

MrWolong · 2025-02-28T05:49:32Z

website/docs/r/ess_scaling_group.html.markdown

@@ -140,6 +140,11 @@ The following arguments are supported:
 * `spot_allocation_strategy` - (Optional, Available since v1.225.1) 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.
 * `allocation_strategy` - (Optional, Available since v1.225.1) 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.
 * `on_demand_base_capacity` - (Optional, Available since v1.54.0) 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.
+* `compensate_with_on_demand` - (Optional, Available since v1.244.0) Specifies whether to automatically create pay-as-you-go instances to meet the requirement on the number of ECS instances when the expected capacity of preemptible instances cannot be provided due to reasons such as cost-related issues and insufficient resources. This parameter is supported only if you set 'multi_az_policy' to COST_OPTIMIZED. Valid values: true, false.


继续改，按照我之前说的，把文档中提到的属性名替换成tf中的字段

MrWolong · 2025-02-28T07:18:52Z

website/docs/r/ess_scaling_group.html.markdown

@@ -140,6 +140,11 @@ The following arguments are supported:
 * `spot_allocation_strategy` - (Optional, Available since v1.225.1) 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.
 * `allocation_strategy` - (Optional, Available since v1.225.1) 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.
 * `on_demand_base_capacity` - (Optional, Available since v1.54.0) 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.
+* `compensate_with_on_demand` - (Optional, Available since v1.244.0) Specifies whether to automatically create pay-as-you-go instances to meet the requirement on the number of ECS instances when the expected capacity of preemptible instances cannot be provided due to reasons such as cost-related issues and insufficient resources. This parameter is supported only if you set 'multi_az_policy' to COST_OPTIMIZED. Valid values: true, false.
+* `capacity_options_on_demand_base_capacity` - (Optional, Available since v1.244.0) The minimum number of pay-as-you-go instances that must be contained in the scaling group. When the actual number of pay-as-you-go instances in the scaling group drops below the value of this parameter, Auto Scaling preferentially creates pay-as-you-go instances. Valid values: 0 to 1000. If you set 'multi_az_policy' to COMPOSABLE, the default value of this parameter is 0.
+* `capacity_options_on_demand_percentage_above_base_capacity` - (Optional, Available since v1.244.0) The percentage of pay-as-you-go instances in the excess instances when the minimum number of pay-as-you-go instances is reached. 'compensate_with_on_demand' specifies the minimum number of pay-as-you-go instances that must be contained in the scaling group. Valid values: 0 to 100. If you set 'multi_az_policy' to COMPOSABLE, the default value of this parameter is 100.


再去看看国际站文档，改！

…h_on_demand, capacity_options_on_demand_base_capacity, capacity_options_on_demand_percentage_above_base_capacity, capacity_options_compensate_with_on_demand and capacity_options_spot_auto_replace_on_demand.

MrWolong

approved

fuliu-zln force-pushed the feat/groupResource branch from 1f238b3 to 367a36e Compare February 14, 2025 08:58

ChenHanZhang reviewed Feb 21, 2025

View reviewed changes

fuliu-zln force-pushed the feat/groupResource branch from 367a36e to cadadd6 Compare February 24, 2025 01:49

MrWolong reviewed Feb 25, 2025

View reviewed changes

fuliu-zln force-pushed the feat/groupResource branch from cadadd6 to 7df94b2 Compare February 27, 2025 10:31

MrWolong reviewed Feb 28, 2025

View reviewed changes

fuliu-zln force-pushed the feat/groupResource branch from 7df94b2 to 1f1469e Compare February 28, 2025 06:39

MrWolong reviewed Feb 28, 2025

View reviewed changes

fuliu-zln force-pushed the feat/groupResource branch 5 times, most recently from ab17ea6 to 7c84aaf Compare February 28, 2025 10:31

resource/alicloud_ess_scaling_group: add attributes of compensate_wit…

4c19f10

…h_on_demand, capacity_options_on_demand_base_capacity, capacity_options_on_demand_percentage_above_base_capacity, capacity_options_compensate_with_on_demand and capacity_options_spot_auto_replace_on_demand.

fuliu-zln force-pushed the feat/groupResource branch from 7c84aaf to 4c19f10 Compare February 28, 2025 10:33

MrWolong reviewed Mar 5, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

resource/alicloud_ess_scaling_group: add attributes of compensate_with_on_demand, capacity_options_on_demand_base_capacity, capacity_options_on_demand_percentage_above_base_capacity, capacity_options_compensate_with_on_demand and capacity_options_spot_auto_replace_on_demand. #8320

resource/alicloud_ess_scaling_group: add attributes of compensate_with_on_demand, capacity_options_on_demand_base_capacity, capacity_options_on_demand_percentage_above_base_capacity, capacity_options_compensate_with_on_demand and capacity_options_spot_auto_replace_on_demand. #8320

fuliu-zln commented Feb 11, 2025

ChenHanZhang Feb 21, 2025

fuliu-zln Feb 24, 2025

MrWolong Feb 25, 2025

fuliu-zln Feb 27, 2025

MrWolong Feb 28, 2025

fuliu-zln Feb 28, 2025

MrWolong Feb 25, 2025

fuliu-zln Feb 27, 2025

MrWolong Feb 25, 2025

fuliu-zln Feb 27, 2025

MrWolong Feb 25, 2025

fuliu-zln Feb 27, 2025

MrWolong Feb 25, 2025 •

edited

Loading

fuliu-zln Feb 27, 2025

MrWolong Feb 28, 2025

fuliu-zln Feb 28, 2025

MrWolong Feb 28, 2025

fuliu-zln Feb 28, 2025

MrWolong left a comment

		@@ -984,6 +992,227 @@ func TestAccAliCloudEssScalingGroup_costoptimized(t *testing.T) {

		}

		func TestAccAliCloudEssScalingGroup_costoptimized_capacityOptions(t *testing.T) {

resource/alicloud_ess_scaling_group: add attributes of compensate_with_on_demand, capacity_options_on_demand_base_capacity, capacity_options_on_demand_percentage_above_base_capacity, capacity_options_compensate_with_on_demand and capacity_options_spot_auto_replace_on_demand. #8320

Are you sure you want to change the base?

resource/alicloud_ess_scaling_group: add attributes of compensate_with_on_demand, capacity_options_on_demand_base_capacity, capacity_options_on_demand_percentage_above_base_capacity, capacity_options_compensate_with_on_demand and capacity_options_spot_auto_replace_on_demand. #8320

Conversation

fuliu-zln commented Feb 11, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MrWolong Feb 25, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MrWolong left a comment

Choose a reason for hiding this comment

MrWolong Feb 25, 2025 •

edited

Loading