Skip to content

Commit

Permalink
Randomize name of S3 bucket in acctest
Browse files Browse the repository at this point in the history
  • Loading branch information
Radek Simko committed Feb 17, 2016
1 parent db0d48e commit f8fac71
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions builtin/providers/aws/resource_aws_lambda_permission_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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$")

Expand All @@ -275,14 +278,15 @@ 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"),
resource.TestCheckResourceAttr("aws_lambda_permission.with_s3", "principal", "s3.amazonaws.com"),
resource.TestCheckResourceAttr("aws_lambda_permission.with_s3", "statement_id", "AllowExecutionFromS3"),
resource.TestMatchResourceAttr("aws_lambda_permission.with_s3", "function_name", endsWithFuncName),
resource.TestCheckResourceAttr("aws_lambda_permission.with_s3", "source_arn", "arn:aws:s3:::tf-acc-towards-lambda"),
resource.TestCheckResourceAttr("aws_lambda_permission.with_s3", "source_arn",
fmt.Sprintf("arn:aws:s3:::tf-acc-towards-lambda-%d", rInt)),
),
},
},
Expand Down Expand Up @@ -612,7 +616,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"
Expand All @@ -622,7 +626,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"
}
Expand Down

0 comments on commit f8fac71

Please sign in to comment.