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

provider/aws: Randomize IAM role names in flow log tests (#14928)

This commit is contained in:
Radek Simko 2017-05-30 16:23:21 +01:00 committed by GitHub
parent efd1e1ffb3
commit 832b7bd456
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/providers/aws/import_aws_flow_log_test.go
View File

@ -1,7 +1,6 @@
package aws package aws
import ( import (
"fmt"
"testing" "testing"
"github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/acctest"
@ -11,7 +10,7 @@ import (
func TestAccAWSFlowLog_importBasic(t *testing.T) { func TestAccAWSFlowLog_importBasic(t *testing.T) {
resourceName := "aws_flow_log.test_flow_log" resourceName := "aws_flow_log.test_flow_log"
fln := fmt.Sprintf("tf-test-fl-%d", acctest.RandInt()) rInt := acctest.RandInt()
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -19,7 +18,7 @@ func TestAccAWSFlowLog_importBasic(t *testing.T) {
CheckDestroy: testAccCheckFlowLogDestroy, CheckDestroy: testAccCheckFlowLogDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccFlowLogConfig_basic(fln), Config: testAccFlowLogConfig_basic(rInt),
}, },
resource.TestStep{ resource.TestStep{

32
builtin/providers/aws/resource_aws_flow_log_test.go
View File

@ -14,7 +14,7 @@ import (
func TestAccAWSFlowLog_basic(t *testing.T) { func TestAccAWSFlowLog_basic(t *testing.T) {
var flowLog ec2.FlowLog var flowLog ec2.FlowLog
fln := fmt.Sprintf("tf-test-fl-%d", acctest.RandInt()) rInt := acctest.RandInt()
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -23,7 +23,7 @@ func TestAccAWSFlowLog_basic(t *testing.T) {
CheckDestroy: testAccCheckFlowLogDestroy, CheckDestroy: testAccCheckFlowLogDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccFlowLogConfig_basic(fln), Config: testAccFlowLogConfig_basic(rInt),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckFlowLogExists("aws_flow_log.test_flow_log", &flowLog), testAccCheckFlowLogExists("aws_flow_log.test_flow_log", &flowLog),
testAccCheckAWSFlowLogAttributes(&flowLog), testAccCheckAWSFlowLogAttributes(&flowLog),
@ -36,7 +36,7 @@ func TestAccAWSFlowLog_basic(t *testing.T) {
func TestAccAWSFlowLog_subnet(t *testing.T) { func TestAccAWSFlowLog_subnet(t *testing.T) {
var flowLog ec2.FlowLog var flowLog ec2.FlowLog
fln := fmt.Sprintf("tf-test-fl-%d", acctest.RandInt()) rInt := acctest.RandInt()
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -45,7 +45,7 @@ func TestAccAWSFlowLog_subnet(t *testing.T) {
CheckDestroy: testAccCheckFlowLogDestroy, CheckDestroy: testAccCheckFlowLogDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccFlowLogConfig_subnet(fln), Config: testAccFlowLogConfig_subnet(rInt),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckFlowLogExists("aws_flow_log.test_flow_log_subnet", &flowLog), testAccCheckFlowLogExists("aws_flow_log.test_flow_log_subnet", &flowLog),
testAccCheckAWSFlowLogAttributes(&flowLog), testAccCheckAWSFlowLogAttributes(&flowLog),
@ -108,7 +108,7 @@ func testAccCheckFlowLogDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccFlowLogConfig_basic(fln string) string { func testAccFlowLogConfig_basic(rInt int) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "aws_vpc" "default" { resource "aws_vpc" "default" {
cidr_block = "10.0.0.0/16" cidr_block = "10.0.0.0/16"
@ -127,7 +127,7 @@ resource "aws_subnet" "test_subnet" {
} }
resource "aws_iam_role" "test_role" { resource "aws_iam_role" "test_role" {
name = "test_role" name = "tf_test_flow_log_basic_%d"
assume_role_policy = <<EOF assume_role_policy = <<EOF
{ {
"Version": "2012-10-17", "Version": "2012-10-17",
@ -149,29 +149,25 @@ EOF
} }
resource "aws_cloudwatch_log_group" "foobar" { resource "aws_cloudwatch_log_group" "foobar" {
name = "%s" name = "tf-test-fl-%d"
} }
resource "aws_flow_log" "test_flow_log" { resource "aws_flow_log" "test_flow_log" {
# log_group_name needs to exist before hand log_group_name = "${aws_cloudwatch_log_group.foobar.name}"
# until we have a CloudWatch Log Group Resource
log_group_name = "tf-test-log-group"
iam_role_arn = "${aws_iam_role.test_role.arn}" iam_role_arn = "${aws_iam_role.test_role.arn}"
vpc_id = "${aws_vpc.default.id}" vpc_id = "${aws_vpc.default.id}"
traffic_type = "ALL" traffic_type = "ALL"
} }
resource "aws_flow_log" "test_flow_log_subnet" { resource "aws_flow_log" "test_flow_log_subnet" {
# log_group_name needs to exist before hand
# until we have a CloudWatch Log Group Resource
log_group_name = "${aws_cloudwatch_log_group.foobar.name}" log_group_name = "${aws_cloudwatch_log_group.foobar.name}"
iam_role_arn = "${aws_iam_role.test_role.arn}" iam_role_arn = "${aws_iam_role.test_role.arn}"
subnet_id = "${aws_subnet.test_subnet.id}" subnet_id = "${aws_subnet.test_subnet.id}"
traffic_type = "ALL" traffic_type = "ALL"
} }
`, fln) `, rInt, rInt)
} }
func testAccFlowLogConfig_subnet(fln string) string { func testAccFlowLogConfig_subnet(rInt int) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "aws_vpc" "default" { resource "aws_vpc" "default" {
cidr_block = "10.0.0.0/16" cidr_block = "10.0.0.0/16"
@ -190,7 +186,7 @@ resource "aws_subnet" "test_subnet" {
} }
resource "aws_iam_role" "test_role" { resource "aws_iam_role" "test_role" {
name = "tf_test_%s" name = "tf_test_flow_log_subnet_%d"
assume_role_policy = <<EOF assume_role_policy = <<EOF
{ {
"Version": "2012-10-17", "Version": "2012-10-17",
@ -211,16 +207,14 @@ resource "aws_iam_role" "test_role" {
EOF EOF
} }
resource "aws_cloudwatch_log_group" "foobar" { resource "aws_cloudwatch_log_group" "foobar" {
name = "%s" name = "tf-test-fl-%d"
} }
resource "aws_flow_log" "test_flow_log_subnet" { resource "aws_flow_log" "test_flow_log_subnet" {
# log_group_name needs to exist before hand
# until we have a CloudWatch Log Group Resource
log_group_name = "${aws_cloudwatch_log_group.foobar.name}" log_group_name = "${aws_cloudwatch_log_group.foobar.name}"
iam_role_arn = "${aws_iam_role.test_role.arn}" iam_role_arn = "${aws_iam_role.test_role.arn}"
subnet_id = "${aws_subnet.test_subnet.id}" subnet_id = "${aws_subnet.test_subnet.id}"
traffic_type = "ALL" traffic_type = "ALL"
} }
`, fln, fln) `, rInt, rInt)
} }