Replaces uses of tfresource.SetLastError with retry.SetLastError

.ci/semgrep/retry/retry.yml

@@ -16,3 +16,12 @@ rules:
     fix: |
       retry.TimedOut($ERR)
     severity: ERROR
+
+  - id: internal-retry-setlasterror
+    languages: [go]
+    message: "Prefer retry.SetLastError to tfresource.SetLastError"
+    severity: WARNING
+    pattern: |
+      tfresource.SetLastError($ERR, $LASTERR)
+    fix: |
+      retry.SetLastError($ERR, $LASTERR)

internal/service/acm/certificate.go

@@ -929,7 +929,7 @@ func waitCertificateRenewed(ctx context.Context, conn *acm.Client, arn string, t
 
 	if output, ok := outputRaw.(*types.RenewalSummary); ok {
 		if output.RenewalStatus == types.RenewalStatusFailed {
-			tfresource.SetLastError(err, errors.New(string(output.RenewalStatusReason)))
+			retry.SetLastError(err, errors.New(string(output.RenewalStatusReason)))
 		}
 
 		return output, err

internal/service/acm/certificate_validation.go

@@ -21,7 +21,6 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/enum"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/retry"
-	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
@@ -180,9 +179,9 @@ func waitCertificateIssued(ctx context.Context, conn *acm.Client, arn string, ti
 	if output, ok := outputRaw.(*types.CertificateDetail); ok {
 		switch output.Status {
 		case types.CertificateStatusFailed:
-			tfresource.SetLastError(err, errors.New(string(output.FailureReason)))
+			retry.SetLastError(err, errors.New(string(output.FailureReason)))
 		case types.CertificateStatusRevoked:
-			tfresource.SetLastError(err, errors.New(string(output.RevocationReason)))
+			retry.SetLastError(err, errors.New(string(output.RevocationReason)))
 		}
 
 		return output, err

internal/service/acmpca/certificate_authority.go

@@ -610,7 +610,7 @@ func waitCertificateAuthorityCreated(ctx context.Context, conn *acmpca.Client, a
 
 	if output, ok := outputRaw.(*types.CertificateAuthority); ok {
 		if output.Status == types.CertificateAuthorityStatusFailed {
-			tfresource.SetLastError(err, errors.New(string(output.FailureReason)))
+			retry.SetLastError(err, errors.New(string(output.FailureReason)))
 		}
 
 		return output, err

internal/service/amp/alert_manager_definition.go

@@ -198,7 +198,7 @@ func waitAlertManagerDefinitionCreated(ctx context.Context, conn *amp.Client, id
 
 	if output, ok := outputRaw.(*types.AlertManagerDefinitionDescription); ok {
 		if statusCode := output.Status.StatusCode; statusCode == types.AlertManagerDefinitionStatusCodeCreationFailed {
-			tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
+			retry.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
 		}
 
 		return output, err
@@ -222,7 +222,7 @@ func waitAlertManagerDefinitionUpdated(ctx context.Context, conn *amp.Client, id
 
 	if output, ok := outputRaw.(*types.AlertManagerDefinitionDescription); ok {
 		if statusCode := output.Status.StatusCode; statusCode == types.AlertManagerDefinitionStatusCodeUpdateFailed {
-			tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
+			retry.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
 		}
 
 		return output, err

internal/service/amp/query_logging_configuration.go

@@ -315,7 +315,7 @@ func waitQueryLoggingConfigurationCreated(ctx context.Context, conn *amp.Client,
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.QueryLoggingConfigurationMetadata); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
 
 		return output, err
 	}
@@ -334,7 +334,7 @@ func waitQueryLoggingConfigurationUpdated(ctx context.Context, conn *amp.Client,
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.QueryLoggingConfigurationMetadata); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
 
 		return output, err
 	}
@@ -353,7 +353,7 @@ func waitQueryLoggingConfigurationDeleted(ctx context.Context, conn *amp.Client,
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.QueryLoggingConfigurationMetadata); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
 
 		return output, err
 	}

internal/service/amp/scraper.go

@@ -554,7 +554,7 @@ func waitScraperCreated(ctx context.Context, conn *amp.Client, id string, timeou
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.ScraperDescription); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason)))
 
 		return output, err
 	}
@@ -573,7 +573,7 @@ func waitScraperUpdated(ctx context.Context, conn *amp.Client, id string, timeou
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.ScraperDescription); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason)))
 
 		return output, err
 	}
@@ -593,7 +593,7 @@ func waitScraperDeleted(ctx context.Context, conn *amp.Client, id string, timeou
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.ScraperDescription); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason)))
 
 		return output, err
 	}

internal/service/amp/workspace.go

@@ -447,7 +447,7 @@ func waitLoggingConfigurationCreated(ctx context.Context, conn *amp.Client, work
 
 	if output, ok := outputRaw.(*types.LoggingConfigurationMetadata); ok {
 		if statusCode := output.Status.StatusCode; statusCode == types.LoggingConfigurationStatusCodeCreationFailed {
-			tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
+			retry.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
 		}
 
 		return output, err
@@ -471,7 +471,7 @@ func waitLoggingConfigurationUpdated(ctx context.Context, conn *amp.Client, work
 
 	if output, ok := outputRaw.(*types.LoggingConfigurationMetadata); ok {
 		if statusCode := output.Status.StatusCode; statusCode == types.LoggingConfigurationStatusCodeUpdateFailed {
-			tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
+			retry.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
 		}
 
 		return output, err

internal/service/amp/workspace_configuration.go

@@ -282,7 +282,7 @@ func waitWorkspaceConfigurationUpdated(ctx context.Context, conn *amp.Client, id
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.WorkspaceConfigurationDescription); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.Status.StatusReason)))
 
 		return output, err
 	}

internal/service/amplify/domain_association.go

@@ -338,7 +338,7 @@ func waitDomainAssociationCreated(ctx context.Context, conn *amplify.Client, app
 
 	if v, ok := outputRaw.(*types.DomainAssociation); ok {
 		if v.DomainStatus == types.DomainStatusFailed {
-			tfresource.SetLastError(err, errors.New(aws.ToString(v.StatusReason)))
+			retry.SetLastError(err, errors.New(aws.ToString(v.StatusReason)))
 		}
 
 		return v, err
@@ -371,7 +371,7 @@ func waitDomainAssociationVerified(ctx context.Context, conn *amplify.Client, ap
 
 	if v, ok := outputRaw.(*types.DomainAssociation); ok {
 		if v.DomainStatus == types.DomainStatusFailed {
-			tfresource.SetLastError(err, errors.New(aws.ToString(v.StatusReason)))
+			retry.SetLastError(err, errors.New(aws.ToString(v.StatusReason)))
 		}
 
 		return v, err
@@ -402,7 +402,7 @@ func waitDomainAssociationAvailable(ctx context.Context, conn *amplify.Client, a
 
 	if v, ok := outputRaw.(*types.DomainAssociation); ok {
 		if v.DomainStatus == types.DomainStatusFailed {
-			tfresource.SetLastError(err, errors.New(aws.ToString(v.StatusReason)))
+			retry.SetLastError(err, errors.New(aws.ToString(v.StatusReason)))
 		}
 
 		return v, err

internal/service/apigateway/domain_name.go

@@ -586,7 +586,7 @@ func waitDomainNameUpdated(ctx context.Context, conn *apigateway.Client, domainN
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*types.DomainName); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.DomainNameStatusMessage)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.DomainNameStatusMessage)))
 
 		return output, err
 	}

internal/service/apigateway/vpc_link.go

@@ -245,7 +245,7 @@ func waitVPCLinkAvailable(ctx context.Context, conn *apigateway.Client, id strin
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*apigateway.GetVpcLinkOutput); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage)))
 
 		return output, err
 	}
@@ -268,7 +268,7 @@ func waitVPCLinkDeleted(ctx context.Context, conn *apigateway.Client, id string)
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*apigateway.GetVpcLinkOutput); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage)))
 
 		return output, err
 	}

internal/service/apigatewayv2/deployment.go

@@ -235,7 +235,7 @@ func waitDeploymentDeployed(ctx context.Context, conn *apigatewayv2.Client, apiI
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*apigatewayv2.GetDeploymentOutput); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.DeploymentStatusMessage)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.DeploymentStatusMessage)))
 
 		return output, err
 	}

internal/service/apigatewayv2/domain_name.go

@@ -309,7 +309,7 @@ func waitDomainNameAvailable(ctx context.Context, conn *apigatewayv2.Client, nam
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*apigatewayv2.GetDomainNameOutput); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.DomainNameConfigurations[0].DomainNameStatusMessage)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.DomainNameConfigurations[0].DomainNameStatusMessage)))
 
 		return output, err
 	}

internal/service/apigatewayv2/vpc_link.go

@@ -226,7 +226,7 @@ func waitVPCLinkAvailable(ctx context.Context, conn *apigatewayv2.Client, id str
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*apigatewayv2.GetVpcLinkOutput); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.VpcLinkStatusMessage)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.VpcLinkStatusMessage)))
 
 		return output, err
 	}
@@ -248,7 +248,7 @@ func waitVPCLinkDeleted(ctx context.Context, conn *apigatewayv2.Client, vpcLinkI
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*apigatewayv2.GetVpcLinkOutput); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.VpcLinkStatusMessage)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.VpcLinkStatusMessage)))
 
 		return output, err
 	}

internal/service/appfabric/ingestion_destination.go

@@ -438,7 +438,7 @@ func waitIngestionDestinationActive(ctx context.Context, conn *appfabric.Client,
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.IngestionDestination); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason)))
 
 		return output, err
 	}
@@ -457,7 +457,7 @@ func waitIngestionDestinationDeleted(ctx context.Context, conn *appfabric.Client
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.IngestionDestination); ok {
-		tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason)))
+		retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason)))
 
 		return output, err
 	}

internal/service/appstream/fleet.go

@@ -633,7 +633,7 @@ func waitFleetRunning(ctx context.Context, conn *appstream.Client, id string) (*
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.Fleet); ok {
-		tfresource.SetLastError(err, fleetsError(output.FleetErrors))
+		retry.SetLastError(err, fleetsError(output.FleetErrors))
 
 		return output, err
 	}
@@ -655,7 +655,7 @@ func waitFleetStopped(ctx context.Context, conn *appstream.Client, id string) (*
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.Fleet); ok {
-		tfresource.SetLastError(err, fleetsError(output.FleetErrors))
+		retry.SetLastError(err, fleetsError(output.FleetErrors))
 
 		return output, err
 	}

internal/service/appstream/image_builder.go

@@ -404,7 +404,7 @@ func waitImageBuilderRunning(ctx context.Context, conn *appstream.Client, id str
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.ImageBuilder); ok {
-		tfresource.SetLastError(err, resourcesError(output.ImageBuilderErrors))
+		retry.SetLastError(err, resourcesError(output.ImageBuilderErrors))
 
 		return output, err
 	}
@@ -426,7 +426,7 @@ func waitImageBuilderDeleted(ctx context.Context, conn *appstream.Client, id str
 	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if output, ok := outputRaw.(*awstypes.ImageBuilder); ok {
-		tfresource.SetLastError(err, resourcesError(output.ImageBuilderErrors))
+		retry.SetLastError(err, resourcesError(output.ImageBuilderErrors))
 
 		return output, err
 	}

internal/service/appsync/api.go

@@ -30,7 +30,7 @@ import (
 	fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex"
 	fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types"
 	fwvalidators "github.com/hashicorp/terraform-provider-aws/internal/framework/validators"
-	intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	"github.com/hashicorp/terraform-provider-aws/internal/smerr"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -310,7 +310,7 @@ func (r *apiResource) Read(ctx context.Context, request resource.ReadRequest, re
 	apiID := fwflex.StringValueFromFramework(ctx, data.ApiID)
 	output, err := findAPIByID(ctx, conn, apiID)
 
-	if intretry.NotFound(err) {
+	if retry.NotFound(err) {
 		smerr.AddOne(ctx, &response.Diagnostics, fwdiag.NewResourceNotFoundWarningDiagnostic(err))
 		response.State.RemoveResource(ctx)
 		return

internal/service/appsync/api_cache.go

@@ -19,7 +19,7 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/enum"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
-	intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	"github.com/hashicorp/terraform-provider-aws/internal/smerr"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/names"
@@ -113,7 +113,7 @@ func resourceAPICacheRead(ctx context.Context, d *schema.ResourceData, meta any)
 
 	cache, err := findAPICacheByID(ctx, conn, d.Id())
 
-	if !d.IsNewResource() && intretry.NotFound(err) {
+	if !d.IsNewResource() && retry.NotFound(err) {
 		smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
 		d.SetId("")
 		return diags
@@ -208,7 +208,7 @@ func statusAPICache(ctx context.Context, conn *appsync.Client, name string) sdkr
 	return func() (any, string, error) {
 		output, err := findAPICacheByID(ctx, conn, name)
 
-		if intretry.NotFound(err) {
+		if retry.NotFound(err) {
 			return nil, "", nil
 		}
 

internal/service/appsync/api_key.go

@@ -21,7 +21,7 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
-	intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices"
 	"github.com/hashicorp/terraform-provider-aws/internal/smerr"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -112,7 +112,7 @@ func resourceAPIKeyRead(ctx context.Context, d *schema.ResourceData, meta any) d
 
 	key, err := findAPIKeyByTwoPartKey(ctx, conn, apiID, keyID)
 
-	if !d.IsNewResource() && intretry.NotFound(err) {
+	if !d.IsNewResource() && retry.NotFound(err) {
 		smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
 		d.SetId("")
 		return diags

internal/service/appsync/channel_namespace.go

@@ -27,7 +27,7 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/framework"
 	fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex"
 	fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types"
-	intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	"github.com/hashicorp/terraform-provider-aws/internal/smerr"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -213,7 +213,7 @@ func (r *channelNamespaceResource) Read(ctx context.Context, request resource.Re
 	apiID, name := fwflex.StringValueFromFramework(ctx, data.ApiID), fwflex.StringValueFromFramework(ctx, data.Name)
 	output, err := findChannelNamespaceByTwoPartKey(ctx, conn, apiID, name)
 
-	if intretry.NotFound(err) {
+	if retry.NotFound(err) {
 		smerr.AddOne(ctx, &response.Diagnostics, fwdiag.NewResourceNotFoundWarningDiagnostic(err))
 		response.State.RemoveResource(ctx)
 		return

internal/service/appsync/datasource.go

@@ -22,7 +22,7 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/enum"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
-	intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
+	"github.com/hashicorp/terraform-provider-aws/internal/retry"
 	"github.com/hashicorp/terraform-provider-aws/internal/sdkv2"
 	"github.com/hashicorp/terraform-provider-aws/internal/smerr"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -356,7 +356,7 @@ func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta an
 
 	dataSource, err := findDataSourceByTwoPartKey(ctx, conn, apiID, name)
 
-	if !d.IsNewResource() && intretry.NotFound(err) {
+	if !d.IsNewResource() && retry.NotFound(err) {
 		smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
 		d.SetId("")
 		return diags