From 6c7ff936264efdb3c9b835a54175dd7dc9e70673 Mon Sep 17 00:00:00 2001 From: nitrocode Date: Fri, 27 Aug 2021 10:42:32 -0400 Subject: [PATCH 1/3] initial_lifecycle_hook ForceNew: true --- internal/service/autoscaling/group.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/service/autoscaling/group.go b/internal/service/autoscaling/group.go index 7faa2d90cfd..25bc8257591 100644 --- a/internal/service/autoscaling/group.go +++ b/internal/service/autoscaling/group.go @@ -392,6 +392,7 @@ func ResourceGroup() *schema.Resource { "initial_lifecycle_hook": { Type: schema.TypeSet, Optional: true, + ForceNew: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { From 125e6c31cc535c5bdc98562558712b47642c396f Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 25 Mar 2022 14:11:40 -0400 Subject: [PATCH 2/3] Clean up non-unique test issues --- internal/service/autoscaling/group_test.go | 76 ++++++++++++---------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/internal/service/autoscaling/group_test.go b/internal/service/autoscaling/group_test.go index e3fc718fe38..a1137eb9318 100644 --- a/internal/service/autoscaling/group_test.go +++ b/internal/service/autoscaling/group_test.go @@ -739,6 +739,7 @@ func TestAccAutoScalingGroup_ALB_targetGroups(t *testing.T) { var group autoscaling.Group var tg elbv2.TargetGroup var tg2 elbv2.TargetGroup + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) testCheck := func(targets []*elbv2.TargetGroup) resource.TestCheckFunc { return func(*terraform.State) error { @@ -769,7 +770,7 @@ func TestAccAutoScalingGroup_ALB_targetGroups(t *testing.T) { CheckDestroy: testAccCheckGroupDestroy, Steps: []resource.TestStep{ { - Config: testAccGroupConfig_ALB_TargetGroup_pre(), + Config: testAccGroupConfig_ALB_TargetGroup_pre(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists("aws_autoscaling_group.bar", &group), testAccCheckLBTargetGroupExists("aws_lb_target_group.test", &tg), @@ -779,7 +780,7 @@ func TestAccAutoScalingGroup_ALB_targetGroups(t *testing.T) { }, { - Config: testAccGroupConfig_ALB_TargetGroup_post_duo(), + Config: testAccGroupConfig_ALB_TargetGroup_post_duo(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists("aws_autoscaling_group.bar", &group), testAccCheckLBTargetGroupExists("aws_lb_target_group.test", &tg), @@ -803,7 +804,7 @@ func TestAccAutoScalingGroup_ALB_targetGroups(t *testing.T) { }, }, { - Config: testAccGroupConfig_ALB_TargetGroup_post(), + Config: testAccGroupConfig_ALB_TargetGroup_post(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists("aws_autoscaling_group.bar", &group), testAccCheckLBTargetGroupExists("aws_lb_target_group.test", &tg), @@ -3085,9 +3086,10 @@ resource "aws_autoscaling_group" "bar" { `) } -func testAccGroupConfig_ALB_TargetGroup_pre() string { - return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptInDefaultExclude(), - ` +func testAccGroupConfig_ALB_TargetGroup_pre(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigAvailableAZsNoOptInDefaultExclude(), + fmt.Sprintf(` resource "aws_vpc" "default" { cidr_block = "10.0.0.0/16" @@ -3097,7 +3099,7 @@ resource "aws_vpc" "default" { } resource "aws_lb_target_group" "test" { - name = "tf-example-alb-tg" + name = %[1]q port = 80 protocol = "HTTP" vpc_id = aws_vpc.default.id @@ -3109,7 +3111,7 @@ resource "aws_subnet" "main" { availability_zone = data.aws_availability_zones.available.names[0] tags = { - Name = "tf-acc-autoscaling-group-alb-target-group-main" + Name = %[1]q } } @@ -3119,7 +3121,7 @@ resource "aws_subnet" "alt" { availability_zone = data.aws_availability_zones.available.names[1] tags = { - Name = "tf-acc-autoscaling-group-alb-target-group-alt" + Name = %[1]q } } @@ -3156,8 +3158,8 @@ resource "aws_autoscaling_group" "bar" { } resource "aws_security_group" "tf_test_self" { - name = "tf_test_alb_asg" - description = "tf_test_alb_asg" + name = %[1]q + description = %[1]q vpc_id = aws_vpc.default.id ingress { @@ -3168,25 +3170,26 @@ resource "aws_security_group" "tf_test_self" { } tags = { - Name = "testAccAWSAutoScalingGroupConfig_ALB_TargetGroup" + Name = %[1]q } } -`) +`, rName)) } -func testAccGroupConfig_ALB_TargetGroup_post() string { - return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptInDefaultExclude(), - ` +func testAccGroupConfig_ALB_TargetGroup_post(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigAvailableAZsNoOptInDefaultExclude(), + fmt.Sprintf(` resource "aws_vpc" "default" { cidr_block = "10.0.0.0/16" tags = { - Name = "terraform-testacc-autoscaling-group-alb-target-group" + Name = %[1]q } } resource "aws_lb_target_group" "test" { - name = "tf-example-alb-tg" + name = %[1]q port = 80 protocol = "HTTP" vpc_id = aws_vpc.default.id @@ -3198,7 +3201,7 @@ resource "aws_subnet" "main" { availability_zone = data.aws_availability_zones.available.names[0] tags = { - Name = "tf-acc-autoscaling-group-alb-target-group-main" + Name = %[1]q } } @@ -3208,7 +3211,7 @@ resource "aws_subnet" "alt" { availability_zone = data.aws_availability_zones.available.names[1] tags = { - Name = "tf-acc-autoscaling-group-alb-target-group-alt" + Name = "%[1]s-2" } } @@ -3247,8 +3250,8 @@ resource "aws_autoscaling_group" "bar" { } resource "aws_security_group" "tf_test_self" { - name = "tf_test_alb_asg" - description = "tf_test_alb_asg" + name = %[1]q + description = %[1]q vpc_id = aws_vpc.default.id ingress { @@ -3259,32 +3262,33 @@ resource "aws_security_group" "tf_test_self" { } tags = { - Name = "testAccAWSAutoScalingGroupConfig_ALB_TargetGroup" + Name = %[1]q } } -`) +`, rName)) } -func testAccGroupConfig_ALB_TargetGroup_post_duo() string { - return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptInDefaultExclude(), - ` +func testAccGroupConfig_ALB_TargetGroup_post_duo(rName string) string { + return acctest.ConfigCompose( + acctest.ConfigAvailableAZsNoOptInDefaultExclude(), + fmt.Sprintf(` resource "aws_vpc" "default" { cidr_block = "10.0.0.0/16" tags = { - Name = "terraform-testacc-autoscaling-group-alb-target-group" + Name = %[1]q } } resource "aws_lb_target_group" "test" { - name = "tf-example-alb-tg" + name = %[1]q port = 80 protocol = "HTTP" vpc_id = aws_vpc.default.id } resource "aws_lb_target_group" "test_more" { - name = "tf-example-alb-tg-more" + name = format("%%s-%%s", substr(%[1]q, 0, 28), "2") port = 80 protocol = "HTTP" vpc_id = aws_vpc.default.id @@ -3296,7 +3300,7 @@ resource "aws_subnet" "main" { availability_zone = data.aws_availability_zones.available.names[0] tags = { - Name = "tf-acc-autoscaling-group-alb-target-group-main" + Name = %[1]q } } @@ -3306,7 +3310,7 @@ resource "aws_subnet" "alt" { availability_zone = data.aws_availability_zones.available.names[1] tags = { - Name = "tf-acc-autoscaling-group-alb-target-group-alt" + Name = "%[1]s-2" } } @@ -3348,8 +3352,8 @@ resource "aws_autoscaling_group" "bar" { } resource "aws_security_group" "tf_test_self" { - name = "tf_test_alb_asg" - description = "tf_test_alb_asg" + name = %[1]q + description = %[1]q vpc_id = aws_vpc.default.id ingress { @@ -3360,10 +3364,10 @@ resource "aws_security_group" "tf_test_self" { } tags = { - Name = "testAccAWSAutoScalingGroupConfig_ALB_TargetGroup" + Name = %[1]q } } -`) +`, rName)) } func testAccGroupConfig_TargetGroupARNs(rName string, tgCount int) string { From 93e0f495debcb5863fc5af9c503d4f0aa79c5f3a Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Fri, 25 Mar 2022 14:15:31 -0400 Subject: [PATCH 3/3] Add changelog --- .changelog/20708.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/20708.txt diff --git a/.changelog/20708.txt b/.changelog/20708.txt new file mode 100644 index 00000000000..fca6790b5e9 --- /dev/null +++ b/.changelog/20708.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_autoscaling_group: Fix issue where group was not recreated if `initial_lifecycle_hook` changed +``` \ No newline at end of file