Skip to content

Commit b64416a

Browse files
gdavisongdavison
authored
Merge pull request #41464 from hashicorp/td-inputs-in-heap-ec2
Move inputs off heap with: some `ec2` sub-services
2 parents 05d57a8 + 75e9f19 commit b64416a

File tree

157 files changed

+1692
-1220
lines changed

Some content is hidden

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

157 files changed

+1692
-1220
lines changed

‎.ci/semgrep/aws/input-on-heap.yml‎

Lines changed: 356 additions & 33 deletions
Large diffs are not rendered by default.

‎internal/service/ec2/ebs_default_kms_key.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ func resourceEBSDefaultKMSKeyCreate(ctx context.Context, d *schema.ResourceData,
4040
var diags diag.Diagnostics
4141
conn := meta.(*conns.AWSClient).EC2Client(ctx)
4242

43-
resp, err := conn.ModifyEbsDefaultKmsKeyId(ctx, &ec2.ModifyEbsDefaultKmsKeyIdInput{
43+
input := ec2.ModifyEbsDefaultKmsKeyIdInput{
4444
KmsKeyId: aws.String(d.Get("key_arn").(string)),
45-
})
45+
}
46+
resp, err := conn.ModifyEbsDefaultKmsKeyId(ctx, &input)
4647
if err != nil {
4748
return sdkdiag.AppendErrorf(diags, "creating EBS default KMS key: %s", err)
4849
}
@@ -56,7 +57,8 @@ func resourceEBSDefaultKMSKeyRead(ctx context.Context, d *schema.ResourceData, m
5657
var diags diag.Diagnostics
5758
conn := meta.(*conns.AWSClient).EC2Client(ctx)
5859

59-
resp, err := conn.GetEbsDefaultKmsKeyId(ctx, &ec2.GetEbsDefaultKmsKeyIdInput{})
60+
input := ec2.GetEbsDefaultKmsKeyIdInput{}
61+
resp, err := conn.GetEbsDefaultKmsKeyId(ctx, &input)
6062
if err != nil {
6163
return sdkdiag.AppendErrorf(diags, "reading EBS default KMS key: %s", err)
6264
}
@@ -70,7 +72,8 @@ func resourceEBSDefaultKMSKeyDelete(ctx context.Context, d *schema.ResourceData,
7072
var diags diag.Diagnostics
7173
conn := meta.(*conns.AWSClient).EC2Client(ctx)
7274

73-
_, err := conn.ResetEbsDefaultKmsKeyId(ctx, &ec2.ResetEbsDefaultKmsKeyIdInput{})
75+
input := ec2.ResetEbsDefaultKmsKeyIdInput{}
76+
_, err := conn.ResetEbsDefaultKmsKeyId(ctx, &input)
7477
if err != nil {
7578
return sdkdiag.AppendErrorf(diags, "deleting EBS default KMS key: %s", err)
7679
}

‎internal/service/ec2/ebs_default_kms_key_data_source.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ func dataSourceEBSDefaultKMSKeyRead(ctx context.Context, d *schema.ResourceData,
3535
var diags diag.Diagnostics
3636
conn := meta.(*conns.AWSClient).EC2Client(ctx)
3737

38-
res, err := conn.GetEbsDefaultKmsKeyId(ctx, &ec2.GetEbsDefaultKmsKeyIdInput{})
38+
input := ec2.GetEbsDefaultKmsKeyIdInput{}
39+
res, err := conn.GetEbsDefaultKmsKeyId(ctx, &input)
3940
if err != nil {
4041
return sdkdiag.AppendErrorf(diags, "reading EBS default KMS key: %s", err)
4142
}

‎internal/service/ec2/ebs_default_kms_key_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ func testAccCheckEBSDefaultKMSKeyDestroy(ctx context.Context) resource.TestCheck
5555

5656
conn := acctest.Provider.Meta().(*conns.AWSClient).EC2Client(ctx)
5757

58-
resp, err := conn.GetEbsDefaultKmsKeyId(ctx, &ec2.GetEbsDefaultKmsKeyIdInput{})
58+
input := ec2.GetEbsDefaultKmsKeyIdInput{}
59+
resp, err := conn.GetEbsDefaultKmsKeyId(ctx, &input)
5960
if err != nil {
6061
return err
6162
}
@@ -87,7 +88,8 @@ func testAccCheckEBSDefaultKMSKey(ctx context.Context, name string) resource.Tes
8788

8889
conn := acctest.Provider.Meta().(*conns.AWSClient).EC2Client(ctx)
8990

90-
resp, err := conn.GetEbsDefaultKmsKeyId(ctx, &ec2.GetEbsDefaultKmsKeyIdInput{})
91+
input := ec2.GetEbsDefaultKmsKeyIdInput{}
92+
resp, err := conn.GetEbsDefaultKmsKeyId(ctx, &input)
9193
if err != nil {
9294
return err
9395
}

‎internal/service/ec2/ebs_encryption_by_default.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ func resourceEBSEncryptionByDefaultRead(ctx context.Context, d *schema.ResourceD
5656
var diags diag.Diagnostics
5757
conn := meta.(*conns.AWSClient).EC2Client(ctx)
5858

59-
resp, err := conn.GetEbsEncryptionByDefault(ctx, &ec2.GetEbsEncryptionByDefaultInput{})
59+
input := ec2.GetEbsEncryptionByDefaultInput{}
60+
resp, err := conn.GetEbsEncryptionByDefault(ctx, &input)
6061
if err != nil {
6162
return sdkdiag.AppendErrorf(diags, "reading EBS encryption by default: %s", err)
6263
}
@@ -94,9 +95,11 @@ func setEBSEncryptionByDefault(ctx context.Context, conn *ec2.Client, enabled bo
9495
var err error
9596

9697
if enabled {
97-
_, err = conn.EnableEbsEncryptionByDefault(ctx, &ec2.EnableEbsEncryptionByDefaultInput{})
98+
input := ec2.EnableEbsEncryptionByDefaultInput{}
99+
_, err = conn.EnableEbsEncryptionByDefault(ctx, &input)
98100
} else {
99-
_, err = conn.DisableEbsEncryptionByDefault(ctx, &ec2.DisableEbsEncryptionByDefaultInput{})
101+
input := ec2.DisableEbsEncryptionByDefaultInput{}
102+
_, err = conn.DisableEbsEncryptionByDefault(ctx, &input)
100103
}
101104

102105
return err

‎internal/service/ec2/ebs_encryption_by_default_data_source.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ func dataSourceEBSEncryptionByDefaultRead(ctx context.Context, d *schema.Resourc
3636
var diags diag.Diagnostics
3737
conn := meta.(*conns.AWSClient).EC2Client(ctx)
3838

39-
res, err := conn.GetEbsEncryptionByDefault(ctx, &ec2.GetEbsEncryptionByDefaultInput{})
39+
input := ec2.GetEbsEncryptionByDefaultInput{}
40+
res, err := conn.GetEbsEncryptionByDefault(ctx, &input)
4041
if err != nil {
4142
return sdkdiag.AppendErrorf(diags, "reading default EBS encryption toggle: %s", err)
4243
}

‎internal/service/ec2/ebs_encryption_by_default_data_source_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ func testAccCheckEBSEncryptionByDefaultDataSource(ctx context.Context, n string)
4848
return fmt.Errorf("No ID is set")
4949
}
5050

51-
actual, err := conn.GetEbsEncryptionByDefault(ctx, &ec2.GetEbsEncryptionByDefaultInput{})
51+
input := ec2.GetEbsEncryptionByDefaultInput{}
52+
actual, err := conn.GetEbsEncryptionByDefault(ctx, &input)
5253
if err != nil {
5354
return fmt.Errorf("Error reading default EBS encryption toggle: %q", err)
5455
}

‎internal/service/ec2/ebs_encryption_by_default_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ func testAccCheckEncryptionByDefaultDestroy(ctx context.Context) resource.TestCh
5454
return func(s *terraform.State) error {
5555
conn := acctest.Provider.Meta().(*conns.AWSClient).EC2Client(ctx)
5656

57-
response, err := conn.GetEbsEncryptionByDefault(ctx, &ec2.GetEbsEncryptionByDefaultInput{})
57+
input := ec2.GetEbsEncryptionByDefaultInput{}
58+
response, err := conn.GetEbsEncryptionByDefault(ctx, &input)
5859
if err != nil {
5960
return err
6061
}
@@ -80,7 +81,8 @@ func testAccCheckEBSEncryptionByDefault(ctx context.Context, n string, enabled b
8081

8182
conn := acctest.Provider.Meta().(*conns.AWSClient).EC2Client(ctx)
8283

83-
response, err := conn.GetEbsEncryptionByDefault(ctx, &ec2.GetEbsEncryptionByDefaultInput{})
84+
input := ec2.GetEbsEncryptionByDefaultInput{}
85+
response, err := conn.GetEbsEncryptionByDefault(ctx, &input)
8486
if err != nil {
8587
return err
8688
}

‎internal/service/ec2/ebs_fast_snapshot_restore.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ func (r *ebsFastSnapshotRestoreResource) Create(ctx context.Context, request res
8484

8585
availabilityZone := data.AvailabilityZone.ValueString()
8686
snapshotID := data.SnapshotID.ValueString()
87-
input := &ec2.EnableFastSnapshotRestoresInput{
87+
input := ec2.EnableFastSnapshotRestoresInput{
8888
AvailabilityZones: []string{availabilityZone},
8989
SourceSnapshotIds: []string{snapshotID},
9090
}
9191

92-
output, err := conn.EnableFastSnapshotRestores(ctx, input)
92+
output, err := conn.EnableFastSnapshotRestores(ctx, &input)
9393

9494
if err == nil && output != nil {
9595
err = enableFastSnapshotRestoreItemsError(output.Unsuccessful)
@@ -168,10 +168,11 @@ func (r *ebsFastSnapshotRestoreResource) Delete(ctx context.Context, request res
168168

169169
availabilityZone := data.AvailabilityZone.ValueString()
170170
snapshotID := data.SnapshotID.ValueString()
171-
_, err := conn.DisableFastSnapshotRestores(ctx, &ec2.DisableFastSnapshotRestoresInput{
171+
input := ec2.DisableFastSnapshotRestoresInput{
172172
AvailabilityZones: []string{availabilityZone},
173173
SourceSnapshotIds: []string{snapshotID},
174-
})
174+
}
175+
_, err := conn.DisableFastSnapshotRestores(ctx, &input)
175176

176177
if err != nil {
177178
response.Diagnostics.AddError(fmt.Sprintf("deleting EC2 EBS Fast Snapshot Restore (%s)", data.ID.ValueString()), err.Error())

‎internal/service/ec2/ebs_snapshot.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func resourceEBSSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta
117117
conn := meta.(*conns.AWSClient).EC2Client(ctx)
118118

119119
volumeID := d.Get("volume_id").(string)
120-
input := &ec2.CreateSnapshotInput{
120+
input := ec2.CreateSnapshotInput{
121121
TagSpecifications: getTagSpecificationsIn(ctx, awstypes.ResourceTypeSnapshot),
122122
VolumeId: aws.String(volumeID),
123123
}
@@ -132,7 +132,7 @@ func resourceEBSSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta
132132

133133
outputRaw, err := tfresource.RetryWhenAWSErrMessageContains(ctx, 1*time.Minute,
134134
func() (interface{}, error) {
135-
return conn.CreateSnapshot(ctx, input)
135+
return conn.CreateSnapshot(ctx, &input)
136136
},
137137
errCodeSnapshotCreationPerVolumeRateExceeded, "The maximum per volume CreateSnapshot request rate has been exceeded")
138138

@@ -156,10 +156,11 @@ func resourceEBSSnapshotCreate(ctx context.Context, d *schema.ResourceData, meta
156156
}
157157

158158
if v, ok := d.GetOk("storage_tier"); ok && v.(string) == string(awstypes.TargetStorageTierArchive) {
159-
_, err = conn.ModifySnapshotTier(ctx, &ec2.ModifySnapshotTierInput{
159+
input := ec2.ModifySnapshotTierInput{
160160
SnapshotId: aws.String(d.Id()),
161161
StorageTier: awstypes.TargetStorageTier(v.(string)),
162-
})
162+
}
163+
_, err = conn.ModifySnapshotTier(ctx, &input)
163164

164165
if err != nil {
165166
return sdkdiag.AppendErrorf(diags, "updating EBS Snapshot (%s) Storage Tier: %s", d.Id(), err)
@@ -218,10 +219,11 @@ func resourceEBSSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta
218219

219220
if d.HasChange("storage_tier") {
220221
if tier := d.Get("storage_tier").(string); tier == string(awstypes.TargetStorageTierArchive) {
221-
_, err := conn.ModifySnapshotTier(ctx, &ec2.ModifySnapshotTierInput{
222+
input := ec2.ModifySnapshotTierInput{
222223
SnapshotId: aws.String(d.Id()),
223224
StorageTier: awstypes.TargetStorageTier(tier),
224-
})
225+
}
226+
_, err := conn.ModifySnapshotTier(ctx, &input)
225227

226228
if err != nil {
227229
return sdkdiag.AppendErrorf(diags, "updating EBS Snapshot (%s) Storage Tier: %s", d.Id(), err)
@@ -231,7 +233,7 @@ func resourceEBSSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta
231233
return sdkdiag.AppendErrorf(diags, "waiting for EBS Snapshot (%s) Storage Tier archive: %s", d.Id(), err)
232234
}
233235
} else {
234-
input := &ec2.RestoreSnapshotTierInput{
236+
input := ec2.RestoreSnapshotTierInput{
235237
SnapshotId: aws.String(d.Id()),
236238
}
237239

@@ -244,7 +246,7 @@ func resourceEBSSnapshotUpdate(ctx context.Context, d *schema.ResourceData, meta
244246
}
245247

246248
//Skipping waiter as restoring a snapshot takes 24-72 hours so state will reamin (https://aws.amazon.com/blogs/aws/new-amazon-ebs-snapshots-archive/)
247-
_, err := conn.RestoreSnapshotTier(ctx, input)
249+
_, err := conn.RestoreSnapshotTier(ctx, &input)
248250

249251
if err != nil {
250252
return sdkdiag.AppendErrorf(diags, "restoring EBS Snapshot (%s): %s", d.Id(), err)

0 commit comments

Comments
 (0)