Replaces uses of tfresource.NotFound with retry.NotFound

.ci/.semgrep.yml

@@ -207,7 +207,7 @@ rules:
 
   - id: is-not-found-error
     languages: [go]
-    message: Check for retry.NotFoundError errors with tfresource.NotFound()
+    message: Check for retry.NotFoundError errors with retry.NotFound()
     paths:
       include:
         - "/internal"

.ci/semgrep/errors/error-checks.go

@@ -6,14 +6,15 @@ import (
 	"time"
 
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 )
 
 func test1() {
 	_, err := call()
 
 	// ruleid: notfound-without-err-checks
-	if tfresource.NotFound(err) {
+	if retry.NotFound(err) {
 		return
 	}
 
@@ -24,7 +25,7 @@ func test2() {
 	_, err := call()
 
 	// ok: notfound-without-err-checks
-	if tfresource.NotFound(err) {
+	if retry.NotFound(err) {
 		return
 	}
 
@@ -40,7 +41,7 @@ func test3() {
 
 	if err != nil {
 		// ok: notfound-without-err-checks
-		if tfresource.NotFound(err) {
+		if retry.NotFound(err) {
 			return
 		}
 		return
@@ -55,7 +56,7 @@ func test4() {
 	if err == nil {
 		return
 		// ok: notfound-without-err-checks
-	} else if tfresource.NotFound(err) {
+	} else if retry.NotFound(err) {
 		return
 	} else {
 		return
@@ -66,7 +67,7 @@ func test5() {
 	_, err := call()
 
 	// ok: notfound-without-err-checks
-	if tfresource.NotFound(err) {
+	if retry.NotFound(err) {
 		return
 	} else if err != nil {
 		return
@@ -79,7 +80,7 @@ func test6() error {
 	_, err := call()
 
 	// ok: notfound-without-err-checks
-	if tfresource.NotFound(err) {
+	if retry.NotFound(err) {
 		return
 	}
 
@@ -91,7 +92,7 @@ func test7() {
 		_, err := call()
 
 		// ok: notfound-without-err-checks
-		if tfresource.NotFound(err) {
+		if retry.NotFound(err) {
 			continue
 		}
 	}
@@ -103,7 +104,7 @@ func test8() {
 	_, err := call()
 
 	// ok: notfound-without-err-checks
-	if tfresource.NotFound(err) {
+	if retry.NotFound(err) {
 		return
 	}
 
@@ -123,7 +124,7 @@ func test9() {
 
 	if err != nil {
 		// ok: notfound-without-err-checks
-		if tfresource.NotFound(err) {
+		if retry.NotFound(err) {
 			return
 		} else {
 			return
@@ -137,7 +138,7 @@ func test10() {
 	_, err := call()
 
 	// ok: notfound-without-err-checks
-	if tfresource.NotFound(err) {
+	if retry.NotFound(err) {
 		return
 	} else if err != nil {
 		return
@@ -151,7 +152,7 @@ func test11() {
 
 	tfresource.RetryWhen(ctx, 1*time.Second, nil, func(err error) (bool error) {
 		// ok: notfound-without-err-checks
-		if tfresource.NotFound(err) {
+		if retry.NotFound(err) {
 			return true, err
 		}
 
@@ -163,7 +164,7 @@ func test12() {
 	_, err := call()
 
 	// ok: notfound-without-err-checks
-	if tfresource.NotFound(err) {
+	if retry.NotFound(err) {
 		return
 	}
 

.ci/semgrep/errors/error-checks.yml

@@ -1,25 +1,25 @@
 rules:
   - id: notfound-without-err-checks
     languages: [go]
-    message: When checking for tfresource.NotFound() errors, typically other error conditions should be checked.
+    message: When checking for retry.NotFound() errors, typically other error conditions should be checked.
     patterns:
       - pattern: |
-          if tfresource.NotFound($ERR) { ... }
+          if retry.NotFound($ERR) { ... }
       - pattern-not-inside: |
-          if tfresource.NotFound($ERR) { ... }
+          if retry.NotFound($ERR) { ... }
           if $ERR != nil { ... }
       - pattern-not-inside: |
-          if tfresource.NotFound($ERR) { ... }
+          if retry.NotFound($ERR) { ... }
           if $FUNC($ERR, ...) { ... }
           if $ERR != nil { ... }
       - pattern-not-inside: |
           if err != nil {
-            if tfresource.NotFound($ERR) { ... }
+            if retry.NotFound($ERR) { ... }
             return ...
           }
       - pattern-not-inside: |
           if err != nil {
-            if tfresource.NotFound($ERR) {
+            if retry.NotFound($ERR) {
               ...
             } else {
               ...
@@ -28,28 +28,28 @@ rules:
       - pattern-not-inside: |
           if err == nil {
             ...
-          } else if tfresource.NotFound($ERR) {
+          } else if retry.NotFound($ERR) {
             ...
           } else { ... }
       - pattern-not-inside: |
-          if tfresource.NotFound($ERR) {
+          if retry.NotFound($ERR) {
             ...
           } else if err != nil {
             ...
           } else {
             ...
           }
       - pattern-not-inside: |
-          if tfresource.NotFound($ERR) {
+          if retry.NotFound($ERR) {
             ...
           }
           return $ERR
       - pattern-not-inside: |
-          if tfresource.NotFound($ERR) {
+          if retry.NotFound($ERR) {
             continue
           }
       - pattern-not-inside: |
-          if tfresource.NotFound($ERR) {
+          if retry.NotFound($ERR) {
             ...
           } else if err != nil {
             ...
@@ -60,16 +60,16 @@ rules:
 
   - id: isnewresource-notfound-without-err-checks
     languages: [go]
-    message: When checking for !d.IsNewResource() && tfresource.NotFound() errors, typically other error conditions should be checked.
+    message: When checking for !d.IsNewResource() && retry.NotFound() errors, typically other error conditions should be checked.
     patterns:
       - pattern: |
-          if !d.IsNewResource() && tfresource.NotFound($ERR) { ... }
+          if !d.IsNewResource() && retry.NotFound($ERR) { ... }
       - pattern-not-inside: |
-          if !d.IsNewResource() && tfresource.NotFound($ERR) { ... }
+          if !d.IsNewResource() && retry.NotFound($ERR) { ... }
           if $ERR != nil { ... }
       # e.g. internal/service/dms/s3_endpoint.go
       - pattern-not-inside: |
-          if !d.IsNewResource() && tfresource.NotFound($ERR) { ... }
+          if !d.IsNewResource() && retry.NotFound($ERR) { ... }
           if $ERR == nil && ... {
             ...
             err = ...
@@ -78,26 +78,26 @@ rules:
           if $ERR != nil { ... }
       # e.g., internal/service/neptune/cluster.go
       - pattern-not-inside: |
-          if !d.IsNewResource() && tfresource.NotFound($ERR) { ... }
+          if !d.IsNewResource() && retry.NotFound($ERR) { ... }
           if $ERR != nil && ... { ... }
           for ... = backoff.NewRetryLoop(...); ...; {
             ...
           }
           if $ERR != nil { ... }
       # e.g. internal/service/quicksight/analysis.go
       - pattern-not-inside: |
-          if !d.IsNewResource() && tfresource.NotFound($ERR) { ... }
+          if !d.IsNewResource() && retry.NotFound($ERR) { ... }
           if !d.IsNewResource() && ... { ... }
           if $ERR != nil { ... }
       # e.g. internal/service/sagemaker/app.go
       - pattern-not-inside: |
           if err != nil {
-            if !d.IsNewResource() && tfresource.NotFound($ERR) { ... }
+            if !d.IsNewResource() && retry.NotFound($ERR) { ... }
             return ...
           }
         # e.g. internal/service/storagegateway/gateway.go
       - pattern-not-inside: |
-          if !d.IsNewResource() && tfresource.NotFound($ERR) { ... }
+          if !d.IsNewResource() && retry.NotFound($ERR) { ... }
           if isGatewayNotConnectedErr(err) {
             ...
           }

.ci/semgrep/retry/retry.yml

@@ -0,0 +1,9 @@
+rules:
+  - id: internal-retry-notfound
+    languages: [go]
+    message: "Prefer retry.NotFound to tfresource.NotFound"
+    pattern: |
+      tfresource.NotFound($ERR)
+    fix: |
+      retry.NotFound($ERR)
+    severity: ERROR

.ci/semgrep/smarterr/enforce.yml

@@ -188,24 +188,6 @@ rules:
       exclude:
         - "*_test.go"
 
-  - id: go-no-tfresource-notfound
-    languages: [go]
-    message: Use intretry.NotFound instead of tfresource.NotFound (migrate to smarterr).
-    severity: ERROR
-    patterns:
-      - pattern: |
-          tfresource.NotFound($ERR)
-      - pattern-not-inside: |
-          intretry.NotFound(...)
-    paths:
-      include:
-        - "/internal/service/appsync/"
-        - "/internal/service/bedrockagentcore/"
-        - "/internal/service/cloudwatch/"
-        - "/internal/service/invoicing/"
-      exclude:
-        - "*_test.go"
-
   - id: go-no-bare-assertsinglevalueresult
     languages: [go]
     message: Wrap tfresource.AssertSingleValueResult with smarterr.Assert (migrate to smarterr).

docs/running-and-writing-acceptance-tests.md

@@ -777,7 +777,7 @@ If this test does fail, the fix for this is generally adding error handling imme
 ```go
 output, err := conn.GetThing(input)
 
-if !d.IsNewResource() && tfresource.NotFound(err) {
+if !d.IsNewResource() && retry.NotFound(err) {
   log.Printf("[WARN] Example Thing (%s) not found, removing from state", d.Id())
   d.SetId("")
   return nil

internal/acctest/acctest.go

@@ -63,6 +63,7 @@ import (
 	tfsync "github.com/hashicorp/terraform-provider-aws/internal/experimental/sync"
 	"github.com/hashicorp/terraform-provider-aws/internal/provider"
 	"github.com/hashicorp/terraform-provider-aws/internal/provider/sdkv2"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	tfaccount "github.com/hashicorp/terraform-provider-aws/internal/service/account"
 	tfacmpca "github.com/hashicorp/terraform-provider-aws/internal/service/acmpca"
 	tfec2 "github.com/hashicorp/terraform-provider-aws/internal/service/ec2"
@@ -1164,7 +1165,7 @@ func PreCheckOrganizationsAccount(ctx context.Context, t *testing.T) {
 
 	_, err := tforganizations.FindOrganization(ctx, Provider.Meta().(*conns.AWSClient).OrganizationsClient(ctx))
 
-	if tfresource.NotFound(err) {
+	if retry.NotFound(err) {
 		return
 	}
 
@@ -1200,7 +1201,7 @@ func PreCheckOrganizationsEnabledWithProvider(ctx context.Context, t *testing.T,
 
 	organization, err := tforganizations.FindOrganization(ctx, providerF().Meta().(*conns.AWSClient).OrganizationsClient(ctx))
 
-	if tfresource.NotFound(err) {
+	if retry.NotFound(err) {
 		t.Skip("this AWS account must be an existing member of an AWS Organization")
 	}
 
@@ -1340,7 +1341,7 @@ func PreCheckHasIAMRole(ctx context.Context, t *testing.T, roleName string) {
 
 	_, err := tfiam.FindRoleByName(ctx, Provider.Meta().(*conns.AWSClient).IAMClient(ctx), roleName)
 
-	if tfresource.NotFound(err) {
+	if retry.NotFound(err) {
 		t.Skipf("skipping acceptance test: required IAM role %q not found", roleName)
 	}
 

internal/generate/tagresource/resource.tmpl

@@ -10,8 +10,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
-	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
@@ -78,7 +78,7 @@ func resourceTagRead(ctx context.Context, d *schema.ResourceData, meta any) diag
 
 	value, err := {{ .GetTagFunc }}(ctx, conn, identifier, key)
 
-	if !d.IsNewResource() && tfresource.NotFound(err) {
+	if !d.IsNewResource() && retry.NotFound(err) {
 		log.Printf("[WARN] %s resource (%s) tag (%s) not found, removing from state", names.{{ .AWSServiceUpper }}, identifier, key)
 		d.SetId("")
 		return diags

internal/generate/tagresource/tests.tmpl

@@ -10,9 +10,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	tf{{ .ServicePackage }} "github.com/hashicorp/terraform-provider-aws/internal/service/{{ .ServicePackage }}"
-	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
@@ -32,7 +32,7 @@ func testAccCheckTagDestroy(ctx context.Context) resource.TestCheckFunc {
 
 			_, err = tf{{ .ServicePackage }}.{{ .GetTagFunc | FirstUpper }}(ctx, conn, identifier, key)
 
-			if tfresource.NotFound(err) {
+			if retry.NotFound(err) {
 				continue
 			}
 

internal/generate/tags/templates/wait_tags_propagated_body.gtpl

@@ -9,7 +9,7 @@ func {{ .WaitTagsPropagatedFunc }}(ctx context.Context, conn {{ .ClientType }},
 	checkFunc := func(ctx context.Context) (bool, error) {
 		output, err := {{ .ListTagsFunc }}(ctx, conn, id, optFns...)
 
-		if tfresource.NotFound(err) {
+		if retry.NotFound(err) {
 			return false, nil
 		}
 

internal/provider/interceptors/htags.go

@@ -13,9 +13,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	"github.com/hashicorp/terraform-provider-aws/internal/sdkv2"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
-	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	inttypes "github.com/hashicorp/terraform-provider-aws/internal/types"
 	tfunique "github.com/hashicorp/terraform-provider-aws/internal/unique"
 	"github.com/hashicorp/terraform-provider-aws/names"
@@ -95,7 +95,7 @@ func (h HTags) ListTags(ctx context.Context, sp conns.ServicePackage, c taggingA
 		err = nil
 	case sp.ServicePackageName() == names.DynamoDB && err != nil:
 		// When a DynamoDB Table is `ARCHIVED`, ListTags returns `ResourceNotFoundException`.
-		if tfresource.NotFound(err) || tfawserr.ErrMessageContains(err, "UnknownOperationException", "Tagging is not currently supported in DynamoDB Local.") {
+		if retry.NotFound(err) || tfawserr.ErrMessageContains(err, "UnknownOperationException", "Tagging is not currently supported in DynamoDB Local.") {
 			err = nil
 		}
 	}