Skip to content

Commit b4486ff

Browse files
YakDriverYakDriver
authored
Merge pull request #41806 from hashicorp/td-modernize-go-ec2
ec2: Modernize Go code
2 parents 9eb352e + d5fb66d commit b4486ff

File tree

237 files changed

+2076
-2083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+2076
-2083
lines changed

‎.github/workflows/modern_go.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ jobs:
7575
- run: make TEST=./version/... modern-check
7676

7777
# Services
78+
- run: make TEST=./internal/service/ec2 modern-check
7879
- run: make TEST=./internal/service/mq modern-check
7980
- run: make TEST=./internal/service/wafregional modern-check
8081
- run: make TEST=./internal/service/wafv2 modern-check

‎internal/service/ec2/ebs_default_kms_key.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func resourceEBSDefaultKMSKey() *schema.Resource {
3636
}
3737
}
3838

39-
func resourceEBSDefaultKMSKeyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
39+
func resourceEBSDefaultKMSKeyCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
4040
var diags diag.Diagnostics
4141
conn := meta.(*conns.AWSClient).EC2Client(ctx)
4242

@@ -53,7 +53,7 @@ func resourceEBSDefaultKMSKeyCreate(ctx context.Context, d *schema.ResourceData,
5353
return append(diags, resourceEBSDefaultKMSKeyRead(ctx, d, meta)...)
5454
}
5555

56-
func resourceEBSDefaultKMSKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
56+
func resourceEBSDefaultKMSKeyRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
5757
var diags diag.Diagnostics
5858
conn := meta.(*conns.AWSClient).EC2Client(ctx)
5959

@@ -68,7 +68,7 @@ func resourceEBSDefaultKMSKeyRead(ctx context.Context, d *schema.ResourceData, m
6868
return diags
6969
}
7070

71-
func resourceEBSDefaultKMSKeyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
71+
func resourceEBSDefaultKMSKeyDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
7272
var diags diag.Diagnostics
7373
conn := meta.(*conns.AWSClient).EC2Client(ctx)
7474

‎internal/service/ec2/ebs_default_kms_key_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func dataSourceEBSDefaultKMSKey() *schema.Resource {
3131
},
3232
}
3333
}
34-
func dataSourceEBSDefaultKMSKeyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
34+
func dataSourceEBSDefaultKMSKeyRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
3535
var diags diag.Diagnostics
3636
conn := meta.(*conns.AWSClient).EC2Client(ctx)
3737

‎internal/service/ec2/ebs_encryption_by_default.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func resourceEBSEncryptionByDefault() *schema.Resource {
3737
}
3838
}
3939

40-
func resourceEBSEncryptionByDefaultCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
40+
func resourceEBSEncryptionByDefaultCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
4141
var diags diag.Diagnostics
4242
conn := meta.(*conns.AWSClient).EC2Client(ctx)
4343

@@ -52,7 +52,7 @@ func resourceEBSEncryptionByDefaultCreate(ctx context.Context, d *schema.Resourc
5252
return append(diags, resourceEBSEncryptionByDefaultRead(ctx, d, meta)...)
5353
}
5454

55-
func resourceEBSEncryptionByDefaultRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
55+
func resourceEBSEncryptionByDefaultRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
5656
var diags diag.Diagnostics
5757
conn := meta.(*conns.AWSClient).EC2Client(ctx)
5858

@@ -67,7 +67,7 @@ func resourceEBSEncryptionByDefaultRead(ctx context.Context, d *schema.ResourceD
6767
return diags
6868
}
6969

70-
func resourceEBSEncryptionByDefaultUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
70+
func resourceEBSEncryptionByDefaultUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
7171
var diags diag.Diagnostics
7272
conn := meta.(*conns.AWSClient).EC2Client(ctx)
7373

@@ -79,7 +79,7 @@ func resourceEBSEncryptionByDefaultUpdate(ctx context.Context, d *schema.Resourc
7979
return append(diags, resourceEBSEncryptionByDefaultRead(ctx, d, meta)...)
8080
}
8181

82-
func resourceEBSEncryptionByDefaultDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
82+
func resourceEBSEncryptionByDefaultDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
8383
var diags diag.Diagnostics
8484
conn := meta.(*conns.AWSClient).EC2Client(ctx)
8585

‎internal/service/ec2/ebs_encryption_by_default_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func dataSourceEBSEncryptionByDefault() *schema.Resource {
3232
},
3333
}
3434
}
35-
func dataSourceEBSEncryptionByDefaultRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
35+
func dataSourceEBSEncryptionByDefaultRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
3636
var diags diag.Diagnostics
3737
conn := meta.(*conns.AWSClient).EC2Client(ctx)
3838

‎internal/service/ec2/ebs_snapshot.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func resourceEBSSnapshot() *schema.Resource {
110110
}
111111
}
112112

113-
func resourceEBSSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
113+
func resourceEBSSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
114114
var diags diag.Diagnostics
115115
conn := meta.(*conns.AWSClient).EC2Client(ctx)
116116

@@ -129,7 +129,7 @@ func resourceEBSSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta
129129
}
130130

131131
outputRaw, err := tfresource.RetryWhenAWSErrMessageContains(ctx, 1*time.Minute,
132-
func() (interface{}, error) {
132+
func() (any, error) {
133133
return conn.CreateSnapshot(ctx, &input)
134134
},
135135
errCodeSnapshotCreationPerVolumeRateExceeded, "The maximum per volume CreateSnapshot request rate has been exceeded")
@@ -141,7 +141,7 @@ func resourceEBSSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta
141141
d.SetId(aws.ToString(outputRaw.(*ec2.CreateSnapshotOutput).SnapshotId))
142142

143143
_, err = tfresource.RetryWhenAWSErrCodeEquals(ctx, d.Timeout(schema.TimeoutCreate),
144-
func() (interface{}, error) {
144+
func() (any, error) {
145145
waiter := ec2.NewSnapshotCompletedWaiter(conn)
146146
return waiter.WaitForOutput(ctx, &ec2.DescribeSnapshotsInput{
147147
SnapshotIds: []string{d.Id()},
@@ -172,7 +172,7 @@ func resourceEBSSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta
172172
return append(diags, resourceEBSSnapshotRead(ctx, d, meta)...)
173173
}
174174

175-
func resourceEBSSnapshotRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
175+
func resourceEBSSnapshotRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
176176
var diags diag.Diagnostics
177177
conn := meta.(*conns.AWSClient).EC2Client(ctx)
178178

@@ -211,7 +211,7 @@ func resourceEBSSnapshotRead(ctx context.Context, d *schema.ResourceData, meta i
211211
return diags
212212
}
213213

214-
func resourceEBSSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
214+
func resourceEBSSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
215215
var diags diag.Diagnostics
216216
conn := meta.(*conns.AWSClient).EC2Client(ctx)
217217

@@ -255,12 +255,12 @@ func resourceEBSSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta
255255
return append(diags, resourceEBSSnapshotRead(ctx, d, meta)...)
256256
}
257257

258-
func resourceEBSSnapshotDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
258+
func resourceEBSSnapshotDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
259259
var diags diag.Diagnostics
260260
conn := meta.(*conns.AWSClient).EC2Client(ctx)
261261

262262
log.Printf("[INFO] Deleting EBS Snapshot: %s", d.Id())
263-
_, err := tfresource.RetryWhenAWSErrCodeEquals(ctx, d.Timeout(schema.TimeoutDelete), func() (interface{}, error) {
263+
_, err := tfresource.RetryWhenAWSErrCodeEquals(ctx, d.Timeout(schema.TimeoutDelete), func() (any, error) {
264264
return conn.DeleteSnapshot(ctx, &ec2.DeleteSnapshotInput{
265265
SnapshotId: aws.String(d.Id()),
266266
})

‎internal/service/ec2/ebs_snapshot_block_public_access.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func resourceEBSSnapshotBlockPublicAccess() *schema.Resource {
3838
}
3939
}
4040

41-
func resourceEBSSnapshotBlockPublicAccessPut(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
41+
func resourceEBSSnapshotBlockPublicAccessPut(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
4242
var diags diag.Diagnostics
4343
conn := meta.(*conns.AWSClient).EC2Client(ctx)
4444

@@ -60,7 +60,7 @@ func resourceEBSSnapshotBlockPublicAccessPut(ctx context.Context, d *schema.Reso
6060
return append(diags, resourceEBSSnapshotBlockPublicAccessRead(ctx, d, meta)...)
6161
}
6262

63-
func resourceEBSSnapshotBlockPublicAccessRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
63+
func resourceEBSSnapshotBlockPublicAccessRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
6464
var diags diag.Diagnostics
6565
conn := meta.(*conns.AWSClient).EC2Client(ctx)
6666

@@ -76,7 +76,7 @@ func resourceEBSSnapshotBlockPublicAccessRead(ctx context.Context, d *schema.Res
7676
return diags
7777
}
7878

79-
func resourceEBSSnapshotBlockPublicAccessDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
79+
func resourceEBSSnapshotBlockPublicAccessDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
8080
var diags diag.Diagnostics
8181
conn := meta.(*conns.AWSClient).EC2Client(ctx)
8282

‎internal/service/ec2/ebs_snapshot_copy.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func resourceEBSSnapshotCopy() *schema.Resource {
116116
}
117117
}
118118

119-
func resourceEBSSnapshotCopyCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
119+
func resourceEBSSnapshotCopyCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
120120
var diags diag.Diagnostics
121121
conn := meta.(*conns.AWSClient).EC2Client(ctx)
122122

@@ -151,7 +151,7 @@ func resourceEBSSnapshotCopyCreate(ctx context.Context, d *schema.ResourceData,
151151
d.SetId(aws.ToString(output.SnapshotId))
152152

153153
_, err = tfresource.RetryWhenAWSErrCodeEquals(ctx, d.Timeout(schema.TimeoutCreate),
154-
func() (interface{}, error) {
154+
func() (any, error) {
155155
return ec2.NewSnapshotCompletedWaiter(conn).WaitForOutput(ctx, &ec2.DescribeSnapshotsInput{
156156
SnapshotIds: []string{d.Id()},
157157
}, d.Timeout(schema.TimeoutCreate))

‎internal/service/ec2/ebs_snapshot_create_volume_permission.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func resourceSnapshotCreateVolumePermission() *schema.Resource {
5151
}
5252
}
5353

54-
func resourceSnapshotCreateVolumePermissionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
54+
func resourceSnapshotCreateVolumePermissionCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
5555
var diags diag.Diagnostics
5656
conn := meta.(*conns.AWSClient).EC2Client(ctx)
5757

@@ -76,7 +76,7 @@ func resourceSnapshotCreateVolumePermissionCreate(ctx context.Context, d *schema
7676

7777
d.SetId(id)
7878

79-
_, err = tfresource.RetryWhenNotFound(ctx, d.Timeout(schema.TimeoutCreate), func() (interface{}, error) {
79+
_, err = tfresource.RetryWhenNotFound(ctx, d.Timeout(schema.TimeoutCreate), func() (any, error) {
8080
return findCreateSnapshotCreateVolumePermissionByTwoPartKey(ctx, conn, snapshotID, accountID)
8181
})
8282

@@ -87,7 +87,7 @@ func resourceSnapshotCreateVolumePermissionCreate(ctx context.Context, d *schema
8787
return diags
8888
}
8989

90-
func resourceSnapshotCreateVolumePermissionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
90+
func resourceSnapshotCreateVolumePermissionRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
9191
var diags diag.Diagnostics
9292
conn := meta.(*conns.AWSClient).EC2Client(ctx)
9393

@@ -111,7 +111,7 @@ func resourceSnapshotCreateVolumePermissionRead(ctx context.Context, d *schema.R
111111
return diags
112112
}
113113

114-
func resourceSnapshotCreateVolumePermissionDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
114+
func resourceSnapshotCreateVolumePermissionDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
115115
var diags diag.Diagnostics
116116
conn := meta.(*conns.AWSClient).EC2Client(ctx)
117117

@@ -140,7 +140,7 @@ func resourceSnapshotCreateVolumePermissionDelete(ctx context.Context, d *schema
140140
return sdkdiag.AppendErrorf(diags, "deleting EBS Snapshot CreateVolumePermission (%s): %s", d.Id(), err)
141141
}
142142

143-
_, err = tfresource.RetryUntilNotFound(ctx, d.Timeout(schema.TimeoutDelete), func() (interface{}, error) {
143+
_, err = tfresource.RetryUntilNotFound(ctx, d.Timeout(schema.TimeoutDelete), func() (any, error) {
144144
return findCreateSnapshotCreateVolumePermissionByTwoPartKey(ctx, conn, snapshotID, accountID)
145145
})
146146

@@ -151,7 +151,7 @@ func resourceSnapshotCreateVolumePermissionDelete(ctx context.Context, d *schema
151151
return diags
152152
}
153153

154-
func resourceSnapshotCreateVolumePermissionCustomizeDiff(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error {
154+
func resourceSnapshotCreateVolumePermissionCustomizeDiff(ctx context.Context, diff *schema.ResourceDiff, meta any) error {
155155
if diff.Id() == "" {
156156
if snapshotID := diff.Get(names.AttrSnapshotID).(string); snapshotID != "" {
157157
conn := meta.(*conns.AWSClient).EC2Client(ctx)

‎internal/service/ec2/ebs_snapshot_data_source.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,22 @@ func dataSourceEBSSnapshot() *schema.Resource {
116116
}
117117
}
118118

119-
func dataSourceEBSSnapshotRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
119+
func dataSourceEBSSnapshotRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
120120
var diags diag.Diagnostics
121121
conn := meta.(*conns.AWSClient).EC2Client(ctx)
122122

123123
input := ec2.DescribeSnapshotsInput{}
124124

125-
if v, ok := d.GetOk("owners"); ok && len(v.([]interface{})) > 0 {
126-
input.OwnerIds = flex.ExpandStringValueList(v.([]interface{}))
125+
if v, ok := d.GetOk("owners"); ok && len(v.([]any)) > 0 {
126+
input.OwnerIds = flex.ExpandStringValueList(v.([]any))
127127
}
128128

129-
if v, ok := d.GetOk("restorable_by_user_ids"); ok && len(v.([]interface{})) > 0 {
130-
input.RestorableByUserIds = flex.ExpandStringValueList(v.([]interface{}))
129+
if v, ok := d.GetOk("restorable_by_user_ids"); ok && len(v.([]any)) > 0 {
130+
input.RestorableByUserIds = flex.ExpandStringValueList(v.([]any))
131131
}
132132

133-
if v, ok := d.GetOk("snapshot_ids"); ok && len(v.([]interface{})) > 0 {
134-
input.SnapshotIds = flex.ExpandStringValueList(v.([]interface{}))
133+
if v, ok := d.GetOk("snapshot_ids"); ok && len(v.([]any)) > 0 {
134+
input.SnapshotIds = flex.ExpandStringValueList(v.([]any))
135135
}
136136

137137
input.Filters = append(input.Filters, newCustomFilterList(

0 commit comments

Comments
 (0)