Merge pull request #510 from hashicorp/b-return-error-from-waiter

Prevent infinite loop if an API error is returned when waiting for an async operation to complete

Author: ewbankkit

CHANGELOG.md

@@ -6,6 +6,10 @@ FEATURES:
 * **New Data Source:** `awscc_sagemaker_model_packages`
 * **New Resource:** `awscc_sagemaker_model_package`
 
+BUG FIXES:
+
+* Prevent infinite loop if waiting for any asynchronous operation to complete returns an AWS API error ([#510](https://github.com/hashicorp/terraform-provider-awscc/issues/510))
+
 ## [0.21.0](https://github.com/hashicorp/terraform-provider-awscc/releases/tag/v0.21.0) (May 12, 2022)
 
 FEATURES:

internal/aws/ec2/vpc_resource_test.go

@@ -36,7 +36,10 @@ func TestAccAWSEC2VPC_CidrBlock(t *testing.T) {
 func testAccAWSEC2VPCCidrBlockConfig(td *acctest.TestData, rName, cidrBlock string) string {
 	return fmt.Sprintf(`
 resource %[1]q %[2]q {
-  cidr_block = %[4]q
+  cidr_block           = %[4]q
+  enable_dns_hostnames = false
+  enable_dns_support   = true
+  instance_tenancy     = "default"
 
   tags = [
     {

internal/service/cloudcontrol/waiter.go

@@ -32,6 +32,6 @@ func RetryGetResourceRequestStatus(pProgressEvent **types.ProgressEvent) func(co
 			}
 		}
 
-		return true, nil
+		return true, err
 	}
 }