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

Merge pull request #8651 from hashicorp/reandomize-aws-db-instance-test 

provider/aws: Randomize the `aws_db_instance` enhanced monitoring test names
This commit is contained in:
Paul Stack 2016-09-04 12:59:37 +03:00 committed by GitHub
parent 09d6d2cf3a fbbcd6be74
commit 7694c78f9b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/providers/aws/resource_aws_db_instance_test.go
View File

@ -158,6 +158,7 @@ func TestAccAWSDBInstanceNoSnapshot(t *testing.T) {
func TestAccAWSDBInstance_enhancedMonitoring(t *testing.T) {
var dbInstance rds.DBInstance
rName := acctest.RandString(5)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
@ -165,7 +166,7 @@ func TestAccAWSDBInstance_enhancedMonitoring(t *testing.T) {
CheckDestroy: testAccCheckAWSDBInstanceNoSnapshot,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccSnapshotInstanceConfig_enhancedMonitoring,
Config: testAccSnapshotInstanceConfig_enhancedMonitoring(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSDBInstanceExists("aws_db_instance.enhanced_monitoring", &dbInstance),
resource.TestCheckResourceAttr(
@ -656,9 +657,10 @@ resource "aws_db_instance" "no_snapshot" {
`, acctest.RandString(5))
}
var testAccSnapshotInstanceConfig_enhancedMonitoring = `
func testAccSnapshotInstanceConfig_enhancedMonitoring(rName string) string {
return fmt.Sprintf(`
resource "aws_iam_role" "enhanced_policy_role" {
name = "enhanced-monitoring-role"
name = "enhanced-monitoring-role-%s"
assume_role_policy = <<EOF
{
"Version": "2012-10-17",
@ -687,7 +689,7 @@ resource "aws_iam_policy_attachment" "test-attach" {
}
resource "aws_db_instance" "enhanced_monitoring" {
identifier = "foobarbaz-test-terraform-enhanced-monitoring"
identifier = "foobarbaz-enhanced-monitoring-%s"
depends_on = ["aws_iam_policy_attachment.test-attach"]
allocated_storage = 5
@ -705,8 +707,8 @@ resource "aws_db_instance" "enhanced_monitoring" {
monitoring_interval = "5"
skip_final_snapshot = true
}`, rName, rName)
}
`
func testAccSnapshotInstanceConfig_iopsUpdate(rName string, iops int) string {
return fmt.Sprintf(`