Use 'tfresource.RetryWhenNotFound' in CreateTags.

Acceptance test output: % make testacc TESTARGS='-run=TestAccAWSEc2Tag_basic' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSEc2Tag_basic -timeout 180m === RUN TestAccAWSEc2Tag_basic === PAUSE TestAccAWSEc2Tag_basic === CONT TestAccAWSEc2Tag_basic --- PASS: TestAccAWSEc2Tag_basic (643.11s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 646.359s
hashicorp · Aug 20, 2021 · 49cc3e2 · 49cc3e2
1 parent 5689893
commit 49cc3e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 30 deletions.
diff --git a/aws/internal/keyvaluetags/create_tags_gen.go b/aws/internal/keyvaluetags/create_tags_gen.go
diff --git a/aws/internal/keyvaluetags/generators/createtags/main.go b/aws/internal/keyvaluetags/generators/createtags/main.go
@@ -132,25 +132,13 @@ func {{ . | Title }}CreateTags(conn {{ . | ClientType }}, identifier string{{ if
 
 	{{- if . | RetryCreationOnResourceNotFound }}
 
-	err := resource.Retry(EventualConsistencyTimeout, func() *resource.RetryError {
-		_, err := conn.{{ . | TagFunction }}(input)
+	_, err := tfresource.RetryWhenNotFound(EventualConsistencyTimeout, func() (interface{}, error) {
+		output, err := conn.{{ . | TagFunction }}(input)
 
 		{{ . | ParentResourceNotFoundError }}
 
-		if tfresource.NotFound(err) {
-			return resource.RetryableError(err)
-		}
-
-		if err != nil {
-			return resource.NonRetryableError(err)
-		}
-
-		return nil
+		return output, err
 	})
-
-	if tfresource.TimedOut(err) {
-		_, err = conn.{{ . | TagFunction }}(input)
-	}
 	{{- else }}
 	_, err := conn.{{ . | TagFunction }}(input)
 	{{- end }}