diff --git a/.ci/semgrep/retry/retry.yml b/.ci/semgrep/retry/retry.yml index 69011398dbf..8425e0ea8ad 100644 --- a/.ci/semgrep/retry/retry.yml +++ b/.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) diff --git a/internal/service/acm/certificate.go b/internal/service/acm/certificate.go index a52a88fe18e..e5bab40c3c5 100644 --- a/internal/service/acm/certificate.go +++ b/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 diff --git a/internal/service/acm/certificate_validation.go b/internal/service/acm/certificate_validation.go index cf267fae3db..89916a29ba4 100644 --- a/internal/service/acm/certificate_validation.go +++ b/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 diff --git a/internal/service/acmpca/certificate_authority.go b/internal/service/acmpca/certificate_authority.go index 6efe5f48585..410b1de797c 100644 --- a/internal/service/acmpca/certificate_authority.go +++ b/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 diff --git a/internal/service/amp/alert_manager_definition.go b/internal/service/amp/alert_manager_definition.go index 9e1c796870e..eeb72a527da 100644 --- a/internal/service/amp/alert_manager_definition.go +++ b/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 diff --git a/internal/service/amp/query_logging_configuration.go b/internal/service/amp/query_logging_configuration.go index 7c643325926..3fdd74c09b0 100644 --- a/internal/service/amp/query_logging_configuration.go +++ b/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 } diff --git a/internal/service/amp/scraper.go b/internal/service/amp/scraper.go index 31ba50f4124..00b2c24baf3 100644 --- a/internal/service/amp/scraper.go +++ b/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 } diff --git a/internal/service/amp/workspace.go b/internal/service/amp/workspace.go index 2286acdd29e..ef81fd65ea2 100644 --- a/internal/service/amp/workspace.go +++ b/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 diff --git a/internal/service/amp/workspace_configuration.go b/internal/service/amp/workspace_configuration.go index fcf9bbaec55..c9253ec50db 100644 --- a/internal/service/amp/workspace_configuration.go +++ b/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 } diff --git a/internal/service/amplify/domain_association.go b/internal/service/amplify/domain_association.go index cb832077e11..8d093302e54 100644 --- a/internal/service/amplify/domain_association.go +++ b/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 diff --git a/internal/service/apigateway/domain_name.go b/internal/service/apigateway/domain_name.go index 1f9a41d82d0..a113ccf45f3 100644 --- a/internal/service/apigateway/domain_name.go +++ b/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 } diff --git a/internal/service/apigateway/vpc_link.go b/internal/service/apigateway/vpc_link.go index cf39e43958f..0ffd370376f 100644 --- a/internal/service/apigateway/vpc_link.go +++ b/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 } diff --git a/internal/service/apigatewayv2/deployment.go b/internal/service/apigatewayv2/deployment.go index f36a009208d..3bb1a019f3b 100644 --- a/internal/service/apigatewayv2/deployment.go +++ b/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 } diff --git a/internal/service/apigatewayv2/domain_name.go b/internal/service/apigatewayv2/domain_name.go index 8b7cd27214e..0e3c87f2a2f 100644 --- a/internal/service/apigatewayv2/domain_name.go +++ b/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 } diff --git a/internal/service/apigatewayv2/vpc_link.go b/internal/service/apigatewayv2/vpc_link.go index 63466ebab6a..2827adf9d25 100644 --- a/internal/service/apigatewayv2/vpc_link.go +++ b/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 } diff --git a/internal/service/appfabric/ingestion_destination.go b/internal/service/appfabric/ingestion_destination.go index 1453160e396..242c34d183d 100644 --- a/internal/service/appfabric/ingestion_destination.go +++ b/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 } diff --git a/internal/service/appstream/fleet.go b/internal/service/appstream/fleet.go index a5cf53b3a7f..5f05e8cc3db 100644 --- a/internal/service/appstream/fleet.go +++ b/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 } diff --git a/internal/service/appstream/image_builder.go b/internal/service/appstream/image_builder.go index 7b32a8a11ee..940a480efd5 100644 --- a/internal/service/appstream/image_builder.go +++ b/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 } diff --git a/internal/service/appsync/api.go b/internal/service/appsync/api.go index ec9a99396a6..c5e5741222a 100644 --- a/internal/service/appsync/api.go +++ b/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 diff --git a/internal/service/appsync/api_cache.go b/internal/service/appsync/api_cache.go index 31940b86a2f..219d1a2f188 100644 --- a/internal/service/appsync/api_cache.go +++ b/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 } diff --git a/internal/service/appsync/api_key.go b/internal/service/appsync/api_key.go index 0baaf56ab18..bc168a6d75e 100644 --- a/internal/service/appsync/api_key.go +++ b/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 diff --git a/internal/service/appsync/channel_namespace.go b/internal/service/appsync/channel_namespace.go index ce9d2684ba7..d43c49da842 100644 --- a/internal/service/appsync/channel_namespace.go +++ b/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 diff --git a/internal/service/appsync/datasource.go b/internal/service/appsync/datasource.go index 864fd82eb2c..56055f645c2 100644 --- a/internal/service/appsync/datasource.go +++ b/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 diff --git a/internal/service/appsync/domain_name.go b/internal/service/appsync/domain_name.go index faea19cce27..96a6ba63635 100644 --- a/internal/service/appsync/domain_name.go +++ b/internal/service/appsync/domain_name.go @@ -18,7 +18,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" "github.com/hashicorp/terraform-provider-aws/internal/smerr" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" @@ -93,7 +93,7 @@ func resourceDomainNameRead(ctx context.Context, d *schema.ResourceData, meta an domainName, err := findDomainNameByID(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 diff --git a/internal/service/appsync/domain_name_api_association.go b/internal/service/appsync/domain_name_api_association.go index fb9f9f7a8da..7b7d8b01e54 100644 --- a/internal/service/appsync/domain_name_api_association.go +++ b/internal/service/appsync/domain_name_api_association.go @@ -20,7 +20,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" @@ -83,7 +83,7 @@ func resourceDomainNameAPIAssociationRead(ctx context.Context, d *schema.Resourc association, err := findDomainNameAPIAssociationByID(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 @@ -172,7 +172,7 @@ func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, i return func() (any, string, error) { output, err := findDomainNameAPIAssociationByID(ctx, conn, id) - if intretry.NotFound(err) { + if retry.NotFound(err) { return nil, "", nil } @@ -198,7 +198,7 @@ func waitDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ApiAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.DeploymentDetail))) + retry.SetLastError(err, errors.New(aws.ToString(output.DeploymentDetail))) return output, smarterr.NewError(err) } @@ -219,7 +219,7 @@ func waitDomainNameAPIDisassociation(ctx context.Context, conn *appsync.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ApiAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.DeploymentDetail))) + retry.SetLastError(err, errors.New(aws.ToString(output.DeploymentDetail))) return output, smarterr.NewError(err) } diff --git a/internal/service/appsync/function.go b/internal/service/appsync/function.go index b988b066c89..8ca53a5af95 100644 --- a/internal/service/appsync/function.go +++ b/internal/service/appsync/function.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/smerr" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/internal/verify" @@ -219,7 +219,7 @@ func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta any) function, err := findFunctionByTwoPartKey(ctx, conn, apiID, functionID) - 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 diff --git a/internal/service/appsync/graphql_api.go b/internal/service/appsync/graphql_api.go index 2cd4ca8f7dd..c3d93f6b95c 100644 --- a/internal/service/appsync/graphql_api.go +++ b/internal/service/appsync/graphql_api.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/smerr" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" @@ -412,7 +412,7 @@ func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta an api, err := findGraphQLAPIByID(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 @@ -618,7 +618,7 @@ func statusSchemaCreation(ctx context.Context, conn *appsync.Client, id string) return func() (any, string, error) { output, err := findSchemaCreationStatusByID(ctx, conn, id) - if intretry.NotFound(err) { + if retry.NotFound(err) { return nil, "", nil } @@ -641,7 +641,7 @@ func waitSchemaCreated(ctx context.Context, conn *appsync.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*appsync.GetSchemaCreationStatusOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Details))) + retry.SetLastError(err, errors.New(aws.ToString(output.Details))) return output, smarterr.NewError(err) } diff --git a/internal/service/appsync/resolver.go b/internal/service/appsync/resolver.go index 07b4d018514..dab073e044c 100644 --- a/internal/service/appsync/resolver.go +++ b/internal/service/appsync/resolver.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" - 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/internal/verify" @@ -259,7 +259,7 @@ func resourceResolverRead(ctx context.Context, d *schema.ResourceData, meta any) resolver, err := findResolverByThreePartKey(ctx, conn, apiID, typeName, fieldName) - 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 diff --git a/internal/service/appsync/source_api_association.go b/internal/service/appsync/source_api_association.go index b70392510e0..a39aa51426b 100644 --- a/internal/service/appsync/source_api_association.go +++ b/internal/service/appsync/source_api_association.go @@ -31,7 +31,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/framework" "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" "github.com/hashicorp/terraform-provider-aws/internal/tfresource" "github.com/hashicorp/terraform-provider-aws/names" @@ -219,7 +219,7 @@ func (r *sourceAPIAssociationResource) Read(ctx context.Context, request resourc } out, err := findSourceAPIAssociationByTwoPartKey(ctx, conn, state.AssociationID.ValueString(), state.MergedAPIID.ValueString()) - if intretry.NotFound(err) { + if retry.NotFound(err) { smerr.AddOne(ctx, &response.Diagnostics, fwdiag.NewResourceNotFoundWarningDiagnostic(err)) response.State.RemoveResource(ctx) return @@ -357,7 +357,7 @@ func statusSourceAPIAssociation(ctx context.Context, conn *appsync.Client, assoc return func() (any, string, error) { output, err := findSourceAPIAssociationByTwoPartKey(ctx, conn, associationID, mergedAPIID) - if intretry.NotFound(err) { + if retry.NotFound(err) { return nil, "", nil } @@ -380,7 +380,7 @@ func waitSourceAPIAssociationCreated(ctx context.Context, conn *appsync.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.SourceApiAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.SourceApiAssociationStatusDetail))) + retry.SetLastError(err, errors.New(aws.ToString(output.SourceApiAssociationStatusDetail))) return output, smarterr.NewError(err) } @@ -399,7 +399,7 @@ func waitSourceAPIAssociationUpdated(ctx context.Context, conn *appsync.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.SourceApiAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.SourceApiAssociationStatusDetail))) + retry.SetLastError(err, errors.New(aws.ToString(output.SourceApiAssociationStatusDetail))) return output, smarterr.NewError(err) } @@ -418,7 +418,7 @@ func waitSourceAPIAssociationDeleted(ctx context.Context, conn *appsync.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.SourceApiAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.SourceApiAssociationStatusDetail))) + retry.SetLastError(err, errors.New(aws.ToString(output.SourceApiAssociationStatusDetail))) return output, smarterr.NewError(err) } diff --git a/internal/service/appsync/type.go b/internal/service/appsync/type.go index c925f614971..f187607cbf3 100644 --- a/internal/service/appsync/type.go +++ b/internal/service/appsync/type.go @@ -20,7 +20,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" @@ -102,7 +102,7 @@ func resourceTypeRead(ctx context.Context, d *schema.ResourceData, meta any) dia resp, err := findTypeByThreePartKey(ctx, conn, apiID, format, 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 diff --git a/internal/service/autoscaling/group.go b/internal/service/autoscaling/group.go index e54d24057c8..5891b64bac8 100644 --- a/internal/service/autoscaling/group.go +++ b/internal/service/autoscaling/group.go @@ -2602,7 +2602,7 @@ func waitGroupCapacitySatisfied(ctx context.Context, conn *autoscaling.Client, e outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(struct{ err error }); ok { - tfresource.SetLastError(err, output.err) + retry.SetLastError(err, output.err) } return err @@ -2749,7 +2749,7 @@ func waitInstanceRefreshCancelled(ctx context.Context, conn *autoscaling.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.InstanceRefresh); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/backup/vault.go b/internal/service/backup/vault.go index 3107eb1a73e..3cb50510304 100644 --- a/internal/service/backup/vault.go +++ b/internal/service/backup/vault.go @@ -310,7 +310,7 @@ func waitRecoveryPointDeleted(ctx context.Context, conn *backup.Client, backupVa outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*backup.DescribeRecoveryPointOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } diff --git a/internal/service/backup/vault_test.go b/internal/service/backup/vault_test.go index 84fe1504c62..a8c43d183e1 100644 --- a/internal/service/backup/vault_test.go +++ b/internal/service/backup/vault_test.go @@ -335,7 +335,7 @@ func waitJobCompleted(ctx context.Context, conn *backup.Client, id string, timeo outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*backup.DescribeBackupJobOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } diff --git a/internal/service/batch/compute_environment.go b/internal/service/batch/compute_environment.go index 9bdbce09f40..68169cc4d11 100644 --- a/internal/service/batch/compute_environment.go +++ b/internal/service/batch/compute_environment.go @@ -790,7 +790,7 @@ func waitComputeEnvironmentCreated(ctx context.Context, conn *batch.Client, name outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ComputeEnvironmentDetail); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -809,7 +809,7 @@ func waitComputeEnvironmentUpdated(ctx context.Context, conn *batch.Client, name outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ComputeEnvironmentDetail); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -828,7 +828,7 @@ func waitComputeEnvironmentDeleted(ctx context.Context, conn *batch.Client, name outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ComputeEnvironmentDetail); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/batch/job_queue.go b/internal/service/batch/job_queue.go index 1e835255637..65210649fe3 100644 --- a/internal/service/batch/job_queue.go +++ b/internal/service/batch/job_queue.go @@ -438,7 +438,7 @@ func waitJobQueueCreated(ctx context.Context, conn *batch.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.JobQueueDetail); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -459,7 +459,7 @@ func waitJobQueueUpdated(ctx context.Context, conn *batch.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.JobQueueDetail); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -480,7 +480,7 @@ func waitJobQueueDeleted(ctx context.Context, conn *batch.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.JobQueueDetail); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/bedrock/custom_model.go b/internal/service/bedrock/custom_model.go index ed0a9911179..4b94a1b933a 100644 --- a/internal/service/bedrock/custom_model.go +++ b/internal/service/bedrock/custom_model.go @@ -567,7 +567,7 @@ func waitModelCustomizationJobCompleted(ctx context.Context, conn *bedrock.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*bedrock.GetModelCustomizationJobOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) return output, err } @@ -586,7 +586,7 @@ func waitModelCustomizationJobStopped(ctx context.Context, conn *bedrock.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*bedrock.GetModelCustomizationJobOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) return output, err } diff --git a/internal/service/bedrock/provisioned_model_throughput.go b/internal/service/bedrock/provisioned_model_throughput.go index f4276479321..aab34495578 100644 --- a/internal/service/bedrock/provisioned_model_throughput.go +++ b/internal/service/bedrock/provisioned_model_throughput.go @@ -246,7 +246,7 @@ func waitProvisionedModelThroughputCreated(ctx context.Context, conn *bedrock.Cl outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*bedrock.GetProvisionedModelThroughputOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) return output, err } diff --git a/internal/service/bedrockagent/agent.go b/internal/service/bedrockagent/agent.go index ed1ce1dbe30..2e970cee475 100644 --- a/internal/service/bedrockagent/agent.go +++ b/internal/service/bedrockagent/agent.go @@ -592,7 +592,7 @@ func waitAgentCreated(ctx context.Context, conn *bedrockagent.Client, id string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Agent); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) return output, err } @@ -611,7 +611,7 @@ func waitAgentUpdated(ctx context.Context, conn *bedrockagent.Client, id string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Agent); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) return output, err } @@ -630,7 +630,7 @@ func waitAgentPrepared(ctx context.Context, conn *bedrockagent.Client, id string outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Agent); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) return output, err } @@ -649,7 +649,7 @@ func waitAgentVersioned(ctx context.Context, conn *bedrockagent.Client, id strin outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Agent); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) return output, err } @@ -668,7 +668,7 @@ func waitAgentDeleted(ctx context.Context, conn *bedrockagent.Client, id string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Agent); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) return output, err } diff --git a/internal/service/bedrockagent/data_source.go b/internal/service/bedrockagent/data_source.go index e2c0fef6890..7022ab3150a 100644 --- a/internal/service/bedrockagent/data_source.go +++ b/internal/service/bedrockagent/data_source.go @@ -997,7 +997,7 @@ func waitDataSourceCreated(ctx context.Context, conn *bedrockagent.Client, dataS outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DataSource); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) return output, err } @@ -1016,7 +1016,7 @@ func waitDataSourceDeleted(ctx context.Context, conn *bedrockagent.Client, dataS outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DataSource); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) return output, err } diff --git a/internal/service/bedrockagent/knowledge_base.go b/internal/service/bedrockagent/knowledge_base.go index 313decd4803..8a98b207789 100644 --- a/internal/service/bedrockagent/knowledge_base.go +++ b/internal/service/bedrockagent/knowledge_base.go @@ -703,7 +703,7 @@ func waitKnowledgeBaseCreated(ctx context.Context, conn *bedrockagent.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.KnowledgeBase); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) return output, err } @@ -722,7 +722,7 @@ func waitKnowledgeBaseUpdated(ctx context.Context, conn *bedrockagent.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.KnowledgeBase); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) return output, err } @@ -741,7 +741,7 @@ func waitKnowledgeBaseDeleted(ctx context.Context, conn *bedrockagent.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.KnowledgeBase); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FailureReasons, errors.New)...)) return output, err } diff --git a/internal/service/bedrockagentcore/agent_runtime_endpoint.go b/internal/service/bedrockagentcore/agent_runtime_endpoint.go index 5361a0b27f9..5434465de25 100644 --- a/internal/service/bedrockagentcore/agent_runtime_endpoint.go +++ b/internal/service/bedrockagentcore/agent_runtime_endpoint.go @@ -271,7 +271,7 @@ func waitAgentRuntimeEndpointCreated(ctx context.Context, conn *bedrockagentcore outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*bedrockagentcorecontrol.GetAgentRuntimeEndpointOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(out.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(out.FailureReason))) return out, smarterr.NewError(err) } @@ -289,7 +289,7 @@ func waitAgentRuntimeEndpointUpdated(ctx context.Context, conn *bedrockagentcore outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*bedrockagentcorecontrol.GetAgentRuntimeEndpointOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(out.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(out.FailureReason))) return out, smarterr.NewError(err) } @@ -306,7 +306,7 @@ func waitAgentRuntimeEndpointDeleted(ctx context.Context, conn *bedrockagentcore outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*bedrockagentcorecontrol.GetAgentRuntimeEndpointOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(out.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(out.FailureReason))) return out, smarterr.NewError(err) } diff --git a/internal/service/bedrockagentcore/gateway.go b/internal/service/bedrockagentcore/gateway.go index ebfce103b6b..d7b9b2df068 100644 --- a/internal/service/bedrockagentcore/gateway.go +++ b/internal/service/bedrockagentcore/gateway.go @@ -367,7 +367,7 @@ func waitGatewayCreated(ctx context.Context, conn *bedrockagentcorecontrol.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*bedrockagentcorecontrol.GetGatewayOutput); ok { - tfresource.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) + retry.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) return out, smarterr.NewError(err) } @@ -385,7 +385,7 @@ func waitGatewayUpdated(ctx context.Context, conn *bedrockagentcorecontrol.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*bedrockagentcorecontrol.GetGatewayOutput); ok { - tfresource.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) + retry.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) return out, smarterr.NewError(err) } @@ -402,7 +402,7 @@ func waitGatewayDeleted(ctx context.Context, conn *bedrockagentcorecontrol.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*bedrockagentcorecontrol.GetGatewayOutput); ok { - tfresource.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) + retry.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) return out, smarterr.NewError(err) } diff --git a/internal/service/bedrockagentcore/gateway_target.go b/internal/service/bedrockagentcore/gateway_target.go index 5702eca15be..779fc451a3a 100644 --- a/internal/service/bedrockagentcore/gateway_target.go +++ b/internal/service/bedrockagentcore/gateway_target.go @@ -682,7 +682,7 @@ func waitGatewayTargetCreated(ctx context.Context, conn *bedrockagentcorecontrol outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*bedrockagentcorecontrol.GetGatewayTargetOutput); ok { - tfresource.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) + retry.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) return out, smarterr.NewError(err) } @@ -700,7 +700,7 @@ func waitGatewayTargetUpdated(ctx context.Context, conn *bedrockagentcorecontrol outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*bedrockagentcorecontrol.GetGatewayTargetOutput); ok { - tfresource.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) + retry.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) return out, smarterr.NewError(err) } @@ -717,7 +717,7 @@ func waitGatewayTargetDeleted(ctx context.Context, conn *bedrockagentcorecontrol outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*bedrockagentcorecontrol.GetGatewayTargetOutput); ok { - tfresource.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) + retry.SetLastError(err, errors.New(strings.Join(out.StatusReasons, "; "))) return out, smarterr.NewError(err) } diff --git a/internal/service/bedrockagentcore/memory.go b/internal/service/bedrockagentcore/memory.go index fd5f5b12792..cae667e6843 100644 --- a/internal/service/bedrockagentcore/memory.go +++ b/internal/service/bedrockagentcore/memory.go @@ -272,7 +272,7 @@ func waitMemoryCreated(ctx context.Context, conn *bedrockagentcorecontrol.Client outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*awstypes.Memory); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(out.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(out.FailureReason))) return out, smarterr.NewError(err) } @@ -289,7 +289,7 @@ func waitMemoryDeleted(ctx context.Context, conn *bedrockagentcorecontrol.Client outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*awstypes.Memory); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(out.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(out.FailureReason))) return out, smarterr.NewError(err) } diff --git a/internal/service/cloud9/environment_ec2.go b/internal/service/cloud9/environment_ec2.go index 20c69545a21..fa4952b72ba 100644 --- a/internal/service/cloud9/environment_ec2.go +++ b/internal/service/cloud9/environment_ec2.go @@ -325,7 +325,7 @@ func waitEnvironmentReady(ctx context.Context, conn *cloud9.Client, id string) ( if output, ok := outputRaw.(*types.Environment); ok { if lifecycle := output.Lifecycle; lifecycle.Status == types.EnvironmentLifecycleStatusCreateFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(lifecycle.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(lifecycle.Reason))) } return output, err @@ -349,7 +349,7 @@ func waitEnvironmentDeleted(ctx context.Context, conn *cloud9.Client, id string) if output, ok := outputRaw.(*types.Environment); ok { if lifecycle := output.Lifecycle; lifecycle.Status == types.EnvironmentLifecycleStatusDeleteFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(lifecycle.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(lifecycle.Reason))) } return output, err diff --git a/internal/service/cloudformation/change_set.go b/internal/service/cloudformation/change_set.go index 30bb75a3e9f..5800b838d1a 100644 --- a/internal/service/cloudformation/change_set.go +++ b/internal/service/cloudformation/change_set.go @@ -75,7 +75,7 @@ func waitChangeSetCreated(ctx context.Context, conn *cloudformation.Client, stac if output, ok := outputRaw.(*cloudformation.DescribeChangeSetOutput); ok { if output.Status == awstypes.ChangeSetStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) } return output, err diff --git a/internal/service/cloudformation/stack_set.go b/internal/service/cloudformation/stack_set.go index acd56a298af..a20975b5bf5 100644 --- a/internal/service/cloudformation/stack_set.go +++ b/internal/service/cloudformation/stack_set.go @@ -629,7 +629,7 @@ func waitStackSetOperationSucceeded(ctx context.Context, conn *cloudformation.Cl if output, ok := outputRaw.(*awstypes.StackSetOperation); ok { if output.Status == awstypes.StackSetOperationStatusFailed { if results, findErr := findStackSetOperationResultsByThreePartKey(ctx, conn, stackSetName, operationID, callAs); findErr == nil { - tfresource.SetLastError(err, stackSetOperationError(results)) + retry.SetLastError(err, stackSetOperationError(results)) } } diff --git a/internal/service/cloudhsmv2/cluster.go b/internal/service/cloudhsmv2/cluster.go index ace81a995a6..fb186912db3 100644 --- a/internal/service/cloudhsmv2/cluster.go +++ b/internal/service/cloudhsmv2/cluster.go @@ -312,7 +312,7 @@ func waitClusterActive(ctx context.Context, conn *cloudhsmv2.Client, id string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.Cluster); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) return output, err } @@ -333,7 +333,7 @@ func waitClusterDeleted(ctx context.Context, conn *cloudhsmv2.Client, id string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.Cluster); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) return output, err } @@ -354,7 +354,7 @@ func waitClusterUninitialized(ctx context.Context, conn *cloudhsmv2.Client, id s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.Cluster); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) return output, err } diff --git a/internal/service/cloudhsmv2/hsm.go b/internal/service/cloudhsmv2/hsm.go index 5548427c14a..df21e8659d9 100644 --- a/internal/service/cloudhsmv2/hsm.go +++ b/internal/service/cloudhsmv2/hsm.go @@ -20,7 +20,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "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" ) @@ -237,7 +236,7 @@ func waitHSMCreated(ctx context.Context, conn *cloudhsmv2.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.Hsm); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) return output, err } @@ -258,7 +257,7 @@ func waitHSMDeleted(ctx context.Context, conn *cloudhsmv2.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.Hsm); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) return output, err } diff --git a/internal/service/cloudwatch/composite_alarm.go b/internal/service/cloudwatch/composite_alarm.go index f17fc16ee93..28af47cc0a5 100644 --- a/internal/service/cloudwatch/composite_alarm.go +++ b/internal/service/cloudwatch/composite_alarm.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" - 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" @@ -171,7 +171,7 @@ func resourceCompositeAlarmRead(ctx context.Context, d *schema.ResourceData, met alarm, err := findCompositeAlarmByName(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 diff --git a/internal/service/cloudwatch/contributor_insight_rule.go b/internal/service/cloudwatch/contributor_insight_rule.go index 58ccd0cc93c..818dd167512 100644 --- a/internal/service/cloudwatch/contributor_insight_rule.go +++ b/internal/service/cloudwatch/contributor_insight_rule.go @@ -21,7 +21,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" tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" "github.com/hashicorp/terraform-provider-aws/internal/smerr" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" @@ -129,7 +129,7 @@ func (r *contributorInsightRuleResource) Read(ctx context.Context, req resource. } out, err := findContributorInsightRuleByName(ctx, conn, state.RuleName.ValueString()) - if intretry.NotFound(err) { + if retry.NotFound(err) { resp.State.RemoveResource(ctx) return } diff --git a/internal/service/cloudwatch/contributor_managed_insight_rule.go b/internal/service/cloudwatch/contributor_managed_insight_rule.go index 3c975ba7674..d6a00e1ee5a 100644 --- a/internal/service/cloudwatch/contributor_managed_insight_rule.go +++ b/internal/service/cloudwatch/contributor_managed_insight_rule.go @@ -23,7 +23,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" + 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" tftags "github.com/hashicorp/terraform-provider-aws/internal/tags" @@ -161,7 +161,7 @@ func (r *contributorManagedInsightRuleResource) Read(ctx context.Context, req re } out, err := findContributorManagedInsightRuleDescriptionByTemplateName(ctx, conn, state.ResourceArn.ValueString(), state.TemplateName.ValueString()) - if intretry.NotFound(err) { + if retry.NotFound(err) { resp.State.RemoveResource(ctx) return } diff --git a/internal/service/cloudwatch/dashboard.go b/internal/service/cloudwatch/dashboard.go index 59ae01f48e6..9f69714cd7a 100644 --- a/internal/service/cloudwatch/dashboard.go +++ b/internal/service/cloudwatch/dashboard.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" - intretry "github.com/hashicorp/terraform-provider-aws/internal/retry" + 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/internal/verify" @@ -95,7 +95,7 @@ func resourceDashboardRead(ctx context.Context, d *schema.ResourceData, meta any output, err := findDashboardByName(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 diff --git a/internal/service/cloudwatch/metric_alarm.go b/internal/service/cloudwatch/metric_alarm.go index 0d238e32017..359ceef1029 100644 --- a/internal/service/cloudwatch/metric_alarm.go +++ b/internal/service/cloudwatch/metric_alarm.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" - intretry "github.com/hashicorp/terraform-provider-aws/internal/retry" + 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" @@ -371,7 +371,7 @@ func resourceMetricAlarmRead(ctx context.Context, d *schema.ResourceData, meta a alarm, err := findMetricAlarmByName(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 diff --git a/internal/service/cloudwatch/metric_stream.go b/internal/service/cloudwatch/metric_stream.go index 2ce0fec2a71..5571276abe7 100644 --- a/internal/service/cloudwatch/metric_stream.go +++ b/internal/service/cloudwatch/metric_stream.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs" "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" - intretry "github.com/hashicorp/terraform-provider-aws/internal/retry" + 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" @@ -269,7 +269,7 @@ func resourceMetricStreamRead(ctx context.Context, d *schema.ResourceData, meta output, err := findMetricStreamByName(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 @@ -397,7 +397,7 @@ func statusMetricStream(ctx context.Context, conn *cloudwatch.Client, name strin return func() (any, string, error) { output, err := findMetricStreamByName(ctx, conn, name) - if intretry.NotFound(err) { + if retry.NotFound(err) { return nil, "", nil } diff --git a/internal/service/codebuild/fleet.go b/internal/service/codebuild/fleet.go index 5795fdaa49c..463eb2cafea 100644 --- a/internal/service/codebuild/fleet.go +++ b/internal/service/codebuild/fleet.go @@ -527,7 +527,7 @@ func waitFleetCreated(ctx context.Context, conn *codebuild.Client, arn string, t outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.Fleet); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -548,7 +548,7 @@ func waitFleetUpdated(ctx context.Context, conn *codebuild.Client, arn string, t outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.Fleet); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -569,7 +569,7 @@ func waitFleetDeleted(ctx context.Context, conn *codebuild.Client, arn string, t outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.Fleet); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } diff --git a/internal/service/codegurureviewer/repository_association.go b/internal/service/codegurureviewer/repository_association.go index c2ed25571e0..e6d8ecdc0fd 100644 --- a/internal/service/codegurureviewer/repository_association.go +++ b/internal/service/codegurureviewer/repository_association.go @@ -417,7 +417,7 @@ func waitRepositoryAssociationCreated(ctx context.Context, conn *codegurureviewe outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.RepositoryAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } @@ -436,7 +436,7 @@ func waitRepositoryAssociationDeleted(ctx context.Context, conn *codegurureviewe outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.RepositoryAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } diff --git a/internal/service/comprehend/document_classifier.go b/internal/service/comprehend/document_classifier.go index f2d4c2df8a5..503ddb6a697 100644 --- a/internal/service/comprehend/document_classifier.go +++ b/internal/service/comprehend/document_classifier.go @@ -654,7 +654,7 @@ func waitDocumentClassifierCreated(ctx context.Context, conn *comprehend.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.DocumentClassifierProperties); ok { if output.Status == types.ModelStatusInError { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Message))) } return output, err } diff --git a/internal/service/comprehend/entity_recognizer.go b/internal/service/comprehend/entity_recognizer.go index 314149478e8..a89ac05292f 100644 --- a/internal/service/comprehend/entity_recognizer.go +++ b/internal/service/comprehend/entity_recognizer.go @@ -681,7 +681,7 @@ func waitEntityRecognizerCreated(ctx context.Context, conn *comprehend.Client, i outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.EntityRecognizerProperties); ok { if output.Status == types.ModelStatusInError { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Message))) } return output, err } diff --git a/internal/service/computeoptimizer/enrollment_status.go b/internal/service/computeoptimizer/enrollment_status.go index 52e6c7807de..a85421b22bd 100644 --- a/internal/service/computeoptimizer/enrollment_status.go +++ b/internal/service/computeoptimizer/enrollment_status.go @@ -226,7 +226,7 @@ func waitEnrollmentStatusUpdated(ctx context.Context, conn *computeoptimizer.Cli outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*computeoptimizer.GetEnrollmentStatusOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/configservice/conformance_pack.go b/internal/service/configservice/conformance_pack.go index 8a7f017163e..bfadc32edbe 100644 --- a/internal/service/configservice/conformance_pack.go +++ b/internal/service/configservice/conformance_pack.go @@ -320,7 +320,7 @@ func waitConformancePackCreated(ctx context.Context, conn *configservice.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.ConformancePackStatusDetail); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ConformancePackStatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.ConformancePackStatusReason))) return output, err } @@ -339,7 +339,7 @@ func waitConformancePackDeleted(ctx context.Context, conn *configservice.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.ConformancePackStatusDetail); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ConformancePackStatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.ConformancePackStatusReason))) return output, err } diff --git a/internal/service/configservice/organization_conformance_pack.go b/internal/service/configservice/organization_conformance_pack.go index 0f39f2a7ba2..4887574f970 100644 --- a/internal/service/configservice/organization_conformance_pack.go +++ b/internal/service/configservice/organization_conformance_pack.go @@ -457,7 +457,7 @@ func waitOrganizationConformancePackCreated(ctx context.Context, conn *configser outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.OrganizationConformancePackStatus); ok { - tfresource.SetLastError(err, organizationConformancePackStatusError(ctx, conn, output)) + retry.SetLastError(err, organizationConformancePackStatusError(ctx, conn, output)) return output, err } @@ -477,7 +477,7 @@ func waitOrganizationConformancePackUpdated(ctx context.Context, conn *configser outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.OrganizationConformancePackStatus); ok { - tfresource.SetLastError(err, organizationConformancePackStatusError(ctx, conn, output)) + retry.SetLastError(err, organizationConformancePackStatusError(ctx, conn, output)) return output, err } @@ -498,7 +498,7 @@ func waitOrganizationConformancePackDeleted(ctx context.Context, conn *configser outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.OrganizationConformancePackStatus); ok { - tfresource.SetLastError(err, organizationConformancePackStatusError(ctx, conn, output)) + retry.SetLastError(err, organizationConformancePackStatusError(ctx, conn, output)) return output, err } diff --git a/internal/service/configservice/organization_managed_rule.go b/internal/service/configservice/organization_managed_rule.go index 3246984019f..12d08a71e5b 100644 --- a/internal/service/configservice/organization_managed_rule.go +++ b/internal/service/configservice/organization_managed_rule.go @@ -484,7 +484,7 @@ func waitOrganizationConfigRuleCreated(ctx context.Context, conn *configservice. outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.OrganizationConfigRuleStatus); ok { - tfresource.SetLastError(err, organizationConfigRuleStatusError(ctx, conn, output)) + retry.SetLastError(err, organizationConfigRuleStatusError(ctx, conn, output)) return output, err } @@ -504,7 +504,7 @@ func waitOrganizationConfigRuleUpdated(ctx context.Context, conn *configservice. outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.OrganizationConfigRuleStatus); ok { - tfresource.SetLastError(err, organizationConfigRuleStatusError(ctx, conn, output)) + retry.SetLastError(err, organizationConfigRuleStatusError(ctx, conn, output)) return output, err } @@ -525,7 +525,7 @@ func waitOrganizationConfigRuleDeleted(ctx context.Context, conn *configservice. outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.OrganizationConfigRuleStatus); ok { - tfresource.SetLastError(err, organizationConfigRuleStatusError(ctx, conn, output)) + retry.SetLastError(err, organizationConfigRuleStatusError(ctx, conn, output)) return output, err } diff --git a/internal/service/connect/instance.go b/internal/service/connect/instance.go index df0832edb9d..e7f6b2762c3 100644 --- a/internal/service/connect/instance.go +++ b/internal/service/connect/instance.go @@ -409,7 +409,7 @@ func waitInstanceCreated(ctx context.Context, conn *connect.Client, id string, t if output, ok := outputRaw.(*awstypes.Instance); ok { if statusReason := output.StatusReason; statusReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(statusReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(statusReason.Message))) } return output, err @@ -430,7 +430,7 @@ func waitInstanceDeleted(ctx context.Context, conn *connect.Client, id string, t if output, ok := outputRaw.(*awstypes.Instance); ok { if statusReason := output.StatusReason; statusReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(statusReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(statusReason.Message))) } return output, err diff --git a/internal/service/connect/phone_number.go b/internal/service/connect/phone_number.go index 25bb67b1bce..8ed9e413ffc 100644 --- a/internal/service/connect/phone_number.go +++ b/internal/service/connect/phone_number.go @@ -335,7 +335,7 @@ func waitPhoneNumberCreated(ctx context.Context, conn *connect.Client, id string if output, ok := outputRaw.(*awstypes.ClaimedPhoneNumberSummary); ok { if status := output.PhoneNumberStatus; status.Status == awstypes.PhoneNumberWorkflowStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(status.Message))) } return output, err @@ -356,7 +356,7 @@ func waitPhoneNumberUpdated(ctx context.Context, conn *connect.Client, id string if output, ok := outputRaw.(*awstypes.ClaimedPhoneNumberSummary); ok { if status := output.PhoneNumberStatus; status.Status == awstypes.PhoneNumberWorkflowStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(status.Message))) } return output, err @@ -377,7 +377,7 @@ func waitPhoneNumberDeleted(ctx context.Context, conn *connect.Client, id string if output, ok := outputRaw.(*awstypes.ClaimedPhoneNumberSummary); ok { if status := output.PhoneNumberStatus; status.Status == awstypes.PhoneNumberWorkflowStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(status.Message))) } return output, err diff --git a/internal/service/connect/vocabulary.go b/internal/service/connect/vocabulary.go index a434b54b771..1a5475cc186 100644 --- a/internal/service/connect/vocabulary.go +++ b/internal/service/connect/vocabulary.go @@ -285,7 +285,7 @@ func waitVocabularyCreated(ctx context.Context, conn *connect.Client, instanceID if output, ok := outputRaw.(*awstypes.Vocabulary); ok { if state := output.State; state == awstypes.VocabularyStateCreationFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) } return output, err diff --git a/internal/service/controltower/control.go b/internal/service/controltower/control.go index f6c7ca1054e..109a2b2ebc8 100644 --- a/internal/service/controltower/control.go +++ b/internal/service/controltower/control.go @@ -447,7 +447,7 @@ func waitOperationSucceeded(ctx context.Context, conn *controltower.Client, id s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*controltower.GetControlOperationOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ControlOperation.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ControlOperation.StatusMessage))) return output.ControlOperation, err } diff --git a/internal/service/controltower/landing_zone.go b/internal/service/controltower/landing_zone.go index a4357b36ee3..a7ba3a7c32d 100644 --- a/internal/service/controltower/landing_zone.go +++ b/internal/service/controltower/landing_zone.go @@ -308,7 +308,7 @@ func waitLandingZoneOperationSucceeded(ctx context.Context, conn *controltower.C if output, ok := outputRaw.(*types.LandingZoneOperationDetail); ok { if status := output.Status; status == types.LandingZoneOperationStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err diff --git a/internal/service/datasync/task.go b/internal/service/datasync/task.go index 0b842c2a08d..8674e57871e 100644 --- a/internal/service/datasync/task.go +++ b/internal/service/datasync/task.go @@ -528,7 +528,7 @@ func waitTaskAvailable(ctx context.Context, conn *datasync.Client, arn string, t if output, ok := outputRaw.(*datasync.DescribeTaskOutput); ok { if errorCode, errorDetail := aws.ToString(output.ErrorCode), aws.ToString(output.ErrorDetail); errorCode != "" && errorDetail != "" { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", errorCode, errorDetail)) + retry.SetLastError(err, fmt.Errorf("%s: %s", errorCode, errorDetail)) } return output, err diff --git a/internal/service/datazone/environment.go b/internal/service/datazone/environment.go index b4d53a468e6..f7f80ca81db 100644 --- a/internal/service/datazone/environment.go +++ b/internal/service/datazone/environment.go @@ -404,7 +404,7 @@ func waitEnvironmentCreated(ctx context.Context, conn *datazone.Client, domainId outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*datazone.GetEnvironmentOutput); ok { if status, deployment := out.Status, out.LastDeployment; (status == awstypes.EnvironmentStatusCreateFailed || status == awstypes.EnvironmentStatusValidationFailed) && deployment != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", status, aws.ToString(deployment.FailureReason.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", status, aws.ToString(deployment.FailureReason.Message))) } return out, err } @@ -425,7 +425,7 @@ func waitEnvironmentUpdated(ctx context.Context, conn *datazone.Client, domainId outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*datazone.GetEnvironmentOutput); ok { if status, deployment := out.Status, out.LastDeployment; status == awstypes.EnvironmentStatusUpdateFailed && deployment != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", status, aws.ToString(deployment.FailureReason.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", status, aws.ToString(deployment.FailureReason.Message))) } return out, err } @@ -446,7 +446,7 @@ func waitEnvironmentDeleted(ctx context.Context, conn *datazone.Client, domainId outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*datazone.GetEnvironmentOutput); ok { if status, deployment := out.Status, out.LastDeployment; status == awstypes.EnvironmentStatusDeleteFailed && deployment != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", status, aws.ToString(deployment.FailureReason.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", status, aws.ToString(deployment.FailureReason.Message))) } return out, err } diff --git a/internal/service/directconnect/gateway.go b/internal/service/directconnect/gateway.go index 3f31d8c2cc4..638dfe74696 100644 --- a/internal/service/directconnect/gateway.go +++ b/internal/service/directconnect/gateway.go @@ -245,7 +245,7 @@ func waitGatewayCreated(ctx context.Context, conn *directconnect.Client, id stri outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DirectConnectGateway); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateChangeError))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateChangeError))) return output, err } @@ -264,7 +264,7 @@ func waitGatewayDeleted(ctx context.Context, conn *directconnect.Client, id stri outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DirectConnectGateway); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateChangeError))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateChangeError))) return output, err } diff --git a/internal/service/directconnect/gateway_association.go b/internal/service/directconnect/gateway_association.go index c61b75c525f..154895efcfa 100644 --- a/internal/service/directconnect/gateway_association.go +++ b/internal/service/directconnect/gateway_association.go @@ -422,7 +422,7 @@ func waitGatewayAssociationCreated(ctx context.Context, conn *directconnect.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DirectConnectGatewayAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateChangeError))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateChangeError))) return output, err } @@ -441,7 +441,7 @@ func waitGatewayAssociationUpdated(ctx context.Context, conn *directconnect.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DirectConnectGatewayAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateChangeError))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateChangeError))) return output, err } @@ -460,7 +460,7 @@ func waitGatewayAssociationDeleted(ctx context.Context, conn *directconnect.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DirectConnectGatewayAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateChangeError))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateChangeError))) return output, err } diff --git a/internal/service/dms/endpoint.go b/internal/service/dms/endpoint.go index bb324e08c9d..5869a8c97c1 100644 --- a/internal/service/dms/endpoint.go +++ b/internal/service/dms/endpoint.go @@ -2542,7 +2542,7 @@ func waitConnectionSucceeded(ctx context.Context, conn *dms.Client, endpointARN outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Connection); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.LastFailureMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.LastFailureMessage))) return output, err } diff --git a/internal/service/dms/replication_config.go b/internal/service/dms/replication_config.go index 945f05fb330..dcb9d6315a4 100644 --- a/internal/service/dms/replication_config.go +++ b/internal/service/dms/replication_config.go @@ -469,7 +469,7 @@ func setLastReplicationError(err error, replication *awstypes.Replication) { errs = append(errs, errors.New(v)) } - tfresource.SetLastError(err, errors.Join(errs...)) + retry.SetLastError(err, errors.Join(errs...)) } func waitReplicationRunning(ctx context.Context, conn *dms.Client, arn string, timeout time.Duration) (*awstypes.Replication, error) { diff --git a/internal/service/dms/replication_task.go b/internal/service/dms/replication_task.go index b94a91e173e..81423319bce 100644 --- a/internal/service/dms/replication_task.go +++ b/internal/service/dms/replication_task.go @@ -423,7 +423,7 @@ func setLastReplicationTaskError(err error, replication *awstypes.ReplicationTas errs = append(errs, errors.New(v)) } - tfresource.SetLastError(err, errors.Join(errs...)) + retry.SetLastError(err, errors.Join(errs...)) } func waitReplicationTaskDeleted(ctx context.Context, conn *dms.Client, id string, timeout time.Duration) (*awstypes.ReplicationTask, error) { diff --git a/internal/service/ds/directory.go b/internal/service/ds/directory.go index 46a5802a728..72d5314ec39 100644 --- a/internal/service/ds/directory.go +++ b/internal/service/ds/directory.go @@ -716,7 +716,7 @@ func waitDirectoryCreated(ctx context.Context, conn *directoryservice.Client, id }() if output, ok := outputRaw.(*awstypes.DirectoryDescription); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StageReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StageReason))) return output, err } @@ -744,7 +744,7 @@ func waitDirectoryDeleted(ctx context.Context, conn *directoryservice.Client, id }() if output, ok := outputRaw.(*awstypes.DirectoryDescription); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StageReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StageReason))) return output, err } @@ -835,7 +835,7 @@ func waitDomainControllerCreated(ctx context.Context, conn *directoryservice.Cli outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DomainController); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -854,7 +854,7 @@ func waitDomainControllerDeleted(ctx context.Context, conn *directoryservice.Cli outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DomainController); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/ds/trust.go b/internal/service/ds/trust.go index bf82b7c1442..f62a6518770 100644 --- a/internal/service/ds/trust.go +++ b/internal/service/ds/trust.go @@ -504,7 +504,7 @@ func waitTrustCreated(ctx context.Context, conn *directoryservice.Client, direct }() if output, ok := outputRaw.(*awstypes.Trust); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.TrustStateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.TrustStateReason))) return output, err } @@ -538,7 +538,7 @@ func waitTrustVerified(ctx context.Context, conn *directoryservice.Client, direc }() if output, ok := outputRaw.(*awstypes.Trust); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.TrustStateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.TrustStateReason))) return output, err } @@ -571,7 +571,7 @@ func waitTrustUpdated(ctx context.Context, conn *directoryservice.Client, direct }() if output, ok := outputRaw.(*awstypes.Trust); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.TrustStateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.TrustStateReason))) return output, err } @@ -601,7 +601,7 @@ func waitTrustDeleted(ctx context.Context, conn *directoryservice.Client, direct }() if output, ok := outputRaw.(*awstypes.Trust); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.TrustStateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.TrustStateReason))) return output, err } diff --git a/internal/service/dynamodb/contributor_insights.go b/internal/service/dynamodb/contributor_insights.go index 9408ad04497..3c04d9470d7 100644 --- a/internal/service/dynamodb/contributor_insights.go +++ b/internal/service/dynamodb/contributor_insights.go @@ -259,7 +259,7 @@ func waitContributorInsightsCreated(ctx context.Context, conn *dynamodb.Client, if output, ok := outputRaw.(*dynamodb.DescribeContributorInsightsOutput); ok { if status, failureException := output.ContributorInsightsStatus, output.FailureException; status == awstypes.ContributorInsightsStatusFailed && failureException != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(failureException.ExceptionName), aws.ToString(failureException.ExceptionDescription))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(failureException.ExceptionName), aws.ToString(failureException.ExceptionDescription))) } return output, err @@ -280,7 +280,7 @@ func waitContributorInsightsDeleted(ctx context.Context, conn *dynamodb.Client, if output, ok := outputRaw.(*dynamodb.DescribeContributorInsightsOutput); ok { if status, failureException := output.ContributorInsightsStatus, output.FailureException; status == awstypes.ContributorInsightsStatusFailed && failureException != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(failureException.ExceptionName), aws.ToString(failureException.ExceptionDescription))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(failureException.ExceptionName), aws.ToString(failureException.ExceptionDescription))) } return output, err diff --git a/internal/service/dynamodb/kinesis_streaming_destination.go b/internal/service/dynamodb/kinesis_streaming_destination.go index 9433ed6d923..133aa633f2f 100644 --- a/internal/service/dynamodb/kinesis_streaming_destination.go +++ b/internal/service/dynamodb/kinesis_streaming_destination.go @@ -258,7 +258,7 @@ func waitKinesisStreamingDestinationActive(ctx context.Context, conn *dynamodb.C outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.KinesisDataStreamDestination); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.DestinationStatusDescription))) + retry.SetLastError(err, errors.New(aws.ToString(output.DestinationStatusDescription))) return output, err } @@ -280,7 +280,7 @@ func waitKinesisStreamingDestinationDisabled(ctx context.Context, conn *dynamodb outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.KinesisDataStreamDestination); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.DestinationStatusDescription))) + retry.SetLastError(err, errors.New(aws.ToString(output.DestinationStatusDescription))) return output, err } diff --git a/internal/service/ec2/wait.go b/internal/service/ec2/wait.go index 07255192bf3..8a7425dc7c2 100644 --- a/internal/service/ec2/wait.go +++ b/internal/service/ec2/wait.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/internal/retry" ) const ( @@ -197,7 +197,7 @@ func waitClientVPNAuthorizationRuleCreated(ctx context.Context, conn *ec2.Client outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.AuthorizationRule); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -216,7 +216,7 @@ func waitClientVPNAuthorizationRuleDeleted(ctx context.Context, conn *ec2.Client outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.AuthorizationRule); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -235,7 +235,7 @@ func waitClientVPNEndpointClientConnectResponseOptionsUpdated(ctx context.Contex outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ClientConnectResponseOptions); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -254,7 +254,7 @@ func waitClientVPNEndpointDeleted(ctx context.Context, conn *ec2.Client, id stri outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ClientVpnEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -275,7 +275,7 @@ func waitClientVPNNetworkAssociationCreated(ctx context.Context, conn *ec2.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TargetNetwork); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -296,7 +296,7 @@ func waitClientVPNNetworkAssociationDeleted(ctx context.Context, conn *ec2.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TargetNetwork); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -315,7 +315,7 @@ func waitClientVPNRouteCreated(ctx context.Context, conn *ec2.Client, endpointID outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ClientVpnRoute); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -334,7 +334,7 @@ func waitClientVPNRouteDeleted(ctx context.Context, conn *ec2.Client, endpointID outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ClientVpnRoute); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -396,7 +396,7 @@ func waitSnapshotCompleted(ctx context.Context, conn *ec2.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Snapshot); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) return output, err } @@ -422,7 +422,7 @@ func waitSnapshotImportCompleted(ctx context.Context, conn *ec2.Client, importTa outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.SnapshotTaskDetail); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -442,7 +442,7 @@ func waitSnapshotTierArchive(ctx context.Context, conn *ec2.Client, id string, t outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.SnapshotTierStatus); ok { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(output.LastTieringOperationStatus), aws.ToString(output.LastTieringOperationStatusDetail))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(output.LastTieringOperationStatus), aws.ToString(output.LastTieringOperationStatusDetail))) return output, err } @@ -462,7 +462,7 @@ func waitEIPDomainNameAttributeDeleted(ctx context.Context, conn *ec2.Client, al if output, ok := outputRaw.(*awstypes.AddressAttribute); ok { if v := output.PtrRecordUpdate; v != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(v.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(v.Reason))) } return output, err @@ -483,7 +483,7 @@ func waitEIPDomainNameAttributeUpdated(ctx context.Context, conn *ec2.Client, al if output, ok := outputRaw.(*awstypes.AddressAttribute); ok { if v := output.PtrRecordUpdate; v != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(v.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(v.Reason))) } return output, err @@ -606,7 +606,7 @@ func waitImageAvailable(ctx context.Context, conn *ec2.Client, id string, timeou if output, ok := outputRaw.(*awstypes.Image); ok { if stateReason := output.StateReason; stateReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) } return output, err @@ -643,7 +643,7 @@ func waitImageDeleted(ctx context.Context, conn *ec2.Client, id string, timeout if output, ok := outputRaw.(*awstypes.Image); ok { if stateReason := output.StateReason; stateReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) } return output, err @@ -666,7 +666,7 @@ func waitInstanceCreated(ctx context.Context, conn *ec2.Client, id string, timeo if output, ok := outputRaw.(*awstypes.Instance); ok { if stateReason := output.StateReason; stateReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) } return output, err @@ -695,7 +695,7 @@ func waitInstanceDeleted(ctx context.Context, conn *ec2.Client, id string, timeo if output, ok := outputRaw.(*awstypes.Instance); ok { if stateReason := output.StateReason; stateReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) } return output, err @@ -718,7 +718,7 @@ func waitInstanceReady(ctx context.Context, conn *ec2.Client, id string, timeout if output, ok := outputRaw.(*awstypes.Instance); ok { if stateReason := output.StateReason; stateReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) } return output, err @@ -741,7 +741,7 @@ func waitInstanceStarted(ctx context.Context, conn *ec2.Client, id string, timeo if output, ok := outputRaw.(*awstypes.Instance); ok { if stateReason := output.StateReason; stateReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) } return output, err @@ -769,7 +769,7 @@ func waitInstanceStopped(ctx context.Context, conn *ec2.Client, id string, timeo if output, ok := outputRaw.(*awstypes.Instance); ok { if stateReason := output.StateReason; stateReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) } return output, err @@ -807,7 +807,7 @@ func waitInstanceConnectEndpointCreated(ctx context.Context, conn *ec2.Client, i outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Ec2InstanceConnectEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) return output, err } @@ -826,7 +826,7 @@ func waitInstanceConnectEndpointDeleted(ctx context.Context, conn *ec2.Client, i outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Ec2InstanceConnectEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) return output, err } @@ -992,7 +992,7 @@ func waitIPAMPoolCIDRCreated(ctx context.Context, conn *ec2.Client, poolCIDRID, if output, ok := outputRaw.(*awstypes.IpamPoolCidr); ok { if state, failureReason := output.State, output.FailureReason; state == awstypes.IpamPoolCidrStateFailedProvision && failureReason != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(failureReason.Code), aws.ToString(failureReason.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(failureReason.Code), aws.ToString(failureReason.Message))) } return output, err @@ -1014,7 +1014,7 @@ func waitIPAMPoolCIDRDeleted(ctx context.Context, conn *ec2.Client, poolCIDRID, if output, ok := outputRaw.(*awstypes.IpamPoolCidr); ok { if state, failureReason := output.State, output.FailureReason; state == awstypes.IpamPoolCidrStateFailedDeprovision && failureReason != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(failureReason.Code), aws.ToString(failureReason.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(failureReason.Code), aws.ToString(failureReason.Message))) } return output, err @@ -1036,7 +1036,7 @@ func waitIPAMPoolCreated(ctx context.Context, conn *ec2.Client, id string, timeo if output, ok := outputRaw.(*awstypes.IpamPool); ok { if state := output.State; state == awstypes.IpamPoolStateCreateFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) } return output, err @@ -1058,7 +1058,7 @@ func waitIPAMPoolDeleted(ctx context.Context, conn *ec2.Client, id string, timeo if output, ok := outputRaw.(*awstypes.IpamPool); ok { if state := output.State; state == awstypes.IpamPoolStateDeleteFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) } return output, err @@ -1080,7 +1080,7 @@ func waitIPAMPoolUpdated(ctx context.Context, conn *ec2.Client, id string, timeo if output, ok := outputRaw.(*awstypes.IpamPool); ok { if state := output.State; state == awstypes.IpamPoolStateModifyFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) } return output, err @@ -1339,7 +1339,7 @@ func waitManagedPrefixListCreated(ctx context.Context, conn *ec2.Client, id stri if output, ok := outputRaw.(*awstypes.ManagedPrefixList); ok { if output.State == awstypes.PrefixListStateCreateFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) } return output, err @@ -1360,7 +1360,7 @@ func waitManagedPrefixListDeleted(ctx context.Context, conn *ec2.Client, id stri if output, ok := outputRaw.(*awstypes.ManagedPrefixList); ok { if output.State == awstypes.PrefixListStateDeleteFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) } return output, err @@ -1381,7 +1381,7 @@ func waitManagedPrefixListModified(ctx context.Context, conn *ec2.Client, id str if output, ok := outputRaw.(*awstypes.ManagedPrefixList); ok { if output.State == awstypes.PrefixListStateModifyFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateMessage))) } return output, err @@ -1402,7 +1402,7 @@ func waitNATGatewayAddressAssigned(ctx context.Context, conn *ec2.Client, natGat if output, ok := outputRaw.(*awstypes.NatGatewayAddress); ok { if output.Status == awstypes.NatGatewayAddressStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) } return output, err @@ -1424,7 +1424,7 @@ func waitNATGatewayAddressAssociated(ctx context.Context, conn *ec2.Client, natG if output, ok := outputRaw.(*awstypes.NatGatewayAddress); ok { if output.Status == awstypes.NatGatewayAddressStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) } return output, err @@ -1446,7 +1446,7 @@ func waitNATGatewayAddressDisassociated(ctx context.Context, conn *ec2.Client, n if output, ok := outputRaw.(*awstypes.NatGatewayAddress); ok { if output.Status == awstypes.NatGatewayAddressStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) } return output, err @@ -1467,7 +1467,7 @@ func waitNATGatewayAddressUnassigned(ctx context.Context, conn *ec2.Client, natG if output, ok := outputRaw.(*awstypes.NatGatewayAddress); ok { if output.Status == awstypes.NatGatewayAddressStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureMessage))) } return output, err @@ -1488,7 +1488,7 @@ func waitNATGatewayCreated(ctx context.Context, conn *ec2.Client, id string, tim if output, ok := outputRaw.(*awstypes.NatGateway); ok { if output.State == awstypes.NatGatewayStateFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err @@ -1511,7 +1511,7 @@ func waitNATGatewayDeleted(ctx context.Context, conn *ec2.Client, id string, tim if output, ok := outputRaw.(*awstypes.NatGateway); ok { if output.State == awstypes.NatGatewayStateFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err @@ -1533,7 +1533,7 @@ func waitNetworkInsightsAnalysisCreated(ctx context.Context, conn *ec2.Client, i outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.NetworkInsightsAnalysis); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -1629,7 +1629,7 @@ func waitNetworkInterfacePermissionCreated(ctx context.Context, conn *ec2.Client outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.NetworkInterfacePermission); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.PermissionState.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.PermissionState.StatusMessage))) return output, err } @@ -1648,7 +1648,7 @@ func waitNetworkInterfacePermissionDeleted(ctx context.Context, conn *ec2.Client outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.NetworkInterfacePermission); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.PermissionState.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.PermissionState.StatusMessage))) return output, err } @@ -1740,7 +1740,7 @@ func waitRouteTableAssociationCreated(ctx context.Context, conn *ec2.Client, id if output, ok := outputRaw.(*awstypes.RouteTableAssociationState); ok { if output.State == awstypes.RouteTableAssociationStateCodeFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err @@ -1761,7 +1761,7 @@ func waitRouteTableAssociationDeleted(ctx context.Context, conn *ec2.Client, id if output, ok := outputRaw.(*awstypes.RouteTableAssociationState); ok { if output.State == awstypes.RouteTableAssociationStateCodeFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err @@ -1782,7 +1782,7 @@ func waitRouteTableAssociationUpdated(ctx context.Context, conn *ec2.Client, id if output, ok := outputRaw.(*awstypes.RouteTableAssociationState); ok { if output.State == awstypes.RouteTableAssociationStateCodeFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err @@ -1859,7 +1859,7 @@ func waitSecurityGroupVPCAssociationCreated(ctx context.Context, conn *ec2.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.SecurityGroupVpcAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } @@ -1878,7 +1878,7 @@ func waitSecurityGroupVPCAssociationDeleted(ctx context.Context, conn *ec2.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.SecurityGroupVpcAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } @@ -1934,7 +1934,7 @@ func waitSpotFleetRequestFulfilled(ctx context.Context, conn *ec2.Client, id str } } - tfresource.SetLastError(err, errors.Join(errs...)) + retry.SetLastError(err, errors.Join(errs...)) } return output, err @@ -1977,9 +1977,9 @@ func waitSpotInstanceRequestFulfilled(ctx context.Context, conn *ec2.Client, id if output, ok := outputRaw.(*awstypes.SpotInstanceRequest); ok { if fault := output.Fault; fault != nil { errFault := fmt.Errorf("%s: %s", aws.ToString(fault.Code), aws.ToString(fault.Message)) - tfresource.SetLastError(err, fmt.Errorf("%s %w", aws.ToString(output.Status.Message), errFault)) + retry.SetLastError(err, fmt.Errorf("%s %w", aws.ToString(output.Status.Message), errFault)) } else { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) } return output, err @@ -2107,7 +2107,7 @@ func waitSubnetIPv6CIDRBlockAssociationCreated(ctx context.Context, conn *ec2.Cl if output, ok := outputRaw.(*awstypes.SubnetCidrBlockState); ok { if output.State == awstypes.SubnetCidrBlockStateCodeFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err @@ -2128,7 +2128,7 @@ func waitSubnetIPv6CIDRBlockAssociationDeleted(ctx context.Context, conn *ec2.Cl if output, ok := outputRaw.(*awstypes.SubnetCidrBlockState); ok { if output.State == awstypes.SubnetCidrBlockStateCodeFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err @@ -2416,7 +2416,7 @@ func waitTransitGatewayPeeringAttachmentAccepted(ctx context.Context, conn *ec2. if output, ok := outputRaw.(*awstypes.TransitGatewayPeeringAttachment); ok { if status := output.Status; status != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(status.Code), aws.ToString(status.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(status.Code), aws.ToString(status.Message))) } return output, err @@ -2437,7 +2437,7 @@ func waitTransitGatewayPeeringAttachmentCreated(ctx context.Context, conn *ec2.C if output, ok := outputRaw.(*awstypes.TransitGatewayPeeringAttachment); ok { if status := output.Status; status != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(status.Code), aws.ToString(status.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(status.Code), aws.ToString(status.Message))) } return output, err @@ -2463,7 +2463,7 @@ func waitTransitGatewayPeeringAttachmentDeleted(ctx context.Context, conn *ec2.C if output, ok := outputRaw.(*awstypes.TransitGatewayPeeringAttachment); ok { if status := output.Status; status != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(status.Code), aws.ToString(status.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(status.Code), aws.ToString(status.Message))) } return output, err @@ -2815,7 +2815,7 @@ func waitVerifiedAccessEndpointCreated(ctx context.Context, conn *ec2.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VerifiedAccessEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -2834,7 +2834,7 @@ func waitVerifiedAccessEndpointUpdated(ctx context.Context, conn *ec2.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VerifiedAccessEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -2853,7 +2853,7 @@ func waitVerifiedAccessEndpointDeleted(ctx context.Context, conn *ec2.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VerifiedAccessEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -2913,7 +2913,7 @@ func waitVolumeAttachmentInstanceReady(ctx context.Context, conn *ec2.Client, id if output, ok := outputRaw.(*awstypes.Instance); ok { if stateReason := output.StateReason; stateReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) } return output, err @@ -2941,7 +2941,7 @@ func waitVolumeAttachmentInstanceStopped(ctx context.Context, conn *ec2.Client, if output, ok := outputRaw.(*awstypes.Instance); ok { if stateReason := output.StateReason; stateReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(stateReason.Message))) } return output, err @@ -3004,7 +3004,7 @@ func waitVolumeModificationComplete(ctx context.Context, conn *ec2.Client, id st outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VolumeModification); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -3063,7 +3063,7 @@ func waitVPCCIDRBlockAssociationCreated(ctx context.Context, conn *ec2.Client, i if output, ok := outputRaw.(*awstypes.VpcCidrBlockState); ok { if state := output.State; state == awstypes.VpcCidrBlockStateCodeFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err @@ -3086,7 +3086,7 @@ func waitVPCCIDRBlockAssociationDeleted(ctx context.Context, conn *ec2.Client, i if output, ok := outputRaw.(*awstypes.VpcCidrBlockState); ok { if state := output.State; state == awstypes.VpcCidrBlockStateCodeFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err @@ -3126,7 +3126,7 @@ func waitVPCEndpointAccepted(ctx context.Context, conn *ec2.Client, vpcEndpointI if output, ok := outputRaw.(*awstypes.VpcEndpoint); ok { if state, lastError := string(output.State), output.LastError; strings.EqualFold(state, vpcEndpointStateFailed) && lastError != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(lastError.Code), aws.ToString(lastError.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(lastError.Code), aws.ToString(lastError.Message))) } return output, err @@ -3149,7 +3149,7 @@ func waitVPCEndpointAvailable(ctx context.Context, conn *ec2.Client, vpcEndpoint if output, ok := outputRaw.(*awstypes.VpcEndpoint); ok { if state, lastError := string(output.State), output.LastError; strings.EqualFold(state, vpcEndpointStateFailed) && lastError != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(lastError.Code), aws.ToString(lastError.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(lastError.Code), aws.ToString(lastError.Message))) } return output, err @@ -3293,7 +3293,7 @@ func waitVPCIPv6CIDRBlockAssociationCreated(ctx context.Context, conn *ec2.Clien if output, ok := outputRaw.(*awstypes.VpcCidrBlockState); ok { if state := output.State; state == awstypes.VpcCidrBlockStateCodeFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err @@ -3329,7 +3329,7 @@ func waitVPCPeeringConnectionActive(ctx context.Context, conn *ec2.Client, id st outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcPeeringConnection); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -3352,7 +3352,7 @@ func waitVPCPeeringConnectionDeleted(ctx context.Context, conn *ec2.Client, id s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcPeeringConnection); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status.Message))) return output, err } @@ -3606,7 +3606,7 @@ func waitVPCBlockPublicAccessOptionsUpdated(ctx context.Context, conn *ec2.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcBlockPublicAccessOptions); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(output.Reason))) return output, err } @@ -3626,7 +3626,7 @@ func waitVPCBlockPublicAccessExclusionCreated(ctx context.Context, conn *ec2.Cli outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcBlockPublicAccessExclusion); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(output.Reason))) return output, err } @@ -3646,7 +3646,7 @@ func waitVPCBlockPublicAccessExclusionUpdated(ctx context.Context, conn *ec2.Cli outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcBlockPublicAccessExclusion); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(output.Reason))) return output, err } @@ -3671,7 +3671,7 @@ func waitVPCBlockPublicAccessExclusionDeleted(ctx context.Context, conn *ec2.Cli outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcBlockPublicAccessExclusion); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(output.Reason))) return output, err } @@ -3778,7 +3778,7 @@ func waitRouteServerEndpointCreated(ctx context.Context, conn *ec2.Client, id st outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.RouteServerEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) return output, err } @@ -3797,7 +3797,7 @@ func waitRouteServerEndpointDeleted(ctx context.Context, conn *ec2.Client, id st outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.RouteServerEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) return output, err } @@ -3817,7 +3817,7 @@ func waitRouteServerPeerCreated(ctx context.Context, conn *ec2.Client, id string outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.RouteServerPeer); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) return output, err } @@ -3836,7 +3836,7 @@ func waitRouteServerPeerDeleted(ctx context.Context, conn *ec2.Client, id string outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.RouteServerPeer); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) return output, err } diff --git a/internal/service/ecs/capacity_provider.go b/internal/service/ecs/capacity_provider.go index 3c080200430..91cd5dac697 100644 --- a/internal/service/ecs/capacity_provider.go +++ b/internal/service/ecs/capacity_provider.go @@ -784,7 +784,7 @@ func waitCapacityProviderUpdated(ctx context.Context, conn *ecs.Client, arn stri outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.CapacityProvider); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.UpdateStatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.UpdateStatusReason))) return output, err } diff --git a/internal/service/eks/addon.go b/internal/service/eks/addon.go index c3ac9021fce..2b2246fc9a1 100644 --- a/internal/service/eks/addon.go +++ b/internal/service/eks/addon.go @@ -508,7 +508,7 @@ func waitAddonCreated(ctx context.Context, conn *eks.Client, clusterName, addonN if output, ok := outputRaw.(*types.Addon); ok { if status, health := output.Status, output.Health; status == types.AddonStatusCreateFailed && health != nil { - tfresource.SetLastError(err, addonIssuesError(health.Issues)) + retry.SetLastError(err, addonIssuesError(health.Issues)) } return output, err @@ -529,7 +529,7 @@ func waitAddonDeleted(ctx context.Context, conn *eks.Client, clusterName, addonN if output, ok := outputRaw.(*types.Addon); ok { if status, health := output.Status, output.Health; status == types.AddonStatusDeleteFailed && health != nil { - tfresource.SetLastError(err, addonIssuesError(health.Issues)) + retry.SetLastError(err, addonIssuesError(health.Issues)) } return output, err @@ -550,7 +550,7 @@ func waitAddonUpdateSuccessful(ctx context.Context, conn *eks.Client, clusterNam if output, ok := outputRaw.(*types.Update); ok { if status := output.Status; status == types.UpdateStatusCancelled || status == types.UpdateStatusFailed { - tfresource.SetLastError(err, errorDetailsError(output.Errors)) + retry.SetLastError(err, errorDetailsError(output.Errors)) } return output, err diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go index 8715d740011..e390314740b 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -1157,7 +1157,7 @@ func waitClusterUpdateSuccessful(ctx context.Context, conn *eks.Client, name, id if output, ok := outputRaw.(*types.Update); ok { if status := output.Status; status == types.UpdateStatusCancelled || status == types.UpdateStatusFailed { - tfresource.SetLastError(err, errorDetailsError(output.Errors)) + retry.SetLastError(err, errorDetailsError(output.Errors)) } return output, err diff --git a/internal/service/eks/node_group.go b/internal/service/eks/node_group.go index a5206654307..5b6ad1e9eb3 100644 --- a/internal/service/eks/node_group.go +++ b/internal/service/eks/node_group.go @@ -765,7 +765,7 @@ func waitNodegroupCreated(ctx context.Context, conn *eks.Client, clusterName, no if output, ok := outputRaw.(*types.Nodegroup); ok { if status, health := output.Status, output.Health; status == types.NodegroupStatusCreateFailed && health != nil { - tfresource.SetLastError(err, issuesError(health.Issues)) + retry.SetLastError(err, issuesError(health.Issues)) } return output, err @@ -786,7 +786,7 @@ func waitNodegroupDeleted(ctx context.Context, conn *eks.Client, clusterName, no if output, ok := outputRaw.(*types.Nodegroup); ok { if status, health := output.Status, output.Health; status == types.NodegroupStatusDeleteFailed && health != nil { - tfresource.SetLastError(err, issuesError(health.Issues)) + retry.SetLastError(err, issuesError(health.Issues)) } return output, err @@ -807,7 +807,7 @@ func waitNodegroupUpdateSuccessful(ctx context.Context, conn *eks.Client, cluste if output, ok := outputRaw.(*types.Update); ok { if status := output.Status; status == types.UpdateStatusCancelled || status == types.UpdateStatusFailed { - tfresource.SetLastError(err, errorDetailsError(output.Errors)) + retry.SetLastError(err, errorDetailsError(output.Errors)) } return output, err diff --git a/internal/service/elasticsearch/domain.go b/internal/service/elasticsearch/domain.go index e5cba666e81..9d2ed4d7e9d 100644 --- a/internal/service/elasticsearch/domain.go +++ b/internal/service/elasticsearch/domain.go @@ -1175,7 +1175,7 @@ func waitDomainCreated(ctx context.Context, conn *elasticsearch.Client, domainNa if output, ok := outputRaw.(*awstypes.ElasticsearchDomainStatus); ok { if v := output.ChangeProgressDetails; v != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", v.ConfigChangeStatus, aws.ToString(v.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", v.ConfigChangeStatus, aws.ToString(v.Message))) } return output, err @@ -1196,7 +1196,7 @@ func waitDomainConfigUpdated(ctx context.Context, conn *elasticsearch.Client, do if output, ok := outputRaw.(*awstypes.ElasticsearchDomainStatus); ok { if v := output.ChangeProgressDetails; v != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", v.ConfigChangeStatus, aws.ToString(v.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", v.ConfigChangeStatus, aws.ToString(v.Message))) } return output, err @@ -1217,7 +1217,7 @@ func waitDomainDeleted(ctx context.Context, conn *elasticsearch.Client, domainNa if output, ok := outputRaw.(*awstypes.ElasticsearchDomainStatus); ok { if v := output.ChangeProgressDetails; v != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", v.ConfigChangeStatus, aws.ToString(v.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", v.ConfigChangeStatus, aws.ToString(v.Message))) } return output, err diff --git a/internal/service/elbv2/load_balancer.go b/internal/service/elbv2/load_balancer.go index 412009b5aed..c7730e09cad 100644 --- a/internal/service/elbv2/load_balancer.go +++ b/internal/service/elbv2/load_balancer.go @@ -1138,7 +1138,7 @@ func waitLoadBalancerActive(ctx context.Context, conn *elasticloadbalancingv2.Cl outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.LoadBalancer); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.State.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(output.State.Reason))) return output, err } diff --git a/internal/service/emr/cluster.go b/internal/service/emr/cluster.go index e4248226a5e..68f2b607544 100644 --- a/internal/service/emr/cluster.go +++ b/internal/service/emr/cluster.go @@ -1529,7 +1529,7 @@ func waitClusterCreated(ctx context.Context, conn *emr.Client, id string) (*awst if output, ok := outputRaw.(*awstypes.Cluster); ok { if stateChangeReason := output.Status.StateChangeReason; stateChangeReason != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", stateChangeReason.Code, aws.ToString(stateChangeReason.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", stateChangeReason.Code, aws.ToString(stateChangeReason.Message))) } return output, err @@ -1555,7 +1555,7 @@ func waitClusterDeleted(ctx context.Context, conn *emr.Client, id string) (*awst if output, ok := outputRaw.(*awstypes.Cluster); ok { if stateChangeReason := output.Status.StateChangeReason; stateChangeReason != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", stateChangeReason.Code, aws.ToString(stateChangeReason.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", stateChangeReason.Code, aws.ToString(stateChangeReason.Message))) } return output, err diff --git a/internal/service/events/connection.go b/internal/service/events/connection.go index 3fe60c0c1bb..6f60d6429ba 100644 --- a/internal/service/events/connection.go +++ b/internal/service/events/connection.go @@ -486,7 +486,7 @@ func waitConnectionCreated(ctx context.Context, conn *eventbridge.Client, name s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*eventbridge.DescribeConnectionOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } @@ -508,7 +508,7 @@ func waitConnectionUpdated(ctx context.Context, conn *eventbridge.Client, name s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*eventbridge.DescribeConnectionOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } @@ -530,7 +530,7 @@ func waitConnectionDeleted(ctx context.Context, conn *eventbridge.Client, name s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*eventbridge.DescribeConnectionOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } diff --git a/internal/service/events/endpoint.go b/internal/service/events/endpoint.go index caa5d14c7f3..7f046bc0db5 100644 --- a/internal/service/events/endpoint.go +++ b/internal/service/events/endpoint.go @@ -355,7 +355,7 @@ func waitEndpointCreated(ctx context.Context, conn *eventbridge.Client, name str outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*eventbridge.DescribeEndpointOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } @@ -374,7 +374,7 @@ func waitEndpointUpdated(ctx context.Context, conn *eventbridge.Client, name str outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*eventbridge.DescribeEndpointOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } @@ -393,7 +393,7 @@ func waitEndpointDeleted(ctx context.Context, conn *eventbridge.Client, name str outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*eventbridge.DescribeEndpointOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } diff --git a/internal/service/evidently/wait.go b/internal/service/evidently/wait.go index d357ed3f4e0..1e53b54bacc 100644 --- a/internal/service/evidently/wait.go +++ b/internal/service/evidently/wait.go @@ -13,7 +13,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/evidently/types" sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/internal/retry" ) func waitFeatureCreated(ctx context.Context, conn *evidently.Client, id string, timeout time.Duration) (*awstypes.Feature, error) { @@ -79,7 +79,7 @@ func waitLaunchCreated(ctx context.Context, conn *evidently.Client, id string, t if output, ok := outputRaw.(*awstypes.Launch); ok { if v := aws.ToString(output.StatusReason); v != "" { - tfresource.SetLastError(err, errors.New(v)) + retry.SetLastError(err, errors.New(v)) } return output, err @@ -100,7 +100,7 @@ func waitLaunchUpdated(ctx context.Context, conn *evidently.Client, id string, t if output, ok := outputRaw.(*awstypes.Launch); ok { if v := aws.ToString(output.StatusReason); v != "" { - tfresource.SetLastError(err, errors.New(v)) + retry.SetLastError(err, errors.New(v)) } return output, err @@ -121,7 +121,7 @@ func waitLaunchDeleted(ctx context.Context, conn *evidently.Client, id string, t if output, ok := outputRaw.(*awstypes.Launch); ok { if v := aws.ToString(output.StatusReason); v != "" { - tfresource.SetLastError(err, errors.New(v)) + retry.SetLastError(err, errors.New(v)) } return output, err diff --git a/internal/service/firehose/delivery_stream.go b/internal/service/firehose/delivery_stream.go index 27b8329f456..50143879bdf 100644 --- a/internal/service/firehose/delivery_stream.go +++ b/internal/service/firehose/delivery_stream.go @@ -1888,7 +1888,7 @@ func waitDeliveryStreamCreated(ctx context.Context, conn *firehose.Client, name if output, ok := outputRaw.(*types.DeliveryStreamDescription); ok { if status, failureDescription := output.DeliveryStreamStatus, output.FailureDescription; status == types.DeliveryStreamStatusCreatingFailed && failureDescription != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", failureDescription.Type, aws.ToString(failureDescription.Details))) + retry.SetLastError(err, fmt.Errorf("%s: %s", failureDescription.Type, aws.ToString(failureDescription.Details))) } return output, err @@ -1909,7 +1909,7 @@ func waitDeliveryStreamDeleted(ctx context.Context, conn *firehose.Client, name if output, ok := outputRaw.(*types.DeliveryStreamDescription); ok { if status, failureDescription := output.DeliveryStreamStatus, output.FailureDescription; status == types.DeliveryStreamStatusDeletingFailed && failureDescription != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", failureDescription.Type, aws.ToString(failureDescription.Details))) + retry.SetLastError(err, fmt.Errorf("%s: %s", failureDescription.Type, aws.ToString(failureDescription.Details))) } return output, err @@ -1959,7 +1959,7 @@ func waitDeliveryStreamEncryptionEnabled(ctx context.Context, conn *firehose.Cli if output, ok := outputRaw.(*types.DeliveryStreamEncryptionConfiguration); ok { if status, failureDescription := output.Status, output.FailureDescription; status == types.DeliveryStreamEncryptionStatusEnablingFailed && failureDescription != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", failureDescription.Type, aws.ToString(failureDescription.Details))) + retry.SetLastError(err, fmt.Errorf("%s: %s", failureDescription.Type, aws.ToString(failureDescription.Details))) } return output, err @@ -1980,7 +1980,7 @@ func waitDeliveryStreamEncryptionDisabled(ctx context.Context, conn *firehose.Cl if output, ok := outputRaw.(*types.DeliveryStreamEncryptionConfiguration); ok { if status, failureDescription := output.Status, output.FailureDescription; status == types.DeliveryStreamEncryptionStatusDisablingFailed && failureDescription != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", failureDescription.Type, aws.ToString(failureDescription.Details))) + retry.SetLastError(err, fmt.Errorf("%s: %s", failureDescription.Type, aws.ToString(failureDescription.Details))) } return output, err diff --git a/internal/service/fsx/data_repository_association.go b/internal/service/fsx/data_repository_association.go index 51cd77d6363..d5b5b6a33bf 100644 --- a/internal/service/fsx/data_repository_association.go +++ b/internal/service/fsx/data_repository_association.go @@ -364,7 +364,7 @@ func waitDataRepositoryAssociationCreated(ctx context.Context, conn *fsx.Client, if output, ok := outputRaw.(*awstypes.DataRepositoryAssociation); ok { if status, details := output.Lifecycle, output.FailureDetails; status == awstypes.DataRepositoryLifecycleFailed && details != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) } return output, err @@ -386,7 +386,7 @@ func waitDataRepositoryAssociationUpdated(ctx context.Context, conn *fsx.Client, if output, ok := outputRaw.(*awstypes.DataRepositoryAssociation); ok { if status, details := output.Lifecycle, output.FailureDetails; status == awstypes.DataRepositoryLifecycleFailed && details != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) } return output, err @@ -408,7 +408,7 @@ func waitDataRepositoryAssociationDeleted(ctx context.Context, conn *fsx.Client, if output, ok := outputRaw.(*awstypes.DataRepositoryAssociation); ok { if status, details := output.Lifecycle, output.FailureDetails; status == awstypes.DataRepositoryLifecycleFailed && details != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) } return output, err diff --git a/internal/service/fsx/file_cache.go b/internal/service/fsx/file_cache.go index 7674d96713e..aba7c28e6b8 100644 --- a/internal/service/fsx/file_cache.go +++ b/internal/service/fsx/file_cache.go @@ -518,7 +518,7 @@ func waitFileCacheCreated(ctx context.Context, conn *fsx.Client, id string, time if output, ok := outputRaw.(*awstypes.FileCache); ok { if status, details := output.Lifecycle, output.FailureDetails; status == awstypes.FileCacheLifecycleFailed && details != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) } return output, err @@ -539,7 +539,7 @@ func waitFileCacheUpdated(ctx context.Context, conn *fsx.Client, id string, time if output, ok := outputRaw.(*awstypes.FileCache); ok { if status, details := output.Lifecycle, output.FailureDetails; status == awstypes.FileCacheLifecycleFailed && details != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) } return output, err @@ -561,7 +561,7 @@ func waitFileCacheDeleted(ctx context.Context, conn *fsx.Client, id string, time if output, ok := outputRaw.(*awstypes.FileCache); ok { if status, details := output.Lifecycle, output.FailureDetails; status == awstypes.FileCacheLifecycleFailed && details != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) } return output, err diff --git a/internal/service/fsx/lustre_file_system.go b/internal/service/fsx/lustre_file_system.go index 4133123ea82..755be655a2e 100644 --- a/internal/service/fsx/lustre_file_system.go +++ b/internal/service/fsx/lustre_file_system.go @@ -909,7 +909,7 @@ func waitFileSystemCreated(ctx context.Context, conn *fsx.Client, id string, tim if output, ok := outputRaw.(*awstypes.FileSystem); ok { if status, details := output.Lifecycle, output.FailureDetails; status == awstypes.FileSystemLifecycleFailed && details != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(details.Message))) + retry.SetLastError(err, errors.New(aws.ToString(details.Message))) } return output, err @@ -943,12 +943,12 @@ func waitFileSystemUpdated(ctx context.Context, conn *fsx.Client, id string, sta if details := output.FailureDetails; details != nil { if message := aws.ToString(details.Message); administrativeActionsError != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %w", message, administrativeActionsError)) + retry.SetLastError(err, fmt.Errorf("%s: %w", message, administrativeActionsError)) } else { - tfresource.SetLastError(err, errors.New(message)) + retry.SetLastError(err, errors.New(message)) } } else { - tfresource.SetLastError(err, administrativeActionsError) + retry.SetLastError(err, administrativeActionsError) } } @@ -972,7 +972,7 @@ func waitFileSystemDeleted(ctx context.Context, conn *fsx.Client, id string, tim if output, ok := outputRaw.(*awstypes.FileSystem); ok { if status, details := output.Lifecycle, output.FailureDetails; status == awstypes.FileSystemLifecycleFailed && details != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(details.Message))) + retry.SetLastError(err, errors.New(aws.ToString(details.Message))) } return output, err @@ -1027,7 +1027,7 @@ func waitFileSystemAdministrativeActionCompleted(ctx context.Context, conn *fsx. if output, ok := outputRaw.(*awstypes.AdministrativeAction); ok { if status, details := output.Status, output.FailureDetails; status == awstypes.StatusFailed && details != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) } return output, err diff --git a/internal/service/fsx/ontap_storage_virtual_machine.go b/internal/service/fsx/ontap_storage_virtual_machine.go index f53398165f2..05c13374862 100644 --- a/internal/service/fsx/ontap_storage_virtual_machine.go +++ b/internal/service/fsx/ontap_storage_virtual_machine.go @@ -443,7 +443,7 @@ func waitStorageVirtualMachineCreated(ctx context.Context, conn *fsx.Client, id if output, ok := outputRaw.(*awstypes.StorageVirtualMachine); ok { if reason := output.LifecycleTransitionReason; reason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(reason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(reason.Message))) } return output, err @@ -465,7 +465,7 @@ func waitStorageVirtualMachineUpdated(ctx context.Context, conn *fsx.Client, id if output, ok := outputRaw.(*awstypes.StorageVirtualMachine); ok { if reason := output.LifecycleTransitionReason; reason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(reason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(reason.Message))) } return output, err @@ -488,7 +488,7 @@ func waitStorageVirtualMachineDeleted(ctx context.Context, conn *fsx.Client, id if output, ok := outputRaw.(*awstypes.StorageVirtualMachine); ok { if reason := output.LifecycleTransitionReason; reason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(reason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(reason.Message))) } return output, err diff --git a/internal/service/fsx/ontap_volume.go b/internal/service/fsx/ontap_volume.go index 758f49c1617..5b858d14da8 100644 --- a/internal/service/fsx/ontap_volume.go +++ b/internal/service/fsx/ontap_volume.go @@ -698,7 +698,7 @@ func waitVolumeCreated(ctx context.Context, conn *fsx.Client, id string, timeout if output, ok := outputRaw.(*awstypes.Volume); ok { if output.Lifecycle == awstypes.VolumeLifecycleFailed && output.LifecycleTransitionReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.LifecycleTransitionReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.LifecycleTransitionReason.Message))) } return output, err @@ -732,12 +732,12 @@ func waitVolumeUpdated(ctx context.Context, conn *fsx.Client, id string, startTi if reason := output.LifecycleTransitionReason; reason != nil { if message := aws.ToString(reason.Message); administrativeActionsError != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %w", message, administrativeActionsError)) + retry.SetLastError(err, fmt.Errorf("%s: %w", message, administrativeActionsError)) } else { - tfresource.SetLastError(err, errors.New(message)) + retry.SetLastError(err, errors.New(message)) } } else { - tfresource.SetLastError(err, administrativeActionsError) + retry.SetLastError(err, administrativeActionsError) } } @@ -761,7 +761,7 @@ func waitVolumeDeleted(ctx context.Context, conn *fsx.Client, id string, timeout if output, ok := outputRaw.(*awstypes.Volume); ok { if output.Lifecycle == awstypes.VolumeLifecycleFailed && output.LifecycleTransitionReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.LifecycleTransitionReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.LifecycleTransitionReason.Message))) } return output, err @@ -816,7 +816,7 @@ func waitVolumeAdministrativeActionCompleted(ctx context.Context, conn *fsx.Clie if output, ok := outputRaw.(*awstypes.AdministrativeAction); ok { if output.Status == awstypes.StatusFailed && output.FailureDetails != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureDetails.Message))) } return output, err diff --git a/internal/service/fsx/openzfs_snapshot.go b/internal/service/fsx/openzfs_snapshot.go index 6c5dadc6862..e558675556a 100644 --- a/internal/service/fsx/openzfs_snapshot.go +++ b/internal/service/fsx/openzfs_snapshot.go @@ -254,7 +254,7 @@ func waitSnapshotCreated(ctx context.Context, conn *fsx.Client, id string, timeo if output, ok := outputRaw.(*awstypes.Snapshot); ok { if output.LifecycleTransitionReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.LifecycleTransitionReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.LifecycleTransitionReason.Message))) } return output, err @@ -276,7 +276,7 @@ func waitSnapshotUpdated(ctx context.Context, conn *fsx.Client, id string, timeo if output, ok := outputRaw.(*awstypes.Snapshot); ok { if output.LifecycleTransitionReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.LifecycleTransitionReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.LifecycleTransitionReason.Message))) } return output, err @@ -298,7 +298,7 @@ func waitSnapshotDeleted(ctx context.Context, conn *fsx.Client, id string, timeo if output, ok := outputRaw.(*awstypes.Snapshot); ok { if output.LifecycleTransitionReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(output.LifecycleTransitionReason.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.LifecycleTransitionReason.Message))) } return output, err diff --git a/internal/service/fsx/s3_access_point_attachment.go b/internal/service/fsx/s3_access_point_attachment.go index 53d941efcfe..fea2e0657ca 100644 --- a/internal/service/fsx/s3_access_point_attachment.go +++ b/internal/service/fsx/s3_access_point_attachment.go @@ -453,7 +453,7 @@ func waitS3AccessPointAttachmentCreated(ctx context.Context, conn *fsx.Client, n if output, ok := outputRaw.(*awstypes.S3AccessPointAttachment); ok { if v := output.LifecycleTransitionReason; v != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(v.Message))) + retry.SetLastError(err, errors.New(aws.ToString(v.Message))) } return output, err @@ -475,7 +475,7 @@ func waitS3AccessPointAttachmentDeleted(ctx context.Context, conn *fsx.Client, n if output, ok := outputRaw.(*awstypes.S3AccessPointAttachment); ok { if v := output.LifecycleTransitionReason; v != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(v.Message))) + retry.SetLastError(err, errors.New(aws.ToString(v.Message))) } return output, err diff --git a/internal/service/gamelift/fleet.go b/internal/service/gamelift/fleet.go index 7a2ac9ea682..f1214d4df83 100644 --- a/internal/service/gamelift/fleet.go +++ b/internal/service/gamelift/fleet.go @@ -569,7 +569,7 @@ func waitFleetActive(ctx context.Context, conn *gamelift.Client, id string, star if output, ok := outputRaw.(*awstypes.FleetAttributes); ok { if events, errFFF := findFleetFailuresByID(ctx, conn, id); errFFF == nil { - tfresource.SetLastError(err, fleetFailuresError(events, startTime)) + retry.SetLastError(err, fleetFailuresError(events, startTime)) } return output, err @@ -595,7 +595,7 @@ func waitFleetTerminated(ctx context.Context, conn *gamelift.Client, id string, if output, ok := outputRaw.(*awstypes.FleetAttributes); ok { if events, errFFF := findFleetFailuresByID(ctx, conn, id); errFFF == nil { - tfresource.SetLastError(err, fleetFailuresError(events, startTime)) + retry.SetLastError(err, fleetFailuresError(events, startTime)) } return output, err diff --git a/internal/service/gamelift/game_server_group.go b/internal/service/gamelift/game_server_group.go index ca041248612..e6261b782fa 100644 --- a/internal/service/gamelift/game_server_group.go +++ b/internal/service/gamelift/game_server_group.go @@ -416,7 +416,7 @@ func waitGameServerGroupActive(ctx context.Context, conn *gamelift.Client, name outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.GameServerGroup); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -438,7 +438,7 @@ func waitGameServerGroupTerminated(ctx context.Context, conn *gamelift.Client, n outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.GameServerGroup); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/glue/dev_endpoint.go b/internal/service/glue/dev_endpoint.go index e94ae1fae75..875ef98f45a 100644 --- a/internal/service/glue/dev_endpoint.go +++ b/internal/service/glue/dev_endpoint.go @@ -561,7 +561,7 @@ func waitDevEndpointCreated(ctx context.Context, conn *glue.Client, name string) if output, ok := outputRaw.(*awstypes.DevEndpoint); ok { if status := aws.ToString(output.Status); status == devEndpointStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) } return output, err @@ -582,7 +582,7 @@ func waitDevEndpointDeleted(ctx context.Context, conn *glue.Client, name string) if output, ok := outputRaw.(*awstypes.DevEndpoint); ok { if status := aws.ToString(output.Status); status == devEndpointStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) } return output, err diff --git a/internal/service/iam/service_linked_role.go b/internal/service/iam/service_linked_role.go index af894838660..653e0bc9247 100644 --- a/internal/service/iam/service_linked_role.go +++ b/internal/service/iam/service_linked_role.go @@ -260,7 +260,7 @@ func waitServiceLinkedRoleDeleted(ctx context.Context, conn *iam.Client, id stri errs = append(errs, fmt.Errorf("%s: %s", aws.ToString(v.Region), strings.Join(v.Resources, ", "))) } - tfresource.SetLastError(err, fmt.Errorf("%s: %w", aws.ToString(reason.Reason), errors.Join(errs...))) + retry.SetLastError(err, fmt.Errorf("%s: %w", aws.ToString(reason.Reason), errors.Join(errs...))) } return err diff --git a/internal/service/imagebuilder/image.go b/internal/service/imagebuilder/image.go index 8bbf62ece1c..153175d9845 100644 --- a/internal/service/imagebuilder/image.go +++ b/internal/service/imagebuilder/image.go @@ -488,7 +488,7 @@ func waitImageStatusAvailable(ctx context.Context, conn *imagebuilder.Client, ar outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Image); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.State.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(output.State.Reason))) return output, err } diff --git a/internal/service/iot/topic_rule_destination.go b/internal/service/iot/topic_rule_destination.go index f9f5024d4b1..6e34bc0e3fc 100644 --- a/internal/service/iot/topic_rule_destination.go +++ b/internal/service/iot/topic_rule_destination.go @@ -303,7 +303,7 @@ func waitTopicRuleDestinationCreated(ctx context.Context, conn *iot.Client, arn outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TopicRuleDestination); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -322,7 +322,7 @@ func waitTopicRuleDestinationDeleted(ctx context.Context, conn *iot.Client, arn outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TopicRuleDestination); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -341,7 +341,7 @@ func waitTopicRuleDestinationDisabled(ctx context.Context, conn *iot.Client, arn outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TopicRuleDestination); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -360,7 +360,7 @@ func waitTopicRuleDestinationEnabled(ctx context.Context, conn *iot.Client, arn outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TopicRuleDestination); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/kafka/cluster.go b/internal/service/kafka/cluster.go index 1986f94d14c..7e64fb03d44 100644 --- a/internal/service/kafka/cluster.go +++ b/internal/service/kafka/cluster.go @@ -1260,7 +1260,7 @@ func waitClusterCreated(ctx context.Context, conn *kafka.Client, arn string, tim if output, ok := outputRaw.(*types.Cluster); ok { if state, stateInfo := output.State, output.StateInfo; state == types.ClusterStateFailed && stateInfo != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateInfo.Code), aws.ToString(stateInfo.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateInfo.Code), aws.ToString(stateInfo.Message))) } return output, err @@ -1281,7 +1281,7 @@ func waitClusterDeleted(ctx context.Context, conn *kafka.Client, arn string, tim if output, ok := outputRaw.(*types.Cluster); ok { if state, stateInfo := output.State, output.StateInfo; state == types.ClusterStateFailed && stateInfo != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateInfo.Code), aws.ToString(stateInfo.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateInfo.Code), aws.ToString(stateInfo.Message))) } return output, err @@ -1302,7 +1302,7 @@ func waitClusterOperationCompleted(ctx context.Context, conn *kafka.Client, arn if output, ok := outputRaw.(*types.ClusterOperationInfo); ok { if state, errorInfo := aws.ToString(output.OperationState), output.ErrorInfo; state == clusterOperationStateUpdateFailed && errorInfo != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(errorInfo.ErrorCode), aws.ToString(errorInfo.ErrorString))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(errorInfo.ErrorCode), aws.ToString(errorInfo.ErrorString))) } return output, err diff --git a/internal/service/kafka/replicator.go b/internal/service/kafka/replicator.go index da3162f23c6..7012ebbf19a 100644 --- a/internal/service/kafka/replicator.go +++ b/internal/service/kafka/replicator.go @@ -407,7 +407,7 @@ func waitReplicatorCreated(ctx context.Context, conn *kafka.Client, arn string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*kafka.DescribeReplicatorOutput); ok { if stateInfo := output.StateInfo; stateInfo != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateInfo.Code), aws.ToString(stateInfo.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateInfo.Code), aws.ToString(stateInfo.Message))) } return output, err @@ -427,7 +427,7 @@ func waitReplicatorUpdated(ctx context.Context, conn *kafka.Client, arn string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*kafka.DescribeReplicatorOutput); ok { if stateInfo := output.StateInfo; stateInfo != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateInfo.Code), aws.ToString(stateInfo.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateInfo.Code), aws.ToString(stateInfo.Message))) } return output, err @@ -447,7 +447,7 @@ func waitReplicatorDeleted(ctx context.Context, conn *kafka.Client, arn string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*kafka.DescribeReplicatorOutput); ok { if stateInfo := output.StateInfo; stateInfo != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateInfo.Code), aws.ToString(stateInfo.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateInfo.Code), aws.ToString(stateInfo.Message))) } return output, err diff --git a/internal/service/kafkaconnect/connector.go b/internal/service/kafkaconnect/connector.go index 0d9558017ba..b9c89942069 100644 --- a/internal/service/kafkaconnect/connector.go +++ b/internal/service/kafkaconnect/connector.go @@ -640,7 +640,7 @@ func waitConnectorCreated(ctx context.Context, conn *kafkaconnect.Client, arn st if output, ok := outputRaw.(*kafkaconnect.DescribeConnectorOutput); ok { if state, stateDescription := output.ConnectorState, output.StateDescription; state == awstypes.ConnectorStateFailed && stateDescription != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateDescription.Code), aws.ToString(stateDescription.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateDescription.Code), aws.ToString(stateDescription.Message))) } return output, err @@ -661,7 +661,7 @@ func waitConnectorUpdated(ctx context.Context, conn *kafkaconnect.Client, arn st if output, ok := outputRaw.(*kafkaconnect.DescribeConnectorOutput); ok { if state, stateDescription := output.ConnectorState, output.StateDescription; state == awstypes.ConnectorStateFailed && stateDescription != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateDescription.Code), aws.ToString(stateDescription.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateDescription.Code), aws.ToString(stateDescription.Message))) } return output, err @@ -682,7 +682,7 @@ func waitConnectorDeleted(ctx context.Context, conn *kafkaconnect.Client, arn st if output, ok := outputRaw.(*kafkaconnect.DescribeConnectorOutput); ok { if state, stateDescription := output.ConnectorState, output.StateDescription; state == awstypes.ConnectorStateFailed && stateDescription != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateDescription.Code), aws.ToString(stateDescription.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateDescription.Code), aws.ToString(stateDescription.Message))) } return output, err diff --git a/internal/service/kafkaconnect/custom_plugin.go b/internal/service/kafkaconnect/custom_plugin.go index be279352830..08b98eca0a9 100644 --- a/internal/service/kafkaconnect/custom_plugin.go +++ b/internal/service/kafkaconnect/custom_plugin.go @@ -271,7 +271,7 @@ func waitCustomPluginCreated(ctx context.Context, conn *kafkaconnect.Client, arn if output, ok := outputRaw.(*kafkaconnect.DescribeCustomPluginOutput); ok { if state, stateDescription := output.CustomPluginState, output.StateDescription; state == awstypes.CustomPluginStateCreateFailed && stateDescription != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateDescription.Code), aws.ToString(stateDescription.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(stateDescription.Code), aws.ToString(stateDescription.Message))) } return output, err diff --git a/internal/service/kendra/data_source.go b/internal/service/kendra/data_source.go index 6513bb0eb57..8390e298d9e 100644 --- a/internal/service/kendra/data_source.go +++ b/internal/service/kendra/data_source.go @@ -867,7 +867,7 @@ func waitDataSourceCreated(ctx context.Context, conn *kendra.Client, id, indexId if output, ok := outputRaw.(*kendra.DescribeDataSourceOutput); ok { if output.Status == types.DataSourceStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) } return output, err } @@ -889,7 +889,7 @@ func waitDataSourceUpdated(ctx context.Context, conn *kendra.Client, id, indexId if output, ok := outputRaw.(*kendra.DescribeDataSourceOutput); ok { if output.Status == types.DataSourceStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) } return output, err } @@ -908,7 +908,7 @@ func waitDataSourceDeleted(ctx context.Context, conn *kendra.Client, id, indexId outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*kendra.DescribeDataSourceOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) return output, err } diff --git a/internal/service/kendra/experience.go b/internal/service/kendra/experience.go index b5cd1c82b57..431afeb178a 100644 --- a/internal/service/kendra/experience.go +++ b/internal/service/kendra/experience.go @@ -358,7 +358,7 @@ func waitExperienceCreated(ctx context.Context, conn *kendra.Client, id, indexId outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*kendra.DescribeExperienceOutput); ok { if out.Status == types.ExperienceStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) } } @@ -378,7 +378,7 @@ func waitExperienceUpdated(ctx context.Context, conn *kendra.Client, id, indexId outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*kendra.DescribeExperienceOutput); ok { if out.Status == types.ExperienceStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) } } @@ -396,7 +396,7 @@ func waitExperienceDeleted(ctx context.Context, conn *kendra.Client, id, indexId outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*kendra.DescribeExperienceOutput); ok { if out.Status == types.ExperienceStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) } } diff --git a/internal/service/kendra/faq.go b/internal/service/kendra/faq.go index bdbe956c61b..c643b7a5a0b 100644 --- a/internal/service/kendra/faq.go +++ b/internal/service/kendra/faq.go @@ -316,7 +316,7 @@ func waitFaqCreated(ctx context.Context, conn *kendra.Client, id, indexId string if output, ok := outputRaw.(*kendra.DescribeFaqOutput); ok { if output.Status == types.FaqStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) } return output, err } @@ -335,7 +335,7 @@ func waitFaqDeleted(ctx context.Context, conn *kendra.Client, id, indexId string outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*kendra.DescribeFaqOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) return output, err } diff --git a/internal/service/kendra/index.go b/internal/service/kendra/index.go index 62cde330ba4..cd1060eaa3e 100644 --- a/internal/service/kendra/index.go +++ b/internal/service/kendra/index.go @@ -672,7 +672,7 @@ func waitIndexCreated(ctx context.Context, conn *kendra.Client, id string, timeo if output, ok := outputRaw.(*kendra.DescribeIndexOutput); ok { if output.Status == types.IndexStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) } return output, err } @@ -692,7 +692,7 @@ func waitIndexUpdated(ctx context.Context, conn *kendra.Client, id string, timeo if output, ok := outputRaw.(*kendra.DescribeIndexOutput); ok { if output.Status == types.IndexStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) } return output, err } @@ -711,7 +711,7 @@ func waitIndexDeleted(ctx context.Context, conn *kendra.Client, id string, timeo outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*kendra.DescribeIndexOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) return output, err } diff --git a/internal/service/kendra/query_suggestions_block_list.go b/internal/service/kendra/query_suggestions_block_list.go index dffcf5fdd5c..63781adcbdf 100644 --- a/internal/service/kendra/query_suggestions_block_list.go +++ b/internal/service/kendra/query_suggestions_block_list.go @@ -324,7 +324,7 @@ func waitQuerySuggestionsBlockListCreated(ctx context.Context, conn *kendra.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*kendra.DescribeQuerySuggestionsBlockListOutput); ok { if out.Status == types.QuerySuggestionsBlockListStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) } return out, err } @@ -345,7 +345,7 @@ func waitQuerySuggestionsBlockListUpdated(ctx context.Context, conn *kendra.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*kendra.DescribeQuerySuggestionsBlockListOutput); ok { if out.Status == types.QuerySuggestionsBlockListStatusActiveButUpdateFailed || out.Status == types.QuerySuggestionsBlockListStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) } return out, err } @@ -364,7 +364,7 @@ func waitQuerySuggestionsBlockListDeleted(ctx context.Context, conn *kendra.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*kendra.DescribeQuerySuggestionsBlockListOutput); ok { if out.Status == types.QuerySuggestionsBlockListStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) } return out, err } diff --git a/internal/service/kendra/thesaurus.go b/internal/service/kendra/thesaurus.go index 0e267e93279..aecf28c8379 100644 --- a/internal/service/kendra/thesaurus.go +++ b/internal/service/kendra/thesaurus.go @@ -324,7 +324,7 @@ func waitThesaurusCreated(ctx context.Context, conn *kendra.Client, id, indexId outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*kendra.DescribeThesaurusOutput); ok { if out.Status == types.ThesaurusStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) } return out, err } @@ -345,7 +345,7 @@ func waitThesaurusUpdated(ctx context.Context, conn *kendra.Client, id, indexId outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*kendra.DescribeThesaurusOutput); ok { if out.Status == types.ThesaurusStatusActiveButUpdateFailed || out.Status == types.ThesaurusStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) } return out, err } @@ -364,7 +364,7 @@ func waitThesaurusDeleted(ctx context.Context, conn *kendra.Client, id, indexId outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*kendra.DescribeThesaurusOutput); ok { if out.Status == types.ThesaurusStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(out.ErrorMessage))) } return out, err } diff --git a/internal/service/kinesisanalyticsv2/application.go b/internal/service/kinesisanalyticsv2/application.go index 9dfcb6c5b38..058dbf1d1f6 100644 --- a/internal/service/kinesisanalyticsv2/application.go +++ b/internal/service/kinesisanalyticsv2/application.go @@ -1727,7 +1727,7 @@ func waitApplicationOperationSucceeded(ctx context.Context, conn *kinesisanalyti if output, ok := outputRaw.(*awstypes.ApplicationOperationInfoDetails); ok { if failureDetails := output.OperationFailureDetails; failureDetails != nil && failureDetails.ErrorInfo != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(failureDetails.ErrorInfo.ErrorString))) + retry.SetLastError(err, errors.New(aws.ToString(failureDetails.ErrorInfo.ErrorString))) } return output, err diff --git a/internal/service/lambda/event_source_mapping.go b/internal/service/lambda/event_source_mapping.go index 15bc64fc29f..aff296d7698 100644 --- a/internal/service/lambda/event_source_mapping.go +++ b/internal/service/lambda/event_source_mapping.go @@ -1002,7 +1002,7 @@ func waitEventSourceMappingCreated(ctx context.Context, conn *lambda.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lambda.GetEventSourceMappingOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateTransitionReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateTransitionReason))) return output, err } @@ -1024,7 +1024,7 @@ func waitEventSourceMappingUpdated(ctx context.Context, conn *lambda.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lambda.GetEventSourceMappingOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateTransitionReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateTransitionReason))) return output, err } @@ -1046,7 +1046,7 @@ func waitEventSourceMappingDeleted(ctx context.Context, conn *lambda.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lambda.GetEventSourceMappingOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateTransitionReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateTransitionReason))) return output, err } diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index d38ca7766f3..750fbd9311d 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1456,7 +1456,7 @@ func waitFunctionCreated(ctx context.Context, conn *lambda.Client, name string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.FunctionConfiguration); ok { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(output.StateReasonCode), aws.ToString(output.StateReason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(output.StateReasonCode), aws.ToString(output.StateReason))) return output, err } @@ -1476,7 +1476,7 @@ func waitFunctionUpdated(ctx context.Context, conn *lambda.Client, name string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.FunctionConfiguration); ok { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(output.LastUpdateStatusReasonCode), aws.ToString(output.LastUpdateStatusReason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(output.LastUpdateStatusReasonCode), aws.ToString(output.LastUpdateStatusReason))) return output, err } @@ -1496,7 +1496,7 @@ func waitFunctionConfigurationUpdated(ctx context.Context, conn *lambda.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lambda.GetFunctionConfigurationOutput); ok { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(output.LastUpdateStatusReasonCode), aws.ToString(output.LastUpdateStatusReason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(output.LastUpdateStatusReasonCode), aws.ToString(output.LastUpdateStatusReason))) return output, err } diff --git a/internal/service/lambda/provisioned_concurrency_config.go b/internal/service/lambda/provisioned_concurrency_config.go index a9028b551d1..7a17a1c2321 100644 --- a/internal/service/lambda/provisioned_concurrency_config.go +++ b/internal/service/lambda/provisioned_concurrency_config.go @@ -263,7 +263,7 @@ func waitProvisionedConcurrencyConfigReady(ctx context.Context, conn *lambda.Cli outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lambda.GetProvisionedConcurrencyConfigOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/lexmodels/wait.go b/internal/service/lexmodels/wait.go index 52792539f38..c276c7183ab 100644 --- a/internal/service/lexmodels/wait.go +++ b/internal/service/lexmodels/wait.go @@ -13,7 +13,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice/types" sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/internal/retry" ) const ( @@ -37,7 +37,7 @@ func waitBotVersionCreated(ctx context.Context, conn *lexmodelbuildingservice.Cl if output, ok := outputRaw.(*lexmodelbuildingservice.GetBotOutput); ok { if output.Status == awstypes.StatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) } return output, err @@ -62,7 +62,7 @@ func waitBotDeleted(ctx context.Context, conn *lexmodelbuildingservice.Client, n if output, ok := outputRaw.(*lexmodelbuildingservice.GetBotOutput); ok { if output.Status == awstypes.StatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) } return output, err diff --git a/internal/service/lexv2models/bot.go b/internal/service/lexv2models/bot.go index 07909b28435..c29b8163f2c 100644 --- a/internal/service/lexv2models/bot.go +++ b/internal/service/lexv2models/bot.go @@ -350,7 +350,7 @@ func waitBotCreated(ctx context.Context, conn *lexmodelsv2.Client, id string, ti outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lexmodelsv2.DescribeBotOutput); ok { - tfresource.SetLastError(err, botFailureReasons(output.FailureReasons)) + retry.SetLastError(err, botFailureReasons(output.FailureReasons)) return output, err } @@ -370,7 +370,7 @@ func waitBotUpdated(ctx context.Context, conn *lexmodelsv2.Client, id string, ti outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lexmodelsv2.DescribeBotOutput); ok { - tfresource.SetLastError(err, botFailureReasons(output.FailureReasons)) + retry.SetLastError(err, botFailureReasons(output.FailureReasons)) return output, err } @@ -389,7 +389,7 @@ func waitBotDeleted(ctx context.Context, conn *lexmodelsv2.Client, id string, ti outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lexmodelsv2.DescribeBotOutput); ok { - tfresource.SetLastError(err, botFailureReasons(output.FailureReasons)) + retry.SetLastError(err, botFailureReasons(output.FailureReasons)) return output, err } diff --git a/internal/service/lexv2models/bot_locale.go b/internal/service/lexv2models/bot_locale.go index 865442cf91c..f7edf8e0c7a 100644 --- a/internal/service/lexv2models/bot_locale.go +++ b/internal/service/lexv2models/bot_locale.go @@ -358,7 +358,7 @@ func waitBotLocaleCreated(ctx context.Context, conn *lexmodelsv2.Client, localeI outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lexmodelsv2.DescribeBotLocaleOutput); ok { - tfresource.SetLastError(err, botFailureReasons(output.FailureReasons)) + retry.SetLastError(err, botFailureReasons(output.FailureReasons)) return output, err } @@ -378,7 +378,7 @@ func waitBotLocaleUpdated(ctx context.Context, conn *lexmodelsv2.Client, localeI outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lexmodelsv2.DescribeBotLocaleOutput); ok { - tfresource.SetLastError(err, botFailureReasons(output.FailureReasons)) + retry.SetLastError(err, botFailureReasons(output.FailureReasons)) return output, err } @@ -397,7 +397,7 @@ func waitBotLocaleDeleted(ctx context.Context, conn *lexmodelsv2.Client, localeI outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lexmodelsv2.DescribeBotLocaleOutput); ok { - tfresource.SetLastError(err, botFailureReasons(output.FailureReasons)) + retry.SetLastError(err, botFailureReasons(output.FailureReasons)) return output, err } diff --git a/internal/service/lexv2models/bot_version.go b/internal/service/lexv2models/bot_version.go index 72aebf7b4cf..f7605af51c6 100644 --- a/internal/service/lexv2models/bot_version.go +++ b/internal/service/lexv2models/bot_version.go @@ -282,7 +282,7 @@ func waitBotVersionCreated(ctx context.Context, conn *lexmodelsv2.Client, botID, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lexmodelsv2.DescribeBotVersionOutput); ok { - tfresource.SetLastError(err, botFailureReasons(output.FailureReasons)) + retry.SetLastError(err, botFailureReasons(output.FailureReasons)) return output, err } @@ -301,7 +301,7 @@ func waitBotVersionDeleted(ctx context.Context, conn *lexmodelsv2.Client, botID, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*lexmodelsv2.DescribeBotVersionOutput); ok { - tfresource.SetLastError(err, botFailureReasons(output.FailureReasons)) + retry.SetLastError(err, botFailureReasons(output.FailureReasons)) return output, err } diff --git a/internal/service/lightsail/wait.go b/internal/service/lightsail/wait.go index b1e102ebb55..33baa4d1cea 100644 --- a/internal/service/lightsail/wait.go +++ b/internal/service/lightsail/wait.go @@ -15,7 +15,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/lightsail/types" sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/internal/retry" ) const ( @@ -133,7 +133,7 @@ func waitContainerServiceCreated(ctx context.Context, conn *lightsail.Client, se if output, ok := outputRaw.(*types.ContainerService); ok { if detail := output.StateDetail; detail != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(detail.Code), aws.ToString(detail.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(detail.Code), aws.ToString(detail.Message))) } return err @@ -156,7 +156,7 @@ func waitContainerServiceDisabled(ctx context.Context, conn *lightsail.Client, s if output, ok := outputRaw.(*types.ContainerService); ok { if detail := output.StateDetail; detail != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(detail.Code), aws.ToString(detail.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(detail.Code), aws.ToString(detail.Message))) } return err @@ -179,7 +179,7 @@ func waitContainerServiceUpdated(ctx context.Context, conn *lightsail.Client, se if output, ok := outputRaw.(*types.ContainerService); ok { if detail := output.StateDetail; detail != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(detail.Code), aws.ToString(detail.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(detail.Code), aws.ToString(detail.Message))) } return err @@ -202,7 +202,7 @@ func waitContainerServiceDeleted(ctx context.Context, conn *lightsail.Client, se if output, ok := outputRaw.(*types.ContainerService); ok { if detail := output.StateDetail; detail != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(detail.Code), aws.ToString(detail.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(detail.Code), aws.ToString(detail.Message))) } return err @@ -225,7 +225,7 @@ func waitContainerServiceDeploymentVersionActive(ctx context.Context, conn *ligh if output, ok := outputRaw.(*types.ContainerServiceDeployment); ok { if output.State == types.ContainerServiceDeploymentStateFailed { - tfresource.SetLastError(err, errors.New("The deployment failed. Use the GetContainerLog action to view the log events for the containers in the deployment to try to determine the reason for the failure.")) + retry.SetLastError(err, errors.New("The deployment failed. Use the GetContainerLog action to view the log events for the containers in the deployment to try to determine the reason for the failure.")) } return err diff --git a/internal/service/m2/application.go b/internal/service/m2/application.go index 71e84a776cc..3e7e3ca3558 100644 --- a/internal/service/m2/application.go +++ b/internal/service/m2/application.go @@ -468,7 +468,7 @@ func waitApplicationCreated(ctx context.Context, conn *m2.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetApplicationOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -487,7 +487,7 @@ func waitApplicationUpdated(ctx context.Context, conn *m2.Client, id string, ver outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetApplicationVersionOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -506,7 +506,7 @@ func waitApplicationDeleted(ctx context.Context, conn *m2.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetApplicationOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -525,7 +525,7 @@ func waitApplicationDeletedFromEnvironment(ctx context.Context, conn *m2.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetApplicationOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -545,7 +545,7 @@ func waitApplicationStopped(ctx context.Context, conn *m2.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetApplicationOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -565,7 +565,7 @@ func waitApplicationRunning(ctx context.Context, conn *m2.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetApplicationOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/m2/deployment.go b/internal/service/m2/deployment.go index aca6fb678a6..b3790fa1fa1 100644 --- a/internal/service/m2/deployment.go +++ b/internal/service/m2/deployment.go @@ -397,7 +397,7 @@ func waitDeploymentCreated(ctx context.Context, conn *m2.Client, applicationID, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetDeploymentOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -416,7 +416,7 @@ func waitDeploymentUpdated(ctx context.Context, conn *m2.Client, applicationID, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetDeploymentOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/m2/environment.go b/internal/service/m2/environment.go index c4a2dcf0469..4a5bdb6ed4e 100644 --- a/internal/service/m2/environment.go +++ b/internal/service/m2/environment.go @@ -504,7 +504,7 @@ func waitEnvironmentCreated(ctx context.Context, conn *m2.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetEnvironmentOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -523,7 +523,7 @@ func waitEnvironmentUpdated(ctx context.Context, conn *m2.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetEnvironmentOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } @@ -544,7 +544,7 @@ func waitEnvironmentDeleted(ctx context.Context, conn *m2.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*m2.GetEnvironmentOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/networkmanager/connect_attachment.go b/internal/service/networkmanager/connect_attachment.go index bd599493986..afb4258fd42 100644 --- a/internal/service/networkmanager/connect_attachment.go +++ b/internal/service/networkmanager/connect_attachment.go @@ -334,7 +334,7 @@ func waitConnectAttachmentCreated(ctx context.Context, conn *networkmanager.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ConnectAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -356,7 +356,7 @@ func waitConnectAttachmentDeleted(ctx context.Context, conn *networkmanager.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ConnectAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -375,7 +375,7 @@ func waitConnectAttachmentAvailable(ctx context.Context, conn *networkmanager.Cl outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ConnectAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } diff --git a/internal/service/networkmanager/connect_peer.go b/internal/service/networkmanager/connect_peer.go index 9509954d211..0dfca1a86b3 100644 --- a/internal/service/networkmanager/connect_peer.go +++ b/internal/service/networkmanager/connect_peer.go @@ -434,7 +434,7 @@ func waitConnectPeerCreated(ctx context.Context, conn *networkmanager.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ConnectPeer); ok { - tfresource.SetLastError(err, connectPeersError(output.LastModificationErrors)) + retry.SetLastError(err, connectPeersError(output.LastModificationErrors)) return output, err } @@ -456,7 +456,7 @@ func waitConnectPeerDeleted(ctx context.Context, conn *networkmanager.Client, id outputRaw, err := stateconf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ConnectPeer); ok { - tfresource.SetLastError(err, connectPeersError(output.LastModificationErrors)) + retry.SetLastError(err, connectPeersError(output.LastModificationErrors)) return output, err } diff --git a/internal/service/networkmanager/core_network.go b/internal/service/networkmanager/core_network.go index 2ab7e7658d9..8114859a224 100644 --- a/internal/service/networkmanager/core_network.go +++ b/internal/service/networkmanager/core_network.go @@ -589,7 +589,7 @@ func waitCoreNetworkPolicyCreated(ctx context.Context, conn *networkmanager.Clie errs = append(errs, fmt.Errorf("%s: %s", aws.ToString(err.ErrorCode), aws.ToString(err.Message))) } - tfresource.SetLastError(err, errors.Join(errs...)) + retry.SetLastError(err, errors.Join(errs...)) } return output, err diff --git a/internal/service/networkmanager/dx_gateway_attachment.go b/internal/service/networkmanager/dx_gateway_attachment.go index 20701f0885d..c50fbbff898 100644 --- a/internal/service/networkmanager/dx_gateway_attachment.go +++ b/internal/service/networkmanager/dx_gateway_attachment.go @@ -369,7 +369,7 @@ func waitDirectConnectGatewayAttachmentCreated(ctx context.Context, conn *networ outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DirectConnectGatewayAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -388,7 +388,7 @@ func waitDirectConnectGatewayAttachmentUpdated(ctx context.Context, conn *networ outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DirectConnectGatewayAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -410,7 +410,7 @@ func waitDirectConnectGatewayAttachmentDeleted(ctx context.Context, conn *networ outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DirectConnectGatewayAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -429,7 +429,7 @@ func waitDirectConnectGatewayAttachmentAvailable(ctx context.Context, conn *netw outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DirectConnectGatewayAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -448,7 +448,7 @@ func waitDirectConnectGatewayAttachmentRejected(ctx context.Context, conn *netwo outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DirectConnectGatewayAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } diff --git a/internal/service/networkmanager/site_to_site_vpn_attachment.go b/internal/service/networkmanager/site_to_site_vpn_attachment.go index f8934cc045e..2afc0fc4b88 100644 --- a/internal/service/networkmanager/site_to_site_vpn_attachment.go +++ b/internal/service/networkmanager/site_to_site_vpn_attachment.go @@ -262,7 +262,7 @@ func waitSiteToSiteVPNAttachmentCreated(ctx context.Context, conn *networkmanage outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.SiteToSiteVpnAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -284,7 +284,7 @@ func waitSiteToSiteVPNAttachmentDeleted(ctx context.Context, conn *networkmanage outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.SiteToSiteVpnAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -303,7 +303,7 @@ func waitSiteToSiteVPNAttachmentAvailable(ctx context.Context, conn *networkmana outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.SiteToSiteVpnAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } diff --git a/internal/service/networkmanager/transit_gateway_peering.go b/internal/service/networkmanager/transit_gateway_peering.go index 110b87af298..673a31e6d16 100644 --- a/internal/service/networkmanager/transit_gateway_peering.go +++ b/internal/service/networkmanager/transit_gateway_peering.go @@ -233,7 +233,7 @@ func waitTransitGatewayPeeringCreated(ctx context.Context, conn *networkmanager. outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TransitGatewayPeering); ok { - tfresource.SetLastError(err, peeringsError(output.Peering.LastModificationErrors)) + retry.SetLastError(err, peeringsError(output.Peering.LastModificationErrors)) return output, err } @@ -254,7 +254,7 @@ func waitTransitGatewayPeeringDeleted(ctx context.Context, conn *networkmanager. outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TransitGatewayPeering); ok { - tfresource.SetLastError(err, peeringsError(output.Peering.LastModificationErrors)) + retry.SetLastError(err, peeringsError(output.Peering.LastModificationErrors)) return output, err } diff --git a/internal/service/networkmanager/transit_gateway_registration.go b/internal/service/networkmanager/transit_gateway_registration.go index f25f3c7f3d5..70cc907dc46 100644 --- a/internal/service/networkmanager/transit_gateway_registration.go +++ b/internal/service/networkmanager/transit_gateway_registration.go @@ -259,7 +259,7 @@ func waitTransitGatewayRegistrationCreated(ctx context.Context, conn *networkman if output, ok := outputRaw.(*awstypes.TransitGatewayRegistration); ok { if state := output.State.Code; state == awstypes.TransitGatewayRegistrationStateFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.State.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.State.Message))) } return output, err @@ -280,7 +280,7 @@ func waitTransitGatewayRegistrationDeleted(ctx context.Context, conn *networkman if output, ok := outputRaw.(*awstypes.TransitGatewayRegistration); ok { if state := output.State.Code; state == awstypes.TransitGatewayRegistrationStateFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.State.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.State.Message))) } return output, err diff --git a/internal/service/networkmanager/transit_gateway_route_table_attachment.go b/internal/service/networkmanager/transit_gateway_route_table_attachment.go index 44e737b5c0d..582ab9ae1aa 100644 --- a/internal/service/networkmanager/transit_gateway_route_table_attachment.go +++ b/internal/service/networkmanager/transit_gateway_route_table_attachment.go @@ -248,7 +248,7 @@ func waitTransitGatewayRouteTableAttachmentCreated(ctx context.Context, conn *ne outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TransitGatewayRouteTableAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -268,7 +268,7 @@ func waitTransitGatewayRouteTableAttachmentDeleted(ctx context.Context, conn *ne outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TransitGatewayRouteTableAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -287,7 +287,7 @@ func waitTransitGatewayRouteTableAttachmentAvailable(ctx context.Context, conn * outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.TransitGatewayRouteTableAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } diff --git a/internal/service/networkmanager/vpc_attachment.go b/internal/service/networkmanager/vpc_attachment.go index 1f83c631adc..79e3a445f37 100644 --- a/internal/service/networkmanager/vpc_attachment.go +++ b/internal/service/networkmanager/vpc_attachment.go @@ -430,7 +430,7 @@ func waitVPCAttachmentCreated(ctx context.Context, conn *networkmanager.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -449,7 +449,7 @@ func waitVPCAttachmentAvailable(ctx context.Context, conn *networkmanager.Client outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -468,7 +468,7 @@ func waitVPCAttachmenRejected(ctx context.Context, conn *networkmanager.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -490,7 +490,7 @@ func waitVPCAttachmentDeleted(ctx context.Context, conn *networkmanager.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } @@ -509,7 +509,7 @@ func waitVPCAttachmentUpdated(ctx context.Context, conn *networkmanager.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.VpcAttachment); ok { - tfresource.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) + retry.SetLastError(err, attachmentsError(output.Attachment.LastModificationErrors)) return output, err } diff --git a/internal/service/notifications/notification_hub.go b/internal/service/notifications/notification_hub.go index 1a755561090..5c51c5dd897 100644 --- a/internal/service/notifications/notification_hub.go +++ b/internal/service/notifications/notification_hub.go @@ -246,7 +246,7 @@ func waitNotificationHubCreated(ctx context.Context, conn *notifications.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.NotificationHubOverview); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusSummary.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusSummary.Reason))) return output, err } @@ -265,7 +265,7 @@ func waitNotificationHubDeleted(ctx context.Context, conn *notifications.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.NotificationHubOverview); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusSummary.Reason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusSummary.Reason))) return output, err } diff --git a/internal/service/observabilityadmin/centralization_rule_for_organization.go b/internal/service/observabilityadmin/centralization_rule_for_organization.go index 8301331a01b..06eb09a789a 100644 --- a/internal/service/observabilityadmin/centralization_rule_for_organization.go +++ b/internal/service/observabilityadmin/centralization_rule_for_organization.go @@ -418,7 +418,7 @@ func waitCentralizationRuleForOrganizationHealthy(ctx context.Context, conn *obs outputRaw, err := stateConf.WaitForStateContext(ctx) if out, ok := outputRaw.(*observabilityadmin.GetCentralizationRuleForOrganizationOutput); ok { - tfresource.SetLastError(err, errors.New(string(out.FailureReason))) + retry.SetLastError(err, errors.New(string(out.FailureReason))) return out, smarterr.NewError(err) } diff --git a/internal/service/opensearch/inbound_connection_accepter.go b/internal/service/opensearch/inbound_connection_accepter.go index 8558f9fdcb3..6799d8f0483 100644 --- a/internal/service/opensearch/inbound_connection_accepter.go +++ b/internal/service/opensearch/inbound_connection_accepter.go @@ -235,7 +235,7 @@ func waitInboundConnectionAccepted(ctx context.Context, conn *opensearch.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.InboundConnection); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ConnectionStatus.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.ConnectionStatus.Message))) return output, err } @@ -254,7 +254,7 @@ func waitInboundConnectionRejected(ctx context.Context, conn *opensearch.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.InboundConnection); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ConnectionStatus.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.ConnectionStatus.Message))) return output, err } @@ -273,7 +273,7 @@ func waitInboundConnectionDeleted(ctx context.Context, conn *opensearch.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.InboundConnection); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ConnectionStatus.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.ConnectionStatus.Message))) return output, err } diff --git a/internal/service/opensearch/outbound_connection.go b/internal/service/opensearch/outbound_connection.go index 3829afbc641..dba990c4273 100644 --- a/internal/service/opensearch/outbound_connection.go +++ b/internal/service/opensearch/outbound_connection.go @@ -319,7 +319,7 @@ func waitOutboundConnectionCreated(ctx context.Context, conn *opensearch.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.OutboundConnection); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ConnectionStatus.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.ConnectionStatus.Message))) return output, err } @@ -343,7 +343,7 @@ func waitOutboundConnectionDeleted(ctx context.Context, conn *opensearch.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.OutboundConnection); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ConnectionStatus.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.ConnectionStatus.Message))) return output, err } diff --git a/internal/service/opensearch/package_association.go b/internal/service/opensearch/package_association.go index 5fda7b1fc9f..f30025d01a6 100644 --- a/internal/service/opensearch/package_association.go +++ b/internal/service/opensearch/package_association.go @@ -217,7 +217,7 @@ func waitPackageAssociationCreated(ctx context.Context, conn *opensearch.Client, if output, ok := outputRaw.(*awstypes.DomainPackageDetails); ok { if status, details := output.DomainPackageStatus, output.ErrorDetails; status == awstypes.DomainPackageStatusAssociationFailed && details != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(details.ErrorType), aws.ToString(details.ErrorMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(details.ErrorType), aws.ToString(details.ErrorMessage))) } return output, err @@ -239,7 +239,7 @@ func waitPackageAssociationDeleted(ctx context.Context, conn *opensearch.Client, if output, ok := outputRaw.(*awstypes.DomainPackageDetails); ok { if status, details := output.DomainPackageStatus, output.ErrorDetails; status == awstypes.DomainPackageStatusDissociationFailed && details != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(details.ErrorType), aws.ToString(details.ErrorMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(details.ErrorType), aws.ToString(details.ErrorMessage))) } return output, err diff --git a/internal/service/opensearchserverless/collection.go b/internal/service/opensearchserverless/collection.go index 47b4af1f4de..2d138442621 100644 --- a/internal/service/opensearchserverless/collection.go +++ b/internal/service/opensearchserverless/collection.go @@ -30,7 +30,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" "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" ) @@ -330,7 +329,7 @@ func waitCollectionCreated(ctx context.Context, conn *opensearchserverless.Clien if output, ok := outputRaw.(*awstypes.CollectionDetail); ok { if output.Status == awstypes.CollectionStatusFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err @@ -353,7 +352,7 @@ func waitCollectionDeleted(ctx context.Context, conn *opensearchserverless.Clien if output, ok := outputRaw.(*awstypes.CollectionDetail); ok { if output.Status == awstypes.CollectionStatusFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err diff --git a/internal/service/opensearchserverless/vpc_endpoint.go b/internal/service/opensearchserverless/vpc_endpoint.go index 8463bc05324..d10af5d8324 100644 --- a/internal/service/opensearchserverless/vpc_endpoint.go +++ b/internal/service/opensearchserverless/vpc_endpoint.go @@ -426,7 +426,7 @@ func waitVPCEndpointCreated(ctx context.Context, conn *opensearchserverless.Clie if output, ok := outputRaw.(*awstypes.VpcEndpointDetail); ok { if output.Status == awstypes.VpcEndpointStatusFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err @@ -448,7 +448,7 @@ func waitVPCEndpointUpdated(ctx context.Context, conn *opensearchserverless.Clie if output, ok := outputRaw.(*awstypes.VpcEndpointDetail); ok { if output.Status == awstypes.VpcEndpointStatusFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err @@ -470,7 +470,7 @@ func waitVPCEndpointDeleted(ctx context.Context, conn *opensearchserverless.Clie if output, ok := outputRaw.(*awstypes.VpcEndpointDetail); ok { if output.Status == awstypes.VpcEndpointStatusFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err diff --git a/internal/service/organizations/account.go b/internal/service/organizations/account.go index c7cfd1fb400..c9c696ccd07 100644 --- a/internal/service/organizations/account.go +++ b/internal/service/organizations/account.go @@ -497,7 +497,7 @@ func waitAccountCreated(ctx context.Context, conn *organizations.Client, id stri if output, ok := outputRaw.(*awstypes.CreateAccountStatus); ok { if state := output.State; state == awstypes.CreateAccountStateFailed { - tfresource.SetLastError(err, errors.New(string(output.FailureReason))) + retry.SetLastError(err, errors.New(string(output.FailureReason))) } return output, err diff --git a/internal/service/osis/pipeline.go b/internal/service/osis/pipeline.go index faebee81a6b..cbda5ecc77f 100644 --- a/internal/service/osis/pipeline.go +++ b/internal/service/osis/pipeline.go @@ -424,7 +424,7 @@ func waitPipelineCreated(ctx context.Context, conn *osis.Client, name string, ti if output, ok := outputRaw.(*awstypes.Pipeline); ok { if reason := output.StatusReason; reason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(reason.Description))) + retry.SetLastError(err, errors.New(aws.ToString(reason.Description))) } return output, err @@ -447,7 +447,7 @@ func waitPipelineUpdated(ctx context.Context, conn *osis.Client, name string, ti if output, ok := outputRaw.(*awstypes.Pipeline); ok { if reason := output.StatusReason; reason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(reason.Description))) + retry.SetLastError(err, errors.New(aws.ToString(reason.Description))) } return output, err @@ -470,7 +470,7 @@ func waitPipelineDeleted(ctx context.Context, conn *osis.Client, name string, ti if output, ok := outputRaw.(*awstypes.Pipeline); ok { if reason := output.StatusReason; reason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(reason.Description))) + retry.SetLastError(err, errors.New(aws.ToString(reason.Description))) } return output, err diff --git a/internal/service/pipes/pipe.go b/internal/service/pipes/pipe.go index 912f429dab1..c50800020fc 100644 --- a/internal/service/pipes/pipe.go +++ b/internal/service/pipes/pipe.go @@ -387,7 +387,7 @@ func waitPipeCreated(ctx context.Context, conn *pipes.Client, id string, timeout outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*pipes.DescribePipeOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } @@ -407,7 +407,7 @@ func waitPipeUpdated(ctx context.Context, conn *pipes.Client, id string, timeout outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*pipes.DescribePipeOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } @@ -425,7 +425,7 @@ func waitPipeDeleted(ctx context.Context, conn *pipes.Client, id string, timeout outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*pipes.DescribePipeOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StateReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StateReason))) return output, err } diff --git a/internal/service/qldb/stream.go b/internal/service/qldb/stream.go index b665a837042..0f539764229 100644 --- a/internal/service/qldb/stream.go +++ b/internal/service/qldb/stream.go @@ -304,7 +304,7 @@ func waitStreamCreated(ctx context.Context, conn *qldb.Client, ledgerName, strea outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.JournalKinesisStreamDescription); ok { - tfresource.SetLastError(err, errors.New(string(output.ErrorCause))) + retry.SetLastError(err, errors.New(string(output.ErrorCause))) return output, err } @@ -340,7 +340,7 @@ func waitStreamDeleted(ctx context.Context, conn *qldb.Client, ledgerName, strea outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.JournalKinesisStreamDescription); ok { - tfresource.SetLastError(err, errors.New(string(output.ErrorCause))) + retry.SetLastError(err, errors.New(string(output.ErrorCause))) return output, err } diff --git a/internal/service/quicksight/analysis.go b/internal/service/quicksight/analysis.go index 1eedd166f52..31dbaf8a8e7 100644 --- a/internal/service/quicksight/analysis.go +++ b/internal/service/quicksight/analysis.go @@ -469,7 +469,7 @@ func waitAnalysisCreated(ctx context.Context, conn *quicksight.Client, awsAccoun if output, ok := outputRaw.(*awstypes.Analysis); ok { if status, apiErrors := output.Status, output.Errors; status == awstypes.ResourceStatusCreationFailed { - tfresource.SetLastError(err, analysisError(apiErrors)) + retry.SetLastError(err, analysisError(apiErrors)) } return output, err @@ -490,7 +490,7 @@ func waitAnalysisUpdated(ctx context.Context, conn *quicksight.Client, awsAccoun if output, ok := outputRaw.(*awstypes.Analysis); ok { if status, apiErrors := output.Status, output.Errors; status == awstypes.ResourceStatusUpdateFailed { - tfresource.SetLastError(err, analysisError(apiErrors)) + retry.SetLastError(err, analysisError(apiErrors)) } return output, err diff --git a/internal/service/quicksight/dashboard.go b/internal/service/quicksight/dashboard.go index 6e94559e3d4..785fe7a322a 100644 --- a/internal/service/quicksight/dashboard.go +++ b/internal/service/quicksight/dashboard.go @@ -489,7 +489,7 @@ func waitDashboardCreated(ctx context.Context, conn *quicksight.Client, awsAccou if output, ok := outputRaw.(*awstypes.Dashboard); ok { if status, apiErrors := output.Version.Status, output.Version.Errors; status == awstypes.ResourceStatusCreationFailed { - tfresource.SetLastError(err, dashboardError(apiErrors)) + retry.SetLastError(err, dashboardError(apiErrors)) } return output, err @@ -510,7 +510,7 @@ func waitDashboardUpdated(ctx context.Context, conn *quicksight.Client, awsAccou if output, ok := outputRaw.(*awstypes.Dashboard); ok { if status, apiErrors := output.Version.Status, output.Version.Errors; status == awstypes.ResourceStatusUpdateFailed { - tfresource.SetLastError(err, dashboardError(apiErrors)) + retry.SetLastError(err, dashboardError(apiErrors)) } return output, err diff --git a/internal/service/quicksight/data_source.go b/internal/service/quicksight/data_source.go index 2745f8b1704..11c0e7ae2e1 100644 --- a/internal/service/quicksight/data_source.go +++ b/internal/service/quicksight/data_source.go @@ -431,7 +431,7 @@ func waitDataSourceCreated(ctx context.Context, conn *quicksight.Client, awsAcco if output, ok := outputRaw.(*awstypes.DataSource); ok { if status, errorInfo := output.Status, output.ErrorInfo; status == awstypes.ResourceStatusCreationFailed { - tfresource.SetLastError(err, dataSourceError(errorInfo)) + retry.SetLastError(err, dataSourceError(errorInfo)) } return output, err @@ -455,7 +455,7 @@ func waitDataSourceUpdated(ctx context.Context, conn *quicksight.Client, awsAcco if output, ok := outputRaw.(*awstypes.DataSource); ok { if status, errorInfo := output.Status, output.ErrorInfo; status == awstypes.ResourceStatusUpdateFailed { - tfresource.SetLastError(err, dataSourceError(errorInfo)) + retry.SetLastError(err, dataSourceError(errorInfo)) } return output, err diff --git a/internal/service/quicksight/template.go b/internal/service/quicksight/template.go index edd0c868882..31031bda03a 100644 --- a/internal/service/quicksight/template.go +++ b/internal/service/quicksight/template.go @@ -434,7 +434,7 @@ func waitTemplateCreated(ctx context.Context, conn *quicksight.Client, awsAccoun if output, ok := outputRaw.(*awstypes.Template); ok { if status, apiErrors := output.Version.Status, output.Version.Errors; status == awstypes.ResourceStatusCreationFailed { - tfresource.SetLastError(err, templateError(apiErrors)) + retry.SetLastError(err, templateError(apiErrors)) } return output, err @@ -455,7 +455,7 @@ func waitTemplateUpdated(ctx context.Context, conn *quicksight.Client, awsAccoun if output, ok := outputRaw.(*awstypes.Template); ok { if status, apiErrors := output.Version.Status, output.Version.Errors; status == awstypes.ResourceStatusUpdateFailed { - tfresource.SetLastError(err, templateError(apiErrors)) + retry.SetLastError(err, templateError(apiErrors)) } return output, err diff --git a/internal/service/quicksight/theme.go b/internal/service/quicksight/theme.go index e53cd709bb5..a95f7a0a5c7 100644 --- a/internal/service/quicksight/theme.go +++ b/internal/service/quicksight/theme.go @@ -388,7 +388,7 @@ func waitThemeCreated(ctx context.Context, conn *quicksight.Client, awsAccountID if output, ok := outputRaw.(*awstypes.Theme); ok { if status, apiErrors := output.Version.Status, output.Version.Errors; status == awstypes.ResourceStatusCreationFailed { - tfresource.SetLastError(err, themeError(apiErrors)) + retry.SetLastError(err, themeError(apiErrors)) } return output, err @@ -409,7 +409,7 @@ func waitThemeUpdated(ctx context.Context, conn *quicksight.Client, awsAccountID if output, ok := outputRaw.(*awstypes.Theme); ok { if status, apiErrors := output.Version.Status, output.Version.Errors; status == awstypes.ResourceStatusUpdateFailed { - tfresource.SetLastError(err, themeError(apiErrors)) + retry.SetLastError(err, themeError(apiErrors)) } return output, err diff --git a/internal/service/ram/principal_association.go b/internal/service/ram/principal_association.go index 27ed2ee3764..56b6d08eb38 100644 --- a/internal/service/ram/principal_association.go +++ b/internal/service/ram/principal_association.go @@ -24,7 +24,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag" "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/retry" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" inttypes "github.com/hashicorp/terraform-provider-aws/internal/types" "github.com/hashicorp/terraform-provider-aws/internal/verify" "github.com/hashicorp/terraform-provider-aws/names" @@ -228,7 +227,7 @@ func waitPrincipalAssociationCreated(ctx context.Context, conn *ram.Client, reso outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResourceShareAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -250,7 +249,7 @@ func waitPrincipalAssociationDeleted(ctx context.Context, conn *ram.Client, reso outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResourceShareAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } diff --git a/internal/service/ram/resource_association.go b/internal/service/ram/resource_association.go index c005682814e..859015da4f7 100644 --- a/internal/service/ram/resource_association.go +++ b/internal/service/ram/resource_association.go @@ -248,7 +248,7 @@ func waitResourceAssociationCreated(ctx context.Context, conn *ram.Client, resou outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResourceShareAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -270,7 +270,7 @@ func waitResourceAssociationDeleted(ctx context.Context, conn *ram.Client, resou outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResourceShareAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } diff --git a/internal/service/ram/resource_share.go b/internal/service/ram/resource_share.go index 3de6863c9e1..894130719df 100644 --- a/internal/service/ram/resource_share.go +++ b/internal/service/ram/resource_share.go @@ -291,7 +291,7 @@ func waitResourceShareOwnedBySelfActive(ctx context.Context, conn *ram.Client, a outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResourceShare); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -310,7 +310,7 @@ func waitResourceShareOwnedBySelfDeleted(ctx context.Context, conn *ram.Client, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResourceShare); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } diff --git a/internal/service/ram/resource_share_accepter.go b/internal/service/ram/resource_share_accepter.go index 69918d777d3..704b3c65eac 100644 --- a/internal/service/ram/resource_share_accepter.go +++ b/internal/service/ram/resource_share_accepter.go @@ -401,7 +401,7 @@ func waitResourceShareOwnedBySelfDisassociated(ctx context.Context, conn *ram.Cl outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResourceShare); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } diff --git a/internal/service/rds/export_task.go b/internal/service/rds/export_task.go index 84e99f49668..9e0ddf278ef 100644 --- a/internal/service/rds/export_task.go +++ b/internal/service/rds/export_task.go @@ -327,7 +327,7 @@ func waitExportTaskCreated(ctx context.Context, conn *rds.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ExportTask); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureCause))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureCause))) return output, err } @@ -346,7 +346,7 @@ func waitExportTaskDeleted(ctx context.Context, conn *rds.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ExportTask); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureCause))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureCause))) return output, err } diff --git a/internal/service/rds/instance.go b/internal/service/rds/instance.go index cc40b1b2149..d65e657782e 100644 --- a/internal/service/rds/instance.go +++ b/internal/service/rds/instance.go @@ -3133,7 +3133,7 @@ func waitBlueGreenDeploymentSwitchoverCompleted(ctx context.Context, conn *rds.C if output, ok := outputRaw.(*types.BlueGreenDeployment); ok { if status := aws.ToString(output.Status); status == "INVALID_CONFIGURATION" || status == "SWITCHOVER_FAILED" { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusDetails))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusDetails))) } return output, err diff --git a/internal/service/rds/integration.go b/internal/service/rds/integration.go index 750ad64dc0e..750412808cb 100644 --- a/internal/service/rds/integration.go +++ b/internal/service/rds/integration.go @@ -323,7 +323,7 @@ func waitIntegrationCreated(ctx context.Context, conn *rds.Client, arn string, t outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Integration); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.Errors, integrationError)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.Errors, integrationError)...)) return output, err } @@ -342,7 +342,7 @@ func waitIntegrationDeleted(ctx context.Context, conn *rds.Client, arn string, t outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Integration); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.Errors, integrationError)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.Errors, integrationError)...)) return output, err } diff --git a/internal/service/rds/snapshot.go b/internal/service/rds/snapshot.go index 448fea0bd3e..4646591caf4 100644 --- a/internal/service/rds/snapshot.go +++ b/internal/service/rds/snapshot.go @@ -356,7 +356,7 @@ func waitDBSnapshotCreated(ctx context.Context, conn *rds.Client, id string, tim outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.DBSnapshot); ok { - tfresource.SetLastError(err, fmt.Errorf("%d%% progress", aws.ToInt32(output.PercentProgress))) + retry.SetLastError(err, fmt.Errorf("%d%% progress", aws.ToInt32(output.PercentProgress))) return output, err } diff --git a/internal/service/redshift/cluster.go b/internal/service/redshift/cluster.go index b7784651683..1efa7c7ca2a 100644 --- a/internal/service/redshift/cluster.go +++ b/internal/service/redshift/cluster.go @@ -1054,7 +1054,7 @@ func waitClusterRestored(ctx context.Context, conn *redshift.Client, id string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Cluster); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) + retry.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) return output, err } diff --git a/internal/service/redshift/wait.go b/internal/service/redshift/wait.go index 94d29c984e4..2fcd49a64f4 100644 --- a/internal/service/redshift/wait.go +++ b/internal/service/redshift/wait.go @@ -13,8 +13,8 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/redshift/types" sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/retry" tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) const ( @@ -35,7 +35,7 @@ func waitClusterCreated(ctx context.Context, conn *redshift.Client, id string, t outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Cluster); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) + retry.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) return output, err } @@ -54,7 +54,7 @@ func waitClusterDeleted(ctx context.Context, conn *redshift.Client, id string, t outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Cluster); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) + retry.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) return output, err } @@ -73,7 +73,7 @@ func waitClusterUpdated(ctx context.Context, conn *redshift.Client, id string, t outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Cluster); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) + retry.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) return output, err } @@ -110,7 +110,7 @@ func waitClusterRebooted(ctx context.Context, conn *redshift.Client, id string, outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Cluster); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) + retry.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) return output, err } @@ -130,7 +130,7 @@ func waitClusterAquaApplied(ctx context.Context, conn *redshift.Client, id strin outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Cluster); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) + retry.SetLastError(err, errors.New(aws.ToString(output.ClusterStatus))) return output, err } @@ -151,7 +151,7 @@ func waitEndpointAccessActive(ctx context.Context, conn *redshift.Client, id str outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.EndpointAccess); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.EndpointStatus))) + retry.SetLastError(err, errors.New(aws.ToString(output.EndpointStatus))) return output, err } @@ -172,7 +172,7 @@ func waitEndpointAccessDeleted(ctx context.Context, conn *redshift.Client, id st outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.EndpointAccess); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.EndpointStatus))) + retry.SetLastError(err, errors.New(aws.ToString(output.EndpointStatus))) return output, err } @@ -193,7 +193,7 @@ func waitClusterSnapshotCreated(ctx context.Context, conn *redshift.Client, id s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Snapshot); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status))) return output, err } @@ -214,7 +214,7 @@ func waitClusterSnapshotDeleted(ctx context.Context, conn *redshift.Client, id s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Snapshot); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Status))) + retry.SetLastError(err, errors.New(aws.ToString(output.Status))) return output, err } @@ -233,7 +233,7 @@ func waitIntegrationCreated(ctx context.Context, conn *redshift.Client, arn stri outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Integration); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.Errors, integrationError)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.Errors, integrationError)...)) return output, err } @@ -252,7 +252,7 @@ func waitIntegrationUpdated(ctx context.Context, conn *redshift.Client, arn stri outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Integration); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.Errors, integrationError)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.Errors, integrationError)...)) return output, err } @@ -271,7 +271,7 @@ func waitIntegrationDeleted(ctx context.Context, conn *redshift.Client, arn stri outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.Integration); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.Errors, integrationError)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.Errors, integrationError)...)) return output, err } diff --git a/internal/service/resourcegroups/group.go b/internal/service/resourcegroups/group.go index 26fccad4f5d..ce0f41ea7c6 100644 --- a/internal/service/resourcegroups/group.go +++ b/internal/service/resourcegroups/group.go @@ -372,7 +372,7 @@ func waitGroupConfigurationUpdated(ctx context.Context, conn *resourcegroups.Cli if output, ok := outputRaw.(*types.GroupConfiguration); ok { if status := output.Status; status == types.GroupConfigurationStatusUpdateFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) } return output, err diff --git a/internal/service/route53/hosted_zone_dnssec.go b/internal/service/route53/hosted_zone_dnssec.go index c91f9f2133a..b728d6b5595 100644 --- a/internal/service/route53/hosted_zone_dnssec.go +++ b/internal/service/route53/hosted_zone_dnssec.go @@ -272,7 +272,7 @@ func waitHostedZoneDNSSECStatusUpdated(ctx context.Context, conn *route53.Client if output, ok := outputRaw.(*awstypes.DNSSECStatus); ok { if serveSignature := aws.ToString(output.ServeSignature); serveSignature == serveSignatureInternalFailure { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err diff --git a/internal/service/route53/key_signing_key.go b/internal/service/route53/key_signing_key.go index 2684bbf3e6c..08484bd89c8 100644 --- a/internal/service/route53/key_signing_key.go +++ b/internal/service/route53/key_signing_key.go @@ -390,7 +390,7 @@ func waitKeySigningKeyStatusUpdated(ctx context.Context, conn *route53.Client, h if output, ok := outputRaw.(*awstypes.KeySigningKey); ok { if status := aws.ToString(output.Status); status == keySigningKeyStatusInternalFailure { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err diff --git a/internal/service/route53/traffic_policy_instance.go b/internal/service/route53/traffic_policy_instance.go index 8ddd16d596a..cea1a794476 100644 --- a/internal/service/route53/traffic_policy_instance.go +++ b/internal/service/route53/traffic_policy_instance.go @@ -246,7 +246,7 @@ func waitTrafficPolicyInstanceStateCreated(ctx context.Context, conn *route53.Cl if output, ok := outputRaw.(*awstypes.TrafficPolicyInstance); ok { if state := aws.ToString(output.State); state == trafficPolicyInstanceStateFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Message))) } return output, err @@ -267,7 +267,7 @@ func waitTrafficPolicyInstanceStateUpdated(ctx context.Context, conn *route53.Cl if output, ok := outputRaw.(*awstypes.TrafficPolicyInstance); ok { if state := aws.ToString(output.State); state == trafficPolicyInstanceStateFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Message))) } return output, err @@ -288,7 +288,7 @@ func waitTrafficPolicyInstanceStateDeleted(ctx context.Context, conn *route53.Cl if output, ok := outputRaw.(*awstypes.TrafficPolicyInstance); ok { if state := aws.ToString(output.State); state == trafficPolicyInstanceStateFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Message))) } return output, err diff --git a/internal/service/route53domains/operation.go b/internal/service/route53domains/operation.go index 2e57773e115..fe1abd25790 100644 --- a/internal/service/route53domains/operation.go +++ b/internal/service/route53domains/operation.go @@ -29,7 +29,7 @@ func waitOperationSucceeded(ctx context.Context, conn *route53domains.Client, id outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*route53domains.GetOperationDetailOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Message))) + retry.SetLastError(err, errors.New(aws.ToString(output.Message))) return output, err } diff --git a/internal/service/route53resolver/endpoint.go b/internal/service/route53resolver/endpoint.go index 8ffe85f3a83..13f2e9f1c5d 100644 --- a/internal/service/route53resolver/endpoint.go +++ b/internal/service/route53resolver/endpoint.go @@ -384,7 +384,7 @@ func waitEndpointCreated(ctx context.Context, conn *route53resolver.Client, id s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResolverEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -405,7 +405,7 @@ func waitEndpointUpdated(ctx context.Context, conn *route53resolver.Client, id s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResolverEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -426,7 +426,7 @@ func waitEndpointDeleted(ctx context.Context, conn *route53resolver.Client, id s outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResolverEndpoint); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } diff --git a/internal/service/route53resolver/firewall_domain_list.go b/internal/service/route53resolver/firewall_domain_list.go index 7a4cb5bc34a..d293d2a1199 100644 --- a/internal/service/route53resolver/firewall_domain_list.go +++ b/internal/service/route53resolver/firewall_domain_list.go @@ -263,7 +263,7 @@ func waitFirewallDomainListUpdated(ctx context.Context, conn *route53resolver.Cl if output, ok := outputRaw.(*awstypes.FirewallDomainList); ok { if status := output.Status; status == awstypes.FirewallDomainListStatusCompleteImportFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err diff --git a/internal/service/route53resolver/firewall_rule_group_association.go b/internal/service/route53resolver/firewall_rule_group_association.go index b0f51f07f47..eeef458dc66 100644 --- a/internal/service/route53resolver/firewall_rule_group_association.go +++ b/internal/service/route53resolver/firewall_rule_group_association.go @@ -245,7 +245,7 @@ func waitFirewallRuleGroupAssociationCreated(ctx context.Context, conn *route53r outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.FirewallRuleGroupAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -264,7 +264,7 @@ func waitFirewallRuleGroupAssociationUpdated(ctx context.Context, conn *route53r outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.FirewallRuleGroupAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -283,7 +283,7 @@ func waitFirewallRuleGroupAssociationDeleted(ctx context.Context, conn *route53r outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.FirewallRuleGroupAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } diff --git a/internal/service/route53resolver/query_log_config_association.go b/internal/service/route53resolver/query_log_config_association.go index e21eb97ba68..03319d02a82 100644 --- a/internal/service/route53resolver/query_log_config_association.go +++ b/internal/service/route53resolver/query_log_config_association.go @@ -179,7 +179,7 @@ func waitQueryLogConfigAssociationCreated(ctx context.Context, conn *route53reso if output, ok := outputRaw.(*awstypes.ResolverQueryLogConfigAssociation); ok { if status := output.Status; status == awstypes.ResolverQueryLogConfigAssociationStatusFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(output.Error), aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(output.Error), aws.ToString(output.ErrorMessage))) } return output, err @@ -200,7 +200,7 @@ func waitQueryLogConfigAssociationDeleted(ctx context.Context, conn *route53reso if output, ok := outputRaw.(*awstypes.ResolverQueryLogConfigAssociation); ok { if status := output.Status; status == awstypes.ResolverQueryLogConfigAssociationStatusFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", string(output.Error), aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", string(output.Error), aws.ToString(output.ErrorMessage))) } return output, err diff --git a/internal/service/route53resolver/rule.go b/internal/service/route53resolver/rule.go index 90902d8cb8a..2561330a752 100644 --- a/internal/service/route53resolver/rule.go +++ b/internal/service/route53resolver/rule.go @@ -316,7 +316,7 @@ func waitRuleCreated(ctx context.Context, conn *route53resolver.Client, id strin if output, ok := outputRaw.(*awstypes.ResolverRule); ok { if output.Status == awstypes.ResolverRuleStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err @@ -337,7 +337,7 @@ func waitRuleUpdated(ctx context.Context, conn *route53resolver.Client, id strin if output, ok := outputRaw.(*awstypes.ResolverRule); ok { if output.Status == awstypes.ResolverRuleStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err @@ -358,7 +358,7 @@ func waitRuleDeleted(ctx context.Context, conn *route53resolver.Client, id strin if output, ok := outputRaw.(*awstypes.ResolverRule); ok { if output.Status == awstypes.ResolverRuleStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) } return output, err diff --git a/internal/service/route53resolver/rule_association.go b/internal/service/route53resolver/rule_association.go index f91fcd33fa9..0696d6fbcaf 100644 --- a/internal/service/route53resolver/rule_association.go +++ b/internal/service/route53resolver/rule_association.go @@ -194,7 +194,7 @@ func waitRuleAssociationCreated(ctx context.Context, conn *route53resolver.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResolverRuleAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } @@ -215,7 +215,7 @@ func waitRuleAssociationDeleted(ctx context.Context, conn *route53resolver.Clien outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.ResolverRuleAssociation); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusMessage))) return output, err } diff --git a/internal/service/s3/bucket_metadata_configuration.go b/internal/service/s3/bucket_metadata_configuration.go index 03c966b2270..31af8789652 100644 --- a/internal/service/s3/bucket_metadata_configuration.go +++ b/internal/service/s3/bucket_metadata_configuration.go @@ -478,7 +478,7 @@ func waitBucketMetadataInventoryTableConfigurationCreated(ctx context.Context, c if output, ok := outputRaw.(*awstypes.InventoryTableConfigurationResult); ok { if v := output.Error; v != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(v.ErrorCode), aws.ToString(v.ErrorMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(v.ErrorCode), aws.ToString(v.ErrorMessage))) } return output, err @@ -500,7 +500,7 @@ func waitBucketMetadataJournalTableConfigurationCreated(ctx context.Context, con if output, ok := outputRaw.(*awstypes.JournalTableConfigurationResult); ok { if v := output.Error; v != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(v.ErrorCode), aws.ToString(v.ErrorMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(v.ErrorCode), aws.ToString(v.ErrorMessage))) } return output, err diff --git a/internal/service/s3control/multi_region_access_point.go b/internal/service/s3control/multi_region_access_point.go index 29bac84a213..a40da893dcd 100644 --- a/internal/service/s3control/multi_region_access_point.go +++ b/internal/service/s3control/multi_region_access_point.go @@ -359,7 +359,7 @@ func waitMultiRegionAccessPointRequestSucceeded(ctx context.Context, conn *s3con if output, ok := outputRaw.(*types.AsyncOperation); ok { if status, responseDetails := aws.ToString(output.RequestStatus), output.ResponseDetails; status == asyncOperationRequestStatusFailed && responseDetails != nil && responseDetails.ErrorDetails != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(responseDetails.ErrorDetails.Code), aws.ToString(responseDetails.ErrorDetails.Message))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(responseDetails.ErrorDetails.Code), aws.ToString(responseDetails.ErrorDetails.Message))) } return output, err diff --git a/internal/service/sagemaker/endpoint.go b/internal/service/sagemaker/endpoint.go index e8047fd69fd..106944dbcaf 100644 --- a/internal/service/sagemaker/endpoint.go +++ b/internal/service/sagemaker/endpoint.go @@ -425,7 +425,7 @@ func waitEndpointInService(ctx context.Context, conn *sagemaker.Client, name str if output, ok := outputRaw.(*sagemaker.DescribeEndpointOutput); ok { if failureReason := output.FailureReason; failureReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(failureReason))) + retry.SetLastError(err, errors.New(aws.ToString(failureReason))) } return output, err @@ -449,7 +449,7 @@ func waitEndpointDeleted(ctx context.Context, conn *sagemaker.Client, name strin if output, ok := outputRaw.(*sagemaker.DescribeEndpointOutput); ok { if failureReason := output.FailureReason; failureReason != nil { - tfresource.SetLastError(err, errors.New(aws.ToString(failureReason))) + retry.SetLastError(err, errors.New(aws.ToString(failureReason))) } return output, err diff --git a/internal/service/sagemaker/user_profile.go b/internal/service/sagemaker/user_profile.go index f3ab8f63184..1d925237e8e 100644 --- a/internal/service/sagemaker/user_profile.go +++ b/internal/service/sagemaker/user_profile.go @@ -1151,7 +1151,7 @@ func waitUserProfileInService(ctx context.Context, conn *sagemaker.Client, domai outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*sagemaker.DescribeUserProfileOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) return output, err } @@ -1173,7 +1173,7 @@ func waitUserProfileDeleted(ctx context.Context, conn *sagemaker.Client, domainI outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*sagemaker.DescribeUserProfileOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) return output, err } diff --git a/internal/service/sagemaker/wait.go b/internal/service/sagemaker/wait.go index ad68de3e2a2..2e4a69802ed 100644 --- a/internal/service/sagemaker/wait.go +++ b/internal/service/sagemaker/wait.go @@ -13,7 +13,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/internal/retry" ) const ( @@ -65,7 +65,7 @@ func waitNotebookInstanceInService(ctx context.Context, conn *sagemaker.Client, if output, ok := outputRaw.(*sagemaker.DescribeNotebookInstanceOutput); ok { if output.NotebookInstanceStatus == awstypes.NotebookInstanceStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) } return err @@ -86,7 +86,7 @@ func waitNotebookInstanceStarted(ctx context.Context, conn *sagemaker.Client, no if output, ok := outputRaw.(*sagemaker.DescribeNotebookInstanceOutput); ok { if output.NotebookInstanceStatus == awstypes.NotebookInstanceStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) } return err @@ -107,7 +107,7 @@ func waitNotebookInstanceStopped(ctx context.Context, conn *sagemaker.Client, no if output, ok := outputRaw.(*sagemaker.DescribeNotebookInstanceOutput); ok { if output.NotebookInstanceStatus == awstypes.NotebookInstanceStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) } return err @@ -128,7 +128,7 @@ func waitNotebookInstanceDeleted(ctx context.Context, conn *sagemaker.Client, no if output, ok := outputRaw.(*sagemaker.DescribeNotebookInstanceOutput); ok { if output.NotebookInstanceStatus == awstypes.NotebookInstanceStatusFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) } return output, err @@ -183,7 +183,7 @@ func waitImageCreated(ctx context.Context, conn *sagemaker.Client, name string) if output, ok := outputRaw.(*sagemaker.DescribeImageOutput); ok { if status, reason := output.ImageStatus, aws.ToString(output.FailureReason); (status == awstypes.ImageStatusCreateFailed || status == awstypes.ImageStatusUpdateFailed) && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return err @@ -204,7 +204,7 @@ func waitImageDeleted(ctx context.Context, conn *sagemaker.Client, name string) if output, ok := outputRaw.(*sagemaker.DescribeImageOutput); ok { if status, reason := output.ImageStatus, aws.ToString(output.FailureReason); status == awstypes.ImageStatusDeleteFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return err @@ -225,7 +225,7 @@ func waitImageVersionCreated(ctx context.Context, conn *sagemaker.Client, name s if output, ok := outputRaw.(*sagemaker.DescribeImageVersionOutput); ok { if status, reason := output.ImageVersionStatus, aws.ToString(output.FailureReason); status == awstypes.ImageVersionStatusCreateFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -246,7 +246,7 @@ func waitImageVersionDeleted(ctx context.Context, conn *sagemaker.Client, name s if output, ok := outputRaw.(*sagemaker.DescribeImageVersionOutput); ok { if status, reason := output.ImageVersionStatus, aws.ToString(output.FailureReason); status == awstypes.ImageVersionStatusDeleteFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -267,7 +267,7 @@ func waitDomainInService(ctx context.Context, conn *sagemaker.Client, domainID s if output, ok := outputRaw.(*sagemaker.DescribeDomainOutput); ok { if status, reason := output.Status, aws.ToString(output.FailureReason); status == awstypes.DomainStatusFailed || status == awstypes.DomainStatusUpdateFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return err @@ -288,7 +288,7 @@ func waitDomainDeleted(ctx context.Context, conn *sagemaker.Client, domainID str if output, ok := outputRaw.(*sagemaker.DescribeDomainOutput); ok { if status, reason := output.Status, aws.ToString(output.FailureReason); status == awstypes.DomainStatusDeleteFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -309,7 +309,7 @@ func waitFeatureGroupCreated(ctx context.Context, conn *sagemaker.Client, name s if output, ok := outputRaw.(*sagemaker.DescribeFeatureGroupOutput); ok { if status, reason := output.FeatureGroupStatus, aws.ToString(output.FailureReason); status == awstypes.FeatureGroupStatusCreateFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -330,7 +330,7 @@ func waitFeatureGroupDeleted(ctx context.Context, conn *sagemaker.Client, name s if output, ok := outputRaw.(*sagemaker.DescribeFeatureGroupOutput); ok { if status, reason := output.FeatureGroupStatus, aws.ToString(output.FailureReason); status == awstypes.FeatureGroupStatusDeleteFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -351,7 +351,7 @@ func waitFeatureGroupUpdated(ctx context.Context, conn *sagemaker.Client, name s if output, ok := outputRaw.(*sagemaker.DescribeFeatureGroupOutput); ok { if v := output.LastUpdateStatus; v != nil && v.Status == awstypes.LastUpdateStatusValueFailed { - tfresource.SetLastError(err, errors.New(*v.FailureReason)) + retry.SetLastError(err, errors.New(*v.FailureReason)) } return output, err @@ -372,7 +372,7 @@ func waitAppInService(ctx context.Context, conn *sagemaker.Client, domainID, use if output, ok := outputRaw.(*sagemaker.DescribeAppOutput); ok { if status, reason := output.Status, aws.ToString(output.FailureReason); status == awstypes.AppStatusFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -393,7 +393,7 @@ func waitAppDeleted(ctx context.Context, conn *sagemaker.Client, domainID, userP if output, ok := outputRaw.(*sagemaker.DescribeAppOutput); ok { if status, reason := output.Status, aws.ToString(output.FailureReason); status == awstypes.AppStatusFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -414,7 +414,7 @@ func waitFlowDefinitionActive(ctx context.Context, conn *sagemaker.Client, name if output, ok := outputRaw.(*sagemaker.DescribeFlowDefinitionOutput); ok { if status, reason := output.FlowDefinitionStatus, aws.ToString(output.FailureReason); status == awstypes.FlowDefinitionStatusFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -435,7 +435,7 @@ func waitFlowDefinitionDeleted(ctx context.Context, conn *sagemaker.Client, name if output, ok := outputRaw.(*sagemaker.DescribeFlowDefinitionOutput); ok { if status, reason := output.FlowDefinitionStatus, aws.ToString(output.FailureReason); status == awstypes.FlowDefinitionStatusFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -456,7 +456,7 @@ func waitProjectDeleted(ctx context.Context, conn *sagemaker.Client, name string if output, ok := outputRaw.(*sagemaker.DescribeProjectOutput); ok { if status, reason := output.ProjectStatus, aws.ToString(output.ServiceCatalogProvisionedProductDetails.ProvisionedProductStatusMessage); status == awstypes.ProjectStatusDeleteFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -477,7 +477,7 @@ func waitProjectCreated(ctx context.Context, conn *sagemaker.Client, name string if output, ok := outputRaw.(*sagemaker.DescribeProjectOutput); ok { if status, reason := output.ProjectStatus, aws.ToString(output.ServiceCatalogProvisionedProductDetails.ProvisionedProductStatusMessage); status == awstypes.ProjectStatusCreateFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -498,7 +498,7 @@ func waitProjectUpdated(ctx context.Context, conn *sagemaker.Client, name string if output, ok := outputRaw.(*sagemaker.DescribeProjectOutput); ok { if status, reason := output.ProjectStatus, aws.ToString(output.ServiceCatalogProvisionedProductDetails.ProvisionedProductStatusMessage); status == awstypes.ProjectStatusUpdateFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -519,7 +519,7 @@ func waitWorkforceActive(ctx context.Context, conn *sagemaker.Client, name strin if output, ok := outputRaw.(*awstypes.Workforce); ok { if status, reason := output.Status, aws.ToString(output.FailureReason); status == awstypes.WorkforceStatusFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return err @@ -540,7 +540,7 @@ func waitWorkforceDeleted(ctx context.Context, conn *sagemaker.Client, name stri if output, ok := outputRaw.(*awstypes.Workforce); ok { if status, reason := output.Status, aws.ToString(output.FailureReason); status == awstypes.WorkforceStatusFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -561,7 +561,7 @@ func waitSpaceInService(ctx context.Context, conn *sagemaker.Client, domainId, n if output, ok := outputRaw.(*sagemaker.DescribeSpaceOutput); ok { if status, reason := output.Status, aws.ToString(output.FailureReason); status == awstypes.SpaceStatusUpdateFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return err @@ -582,7 +582,7 @@ func waitSpaceDeleted(ctx context.Context, conn *sagemaker.Client, domainId, nam if output, ok := outputRaw.(*sagemaker.DescribeSpaceOutput); ok { if status, reason := output.Status, aws.ToString(output.FailureReason); status == awstypes.SpaceStatusDeleteFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -603,7 +603,7 @@ func waitMonitoringScheduleScheduled(ctx context.Context, conn *sagemaker.Client if output, ok := outputRaw.(*sagemaker.DescribeMonitoringScheduleOutput); ok { if status, reason := output.MonitoringScheduleStatus, aws.ToString(output.FailureReason); status == awstypes.ScheduleStatusFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return err @@ -624,7 +624,7 @@ func waitMonitoringScheduleNotFound(ctx context.Context, conn *sagemaker.Client, if output, ok := outputRaw.(*sagemaker.DescribeMonitoringScheduleOutput); ok { if status, reason := output.MonitoringScheduleStatus, aws.ToString(output.FailureReason); status == awstypes.ScheduleStatusFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -696,7 +696,7 @@ func waitHubInService(ctx context.Context, conn *sagemaker.Client, name string) if output, ok := outputRaw.(*sagemaker.DescribeHubOutput); ok { if status, reason := output.HubStatus, aws.ToString(output.FailureReason); status == awstypes.HubStatusCreateFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -717,7 +717,7 @@ func waitHubDeleted(ctx context.Context, conn *sagemaker.Client, name string) (* if output, ok := outputRaw.(*sagemaker.DescribeHubOutput); ok { if status, reason := output.HubStatus, aws.ToString(output.FailureReason); status == awstypes.HubStatusDeleteFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err @@ -738,7 +738,7 @@ func waitHubUpdated(ctx context.Context, conn *sagemaker.Client, name string) (* if output, ok := outputRaw.(*sagemaker.DescribeHubOutput); ok { if status, reason := output.HubStatus, aws.ToString(output.FailureReason); status == awstypes.HubStatusUpdateFailed && reason != "" { - tfresource.SetLastError(err, errors.New(reason)) + retry.SetLastError(err, errors.New(reason)) } return output, err diff --git a/internal/service/securityhub/configuration_policy_association.go b/internal/service/securityhub/configuration_policy_association.go index 63aa9c64dea..8cdd000b177 100644 --- a/internal/service/securityhub/configuration_policy_association.go +++ b/internal/service/securityhub/configuration_policy_association.go @@ -200,7 +200,7 @@ func waitConfigurationPolicyAssociationSucceeded(ctx context.Context, conn *secu } if output, ok := outputRaw.(*securityhub.GetConfigurationPolicyAssociationOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.AssociationStatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.AssociationStatusMessage))) return output, err } diff --git a/internal/service/securityhub/organization_configuration.go b/internal/service/securityhub/organization_configuration.go index 21b40f8763d..23ed1fbae2b 100644 --- a/internal/service/securityhub/organization_configuration.go +++ b/internal/service/securityhub/organization_configuration.go @@ -233,7 +233,7 @@ func waitOrganizationConfigurationEnabled(ctx context.Context, conn *securityhub outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*securityhub.DescribeOrganizationConfigurationOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.OrganizationConfiguration.StatusMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.OrganizationConfiguration.StatusMessage))) return output, err } diff --git a/internal/service/securityhub/standards_subscription.go b/internal/service/securityhub/standards_subscription.go index 93f95d1ca78..d1b8739ff98 100644 --- a/internal/service/securityhub/standards_subscription.go +++ b/internal/service/securityhub/standards_subscription.go @@ -219,7 +219,7 @@ func waitStandardsSubscriptionCreated(ctx context.Context, conn *securityhub.Cli if output, ok := outputRaw.(*types.StandardsSubscription); ok { if reason := output.StandardsStatusReason; reason != nil { - tfresource.SetLastError(err, errors.New(string(reason.StatusReasonCode))) + retry.SetLastError(err, errors.New(string(reason.StatusReasonCode))) } return output, err @@ -240,7 +240,7 @@ func waitStandardsSubscriptionDeleted(ctx context.Context, conn *securityhub.Cli if output, ok := outputRaw.(*types.StandardsSubscription); ok { if reason := output.StandardsStatusReason; reason != nil { - tfresource.SetLastError(err, errors.New(string(reason.StatusReasonCode))) + retry.SetLastError(err, errors.New(string(reason.StatusReasonCode))) } return output, err diff --git a/internal/service/securitylake/data_lake.go b/internal/service/securitylake/data_lake.go index ab32aa26364..a1b4a54b8fd 100644 --- a/internal/service/securitylake/data_lake.go +++ b/internal/service/securitylake/data_lake.go @@ -461,7 +461,7 @@ func waitDataLakeCreated(ctx context.Context, conn *securitylake.Client, arn str if output, ok := outputRaw.(*awstypes.DataLakeResource); ok { if v := output.UpdateStatus; v != nil { if v := v.Exception; v != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(v.Code), aws.ToString(v.Reason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(v.Code), aws.ToString(v.Reason))) } } @@ -484,7 +484,7 @@ func waitDataLakeUpdated(ctx context.Context, conn *securitylake.Client, arn str if output, ok := outputRaw.(*awstypes.DataLakeResource); ok { if v := output.UpdateStatus; v != nil { if v := v.Exception; v != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(v.Code), aws.ToString(v.Reason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(v.Code), aws.ToString(v.Reason))) } } @@ -507,7 +507,7 @@ func waitDataLakeDeleted(ctx context.Context, conn *securitylake.Client, arn str if output, ok := outputRaw.(*awstypes.DataLakeResource); ok { if v := output.UpdateStatus; v != nil { if v := v.Exception; v != nil { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(v.Code), aws.ToString(v.Reason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(v.Code), aws.ToString(v.Reason))) } } diff --git a/internal/service/servicediscovery/operation.go b/internal/service/servicediscovery/operation.go index 2ac1ed3cdcc..ceee8e77d1a 100644 --- a/internal/service/servicediscovery/operation.go +++ b/internal/service/servicediscovery/operation.go @@ -37,7 +37,7 @@ func waitOperationSucceeded(ctx context.Context, conn *servicediscovery.Client, // "ErrorMessage":"The VPC that you chose, vpc-xxx in region xxx, is already associated with another private hosted zone that has an overlapping name space, xxx.. (Service: AmazonRoute53; Status Code: 400; Error Code: ConflictingDomainExists; Request ID: xxx)" // "Status":"FAIL", if status := output.Status; status == awstypes.OperationStatusFail { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.ErrorCode), aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.ErrorCode), aws.ToString(output.ErrorMessage))) } return output, err diff --git a/internal/service/signer/signing_job.go b/internal/service/signer/signing_job.go index 490b7d3a8d1..adad02af889 100644 --- a/internal/service/signer/signing_job.go +++ b/internal/service/signer/signing_job.go @@ -336,7 +336,7 @@ func waitSigningJobSucceeded(ctx context.Context, conn *signer.Client, id string outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*signer.DescribeSigningJobOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusReason))) return output, err } diff --git a/internal/service/ssm/association.go b/internal/service/ssm/association.go index 1533a3b9d15..6a5aadf2aa4 100644 --- a/internal/service/ssm/association.go +++ b/internal/service/ssm/association.go @@ -437,7 +437,7 @@ func waitAssociationCreated(ctx context.Context, conn *ssm.Client, id string, ti if output, ok := outputRaw.(*awstypes.AssociationDescription); ok { if status := awstypes.AssociationStatusName(aws.ToString(output.Overview.Status)); status == awstypes.AssociationStatusNameFailed { - tfresource.SetLastError(err, errors.New(aws.ToString(output.Overview.DetailedStatus))) + retry.SetLastError(err, errors.New(aws.ToString(output.Overview.DetailedStatus))) } return output, err diff --git a/internal/service/ssm/document.go b/internal/service/ssm/document.go index af64e5b5607..5b9e735ae61 100644 --- a/internal/service/ssm/document.go +++ b/internal/service/ssm/document.go @@ -596,7 +596,7 @@ func waitDocumentActive(ctx context.Context, conn *ssm.Client, name string) (*aw outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DocumentDescription); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusInformation))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusInformation))) return output, err } @@ -618,7 +618,7 @@ func waitDocumentDeleted(ctx context.Context, conn *ssm.Client, name string) (*a outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.DocumentDescription); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.StatusInformation))) + retry.SetLastError(err, errors.New(aws.ToString(output.StatusInformation))) return output, err } diff --git a/internal/service/ssoadmin/account_assignment.go b/internal/service/ssoadmin/account_assignment.go index 677f0f274a3..c073d525bb6 100644 --- a/internal/service/ssoadmin/account_assignment.go +++ b/internal/service/ssoadmin/account_assignment.go @@ -385,7 +385,7 @@ func waitAccountAssignmentCreated(ctx context.Context, conn *ssoadmin.Client, in outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.AccountAssignmentOperationStatus); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) return output, err } @@ -406,7 +406,7 @@ func waitAccountAssignmentDeleted(ctx context.Context, conn *ssoadmin.Client, in outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.AccountAssignmentOperationStatus); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) return output, err } diff --git a/internal/service/ssoadmin/permission_set.go b/internal/service/ssoadmin/permission_set.go index 105d1ca3a57..0eb04de0dbc 100644 --- a/internal/service/ssoadmin/permission_set.go +++ b/internal/service/ssoadmin/permission_set.go @@ -362,7 +362,7 @@ func waitPermissionSetProvisioned(ctx context.Context, conn *ssoadmin.Client, in outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.PermissionSetProvisioningStatus); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) return output, err } diff --git a/internal/service/storagegateway/file_system_association.go b/internal/service/storagegateway/file_system_association.go index 7819fc35f08..133d614172f 100644 --- a/internal/service/storagegateway/file_system_association.go +++ b/internal/service/storagegateway/file_system_association.go @@ -299,7 +299,7 @@ func waitFileSystemAssociationAvailable(ctx context.Context, conn *storagegatewa outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.FileSystemAssociationInfo); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FileSystemAssociationStatusDetails, fileSystemAssociationStatusDetailError)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FileSystemAssociationStatusDetails, fileSystemAssociationStatusDetailError)...)) return output, err } @@ -320,7 +320,7 @@ func waitFileSystemAssociationDeleted(ctx context.Context, conn *storagegateway. outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*awstypes.FileSystemAssociationInfo); ok { - tfresource.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FileSystemAssociationStatusDetails, fileSystemAssociationStatusDetailError)...)) + retry.SetLastError(err, errors.Join(tfslices.ApplyToAll(output.FileSystemAssociationStatusDetails, fileSystemAssociationStatusDetailError)...)) return output, err } diff --git a/internal/service/synthetics/wait.go b/internal/service/synthetics/wait.go index 1b1940c72b6..a951d924201 100644 --- a/internal/service/synthetics/wait.go +++ b/internal/service/synthetics/wait.go @@ -13,7 +13,7 @@ import ( awstypes "github.com/aws/aws-sdk-go-v2/service/synthetics/types" sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/enum" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/internal/retry" ) const ( @@ -35,7 +35,7 @@ func waitCanaryReady(ctx context.Context, conn *synthetics.Client, name string) if output, ok := outputRaw.(*awstypes.Canary); ok { if status := output.Status; status.State == awstypes.CanaryStateError { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", status.StateReasonCode, aws.ToString(status.StateReason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", status.StateReasonCode, aws.ToString(status.StateReason))) } return output, err @@ -61,7 +61,7 @@ func waitCanaryStopped(ctx context.Context, conn *synthetics.Client, name string if output, ok := outputRaw.(*awstypes.Canary); ok { if status := output.Status; status.State == awstypes.CanaryStateError { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", status.StateReasonCode, aws.ToString(status.StateReason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", status.StateReasonCode, aws.ToString(status.StateReason))) } return output, err @@ -85,7 +85,7 @@ func waitCanaryRunning(ctx context.Context, conn *synthetics.Client, name string if output, ok := outputRaw.(*awstypes.Canary); ok { if status := output.Status; status.State == awstypes.CanaryStateError { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", status.StateReasonCode, aws.ToString(status.StateReason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", status.StateReasonCode, aws.ToString(status.StateReason))) } return output, err @@ -106,7 +106,7 @@ func waitCanaryDeleted(ctx context.Context, conn *synthetics.Client, name string if output, ok := outputRaw.(*awstypes.Canary); ok { if status := output.Status; status.State == awstypes.CanaryStateError { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", status.StateReasonCode, aws.ToString(status.StateReason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", status.StateReasonCode, aws.ToString(status.StateReason))) } return output, err diff --git a/internal/service/vpclattice/resource_configuration.go b/internal/service/vpclattice/resource_configuration.go index c3b428282d2..0c058c609d9 100644 --- a/internal/service/vpclattice/resource_configuration.go +++ b/internal/service/vpclattice/resource_configuration.go @@ -478,7 +478,7 @@ func waitResourceConfigurationCreated(ctx context.Context, conn *vpclattice.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*vpclattice.GetResourceConfigurationOutput); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) + retry.SetLastError(err, errors.New(aws.ToString(output.FailureReason))) return output, err } diff --git a/internal/service/vpclattice/service_network_resource_association.go b/internal/service/vpclattice/service_network_resource_association.go index 52da5f96de3..b9844326575 100644 --- a/internal/service/vpclattice/service_network_resource_association.go +++ b/internal/service/vpclattice/service_network_resource_association.go @@ -247,7 +247,7 @@ func waitServiceNetworkResourceAssociationCreated(ctx context.Context, conn *vpc outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*vpclattice.GetServiceNetworkResourceAssociationOutput); ok { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureReason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureReason))) return output, err } @@ -266,7 +266,7 @@ func waitServiceNetworkResourceAssociationDeleted(ctx context.Context, conn *vpc outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*vpclattice.GetServiceNetworkResourceAssociationOutput); ok { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureReason))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureReason))) return output, err } diff --git a/internal/service/vpclattice/service_network_service_association.go b/internal/service/vpclattice/service_network_service_association.go index 32ddaa530b0..3b629c480f1 100644 --- a/internal/service/vpclattice/service_network_service_association.go +++ b/internal/service/vpclattice/service_network_service_association.go @@ -244,7 +244,7 @@ func waitServiceNetworkServiceAssociationCreated(ctx context.Context, conn *vpcl if output, ok := outputRaw.(*vpclattice.GetServiceNetworkServiceAssociationOutput); ok { if output.Status == types.ServiceNetworkServiceAssociationStatusCreateFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err @@ -265,7 +265,7 @@ func waitServiceNetworkServiceAssociationDeleted(ctx context.Context, conn *vpcl if output, ok := outputRaw.(*vpclattice.GetServiceNetworkServiceAssociationOutput); ok { if output.Status == types.ServiceNetworkServiceAssociationStatusDeleteFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err diff --git a/internal/service/vpclattice/service_network_vpc_association.go b/internal/service/vpclattice/service_network_vpc_association.go index 1682821d12d..c5ecc4ebfbb 100644 --- a/internal/service/vpclattice/service_network_vpc_association.go +++ b/internal/service/vpclattice/service_network_vpc_association.go @@ -245,7 +245,7 @@ func waitServiceNetworkVPCAssociationCreated(ctx context.Context, conn *vpclatti if output, ok := outputRaw.(*vpclattice.GetServiceNetworkVpcAssociationOutput); ok { if output.Status == types.ServiceNetworkVpcAssociationStatusCreateFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err @@ -266,7 +266,7 @@ func waitServiceNetworkVPCAssociationDeleted(ctx context.Context, conn *vpclatti if output, ok := outputRaw.(*vpclattice.GetServiceNetworkVpcAssociationOutput); ok { if output.Status == types.ServiceNetworkVpcAssociationStatusDeleteFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err diff --git a/internal/service/vpclattice/target_group.go b/internal/service/vpclattice/target_group.go index d192919c0d1..c4658bec8eb 100644 --- a/internal/service/vpclattice/target_group.go +++ b/internal/service/vpclattice/target_group.go @@ -387,7 +387,7 @@ func waitTargetGroupCreated(ctx context.Context, conn *vpclattice.Client, id str if output, ok := outputRaw.(*vpclattice.GetTargetGroupOutput); ok { if output.Status == types.TargetGroupStatusCreateFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err @@ -408,7 +408,7 @@ func waitTargetGroupDeleted(ctx context.Context, conn *vpclattice.Client, id str if output, ok := outputRaw.(*vpclattice.GetTargetGroupOutput); ok { if output.Status == types.TargetGroupStatusDeleteFailed { - tfresource.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) + retry.SetLastError(err, fmt.Errorf("%s: %s", aws.ToString(output.FailureCode), aws.ToString(output.FailureMessage))) } return output, err diff --git a/internal/service/vpclattice/target_group_attachment.go b/internal/service/vpclattice/target_group_attachment.go index 240001a0561..59bbd484b46 100644 --- a/internal/service/vpclattice/target_group_attachment.go +++ b/internal/service/vpclattice/target_group_attachment.go @@ -252,7 +252,7 @@ func waitTargetGroupAttachmentCreated(ctx context.Context, conn *vpclattice.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.TargetSummary); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ReasonCode))) + retry.SetLastError(err, errors.New(aws.ToString(output.ReasonCode))) return output, err } @@ -271,7 +271,7 @@ func waitTargetGroupAttachmentDeleted(ctx context.Context, conn *vpclattice.Clie outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.TargetSummary); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ReasonCode))) + retry.SetLastError(err, errors.New(aws.ToString(output.ReasonCode))) return output, err } diff --git a/internal/service/workspaces/directory.go b/internal/service/workspaces/directory.go index 3c92022bae4..a61b4b863f2 100644 --- a/internal/service/workspaces/directory.go +++ b/internal/service/workspaces/directory.go @@ -778,7 +778,7 @@ func waitDirectoryRegistered(ctx context.Context, conn *workspaces.Client, direc outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.WorkspaceDirectory); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) return output, err } @@ -804,7 +804,7 @@ func waitDirectoryDeregistered(ctx context.Context, conn *workspaces.Client, dir outputRaw, err := stateConf.WaitForStateContext(ctx) if output, ok := outputRaw.(*types.WorkspaceDirectory); ok { - tfresource.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) + retry.SetLastError(err, errors.New(aws.ToString(output.ErrorMessage))) return output, err } diff --git a/internal/tfresource/errors_test.go b/internal/tfresource/errors_test.go deleted file mode 100644 index 969e3747302..00000000000 --- a/internal/tfresource/errors_test.go +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -package tfresource_test - -import ( - "errors" - "strings" - "testing" - - sdkretry "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" - "github.com/hashicorp/terraform-provider-aws/internal/tfresource" -) - -func TestSetLastError(t *testing.T) { - t.Parallel() - - testCases := []struct { - Name string - Err error - LastErr error - Expected bool - }{ - { - Name: "nil error", - }, - { - Name: "other error", - Err: errors.New("test"), - LastErr: errors.New("last"), - }, - { - Name: "timeout error lastErr is nil", - Err: &sdkretry.TimeoutError{}, - }, - { - Name: "timeout error", - Err: &sdkretry.TimeoutError{}, - LastErr: errors.New("lasttest"), - Expected: true, - }, - { - Name: "timeout error non-nil last error lastErr is nil", - Err: &sdkretry.TimeoutError{LastError: errors.New("test")}, - }, - { - Name: "timeout error non-nil last error no overwrite", - Err: &sdkretry.TimeoutError{LastError: errors.New("test")}, - LastErr: errors.New("lasttest"), - }, - { - Name: "unexpected state error lastErr is nil", - Err: &sdkretry.UnexpectedStateError{}, - }, - { - Name: "unexpected state error", - Err: &sdkretry.UnexpectedStateError{}, - LastErr: errors.New("lasttest"), - Expected: true, - }, - { - Name: "unexpected state error non-nil last error lastErr is nil", - Err: &sdkretry.UnexpectedStateError{LastError: errors.New("test")}, - }, - { - Name: "unexpected state error non-nil last error no overwrite", - Err: &sdkretry.UnexpectedStateError{LastError: errors.New("test")}, - LastErr: errors.New("lasttest"), - }, - } - - for _, testCase := range testCases { - t.Run(testCase.Name, func(t *testing.T) { - t.Parallel() - - tfresource.SetLastError(testCase.Err, testCase.LastErr) - - if testCase.Err != nil { - got := testCase.Err.Error() - contains := strings.Contains(got, "lasttest") - - if (testCase.Expected && !contains) || (!testCase.Expected && contains) { - t.Errorf("got %s", got) - } - } - }) - } -} diff --git a/internal/vcr/.semgrep-vcr.yml b/internal/vcr/.semgrep-vcr.yml index d7ef6872a64..ff99e70990d 100644 --- a/internal/vcr/.semgrep-vcr.yml +++ b/internal/vcr/.semgrep-vcr.yml @@ -221,15 +221,3 @@ rules: paths: include: - "**/*.go" - - - id: internal-retry-setlasterror - languages: [go] - message: "Use retry.SetLastError to replace the deprecated tfresource alias" - severity: WARNING - pattern: | - tfresource.SetLastError($ERR, $LASTERR) - fix: | - retry.SetLastError($ERR, $LASTERR) - paths: - include: - - "**/*.go"