From 76b3c74a5835659ce23abd66ce12bdf65c77f07a Mon Sep 17 00:00:00 2001 From: Kraig Amador Date: Wed, 9 Mar 2016 19:06:36 -0800 Subject: [PATCH] Providing a more informative error message when combining kms_key_id and etag as well as using aws_kms_key to test aws_s3_bucket's kms_key_id. --- builtin/providers/aws/resource_aws_s3_bucket_object.go | 2 +- builtin/providers/aws/resource_aws_s3_bucket_object_test.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/providers/aws/resource_aws_s3_bucket_object.go b/builtin/providers/aws/resource_aws_s3_bucket_object.go index 408ff80d1..c7ae47d75 100644 --- a/builtin/providers/aws/resource_aws_s3_bucket_object.go +++ b/builtin/providers/aws/resource_aws_s3_bucket_object.go @@ -124,7 +124,7 @@ func resourceAwsS3BucketObjectPut(d *schema.ResourceData, meta interface{}) erro 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 on the same object") + 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") } } diff --git a/builtin/providers/aws/resource_aws_s3_bucket_object_test.go b/builtin/providers/aws/resource_aws_s3_bucket_object_test.go index 78f314631..60ca49081 100644 --- a/builtin/providers/aws/resource_aws_s3_bucket_object_test.go +++ b/builtin/providers/aws/resource_aws_s3_bucket_object_test.go @@ -343,6 +343,9 @@ resource "aws_s3_bucket_object" "object" { func testAccAWSS3BucketObjectConfig_withKMSId(randInt int) string { return fmt.Sprintf(` +resource "aws_kms_key" "kms_key_1" { +} + resource "aws_s3_bucket" "object_bucket_2" { bucket = "tf-object-test-bucket-%d" } @@ -351,7 +354,7 @@ resource "aws_s3_bucket_object" "object" { bucket = "${aws_s3_bucket.object_bucket_2.bucket}" key = "test-key" content = "stuff" - kms_key_id = "01961aed-d0b6-4ad3-9f7f-8264818ea611" + kms_key_id = "${aws_kms_key.kms_key_1.key_id}" } `, randInt) }