Merge pull request #26194 from hashicorp/b-aws_lb_listener_tags

r/aws_lb_listener: update tags after creation
hashicorp · Aug 9, 2022 · c7fb276 · c7fb276
2 parents e98dbe6 + c7903d2
commit c7fb276
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 0 deletions.
diff --git a/.changelog/26194.txt b/.changelog/26194.txt
@@ -0,0 +1,7 @@
+```release-note:bug
+ resource/aws_lb_listener: Fix `ValidationError` when tags are added on `create`
+```
+
+```release-note:bug
+  resource/aws_lb_target_group: Fix `ValidationError` when tags are added on `create`
+```
diff --git a/internal/service/elbv2/const.go b/internal/service/elbv2/const.go
@@ -0,0 +1,7 @@
+package elbv2
+
+const (
+	ErrValidationError = "ValidationError"
+
+	TagsOnCreationErrMessage = "cannot specify tags on creation"
+)
diff --git a/internal/service/elbv2/listener.go b/internal/service/elbv2/listener.go
@@ -441,6 +441,14 @@ func resourceListenerCreate(d *schema.ResourceData, meta interface{}) error {
 		output, err = retryListenerCreate(conn, params)
 	}
 
+	// Tags are not supported on creation with some load balancer types (i.e. Gateway)
+	// Retry creation without tags
+	if params.Tags != nil && tfawserr.ErrMessageContains(err, ErrValidationError, TagsOnCreationErrMessage) {
+		log.Printf("[WARN] ELBv2 Listener (%s) create failed (%s) with tags. Trying create without tags.", lbArn, err)
+		params.Tags = nil
+		output, err = retryListenerCreate(conn, params)
+	}
+
 	if err != nil {
 		return fmt.Errorf("creating ELBv2 Listener (%s): %w", lbArn, err)
 	}

diff --git a/internal/service/elbv2/listener_test.go b/internal/service/elbv2/listener_test.go
@@ -314,6 +314,7 @@ func TestAccELBV2Listener_LoadBalancerARN_gatewayLoadBalancer(t *testing.T) {
 					resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", lbResourceName, "arn"),
 					resource.TestCheckResourceAttr(resourceName, "protocol", ""),
 					resource.TestCheckResourceAttr(resourceName, "port", "0"),
+					resource.TestCheckResourceAttr(resourceName, "tags.Name", rName),
 				),
 			},
 		},
@@ -1238,6 +1239,10 @@ resource "aws_lb_listener" "test" {
     target_group_arn = aws_lb_target_group.test.id
     type             = "forward"
   }
+
+  tags = {
+    Name = %[1]q
+  }
 }
 `, rName))
 }

diff --git a/internal/service/elbv2/target_group.go b/internal/service/elbv2/target_group.go
@@ -374,6 +374,14 @@ func resourceTargetGroupCreate(d *schema.ResourceData, meta interface{}) error {
 		resp, err = conn.CreateTargetGroup(params)
 	}
 
+	// Tags are not supported on creation with some protocol types(i.e. GENEVE)
+	// Retry creation without tags
+	if params.Tags != nil && tfawserr.ErrMessageContains(err, ErrValidationError, TagsOnCreationErrMessage) {
+		log.Printf("[WARN] ELBv2 Target Group (%s) create failed (%s) with tags. Trying create without tags.", groupName, err)
+		params.Tags = nil
+		resp, err = conn.CreateTargetGroup(params)
+	}
+
 	if err != nil {
 		return fmt.Errorf("creating LB Target Group: %w", err)
 	}

diff --git a/internal/service/elbv2/target_group_test.go b/internal/service/elbv2/target_group_test.go
@@ -924,6 +924,7 @@ func TestAccELBV2TargetGroup_Geneve_basic(t *testing.T) {
 					testAccCheckTargetGroupExists(resourceName, &conf),
 					resource.TestCheckResourceAttr(resourceName, "port", "6081"),
 					resource.TestCheckResourceAttr(resourceName, "protocol", elbv2.ProtocolEnumGeneve),
+					resource.TestCheckResourceAttr(resourceName, "tags.Name", rName),
 				),
 			},
 			{
@@ -2164,6 +2165,10 @@ resource "aws_lb_target_group" "test" {
     port     = 80
     protocol = "HTTP"
   }
+
+  tags = {
+    Name = %[1]q
+  }
 }
 `, rName)
 }