From da77548e90450b421a17fb50ef14cd1796b3e672 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 19:37:04 -0400 Subject: [PATCH 01/10] tests/r/alb_target_group: Add ErrorCheck --- aws/resource_aws_alb_target_group_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/aws/resource_aws_alb_target_group_test.go b/aws/resource_aws_alb_target_group_test.go index c1061cb746e9..f05873f99e9e 100644 --- a/aws/resource_aws_alb_target_group_test.go +++ b/aws/resource_aws_alb_target_group_test.go @@ -50,6 +50,7 @@ func TestAccAWSALBTargetGroup_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -92,6 +93,7 @@ func TestAccAWSALBTargetGroup_namePrefix(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -112,6 +114,7 @@ func TestAccAWSALBTargetGroup_generatedName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -133,6 +136,7 @@ func TestAccAWSALBTargetGroup_changeNameForceNew(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -161,6 +165,7 @@ func TestAccAWSALBTargetGroup_changeProtocolForceNew(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -189,6 +194,7 @@ func TestAccAWSALBTargetGroup_changePortForceNew(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -217,6 +223,7 @@ func TestAccAWSALBTargetGroup_changeVpcForceNew(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -243,6 +250,7 @@ func TestAccAWSALBTargetGroup_tags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -274,6 +282,7 @@ func TestAccAWSALBTargetGroup_updateHealthCheck(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -336,6 +345,7 @@ func TestAccAWSALBTargetGroup_updateSticknessEnabled(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -421,6 +431,7 @@ func TestAccAWSALBTargetGroup_setAndUpdateSlowStart(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -449,6 +460,7 @@ func TestAccAWSALBTargetGroup_updateLoadBalancingAlgorithmType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_target_group.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, @@ -552,6 +564,7 @@ func TestAccAWSALBTargetGroup_lambda(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, Steps: []resource.TestStep{ @@ -585,6 +598,7 @@ func TestAccAWSALBTargetGroup_lambdaMultiValueHeadersEnabled(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, Steps: []resource.TestStep{ @@ -632,6 +646,7 @@ func TestAccAWSALBTargetGroup_missingPortProtocolVpc(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSALBTargetGroupDestroy, Steps: []resource.TestStep{ From c75895c4d4c3fb123de3dcb78259c01a10c406ae Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 19:37:14 -0400 Subject: [PATCH 02/10] tests/r/lb: Add ErrorCheck --- aws/resource_aws_lb_test.go | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/aws/resource_aws_lb_test.go b/aws/resource_aws_lb_test.go index a7fdef25991d..4f9248fbcb0f 100644 --- a/aws/resource_aws_lb_test.go +++ b/aws/resource_aws_lb_test.go @@ -99,6 +99,7 @@ func TestAccAWSLB_ALB_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -136,6 +137,7 @@ func TestAccAWSLB_NLB_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -169,6 +171,7 @@ func TestAccAWSLB_LoadBalancerType_Gateway(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckElbv2GatewayLoadBalancer(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), ProviderFactories: testAccProviderFactories, CheckDestroy: testAccCheckAWSLBDestroy, Steps: []resource.TestStep{ @@ -201,6 +204,7 @@ func TestAccAWSLB_IPv6SubnetMapping(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), ProviderFactories: testAccProviderFactories, CheckDestroy: testAccCheckAWSLBDestroy, Steps: []resource.TestStep{ @@ -234,6 +238,7 @@ func TestAccAWSLB_LoadBalancerType_Gateway_EnableCrossZoneLoadBalancing(t *testi resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckElbv2GatewayLoadBalancer(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), ProviderFactories: testAccProviderFactories, CheckDestroy: testAccCheckAWSLBDestroy, Steps: []resource.TestStep{ @@ -276,6 +281,7 @@ func TestAccAWSLB_ALB_outpost(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSOutpostsOutposts(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -315,6 +321,7 @@ func TestAccAWSLB_networkLoadbalancerEIP(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, Steps: []resource.TestStep{ @@ -344,6 +351,7 @@ func TestAccAWSLB_NLB_privateipv4address(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -373,6 +381,7 @@ func TestAccAWSLB_BackwardsCompatibility(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -407,6 +416,7 @@ func TestAccAWSLB_generatedName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -428,6 +438,7 @@ func TestAccAWSLB_generatesNameForZeroValue(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -449,6 +460,7 @@ func TestAccAWSLB_namePrefix(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -473,6 +485,7 @@ func TestAccAWSLB_tags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -513,6 +526,7 @@ func TestAccAWSLB_networkLoadbalancer_updateCrossZone(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -554,6 +568,7 @@ func TestAccAWSLB_applicationLoadBalancer_updateHttp2(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -594,6 +609,7 @@ func TestAccAWSLB_applicationLoadBalancer_updateDropInvalidHeaderFields(t *testi resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_lb.lb_test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -635,6 +651,7 @@ func TestAccAWSLB_applicationLoadBalancer_updateDeletionProtection(t *testing.T) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -676,6 +693,7 @@ func TestAccAWSLB_updatedSecurityGroups(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -706,6 +724,7 @@ func TestAccAWSLB_updatedSubnets(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -736,6 +755,7 @@ func TestAccAWSLB_updatedIpAddressType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -768,6 +788,7 @@ func TestAccAWSLB_noSecurityGroup(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -801,6 +822,7 @@ func TestAccAWSLB_ALB_AccessLogs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -889,6 +911,7 @@ func TestAccAWSLB_ALB_AccessLogs_Prefix(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -959,6 +982,7 @@ func TestAccAWSLB_NLB_AccessLogs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -1047,6 +1071,7 @@ func TestAccAWSLB_NLB_AccessLogs_Prefix(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, @@ -1116,6 +1141,7 @@ func TestAccAWSLB_networkLoadbalancer_subnet_change(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBDestroy, From 8ae4c372ac99c1c456adacf60496d685b53aef1f Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 19:37:24 -0400 Subject: [PATCH 03/10] tests/r/lb_listener: Add ErrorCheck --- aws/resource_aws_lb_listener_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/aws/resource_aws_lb_listener_test.go b/aws/resource_aws_lb_listener_test.go index 2b75c502602c..40ea40395431 100644 --- a/aws/resource_aws_lb_listener_test.go +++ b/aws/resource_aws_lb_listener_test.go @@ -20,6 +20,7 @@ func TestAccAWSLBListener_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_lb_listener.front_end", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, @@ -53,6 +54,7 @@ func TestAccAWSLBListener_forwardWeighted(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, @@ -124,6 +126,7 @@ func TestAccAWSLBListener_basicUdp(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_lb_listener.front_end", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, @@ -155,6 +158,7 @@ func TestAccAWSLBListener_BackwardsCompatibility(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_alb_listener.front_end", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, @@ -187,6 +191,7 @@ func TestAccAWSLBListener_https(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_lb_listener.front_end", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, @@ -247,6 +252,7 @@ func TestAccAWSLBListener_Protocol_Tls(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, Steps: []resource.TestStep{ @@ -267,6 +273,7 @@ func TestAccAWSLBListener_redirect(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_lb_listener.front_end", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, @@ -303,6 +310,7 @@ func TestAccAWSLBListener_fixedResponse(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_lb_listener.front_end", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, @@ -376,6 +384,7 @@ func TestAccAWSLBListener_oidc(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: "aws_lb_listener.test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, @@ -417,6 +426,7 @@ func TestAccAWSLBListener_DefaultAction_Order(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, Steps: []resource.TestStep{ @@ -443,6 +453,7 @@ func TestAccAWSLBListener_DefaultAction_Order_Recreates(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerDestroy, Steps: []resource.TestStep{ From 620502484f503e9bf4ac2d9660ffa0fbd5531917 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 19:37:34 -0400 Subject: [PATCH 04/10] tests/r/lb_listener_certificate: Add ErrorCheck --- aws/resource_aws_lb_listener_certificate_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws/resource_aws_lb_listener_certificate_test.go b/aws/resource_aws_lb_listener_certificate_test.go index 3d5f4a07edc7..c319db8bd46f 100644 --- a/aws/resource_aws_lb_listener_certificate_test.go +++ b/aws/resource_aws_lb_listener_certificate_test.go @@ -22,6 +22,7 @@ func TestAccAwsLbListenerCertificate_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAwsLbListenerCertificateDestroy, Steps: []resource.TestStep{ @@ -53,6 +54,7 @@ func TestAccAwsLbListenerCertificate_CertificateArn_Underscores(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAwsLbListenerCertificateDestroy, Steps: []resource.TestStep{ @@ -86,6 +88,7 @@ func TestAccAwsLbListenerCertificate_multiple(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAwsLbListenerCertificateDestroy, Steps: []resource.TestStep{ @@ -152,6 +155,7 @@ func TestAccAwsLbListenerCertificate_disappears(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAwsLbListenerCertificateDestroy, Steps: []resource.TestStep{ From 3d03b109855c6b9073b207ae799a852fed75ab53 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 19:37:43 -0400 Subject: [PATCH 05/10] tests/r/lb_listener_rule: Add ErrorCheck --- aws/resource_aws_lb_listener_rule_test.go | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/aws/resource_aws_lb_listener_rule_test.go b/aws/resource_aws_lb_listener_rule_test.go index 065a46689a2f..c4804d3768d9 100644 --- a/aws/resource_aws_lb_listener_rule_test.go +++ b/aws/resource_aws_lb_listener_rule_test.go @@ -65,6 +65,7 @@ func TestAccAWSLBListenerRule_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -112,6 +113,7 @@ func TestAccAWSLBListenerRule_forwardWeighted(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -190,6 +192,7 @@ func TestAccAWSLBListenerRule_BackwardsCompatibility(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -234,6 +237,7 @@ func TestAccAWSLBListenerRule_redirect(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -274,6 +278,7 @@ func TestAccAWSLBListenerRule_fixedResponse(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -311,6 +316,7 @@ func TestAccAWSLBListenerRule_updateFixedResponse(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -341,6 +347,7 @@ func TestAccAWSLBListenerRule_updateRulePriority(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -371,6 +378,7 @@ func TestAccAWSLBListenerRule_changeListenerRuleArnForcesNew(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -398,6 +406,7 @@ func TestAccAWSLBListenerRule_priority(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -479,6 +488,7 @@ func TestAccAWSLBListenerRule_cognito(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -519,6 +529,7 @@ func TestAccAWSLBListenerRule_oidc(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -559,6 +570,7 @@ func TestAccAWSLBListenerRule_Action_Order(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -585,6 +597,7 @@ func TestAccAWSLBListenerRule_Action_Order_Recreates(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -608,6 +621,7 @@ func TestAccAWSLBListenerRule_conditionAttributesCount(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -644,6 +658,7 @@ func TestAccAWSLBListenerRule_conditionHostHeader(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -682,6 +697,7 @@ func TestAccAWSLBListenerRule_conditionHttpHeader(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -726,6 +742,7 @@ func TestAccAWSLBListenerRule_conditionHttpHeader(t *testing.T) { func TestAccAWSLBListenerRule_conditionHttpHeader_invalid(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -746,6 +763,7 @@ func TestAccAWSLBListenerRule_conditionHttpRequestMethod(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -784,6 +802,7 @@ func TestAccAWSLBListenerRule_conditionPathPattern(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -822,6 +841,7 @@ func TestAccAWSLBListenerRule_conditionQueryString(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -884,6 +904,7 @@ func TestAccAWSLBListenerRule_conditionSourceIp(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -922,6 +943,7 @@ func TestAccAWSLBListenerRule_conditionUpdateMixed(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -995,6 +1017,7 @@ func TestAccAWSLBListenerRule_conditionMultiple(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ @@ -1077,6 +1100,7 @@ func TestAccAWSLBListenerRule_conditionUpdateMultiple(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBListenerRuleDestroy, Steps: []resource.TestStep{ From c984192d75dc9b629effa7300d2cad9fce2cc31b Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 19:38:07 -0400 Subject: [PATCH 06/10] tests/r/lb_target_group: Add ErrorCheck --- aws/resource_aws_lb_target_group_test.go | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/aws/resource_aws_lb_target_group_test.go b/aws/resource_aws_lb_target_group_test.go index b1ceba292d51..9e03807d7aa0 100644 --- a/aws/resource_aws_lb_target_group_test.go +++ b/aws/resource_aws_lb_target_group_test.go @@ -98,6 +98,7 @@ func TestAccAWSLBTargetGroup_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -143,6 +144,7 @@ func TestAccAWSLBTargetGroup_basicUdp(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -174,6 +176,7 @@ func TestAccAWSLBTargetGroup_ProtocolVersion(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -219,6 +222,7 @@ func TestAccAWSLBTargetGroup_withoutHealthcheck(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -244,6 +248,7 @@ func TestAccAWSLBTargetGroup_networkLB_TargetGroup(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -324,6 +329,7 @@ func TestAccAWSLBTargetGroup_Protocol_Geneve(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckElbv2GatewayLoadBalancer(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), ProviderFactories: testAccProviderFactories, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, Steps: []resource.TestStep{ @@ -356,6 +362,7 @@ func TestAccAWSLBTargetGroup_Protocol_Tcp_HealthCheck_Protocol(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -388,6 +395,7 @@ func TestAccAWSLBTargetGroup_Protocol_Tls(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, Steps: []resource.TestStep{ @@ -409,6 +417,7 @@ func TestAccAWSLBTargetGroup_ProtocolVersion_GRPC_HealthCheck(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -433,6 +442,7 @@ func TestAccAWSLBTargetGroup_ProtocolVersion_HTTP_GRPC_Update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, Steps: []resource.TestStep{ @@ -463,6 +473,7 @@ func TestAccAWSLBTargetGroup_networkLB_TargetGroupWithProxy(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -493,6 +504,7 @@ func TestAccAWSLBTargetGroup_TCP_HTTPHealthCheck(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -560,6 +572,7 @@ func TestAccAWSLBTargetGroup_BackwardsCompatibility(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -602,6 +615,7 @@ func TestAccAWSLBTargetGroup_namePrefix(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -623,6 +637,7 @@ func TestAccAWSLBTargetGroup_generatedName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -645,6 +660,7 @@ func TestAccAWSLBTargetGroup_changeNameForceNew(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -674,6 +690,7 @@ func TestAccAWSLBTargetGroup_changeProtocolForceNew(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -703,6 +720,7 @@ func TestAccAWSLBTargetGroup_changePortForceNew(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -732,6 +750,7 @@ func TestAccAWSLBTargetGroup_changeVpcForceNew(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -759,6 +778,7 @@ func TestAccAWSLBTargetGroup_tags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -799,6 +819,7 @@ func TestAccAWSLBTargetGroup_enableHealthCheck(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -836,6 +857,7 @@ func TestAccAWSLBTargetGroup_updateHealthCheck(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -908,6 +930,7 @@ func TestAccAWSLBTargetGroup_updateSticknessEnabled(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -994,6 +1017,7 @@ func TestAccAWSLBTargetGroup_defaults_application(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -1055,6 +1079,7 @@ protocol = "TCP" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -1103,6 +1128,7 @@ func TestAccAWSLBTargetGroup_stickinessDefaultNLB(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -1144,6 +1170,7 @@ func TestAccAWSLBTargetGroup_stickinessDefaultALB(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -1167,6 +1194,7 @@ func TestAccAWSLBTargetGroup_stickinessValidNLB(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -1226,6 +1254,7 @@ func TestAccAWSLBTargetGroup_stickinessValidALB(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), IDRefreshName: resourceName, Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, @@ -1257,6 +1286,7 @@ func TestAccAWSLBTargetGroup_stickinessValidALB(t *testing.T) { func TestAccAWSLBTargetGroup_stickinessInvalidNLB(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, Steps: []resource.TestStep{ @@ -1279,6 +1309,7 @@ func TestAccAWSLBTargetGroup_stickinessInvalidNLB(t *testing.T) { func TestAccAWSLBTargetGroup_stickinessInvalidALB(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupDestroy, Steps: []resource.TestStep{ From 0818b9baba6a740661aba574c51d1de6614bf3a5 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 19:38:20 -0400 Subject: [PATCH 07/10] tests/r/lb_target_group_attachment: Add ErrorCheck --- aws/resource_aws_lb_target_group_attachment_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/aws/resource_aws_lb_target_group_attachment_test.go b/aws/resource_aws_lb_target_group_attachment_test.go index af3fed5fef66..e331ba2e5f16 100644 --- a/aws/resource_aws_lb_target_group_attachment_test.go +++ b/aws/resource_aws_lb_target_group_attachment_test.go @@ -18,6 +18,7 @@ func TestAccAWSLBTargetGroupAttachment_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupAttachmentDestroy, Steps: []resource.TestStep{ @@ -35,6 +36,7 @@ func TestAccAWSLBTargetGroupAttachment_disappears(t *testing.T) { targetGroupName := fmt.Sprintf("test-target-group-%s", acctest.RandString(10)) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupAttachmentDestroy, Steps: []resource.TestStep{ @@ -55,6 +57,7 @@ func TestAccAWSLBTargetGroupAttachment_BackwardsCompatibility(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupAttachmentDestroy, Steps: []resource.TestStep{ @@ -73,6 +76,7 @@ func TestAccAWSLBTargetGroupAttachment_Port(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupAttachmentDestroy, Steps: []resource.TestStep{ @@ -91,6 +95,7 @@ func TestAccAWSLBTargetGroupAttachment_ipAddress(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupAttachmentDestroy, Steps: []resource.TestStep{ @@ -109,6 +114,7 @@ func TestAccAWSLBTargetGroupAttachment_lambda(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLBTargetGroupAttachmentDestroy, Steps: []resource.TestStep{ From e9aeba3f654ae8f2265db345c7403cd36833ac50 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 19:38:54 -0400 Subject: [PATCH 08/10] tests/ds/lb: Add ErrorCheck --- aws/data_source_aws_lb_test.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/aws/data_source_aws_lb_test.go b/aws/data_source_aws_lb_test.go index 4e7b18db73ff..d7ae474fbe20 100644 --- a/aws/data_source_aws_lb_test.go +++ b/aws/data_source_aws_lb_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + "github.com/aws/aws-sdk-go/service/elbv2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) @@ -15,8 +16,9 @@ func TestAccDataSourceAWSLB_basic(t *testing.T) { resourceName := "aws_lb.alb_test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), + Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccDataSourceAWSLBConfigBasic(lbName), @@ -61,8 +63,9 @@ func TestAccDataSourceAWSLB_outpost(t *testing.T) { resourceName := "aws_lb.alb_test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSOutpostsOutposts(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSOutpostsOutposts(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), + Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccDataSourceAWSLBConfigOutpost(lbName), @@ -95,8 +98,9 @@ func TestAccDataSourceAWSLB_BackwardsCompatibility(t *testing.T) { resourceName := "aws_alb.alb_test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), + Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccDataSourceAWSLBConfigBackardsCompatibility(lbName), From 8eeb33082c4c5060bc8403537ccacb45af708cbe Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 19:39:06 -0400 Subject: [PATCH 09/10] tests/ds/lb_listener: Add ErrorCheck --- aws/data_source_aws_lb_listener_test.go | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/aws/data_source_aws_lb_listener_test.go b/aws/data_source_aws_lb_listener_test.go index 7247ac2d94ea..b15f0336c30f 100644 --- a/aws/data_source_aws_lb_listener_test.go +++ b/aws/data_source_aws_lb_listener_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + "github.com/aws/aws-sdk-go/service/elbv2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) @@ -13,8 +14,9 @@ func TestAccDataSourceAWSLBListener_basic(t *testing.T) { targetGroupName := fmt.Sprintf("testtargetgroup-%s", acctest.RandString(10)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), + Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccDataSourceAWSLBListenerConfigBasic(lbName, targetGroupName), @@ -44,8 +46,9 @@ func TestAccDataSourceAWSLBListener_BackwardsCompatibility(t *testing.T) { targetGroupName := fmt.Sprintf("testtargetgroup-%s", acctest.RandString(10)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), + Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccDataSourceAWSLBListenerConfigBackwardsCompatibility(lbName, targetGroupName), @@ -77,8 +80,9 @@ func TestAccDataSourceAWSLBListener_https(t *testing.T) { certificate := tlsRsaX509SelfSignedCertificatePem(key, "example.com") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), + Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccDataSourceAWSLBListenerConfigHTTPS(lbName, targetGroupName, tlsPemEscapeNewlines(certificate), tlsPemEscapeNewlines(key)), @@ -113,8 +117,9 @@ func TestAccDataSourceAWSLBListener_DefaultAction_Forward(t *testing.T) { resourceName := "aws_lb_listener.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), + Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccDataSourceAWSLBListenerConfigDefaultActionForward(rName), From c1fdc0b85140bcf4efb3045b17a8ad5ac8aead88 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 19:39:18 -0400 Subject: [PATCH 10/10] tests/ds/lb_target_group: Add ErrorCheck --- aws/data_source_aws_lb_target_group_test.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/aws/data_source_aws_lb_target_group_test.go b/aws/data_source_aws_lb_target_group_test.go index 2bf0191f30ce..388cd5706f1b 100644 --- a/aws/data_source_aws_lb_target_group_test.go +++ b/aws/data_source_aws_lb_target_group_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + "github.com/aws/aws-sdk-go/service/elbv2" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) @@ -15,8 +16,9 @@ func TestAccDataSourceAWSALBTargetGroup_basic(t *testing.T) { resourceName := "data.aws_lb_target_group.alb_tg_test_with_name" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), + Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccDataSourceAWSLBTargetGroupConfigBasic(lbName, targetGroupName), @@ -76,8 +78,9 @@ func TestAccDataSourceAWSLBTargetGroup_BackwardsCompatibility(t *testing.T) { resourceName := "data.aws_alb_target_group.alb_tg_test_with_name" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, + PreCheck: func() { testAccPreCheck(t) }, + ErrorCheck: testAccErrorCheck(t, elbv2.EndpointsID), + Providers: testAccProviders, Steps: []resource.TestStep{ { Config: testAccDataSourceAWSLBTargetGroupConfigBackwardsCompatibility(lbName, targetGroupName),