Skip to content

Commit 3cdfb51

Browse files
gdavisongdavison
committed
Removes intretry alias for github.com/hashicorp/terraform-provider-aws/internal/retry 
1 parent 1d98915 commit 3cdfb51

18 files changed

+38
-41
lines changed

‎internal/service/appsync/api.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex"
3131
fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types"
3232
fwvalidators "github.com/hashicorp/terraform-provider-aws/internal/framework/validators"
33-
intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
33+
"github.com/hashicorp/terraform-provider-aws/internal/retry"
3434
"github.com/hashicorp/terraform-provider-aws/internal/smerr"
3535
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
3636
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -310,7 +310,7 @@ func (r *apiResource) Read(ctx context.Context, request resource.ReadRequest, re
310310
apiID := fwflex.StringValueFromFramework(ctx, data.ApiID)
311311
output, err := findAPIByID(ctx, conn, apiID)
312312

313-
if intretry.NotFound(err) {
313+
if retry.NotFound(err) {
314314
smerr.AddOne(ctx, &response.Diagnostics, fwdiag.NewResourceNotFoundWarningDiagnostic(err))
315315
response.State.RemoveResource(ctx)
316316
return

‎internal/service/appsync/api_cache.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/hashicorp/terraform-provider-aws/internal/enum"
2020
"github.com/hashicorp/terraform-provider-aws/internal/errs"
2121
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
22-
intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
22+
"github.com/hashicorp/terraform-provider-aws/internal/retry"
2323
"github.com/hashicorp/terraform-provider-aws/internal/smerr"
2424
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
2525
"github.com/hashicorp/terraform-provider-aws/names"
@@ -113,7 +113,7 @@ func resourceAPICacheRead(ctx context.Context, d *schema.ResourceData, meta any)
113113

114114
cache, err := findAPICacheByID(ctx, conn, d.Id())
115115

116-
if !d.IsNewResource() && intretry.NotFound(err) {
116+
if !d.IsNewResource() && retry.NotFound(err) {
117117
smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
118118
d.SetId("")
119119
return diags
@@ -208,7 +208,7 @@ func statusAPICache(ctx context.Context, conn *appsync.Client, name string) sdkr
208208
return func() (any, string, error) {
209209
output, err := findAPICacheByID(ctx, conn, name)
210210

211-
if intretry.NotFound(err) {
211+
if retry.NotFound(err) {
212212
return nil, "", nil
213213
}
214214

‎internal/service/appsync/api_key.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/hashicorp/terraform-provider-aws/internal/conns"
2222
"github.com/hashicorp/terraform-provider-aws/internal/errs"
2323
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
24-
intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
24+
"github.com/hashicorp/terraform-provider-aws/internal/retry"
2525
tfslices "github.com/hashicorp/terraform-provider-aws/internal/slices"
2626
"github.com/hashicorp/terraform-provider-aws/internal/smerr"
2727
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -112,7 +112,7 @@ func resourceAPIKeyRead(ctx context.Context, d *schema.ResourceData, meta any) d
112112

113113
key, err := findAPIKeyByTwoPartKey(ctx, conn, apiID, keyID)
114114

115-
if !d.IsNewResource() && intretry.NotFound(err) {
115+
if !d.IsNewResource() && retry.NotFound(err) {
116116
smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
117117
d.SetId("")
118118
return diags

‎internal/service/appsync/channel_namespace.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/hashicorp/terraform-provider-aws/internal/framework"
2828
fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex"
2929
fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types"
30-
intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
30+
"github.com/hashicorp/terraform-provider-aws/internal/retry"
3131
"github.com/hashicorp/terraform-provider-aws/internal/smerr"
3232
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
3333
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -213,7 +213,7 @@ func (r *channelNamespaceResource) Read(ctx context.Context, request resource.Re
213213
apiID, name := fwflex.StringValueFromFramework(ctx, data.ApiID), fwflex.StringValueFromFramework(ctx, data.Name)
214214
output, err := findChannelNamespaceByTwoPartKey(ctx, conn, apiID, name)
215215

216-
if intretry.NotFound(err) {
216+
if retry.NotFound(err) {
217217
smerr.AddOne(ctx, &response.Diagnostics, fwdiag.NewResourceNotFoundWarningDiagnostic(err))
218218
response.State.RemoveResource(ctx)
219219
return

‎internal/service/appsync/datasource.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/hashicorp/terraform-provider-aws/internal/enum"
2323
"github.com/hashicorp/terraform-provider-aws/internal/errs"
2424
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
25-
intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
25+
"github.com/hashicorp/terraform-provider-aws/internal/retry"
2626
"github.com/hashicorp/terraform-provider-aws/internal/sdkv2"
2727
"github.com/hashicorp/terraform-provider-aws/internal/smerr"
2828
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -356,7 +356,7 @@ func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta an
356356

357357
dataSource, err := findDataSourceByTwoPartKey(ctx, conn, apiID, name)
358358

359-
if !d.IsNewResource() && intretry.NotFound(err) {
359+
if !d.IsNewResource() && retry.NotFound(err) {
360360
smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
361361
d.SetId("")
362362
return diags

‎internal/service/appsync/domain_name.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/hashicorp/terraform-provider-aws/internal/conns"
1919
"github.com/hashicorp/terraform-provider-aws/internal/errs"
2020
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
21-
intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
21+
"github.com/hashicorp/terraform-provider-aws/internal/retry"
2222
"github.com/hashicorp/terraform-provider-aws/internal/smerr"
2323
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
2424
"github.com/hashicorp/terraform-provider-aws/internal/verify"
@@ -93,7 +93,7 @@ func resourceDomainNameRead(ctx context.Context, d *schema.ResourceData, meta an
9393

9494
domainName, err := findDomainNameByID(ctx, conn, d.Id())
9595

96-
if !d.IsNewResource() && intretry.NotFound(err) {
96+
if !d.IsNewResource() && retry.NotFound(err) {
9797
smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
9898
d.SetId("")
9999
return diags

‎internal/service/appsync/domain_name_api_association.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/hashicorp/terraform-provider-aws/internal/errs"
2222
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
2323
"github.com/hashicorp/terraform-provider-aws/internal/retry"
24-
intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
2524
"github.com/hashicorp/terraform-provider-aws/internal/smerr"
2625
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
2726
"github.com/hashicorp/terraform-provider-aws/names"
@@ -84,7 +83,7 @@ func resourceDomainNameAPIAssociationRead(ctx context.Context, d *schema.Resourc
8483

8584
association, err := findDomainNameAPIAssociationByID(ctx, conn, d.Id())
8685

87-
if !d.IsNewResource() && intretry.NotFound(err) {
86+
if !d.IsNewResource() && retry.NotFound(err) {
8887
smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
8988
d.SetId("")
9089
return diags
@@ -173,7 +172,7 @@ func statusDomainNameAPIAssociation(ctx context.Context, conn *appsync.Client, i
173172
return func() (any, string, error) {
174173
output, err := findDomainNameAPIAssociationByID(ctx, conn, id)
175174

176-
if intretry.NotFound(err) {
175+
if retry.NotFound(err) {
177176
return nil, "", nil
178177
}
179178

‎internal/service/appsync/function.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/hashicorp/terraform-provider-aws/internal/enum"
2323
"github.com/hashicorp/terraform-provider-aws/internal/errs"
2424
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
25-
intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
25+
"github.com/hashicorp/terraform-provider-aws/internal/retry"
2626
"github.com/hashicorp/terraform-provider-aws/internal/smerr"
2727
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
2828
"github.com/hashicorp/terraform-provider-aws/internal/verify"
@@ -219,7 +219,7 @@ func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta any)
219219

220220
function, err := findFunctionByTwoPartKey(ctx, conn, apiID, functionID)
221221

222-
if !d.IsNewResource() && intretry.NotFound(err) {
222+
if !d.IsNewResource() && retry.NotFound(err) {
223223
smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
224224
d.SetId("")
225225
return diags

‎internal/service/appsync/graphql_api.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/hashicorp/terraform-provider-aws/internal/errs"
2424
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
2525
"github.com/hashicorp/terraform-provider-aws/internal/retry"
26-
intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
2726
"github.com/hashicorp/terraform-provider-aws/internal/smerr"
2827
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
2928
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -413,7 +412,7 @@ func resourceGraphQLAPIRead(ctx context.Context, d *schema.ResourceData, meta an
413412

414413
api, err := findGraphQLAPIByID(ctx, conn, d.Id())
415414

416-
if !d.IsNewResource() && intretry.NotFound(err) {
415+
if !d.IsNewResource() && retry.NotFound(err) {
417416
smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
418417
d.SetId("")
419418
return diags
@@ -619,7 +618,7 @@ func statusSchemaCreation(ctx context.Context, conn *appsync.Client, id string)
619618
return func() (any, string, error) {
620619
output, err := findSchemaCreationStatusByID(ctx, conn, id)
621620

622-
if intretry.NotFound(err) {
621+
if retry.NotFound(err) {
623622
return nil, "", nil
624623
}
625624

‎internal/service/appsync/resolver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/hashicorp/terraform-provider-aws/internal/errs"
2424
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
2525
"github.com/hashicorp/terraform-provider-aws/internal/flex"
26-
intretry "github.com/hashicorp/terraform-provider-aws/internal/retry"
26+
"github.com/hashicorp/terraform-provider-aws/internal/retry"
2727
"github.com/hashicorp/terraform-provider-aws/internal/smerr"
2828
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
2929
"github.com/hashicorp/terraform-provider-aws/internal/verify"
@@ -259,7 +259,7 @@ func resourceResolverRead(ctx context.Context, d *schema.ResourceData, meta any)
259259

260260
resolver, err := findResolverByThreePartKey(ctx, conn, apiID, typeName, fieldName)
261261

262-
if !d.IsNewResource() && intretry.NotFound(err) {
262+
if !d.IsNewResource() && retry.NotFound(err) {
263263
smerr.AppendOne(ctx, diags, sdkdiag.NewResourceNotFoundWarningDiagnostic(err), smerr.ID, d.Id())
264264
d.SetId("")
265265
return diags

0 commit comments

Comments
 (0)