ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/aws: Fix Content-Encoding for S3 object acc test (#14400)

This commit is contained in:
Radek Simko 2017-05-11 18:35:50 +02:00 committed by GitHub
parent 40c5b97c17
commit 68aebee1e5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/aws/data_source_aws_s3_bucket_object_test.go
View File

@ -149,7 +149,7 @@ func TestAccDataSourceAWSS3BucketObject_allParams(t *testing.T) {
resource.TestCheckNoResourceAttr("data.aws_s3_bucket_object.obj", "body"), resource.TestCheckNoResourceAttr("data.aws_s3_bucket_object.obj", "body"),
resource.TestCheckResourceAttr("data.aws_s3_bucket_object.obj", "cache_control", "no-cache"), resource.TestCheckResourceAttr("data.aws_s3_bucket_object.obj", "cache_control", "no-cache"),
resource.TestCheckResourceAttr("data.aws_s3_bucket_object.obj", "content_disposition", "attachment"), resource.TestCheckResourceAttr("data.aws_s3_bucket_object.obj", "content_disposition", "attachment"),
resource.TestCheckResourceAttr("data.aws_s3_bucket_object.obj", "content_encoding", "gzip"), resource.TestCheckResourceAttr("data.aws_s3_bucket_object.obj", "content_encoding", "identity"),
resource.TestCheckResourceAttr("data.aws_s3_bucket_object.obj", "content_language", "en-GB"), resource.TestCheckResourceAttr("data.aws_s3_bucket_object.obj", "content_language", "en-GB"),
// Encryption is off // Encryption is off
resource.TestCheckResourceAttr("data.aws_s3_bucket_object.obj", "server_side_encryption", ""), resource.TestCheckResourceAttr("data.aws_s3_bucket_object.obj", "server_side_encryption", ""),
@ -284,7 +284,7 @@ CONTENT
content_type = "application/unknown" content_type = "application/unknown"
cache_control = "no-cache" cache_control = "no-cache"
content_disposition = "attachment" content_disposition = "attachment"
content_encoding = "gzip" content_encoding = "identity"
content_language = "en-GB" content_language = "en-GB"
tags { tags {
Key1 = "Value 1" Key1 = "Value 1"

2
website/source/docs/providers/aws/r/s3_bucket_object.html.markdown
View File

@ -62,6 +62,8 @@ resource "aws_s3_bucket_object" "examplebucket_object" {
## Argument Reference ## Argument Reference
-> **Note:** If you specify `content_encoding` you are responsible for encoding the body appropriately (i.e. `source` and `content` both expect already encoded/compressed bytes)
The following arguments are supported: The following arguments are supported:
* `bucket` - (Required) The name of the bucket to put the file in. * `bucket` - (Required) The name of the bucket to put the file in.