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

Merge pull request #12023 from hashicorp/b-aws-test-fixes 

provider/aws: Fix more lambda tests
This commit is contained in:
Clint 2017-02-16 14:52:36 -06:00 committed by GitHub
parent 645dfbe8bb fc5b7b9619
commit 469216982d
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
builtin/providers/aws/resource_aws_lambda_event_source_mapping_test.go
View File

@ -10,12 +10,14 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/lambda" "github.com/aws/aws-sdk-go/service/lambda"
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
func TestAccAWSLambdaEventSourceMapping_basic(t *testing.T) { func TestAccAWSLambdaEventSourceMapping_basic(t *testing.T) {
var conf lambda.EventSourceMappingConfiguration var conf lambda.EventSourceMappingConfiguration
rInt := acctest.RandInt()
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -23,14 +25,14 @@ func TestAccAWSLambdaEventSourceMapping_basic(t *testing.T) {
CheckDestroy: testAccCheckLambdaEventSourceMappingDestroy, CheckDestroy: testAccCheckLambdaEventSourceMappingDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccAWSLambdaEventSourceMappingConfig, Config: testAccAWSLambdaEventSourceMappingConfig(rInt),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAwsLambdaEventSourceMappingExists("aws_lambda_event_source_mapping.lambda_event_source_mapping_test", &conf), testAccCheckAwsLambdaEventSourceMappingExists("aws_lambda_event_source_mapping.lambda_event_source_mapping_test", &conf),
testAccCheckAWSLambdaEventSourceMappingAttributes(&conf), testAccCheckAWSLambdaEventSourceMappingAttributes(&conf),
), ),
}, },
resource.TestStep{ resource.TestStep{
Config: testAccAWSLambdaEventSourceMappingConfigUpdate, Config: testAccAWSLambdaEventSourceMappingConfigUpdate(rInt),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAwsLambdaEventSourceMappingExists("aws_lambda_event_source_mapping.lambda_event_source_mapping_test", &conf), testAccCheckAwsLambdaEventSourceMappingExists("aws_lambda_event_source_mapping.lambda_event_source_mapping_test", &conf),
resource.TestCheckResourceAttr("aws_lambda_event_source_mapping.lambda_event_source_mapping_test", resource.TestCheckResourceAttr("aws_lambda_event_source_mapping.lambda_event_source_mapping_test",
@ -53,13 +55,15 @@ func TestAccAWSLambdaEventSourceMapping_basic(t *testing.T) {
func TestAccAWSLambdaEventSourceMapping_disappears(t *testing.T) { func TestAccAWSLambdaEventSourceMapping_disappears(t *testing.T) {
var conf lambda.EventSourceMappingConfiguration var conf lambda.EventSourceMappingConfiguration
rInt := acctest.RandInt()
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
CheckDestroy: testAccCheckLambdaEventSourceMappingDestroy, CheckDestroy: testAccCheckLambdaEventSourceMappingDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccAWSLambdaEventSourceMappingConfig, Config: testAccAWSLambdaEventSourceMappingConfig(rInt),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAwsLambdaEventSourceMappingExists("aws_lambda_event_source_mapping.lambda_event_source_mapping_test", &conf), testAccCheckAwsLambdaEventSourceMappingExists("aws_lambda_event_source_mapping.lambda_event_source_mapping_test", &conf),
testAccCheckAWSLambdaEventSourceMappingDisappears(&conf), testAccCheckAWSLambdaEventSourceMappingDisappears(&conf),
@ -166,9 +170,10 @@ func testAccCheckAWSLambdaEventSourceMappingAttributes(mapping *lambda.EventSour
} }
} }
const testAccAWSLambdaEventSourceMappingConfig = ` func testAccAWSLambdaEventSourceMappingConfig(rInt int) string {
return fmt.Sprintf(`
resource "aws_iam_role" "iam_for_lambda" { resource "aws_iam_role" "iam_for_lambda" {
name = "iam_for_lambda" name = "iam_for_lambda_%d"
assume_role_policy = <<EOF assume_role_policy = <<EOF
{ {
"Version": "2012-10-17", "Version": "2012-10-17",
@ -187,7 +192,7 @@ EOF
} }
resource "aws_iam_policy" "policy_for_role" { resource "aws_iam_policy" "policy_for_role" {
name = "policy_for_role" name = "policy_for_role_%d"
path = "/" path = "/"
description = "IAM policy for for Lamda event mapping testing" description = "IAM policy for for Lamda event mapping testing"
policy = <<EOF policy = <<EOF
@ -216,19 +221,19 @@ EOF
} }
resource "aws_iam_policy_attachment" "policy_attachment_for_role" { resource "aws_iam_policy_attachment" "policy_attachment_for_role" {
name = "policy_attachment_for_role" name = "policy_attachment_for_role_%d"
roles = ["${aws_iam_role.iam_for_lambda.name}"] roles = ["${aws_iam_role.iam_for_lambda.name}"]
policy_arn = "${aws_iam_policy.policy_for_role.arn}" policy_arn = "${aws_iam_policy.policy_for_role.arn}"
} }
resource "aws_kinesis_stream" "kinesis_stream_test" { resource "aws_kinesis_stream" "kinesis_stream_test" {
name = "kinesis_stream_test" name = "kinesis_stream_test_%d"
shard_count = 1 shard_count = 1
} }
resource "aws_lambda_function" "lambda_function_test_create" { resource "aws_lambda_function" "lambda_function_test_create" {
filename = "test-fixtures/lambdatest.zip" filename = "test-fixtures/lambdatest.zip"
function_name = "example_lambda_name_create" function_name = "%d_example_lambda_name_create"
role = "${aws_iam_role.iam_for_lambda.arn}" role = "${aws_iam_role.iam_for_lambda.arn}"
handler = "exports.example" handler = "exports.example"
runtime = "nodejs4.3" runtime = "nodejs4.3"
@ -236,7 +241,7 @@ resource "aws_lambda_function" "lambda_function_test_create" {
resource "aws_lambda_function" "lambda_function_test_update" { resource "aws_lambda_function" "lambda_function_test_update" {
filename = "test-fixtures/lambdatest.zip" filename = "test-fixtures/lambdatest.zip"
function_name = "example_lambda_name_update" function_name = "%d_example_lambda_name_update"
role = "${aws_iam_role.iam_for_lambda.arn}" role = "${aws_iam_role.iam_for_lambda.arn}"
handler = "exports.example" handler = "exports.example"
runtime = "nodejs4.3" runtime = "nodejs4.3"
@ -249,12 +254,13 @@ resource "aws_lambda_event_source_mapping" "lambda_event_source_mapping_test" {
depends_on = ["aws_iam_policy_attachment.policy_attachment_for_role"] depends_on = ["aws_iam_policy_attachment.policy_attachment_for_role"]
function_name = "${aws_lambda_function.lambda_function_test_create.arn}" function_name = "${aws_lambda_function.lambda_function_test_create.arn}"
starting_position = "TRIM_HORIZON" starting_position = "TRIM_HORIZON"
}`, rInt, rInt, rInt, rInt, rInt, rInt)
} }
`
const testAccAWSLambdaEventSourceMappingConfigUpdate = ` func testAccAWSLambdaEventSourceMappingConfigUpdate(rInt int) string {
return fmt.Sprintf(`
resource "aws_iam_role" "iam_for_lambda" { resource "aws_iam_role" "iam_for_lambda" {
name = "iam_for_lambda" name = "iam_for_lambda_%d"
assume_role_policy = <<EOF assume_role_policy = <<EOF
{ {
"Version": "2012-10-17", "Version": "2012-10-17",
@ -273,7 +279,7 @@ EOF
} }
resource "aws_iam_policy" "policy_for_role" { resource "aws_iam_policy" "policy_for_role" {
name = "policy_for_role" name = "policy_for_role_%d"
path = "/" path = "/"
description = "IAM policy for for Lamda event mapping testing" description = "IAM policy for for Lamda event mapping testing"
policy = <<EOF policy = <<EOF
@ -302,19 +308,19 @@ EOF
} }
resource "aws_iam_policy_attachment" "policy_attachment_for_role" { resource "aws_iam_policy_attachment" "policy_attachment_for_role" {
name = "policy_attachment_for_role" name = "policy_attachment_for_role_%d"
roles = ["${aws_iam_role.iam_for_lambda.name}"] roles = ["${aws_iam_role.iam_for_lambda.name}"]
policy_arn = "${aws_iam_policy.policy_for_role.arn}" policy_arn = "${aws_iam_policy.policy_for_role.arn}"
} }
resource "aws_kinesis_stream" "kinesis_stream_test" { resource "aws_kinesis_stream" "kinesis_stream_test" {
name = "kinesis_stream_test" name = "kinesis_stream_test_%d"
shard_count = 1 shard_count = 1
} }
resource "aws_lambda_function" "lambda_function_test_create" { resource "aws_lambda_function" "lambda_function_test_create" {
filename = "test-fixtures/lambdatest.zip" filename = "test-fixtures/lambdatest.zip"
function_name = "example_lambda_name_create" function_name = "%d_example_lambda_name_create"
role = "${aws_iam_role.iam_for_lambda.arn}" role = "${aws_iam_role.iam_for_lambda.arn}"
handler = "exports.example" handler = "exports.example"
runtime = "nodejs4.3" runtime = "nodejs4.3"
@ -322,7 +328,7 @@ resource "aws_lambda_function" "lambda_function_test_create" {
resource "aws_lambda_function" "lambda_function_test_update" { resource "aws_lambda_function" "lambda_function_test_update" {
filename = "test-fixtures/lambdatest.zip" filename = "test-fixtures/lambdatest.zip"
function_name = "example_lambda_name_update" function_name = "%d_example_lambda_name_update"
role = "${aws_iam_role.iam_for_lambda.arn}" role = "${aws_iam_role.iam_for_lambda.arn}"
handler = "exports.example" handler = "exports.example"
runtime = "nodejs4.3" runtime = "nodejs4.3"
@ -335,5 +341,5 @@ resource "aws_lambda_event_source_mapping" "lambda_event_source_mapping_test" {
depends_on = ["aws_iam_policy_attachment.policy_attachment_for_role"] depends_on = ["aws_iam_policy_attachment.policy_attachment_for_role"]
function_name = "${aws_lambda_function.lambda_function_test_update.arn}" function_name = "${aws_lambda_function.lambda_function_test_update.arn}"
starting_position = "TRIM_HORIZON" starting_position = "TRIM_HORIZON"
}`, rInt, rInt, rInt, rInt, rInt, rInt)
} }
`

4
builtin/providers/aws/resource_aws_lambda_permission_test.go
View File

@ -401,7 +401,7 @@ func isLambdaPermissionGone(rs *terraform.ResourceState, conn *lambda.Lambda) er
params := &lambda.GetPolicyInput{ params := &lambda.GetPolicyInput{
FunctionName: aws.String(rs.Primary.Attributes["function_name"]), FunctionName: aws.String(rs.Primary.Attributes["function_name"]),
} }
if v, ok := rs.Primary.Attributes["qualifier"]; ok { if v, ok := rs.Primary.Attributes["qualifier"]; ok && v != "" {
params.Qualifier = aws.String(v) params.Qualifier = aws.String(v)
} }
@ -438,7 +438,7 @@ func lambdaPermissionExists(rs *terraform.ResourceState, conn *lambda.Lambda) (*
params := &lambda.GetPolicyInput{ params := &lambda.GetPolicyInput{
FunctionName: aws.String(rs.Primary.Attributes["function_name"]), FunctionName: aws.String(rs.Primary.Attributes["function_name"]),
} }
if v, ok := rs.Primary.Attributes["qualifier"]; ok { if v, ok := rs.Primary.Attributes["qualifier"]; ok && v != "" {
params.Qualifier = aws.String(v) params.Qualifier = aws.String(v)
} }