Skip to content

Commit 2365d9f

Browse files
committed
Fix golangci-lint 'gomnd'.
1 parent 77ffdc9 commit 2365d9f

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

internal/service/s3control/access_grant.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,13 @@ type granteeModel struct {
363363
GranteeType fwtypes.StringEnum[awstypes.GranteeType] `tfsdk:"grantee_type"`
364364
}
365365

366+
const (
367+
accessGrantResourceIDPartCount = 2
368+
)
369+
366370
func (data *accessGrantResourceModel) InitFromID() error {
367371
id := data.ID.ValueString()
368-
parts, err := flex.ExpandResourceId(id, 2, false)
372+
parts, err := flex.ExpandResourceId(id, accessGrantResourceIDPartCount, false)
369373

370374
if err != nil {
371375
return err
@@ -378,7 +382,7 @@ func (data *accessGrantResourceModel) InitFromID() error {
378382
}
379383

380384
func (data *accessGrantResourceModel) setID() {
381-
data.ID = types.StringValue(errs.Must(flex.FlattenResourceId([]string{data.AccountID.ValueString(), data.AccessGrantID.ValueString()}, 2, false)))
385+
data.ID = types.StringValue(errs.Must(flex.FlattenResourceId([]string{data.AccountID.ValueString(), data.AccessGrantID.ValueString()}, accessGrantResourceIDPartCount, false)))
382386
}
383387

384388
// API returns <AccessGrantsLocationConfiguration><S3SubPrefix></S3SubPrefix></AccessGrantsLocationConfiguration>.

internal/service/s3control/access_grants_location.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,9 +300,13 @@ type accessGrantsLocationResourceModel struct {
300300
TagsAll types.Map `tfsdk:"tags_all"`
301301
}
302302

303+
const (
304+
accessGrantsLocationResourceIDPartCount = 2
305+
)
306+
303307
func (data *accessGrantsLocationResourceModel) InitFromID() error {
304308
id := data.ID.ValueString()
305-
parts, err := flex.ExpandResourceId(id, 2, false)
309+
parts, err := flex.ExpandResourceId(id, accessGrantsLocationResourceIDPartCount, false)
306310

307311
if err != nil {
308312
return err
@@ -315,5 +319,5 @@ func (data *accessGrantsLocationResourceModel) InitFromID() error {
315319
}
316320

317321
func (data *accessGrantsLocationResourceModel) setID() {
318-
data.ID = types.StringValue(errs.Must(flex.FlattenResourceId([]string{data.AccountID.ValueString(), data.AccessGrantsLocationID.ValueString()}, 2, false)))
322+
data.ID = types.StringValue(errs.Must(flex.FlattenResourceId([]string{data.AccountID.ValueString(), data.AccessGrantsLocationID.ValueString()}, accessGrantsLocationResourceIDPartCount, false)))
319323
}

0 commit comments

Comments
 (0)