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

provider/aws: Fix cause error when re-apply specified together `etag` and `kms_key_id`

This commit is contained in:
Kazunori Kojima 2016-10-02 15:13:09 +09:00 committed by Clint
parent 983f5f1e40
commit dd2e9a5caa
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/providers/aws/resource_aws_s3_bucket_object.go
View File

@ -99,8 +99,9 @@ func resourceAwsS3BucketObject() *schema.Resource {
// This will conflict with SSE-C and SSE-KMS encryption and multi-part upload
// if/when it's actually implemented. The Etag then won't match raw-file MD5.
// See http://docs.aws.amazon.com/AmazonS3/latest/API/RESTCommonResponseHeaders.html
Optional: true,
Computed: true,
Optional: true,
Computed: true,
ConflictsWith: []string{"kms_key_id"},
},
"version_id": &schema.Schema{
@ -135,12 +136,6 @@ func resourceAwsS3BucketObjectPut(d *schema.ResourceData, meta interface{}) erro
return fmt.Errorf("Must specify \"source\" or \"content\" field")
}
if _, ok := d.GetOk("kms_key_id"); ok {
if _, ok := d.GetOk("etag"); ok {
return fmt.Errorf("Unable to specify 'kms_key_id' and 'etag' together because 'etag' wouldn't equal the MD5 digest of the raw object data")
}
}
bucket := d.Get("bucket").(string)
key := d.Get("key").(string)