Merge pull request #12018 from lachlancooper/asg-update-min-size

Fix wait for ASG capacity when increasing min size

.changelog/12018.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_autoscaling_group: Prevent infinite wait for capacity when increasing `min_size` and not specifying `desired_capacity`
+```

internal/service/autoscaling/group_waiting.go

@@ -185,11 +185,13 @@ func CapacitySatisfiedCreate(d *schema.ResourceData, haveASG, haveELB int) (bool
 
 // CapacitySatisfiedUpdate only cares about specific targets
 func CapacitySatisfiedUpdate(d *schema.ResourceData, haveASG, haveELB int) (bool, string) {
-	if wantASG := d.Get("desired_capacity").(int); wantASG > 0 {
-		if haveASG != wantASG {
-			return false, fmt.Sprintf(
-				"Need exactly %d healthy instances in ASG, have %d", wantASG, haveASG)
-		}
+	minASG := d.Get("min_size").(int)
+	if wantASG := d.Get("desired_capacity").(int); wantASG > minASG {
+		minASG = wantASG
+	}
+	if haveASG != minASG {
+		return false, fmt.Sprintf(
+			"Need exactly %d healthy instances in ASG, have %d", minASG, haveASG)
 	}
 	if wantELB := d.Get("wait_for_elb_capacity").(int); wantELB > 0 {
 		if haveELB != wantELB {

internal/service/autoscaling/group_waiting_test.go

@@ -157,6 +157,22 @@ func TestCapacitySatisfiedUpdate(t *testing.T) {
 			Data:            map[string]interface{}{},
 			ExpectSatisfied: true,
 		},
+		"min_size, got it": {
+			Data: map[string]interface{}{
+				"min_size": 5,
+			},
+			HaveASG:         5,
+			ExpectSatisfied: true,
+		},
+		"min_size overrides desired_capacity": {
+			Data: map[string]interface{}{
+				"min_size":         5,
+				"desired_capacity": 2,
+			},
+			HaveASG:         2,
+			ExpectSatisfied: false,
+			ExpectReason:    "Need exactly 5 healthy instances in ASG, have 2",
+		},
 		"desired_capacity, have less": {
 			Data: map[string]interface{}{
 				"desired_capacity": 5,
@@ -165,6 +181,15 @@ func TestCapacitySatisfiedUpdate(t *testing.T) {
 			ExpectSatisfied: false,
 			ExpectReason:    "Need exactly 5 healthy instances in ASG, have 2",
 		},
+		"desired_capacity overrides min_size": {
+			Data: map[string]interface{}{
+				"min_size":         2,
+				"desired_capacity": 5,
+			},
+			HaveASG:         2,
+			ExpectSatisfied: false,
+			ExpectReason:    "Need exactly 5 healthy instances in ASG, have 2",
+		},
 		"desired_capacity, got it": {
 			Data: map[string]interface{}{
 				"desired_capacity": 5,