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

fix db subnet test

This commit is contained in:
clint shryock 2017-02-03 10:22:46 -06:00
parent 8cede07657
commit 9ad75cfdc6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ func TestAccAWSDBInstance_subnetGroup(t *testing.T) {
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSDBInstanceExists("aws_db_instance.bar", &v), testAccCheckAWSDBInstanceExists("aws_db_instance.bar", &v),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"aws_db_instance.bar", "db_subnet_group_name", "foo"), "aws_db_instance.bar", "db_subnet_group_name", "foo-"+rName),
), ),
}, },
{ {
@ -100,7 +100,7 @@ func TestAccAWSDBInstance_subnetGroup(t *testing.T) {
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSDBInstanceExists("aws_db_instance.bar", &v), testAccCheckAWSDBInstanceExists("aws_db_instance.bar", &v),
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"aws_db_instance.bar", "db_subnet_group_name", "bar"), "aws_db_instance.bar", "db_subnet_group_name", "bar-"+rName),
), ),
}, },
}, },
@ -897,7 +897,7 @@ resource "aws_subnet" "bar" {
} }
resource "aws_db_subnet_group" "foo" { resource "aws_db_subnet_group" "foo" {
name = "foo" name = "foo-%s"
subnet_ids = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"] subnet_ids = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"]
tags { tags {
Name = "tf-dbsubnet-group-test" Name = "tf-dbsubnet-group-test"
@ -917,8 +917,9 @@ resource "aws_db_instance" "bar" {
port = 3305 port = 3305
allocated_storage = 10 allocated_storage = 10
backup_retention_period = 0
apply_immediately = true apply_immediately = true
}`, rName) }`, rName, rName)
} }
func testAccAWSDBInstanceConfigWithSubnetGroupUpdated(rName string) string { func testAccAWSDBInstanceConfigWithSubnetGroupUpdated(rName string) string {
@ -951,7 +952,7 @@ resource "aws_subnet" "bar" {
resource "aws_subnet" "test" { resource "aws_subnet" "test" {
cidr_block = "10.10.3.0/24" cidr_block = "10.10.3.0/24"
availability_zone = "us-west-2c" availability_zone = "us-west-2b"
vpc_id = "${aws_vpc.bar.id}" vpc_id = "${aws_vpc.bar.id}"
tags { tags {
Name = "tf-dbsubnet-test-3" Name = "tf-dbsubnet-test-3"
@ -968,7 +969,7 @@ resource "aws_subnet" "another_test" {
} }
resource "aws_db_subnet_group" "foo" { resource "aws_db_subnet_group" "foo" {
name = "foo" name = "foo-%s"
subnet_ids = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"] subnet_ids = ["${aws_subnet.foo.id}", "${aws_subnet.bar.id}"]
tags { tags {
Name = "tf-dbsubnet-group-test" Name = "tf-dbsubnet-group-test"
@ -976,7 +977,7 @@ resource "aws_db_subnet_group" "foo" {
} }
resource "aws_db_subnet_group" "bar" { resource "aws_db_subnet_group" "bar" {
name = "bar" name = "bar-%s"
subnet_ids = ["${aws_subnet.test.id}", "${aws_subnet.another_test.id}"] subnet_ids = ["${aws_subnet.test.id}", "${aws_subnet.another_test.id}"]
tags { tags {
Name = "tf-dbsubnet-group-test-updated" Name = "tf-dbsubnet-group-test-updated"
@ -996,8 +997,10 @@ resource "aws_db_instance" "bar" {
port = 3305 port = 3305
allocated_storage = 10 allocated_storage = 10
backup_retention_period = 0
apply_immediately = true apply_immediately = true
}`, rName) }`, rName, rName, rName)
} }
const testAccAWSDBMSSQL_timezone = ` const testAccAWSDBMSSQL_timezone = `