From d44ae5028f35fe3a011f1bce230c8a4f94062ac7 Mon Sep 17 00:00:00 2001 From: Alex Eftimie Date: Wed, 25 May 2016 10:02:20 +0200 Subject: [PATCH] S3Bucket and S3Key are always required --- .../aws/resource_aws_lambda_function.go | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/builtin/providers/aws/resource_aws_lambda_function.go b/builtin/providers/aws/resource_aws_lambda_function.go index 33a7e387d1..9a680e74d4 100644 --- a/builtin/providers/aws/resource_aws_lambda_function.go +++ b/builtin/providers/aws/resource_aws_lambda_function.go @@ -320,17 +320,19 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e s3Key, keyOk := d.GetOk("s3_key") s3ObjectVersion, versionOk := d.GetOk("s3_object_version") - if bucketOk && d.HasChange("s3_bucket") { - codeReq.S3Bucket = aws.String(s3Bucket.(string)) - codeUpdate = true - } - if keyOk && d.HasChange("s3_key") { - codeReq.S3Key = aws.String(s3Key.(string)) - codeUpdate = true - } - if versionOk && d.HasChange("s3_object_version") { - codeReq.S3ObjectVersion = aws.String(s3ObjectVersion.(string)) - codeUpdate = true + if bucketOk && keyOk { + if d.HasChange("s3_bucket") || d.HasChange("s3_key") { + codeReq.S3Bucket = aws.String(s3Bucket.(string)) + codeReq.S3Key = aws.String(s3Key.(string)) + codeUpdate = true + } + + if versionOk && d.HasChange("s3_object_version") { + codeReq.S3Bucket = aws.String(s3Bucket.(string)) + codeReq.S3Key = aws.String(s3Key.(string)) + codeReq.S3ObjectVersion = aws.String(s3ObjectVersion.(string)) + codeUpdate = true + } } }