From acaf6b84fe70db7901dc9215d8921e0998156974 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 22:40:08 -0400 Subject: [PATCH 1/5] tests/r/lightsail_domain: Add ErrorCheck --- aws/resource_aws_lightsail_domain_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aws/resource_aws_lightsail_domain_test.go b/aws/resource_aws_lightsail_domain_test.go index d152cb729893..a19edbcaf2bc 100644 --- a/aws/resource_aws_lightsail_domain_test.go +++ b/aws/resource_aws_lightsail_domain_test.go @@ -20,6 +20,7 @@ func TestAccAWSLightsailDomain_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckLightsailDomain(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), ProviderFactories: testAccProviderFactories, CheckDestroy: testAccCheckAWSLightsailDomainDestroy, Steps: []resource.TestStep{ @@ -40,6 +41,7 @@ func TestAccAWSLightsailDomain_disappears(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckLightsailDomain(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), ProviderFactories: testAccProviderFactories, CheckDestroy: testAccCheckAWSLightsailDomainDestroy, Steps: []resource.TestStep{ From cd71aa2931d2aa8195bfaac825dff43c240dfbdf Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 22:40:18 -0400 Subject: [PATCH 2/5] tests/r/lightsail_instance: Add ErrorCheck --- aws/resource_aws_lightsail_instance_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws/resource_aws_lightsail_instance_test.go b/aws/resource_aws_lightsail_instance_test.go index a4dce503afe9..6a20036d7bdb 100644 --- a/aws/resource_aws_lightsail_instance_test.go +++ b/aws/resource_aws_lightsail_instance_test.go @@ -82,6 +82,7 @@ func TestAccAWSLightsailInstance_basic(t *testing.T) { testAccPartitionHasServicePreCheck(lightsail.EndpointsID, t) testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), IDRefreshName: "aws_lightsail_instance.lightsail_instance_test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailInstanceDestroy, @@ -117,6 +118,7 @@ func TestAccAWSLightsailInstance_Name(t *testing.T) { testAccPartitionHasServicePreCheck(lightsail.EndpointsID, t) testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), IDRefreshName: "aws_lightsail_instance.lightsail_instance_test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailInstanceDestroy, @@ -163,6 +165,7 @@ func TestAccAWSLightsailInstance_Tags(t *testing.T) { testAccPartitionHasServicePreCheck(lightsail.EndpointsID, t) testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), IDRefreshName: "aws_lightsail_instance.lightsail_instance_test", Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailInstanceDestroy, @@ -220,6 +223,7 @@ func TestAccAWSLightsailInstance_disapear(t *testing.T) { testAccPartitionHasServicePreCheck(lightsail.EndpointsID, t) testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailInstanceDestroy, Steps: []resource.TestStep{ From d52fe330d283a990fccb1cb8342d893fdfe021cd Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 22:40:28 -0400 Subject: [PATCH 3/5] tests/r/lightsail_key_pair: Add ErrorCheck --- aws/resource_aws_lightsail_key_pair_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws/resource_aws_lightsail_key_pair_test.go b/aws/resource_aws_lightsail_key_pair_test.go index e1a6a534da66..fe003123aa36 100644 --- a/aws/resource_aws_lightsail_key_pair_test.go +++ b/aws/resource_aws_lightsail_key_pair_test.go @@ -19,6 +19,7 @@ func TestAccAWSLightsailKeyPair_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailKeyPairDestroy, Steps: []resource.TestStep{ @@ -42,6 +43,7 @@ func TestAccAWSLightsailKeyPair_publicKey(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailKeyPairDestroy, Steps: []resource.TestStep{ @@ -67,6 +69,7 @@ func TestAccAWSLightsailKeyPair_encrypted(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailKeyPairDestroy, Steps: []resource.TestStep{ @@ -91,6 +94,7 @@ func TestAccAWSLightsailKeyPair_nameprefix(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailKeyPairDestroy, Steps: []resource.TestStep{ From e15f8368937000732c17e21c166ac341968e4ea0 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 22:40:37 -0400 Subject: [PATCH 4/5] tests/r/lightsail_static_ip: Add ErrorCheck --- aws/resource_aws_lightsail_static_ip_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aws/resource_aws_lightsail_static_ip_test.go b/aws/resource_aws_lightsail_static_ip_test.go index b44f0927ecd3..c288f5602512 100644 --- a/aws/resource_aws_lightsail_static_ip_test.go +++ b/aws/resource_aws_lightsail_static_ip_test.go @@ -72,6 +72,7 @@ func TestAccAWSLightsailStaticIp_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailStaticIpDestroy, Steps: []resource.TestStep{ @@ -104,6 +105,7 @@ func TestAccAWSLightsailStaticIp_disappears(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailStaticIpDestroy, Steps: []resource.TestStep{ From 54dfac5a2095b4cae8944b680d5ba32289aa03c1 Mon Sep 17 00:00:00 2001 From: Dirk Avery Date: Thu, 18 Mar 2021 22:40:47 -0400 Subject: [PATCH 5/5] tests/r/lightsail_static_ip_attachment: Add ErrorCheck --- aws/resource_aws_lightsail_static_ip_attachment_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aws/resource_aws_lightsail_static_ip_attachment_test.go b/aws/resource_aws_lightsail_static_ip_attachment_test.go index 3044174be0e4..9201ee1a41a6 100644 --- a/aws/resource_aws_lightsail_static_ip_attachment_test.go +++ b/aws/resource_aws_lightsail_static_ip_attachment_test.go @@ -21,6 +21,7 @@ func TestAccAWSLightsailStaticIpAttachment_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailStaticIpAttachmentDestroy, Steps: []resource.TestStep{ @@ -56,6 +57,7 @@ func TestAccAWSLightsailStaticIpAttachment_disappears(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t); testAccPreCheckAWSLightsail(t) }, + ErrorCheck: testAccErrorCheck(t, lightsail.EndpointsID), Providers: testAccProviders, CheckDestroy: testAccCheckAWSLightsailStaticIpAttachmentDestroy, Steps: []resource.TestStep{