Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/aws_s3_bucket_object: Add source_hash attribute #11522

Merged
merged 6 commits into from
Jul 13, 2021
Merged

r/aws_s3_bucket_object: Add source_hash attribute #11522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26271f3
Add source_hash to aws_s3_bucket_object
theophilechevalier Jan 7, 2020
bef29fe
tests/r/s3_bucket_object: Clean up tests
YakDriver Jul 13, 2021
2ee18a5
tests/r/s3_bucket_object: Fix tests
YakDriver Jul 13, 2021
73fad55
docs/r/s3_bucket_object: Clean up documentation
YakDriver Jul 13, 2021
76e6415
r/s3_bucket_object: Add changelog
YakDriver Jul 13, 2021
efc078e
tests/r/s3_bucket_object: Add errorcheck
YakDriver Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/11522.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_s3_bucket_object: Add `source_hash` argument to compliment `etag`'s encryption limitations
```
12 changes: 12 additions & 0 deletions aws/resource_aws_s3_bucket_object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,11 @@ func resourceAwsS3BucketObject() *schema.Resource {
Optional: true,
ValidateFunc: validation.IsRFC3339Time,
},

"source_hash": {
Type: schema.TypeString,
Optional: true,
},
},
}
}
Expand Down Expand Up @@ -564,6 +569,12 @@ func resourceAwsS3BucketObjectCustomizeDiff(_ context.Context, d *schema.Resourc
if hasS3BucketObjectContentChanges(d) {
return d.SetNewComputed("version_id")
}

if d.HasChange("source_hash") {
d.SetNewComputed("version_id")
d.SetNewComputed("etag")
}

return nil
}

Expand All @@ -582,6 +593,7 @@ func hasS3BucketObjectContentChanges(d resourceDiffer) bool {
"metadata",
"server_side_encryption",
"source",
"source_hash",
"storage_class",
"website_redirect",
} {
Expand Down
Loading