Skip to content

Commit

Permalink
drop default value for acl s3 object
Browse files Browse the repository at this point in the history
  • Loading branch information
lomluca committed Oct 12, 2022
1 parent dbbe365 commit ec51e68
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .changelog/27197.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_s3_object: Remove default value for ACL in order to work with S3 buckets that have ACL disabled
```
6 changes: 4 additions & 2 deletions internal/service/s3/object.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,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 @@ -464,12 +463,15 @@ func resourceObjectUpload(d *schema.ResourceData, meta interface{}) error {
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
2 changes: 1 addition & 1 deletion website/docs/r/s3_object.html.markdown
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

0 comments on commit ec51e68

Please sign in to comment.