resource/aws_lb_listener: Remove extraneous isListenerNotFound function

hashicorp · Mar 26, 2018 · 6c67b85 · 6c67b85
1 parent 941ce36
commit 6c67b85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/aws/resource_aws_lb_listener.go b/aws/resource_aws_lb_listener.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/elbv2"
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform/helper/resource"
@@ -156,7 +155,7 @@ func resourceAwsLbListenerRead(d *schema.ResourceData, meta interface{}) error {
 		ListenerArns: []*string{aws.String(d.Id())},
 	})
 	if err != nil {
-		if isListenerNotFound(err) {
+		if isAWSErr(err, elbv2.ErrCodeListenerNotFoundException, "") {
 			log.Printf("[WARN] DescribeListeners - removing %s from state", d.Id())
 			d.SetId("")
 			return nil
@@ -258,11 +257,6 @@ func resourceAwsLbListenerDelete(d *schema.ResourceData, meta interface{}) error
 	return nil
 }
 
-func isListenerNotFound(err error) bool {
-	elberr, ok := err.(awserr.Error)
-	return ok && elberr.Code() == "ListenerNotFound"
-}
-
 func validateLbListenerActionType() schema.SchemaValidateFunc {
 	return validation.StringInSlice([]string{
 		elbv2.ActionTypeEnumForward,

diff --git a/aws/resource_aws_lb_listener_test.go b/aws/resource_aws_lb_listener_test.go
@@ -152,7 +152,7 @@ func testAccCheckAWSLBListenerDestroy(s *terraform.State) error {
 		}
 
 		// Verify the error
-		if isListenerNotFound(err) {
+		if isAWSErr(err, elbv2.ErrCodeListenerNotFoundException, "") {
 			return nil
 		} else {
 			return errwrap.Wrapf("Unexpected error checking LB Listener destroyed: {{err}}", err)