fix db option group test

This commit is contained in:
clint shryock 2017-01-30 15:48:52 -06:00
parent 75121fe00e
commit 2313281eba
1 changed files with 9 additions and 6 deletions

View File

@ -110,18 +110,20 @@ func TestAccAWSDBInstance_subnetGroup(t *testing.T) {
func TestAccAWSDBInstance_optionGroup(t *testing.T) { func TestAccAWSDBInstance_optionGroup(t *testing.T) {
var v rds.DBInstance var v rds.DBInstance
rName := fmt.Sprintf("tf-option-test-%d", 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: testAccCheckAWSDBInstanceDestroy, CheckDestroy: testAccCheckAWSDBInstanceDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccAWSDBInstanceConfigWithOptionGroup, Config: testAccAWSDBInstanceConfigWithOptionGroup(rName),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSDBInstanceExists("aws_db_instance.bar", &v), testAccCheckAWSDBInstanceExists("aws_db_instance.bar", &v),
testAccCheckAWSDBInstanceAttributes(&v), testAccCheckAWSDBInstanceAttributes(&v),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"aws_db_instance.bar", "option_group_name", "option-group-test-terraform"), "aws_db_instance.bar", "option_group_name", rName),
), ),
}, },
}, },
@ -642,10 +644,10 @@ resource "aws_db_instance" "bar" {
} }
` `
var testAccAWSDBInstanceConfigWithOptionGroup = fmt.Sprintf(` func testAccAWSDBInstanceConfigWithOptionGroup(rName string) string {
return fmt.Sprintf(`
resource "aws_db_option_group" "bar" { resource "aws_db_option_group" "bar" {
name = "option-group-test-terraform" name = "%s"
option_group_description = "Test option group for terraform" option_group_description = "Test option group for terraform"
engine_name = "mysql" engine_name = "mysql"
major_engine_version = "5.6" major_engine_version = "5.6"
@ -665,7 +667,8 @@ resource "aws_db_instance" "bar" {
parameter_group_name = "default.mysql5.6" parameter_group_name = "default.mysql5.6"
option_group_name = "${aws_db_option_group.bar.name}" option_group_name = "${aws_db_option_group.bar.name}"
}`, acctest.RandInt()) }`, rName, acctest.RandInt())
}
func testAccReplicaInstanceConfig(val int) string { func testAccReplicaInstanceConfig(val int) string {
return fmt.Sprintf(` return fmt.Sprintf(`