From a810edd7a6397b8d45d566bf371e043ee15bb997 Mon Sep 17 00:00:00 2001 From: clint shryock Date: Mon, 18 Apr 2016 10:00:59 -0500 Subject: [PATCH] provider/aws: Randomize DB Identifier in test Getting name collisions every now and again --- builtin/providers/aws/resource_aws_db_instance_test.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builtin/providers/aws/resource_aws_db_instance_test.go b/builtin/providers/aws/resource_aws_db_instance_test.go index 5830a736f4..fcff06f65d 100644 --- a/builtin/providers/aws/resource_aws_db_instance_test.go +++ b/builtin/providers/aws/resource_aws_db_instance_test.go @@ -100,7 +100,7 @@ func TestAccAWSDBInstanceNoSnapshot(t *testing.T) { CheckDestroy: testAccCheckAWSDBInstanceNoSnapshot, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccNoSnapshotInstanceConfig, + Config: testAccNoSnapshotInstanceConfig(), Check: resource.ComposeTestCheckFunc( testAccCheckAWSDBInstanceExists("aws_db_instance.no_snapshot", &nosnap), ), @@ -447,12 +447,13 @@ resource "aws_db_instance" "snapshot" { }`, acctest.RandInt()) } -var testAccNoSnapshotInstanceConfig = ` +func testAccNoSnapshotInstanceConfig() string { + return fmt.Sprintf(` provider "aws" { region = "us-east-1" } resource "aws_db_instance" "no_snapshot" { - identifier = "foobarbaz-test-terraform-snapshot-2" + identifier = "tf-test-%s" allocated_storage = 5 engine = "mysql" @@ -469,7 +470,8 @@ resource "aws_db_instance" "no_snapshot" { skip_final_snapshot = true final_snapshot_identifier = "foobarbaz-test-terraform-final-snapshot-2" } -` +`, acctest.RandString(5)) +} var testAccSnapshotInstanceConfig_enhancedMonitoring = ` resource "aws_iam_role" "enhanced_policy_role" {