From 8b252d19abd358f0b314cc6e2a9f182725065cf1 Mon Sep 17 00:00:00 2001 From: clint shryock Date: Mon, 8 May 2017 16:22:58 -0500 Subject: [PATCH] provider/aws: Update TestAccAWSCloudWatchEventTarget_ssmDocument / TestAccAWSCloudWatchEventTarget_full tests to avoid name collisions --- ...source_aws_cloudwatch_event_target_test.go | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/builtin/providers/aws/resource_aws_cloudwatch_event_target_test.go b/builtin/providers/aws/resource_aws_cloudwatch_event_target_test.go index d6d581674..044a32e67 100644 --- a/builtin/providers/aws/resource_aws_cloudwatch_event_target_test.go +++ b/builtin/providers/aws/resource_aws_cloudwatch_event_target_test.go @@ -6,6 +6,7 @@ import ( "testing" events "github.com/aws/aws-sdk-go/service/cloudwatchevents" + "github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/terraform" ) @@ -65,6 +66,7 @@ func TestAccAWSCloudWatchEventTarget_missingTargetId(t *testing.T) { func TestAccAWSCloudWatchEventTarget_full(t *testing.T) { var target events.Target + rName := acctest.RandomWithPrefix("tf_ssm_Document") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -72,13 +74,13 @@ func TestAccAWSCloudWatchEventTarget_full(t *testing.T) { CheckDestroy: testAccCheckAWSCloudWatchEventTargetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSCloudWatchEventTargetConfig_full, + Config: testAccAWSCloudWatchEventTargetConfig_full(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCloudWatchEventTargetExists("aws_cloudwatch_event_target.foobar", &target), resource.TestCheckResourceAttr("aws_cloudwatch_event_target.foobar", "rule", "tf-acc-cw-event-rule-full"), resource.TestCheckResourceAttr("aws_cloudwatch_event_target.foobar", "target_id", "tf-acc-cw-target-full"), resource.TestMatchResourceAttr("aws_cloudwatch_event_target.foobar", "arn", - regexp.MustCompile("^arn:aws:kinesis:.*:stream/terraform-kinesis-test$")), + regexp.MustCompile("^arn:aws:kinesis:.*:stream/tf_ssm_Document")), resource.TestCheckResourceAttr("aws_cloudwatch_event_target.foobar", "input", "{ \"source\": [\"aws.cloudtrail\"] }\n"), resource.TestCheckResourceAttr("aws_cloudwatch_event_target.foobar", "input_path", ""), ), @@ -89,6 +91,7 @@ func TestAccAWSCloudWatchEventTarget_full(t *testing.T) { func TestAccAWSCloudWatchEventTarget_ssmDocument(t *testing.T) { var target events.Target + rName := acctest.RandomWithPrefix("tf_ssm_Document") resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -96,7 +99,7 @@ func TestAccAWSCloudWatchEventTarget_ssmDocument(t *testing.T) { CheckDestroy: testAccCheckAWSCloudWatchEventTargetDestroy, Steps: []resource.TestStep{ { - Config: testAccAWSCloudWatchEventTargetConfigSsmDocument, + Config: testAccAWSCloudWatchEventTargetConfigSsmDocument(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCloudWatchEventTargetExists("aws_cloudwatch_event_target.test", &target), ), @@ -194,7 +197,8 @@ resource "aws_sns_topic" "sun" { } ` -var testAccAWSCloudWatchEventTargetConfig_full = ` +func testAccAWSCloudWatchEventTargetConfig_full(rName string) string { + return fmt.Sprintf(` resource "aws_cloudwatch_event_rule" "foo" { name = "tf-acc-cw-event-rule-full" schedule_expression = "rate(1 hour)" @@ -202,7 +206,7 @@ resource "aws_cloudwatch_event_rule" "foo" { } resource "aws_iam_role" "role" { - name = "test_role" + name = "%s" assume_role_policy = <