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

No default value for acl attribute in s3 object #27197

Merged
merged 8 commits into from
May 24, 2023
+29 −8
Merged

No default value for acl attribute in s3 object #27197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec51e68
drop default value for acl s3 object
lomluca Oct 11, 2022
cdf6800
Merge branch 'main' into b-allow-no-acl-s3-object
jar-b May 24, 2023
ae934a2
docs: aws_s3_object v5 upgrade guide
jar-b May 24, 2023
e2177f1
r/aws_s3_object(test): fixed _tags post destroy bucket deletion error
jar-b May 24, 2023
f8a2826
r/aws_s3_object_copy: remove acl default
jar-b May 24, 2023
0d4b1c1
docs: aws_s3_object_copy v5 upgrade guide
jar-b May 24, 2023
9522900
chore: update changelog
jar-b May 24, 2023
c2e05f8
r/aws_s3_object_copy(docs): remove acl default
jar-b May 24, 2023
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
7 changes: 7 additions & 0 deletions .changelog/27197.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:bug
resource/aws_s3_object: Remove `acl` default in order to work with S3 buckets that have ACL disabled
```

```release-note:bug
resource/aws_s3_object_copy: Remove `acl` default in order to work with S3 buckets that have ACL disabled
```
6 changes: 4 additions & 2 deletions internal/service/s3/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ func ResourceObject() *schema.Resource {
Schema: map[string]*schema.Schema{
"acl": {
Type: schema.TypeString,
Default: s3.ObjectCannedACLPrivate,
Optional: true,
ValidateFunc: validation.StringInSlice(s3.ObjectCannedACL_Values(), false),
},
Expand Down Expand Up @@ -440,12 +439,15 @@ func resourceObjectUpload(ctx context.Context, d *schema.ResourceData, meta inte
key := d.Get("key").(string)

input := &s3manager.UploadInput{
ACL: aws.String(d.Get("acl").(string)),
Body: body,
Bucket: aws.String(bucket),
Key: aws.String(key),
}

if v, ok := d.GetOk("acl"); ok {
input.ACL = aws.String(v.(string))
}

if v, ok := d.GetOk("storage_class"); ok {
input.StorageClass = aws.String(v.(string))
}
Expand Down
1 change: 0 additions & 1 deletion internal/service/s3/object_copy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ func ResourceObjectCopy() *schema.Resource {
Schema: map[string]*schema.Schema{
"acl": {
Type: schema.TypeString,
Default: s3.ObjectCannedACLPrivate,
Optional: true,
ValidateFunc: validation.StringInSlice(s3.ObjectCannedACL_Values(), false),
ConflictsWith: []string{"grant"},
Expand Down
9 changes: 6 additions & 3 deletions internal/service/s3/object_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1847,7 +1847,8 @@ resource "aws_s3_object" "object" {
func testAccObjectConfig_tags(rName, key, content string) string {
return fmt.Sprintf(`
resource "aws_s3_bucket" "test" {
bucket = %[1]q
bucket = %[1]q
force_destroy = true
}

resource "aws_s3_bucket_versioning" "test" {
Expand Down Expand Up @@ -1875,7 +1876,8 @@ resource "aws_s3_object" "object" {
func testAccObjectConfig_updatedTags(rName, key, content string) string {
return fmt.Sprintf(`
resource "aws_s3_bucket" "test" {
bucket = %[1]q
bucket = %[1]q
force_destroy = true
}

resource "aws_s3_bucket_versioning" "test" {
Expand Down Expand Up @@ -1904,7 +1906,8 @@ resource "aws_s3_object" "object" {
func testAccObjectConfig_noTags(rName, key, content string) string {
return fmt.Sprintf(`
resource "aws_s3_bucket" "test" {
bucket = %[1]q
bucket = %[1]q
force_destroy = true
}

resource "aws_s3_bucket_versioning" "test" {
Expand Down
10 changes: 10 additions & 0 deletions website/docs/guides/version-5-upgrade.html.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ Upgrade topics:
- [resource/aws_redshift_security_group](#resourceaws_redshift_security_group)
- [resource/aws_route](#resourceaws_route)
- [resource/aws_route_table](#resourceaws_route_table)
- [resource/aws_s3_object](#resourceaws_s3_object)
- [resource/aws_s3_object_copy](#resourceaws_s3_object_copy)
- [resource/aws_secretsmanager_secret](#resourceaws_secretsmanager_secret)
- [resource/aws_security_group](#resourceaws_security_group)
- [resource/aws_security_group_rule](#resourceaws_security_group_rule)
Expand Down Expand Up @@ -523,6 +525,14 @@ resource "aws_route_table" "example" {
}
```

## resource/aws_s3_object

The `acl` attribute no longer has a default value. Previously this was set to `private` when omitted. Objects requiring a private ACL should now explicitly set this attribute.

## resource/aws_s3_object_copy

The `acl` attribute no longer has a default value. Previously this was set to `private` when omitted. Object copies requiring a private ACL should now explicitly set this attribute.

## resource/aws_secretsmanager_secret

Remove `rotation_enabled`, `rotation_lambda_arn` and `rotation_rules` from configurations as they no longer exist.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/s3_object.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ The following arguments are required:

The following arguments are optional:

* `acl` - (Optional) [Canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) to apply. Valid values are `private`, `public-read`, `public-read-write`, `aws-exec-read`, `authenticated-read`, `bucket-owner-read`, and `bucket-owner-full-control`. Defaults to `private`.
* `acl` - (Optional) [Canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) to apply. Valid values are `private`, `public-read`, `public-read-write`, `aws-exec-read`, `authenticated-read`, `bucket-owner-read`, and `bucket-owner-full-control`.
* `bucket_key_enabled` - (Optional) Whether or not to use [Amazon S3 Bucket Keys](https://docs.aws.amazon.com/AmazonS3/latest/dev/bucket-key.html) for SSE-KMS.
* `cache_control` - (Optional) Caching behavior along the request/reply chain Read [w3c cache_control](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9) for further details.
* `content_base64` - (Optional, conflicts with `source` and `content`) Base64-encoded data that will be decoded and uploaded as raw bytes for the object content. This allows safely uploading non-UTF8 binary data, but is recommended only for small content such as the result of the `gzipbase64` function with small text strings. For larger objects, use `source` to stream the content from a disk file.
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/s3_object_copy.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The following arguments are required:

The following arguments are optional:

* `acl` - (Optional) [Canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) to apply. Defaults to `private`. Valid values are `private`, `public-read`, `public-read-write`, `authenticated-read`, `aws-exec-read`, `bucket-owner-read`, and `bucket-owner-full-control`. Conflicts with `grant`.
* `acl` - (Optional) [Canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) to apply. Valid values are `private`, `public-read`, `public-read-write`, `authenticated-read`, `aws-exec-read`, `bucket-owner-read`, and `bucket-owner-full-control`. Conflicts with `grant`.
* `cache_control` - (Optional) Specifies caching behavior along the request/reply chain Read [w3c cache_control](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9) for further details.
* `content_disposition` - (Optional) Specifies presentational information for the object. Read [w3c content_disposition](http://www.w3.org/Protocols/rfc2616/rfc2616-sec19.html#sec19.5.1) for further information.
* `content_encoding` - (Optional) Specifies what content encodings have been applied to the object and thus what decoding mechanisms must be applied to obtain the media-type referenced by the Content-Type header field. Read [w3c content encoding](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11) for further information.
Expand Down