From 8a29b91e98cd27b7cf3a17691bacdb4093ba6783 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Wed, 17 Feb 2016 11:59:24 +0000 Subject: [PATCH] Randomize name of S3 bucket in acctest --- .../providers/aws/resource_aws_lambda_permission_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/builtin/providers/aws/resource_aws_lambda_permission_test.go b/builtin/providers/aws/resource_aws_lambda_permission_test.go index 23911290f8d8..041add080df9 100644 --- a/builtin/providers/aws/resource_aws_lambda_permission_test.go +++ b/builtin/providers/aws/resource_aws_lambda_permission_test.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/lambda" + "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) @@ -266,6 +267,8 @@ func TestAccAWSLambdaPermission_multiplePerms(t *testing.T) { } func TestAccAWSLambdaPermission_withS3(t *testing.T) { + rInt := acctest.RandInt() + var statement LambdaPolicyStatement endsWithFuncName := regexp.MustCompile(":function:lambda_function_name_perm_s3$") @@ -275,7 +278,7 @@ func TestAccAWSLambdaPermission_withS3(t *testing.T) { CheckDestroy: testAccCheckAWSLambdaPermissionDestroy, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccAWSLambdaPermissionConfig_withS3, + Config: fmt.Sprintf(testAccAWSLambdaPermissionConfig_withS3_tpl, rInt), Check: resource.ComposeTestCheckFunc( testAccCheckLambdaPermissionExists("aws_lambda_permission.with_s3", &statement), resource.TestCheckResourceAttr("aws_lambda_permission.with_s3", "action", "lambda:InvokeFunction"), @@ -612,7 +615,7 @@ resource "aws_lambda_permission" "third" { principal = "events.amazonaws.com" }`) -var testAccAWSLambdaPermissionConfig_withS3 = ` +var testAccAWSLambdaPermissionConfig_withS3_tpl = ` resource "aws_lambda_permission" "with_s3" { statement_id = "AllowExecutionFromS3" action = "lambda:InvokeFunction" @@ -622,7 +625,7 @@ resource "aws_lambda_permission" "with_s3" { } resource "aws_s3_bucket" "default" { - bucket = "tf-acc-towards-lambda" + bucket = "tf-acc-towards-lambda-%d" acl = "private" }