r/aws_lb_listener_certificate: remove from state if listener not found (

#32412) * remove from state if listener not found add changelog * r/aws_lb_listener_certificate: move listener not found check to finder * r/aws_lb_listener_certificate(test): add _disappears_Listener --------- Co-authored-by: Jared Baker <[email protected]>
hashicorp · Aug 11, 2023 · c0bbba1 · c0bbba1
1 parent 369a8fb
commit c0bbba1
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/.changelog/32412.txt b/.changelog/32412.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_lb_listener_certificate: Remove from state when listener not found
+```
diff --git a/internal/service/elbv2/listener_certificate.go b/internal/service/elbv2/listener_certificate.go
@@ -184,6 +184,12 @@ func findListenerCertificate(ctx context.Context, conn *elbv2.ELBV2, certificate
 	}
 
 	resp, err := conn.DescribeListenerCertificatesWithContext(ctx, params)
+	if tfawserr.ErrCodeEquals(err, elbv2.ErrCodeListenerNotFoundException) {
+		return &retry.NotFoundError{
+			LastRequest: params,
+			LastError:   err,
+		}
+	}
 	if err != nil {
 		return err
 	}

diff --git a/internal/service/elbv2/listener_certificate_test.go b/internal/service/elbv2/listener_certificate_test.go
@@ -183,6 +183,32 @@ func TestAccELBV2ListenerCertificate_disappears(t *testing.T) {
 	})
 }
 
+func TestAccELBV2ListenerCertificate_disappears_Listener(t *testing.T) {
+	ctx := acctest.Context(t)
+	key := acctest.TLSRSAPrivateKeyPEM(t, 2048)
+	certificate := acctest.TLSRSAX509SelfSignedCertificatePEM(t, key, "example.com")
+	resourceName := "aws_lb_listener_certificate.test"
+	listenerResourceName := "aws_lb_listener.test"
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.PreCheck(ctx, t) },
+		ErrorCheck:               acctest.ErrorCheck(t, elbv2.EndpointsID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             testAccCheckListenerCertificateDestroy(ctx),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccListenerCertificateConfig_basic(rName, key, certificate),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckListenerCertificateExists(resourceName),
+					acctest.CheckResourceDisappears(ctx, acctest.Provider, tfelbv2.ResourceListener(), listenerResourceName),
+				),
+				ExpectNonEmptyPlan: true,
+			},
+		},
+	})
+}
+
 func testAccCheckListenerCertificateDestroy(ctx context.Context) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		conn := acctest.Provider.Meta().(*conns.AWSClient).ELBV2Conn(ctx)