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

Merge pull request #4550 from hashicorp/b-aws-acc-fixes 

provider/aws: Update acceptance tests
This commit is contained in:
Clint 2016-01-08 09:27:32 -06:00
parent aef1353b4a 9a4f0a06b3
commit 3c494a4d6a
2 changed files with 133 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
builtin/providers/aws/resource_aws_opsworks_stack_test.go
View File

@ -132,11 +132,11 @@ func TestAccAWSOpsworksStackNoVpc(t *testing.T) {
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccAwsOpsworksStackConfigNoVpcCreate, Config: testAccAwsOpsworksStackConfigNoVpcCreate,
Check: testAccAwsOpsworksStackCheckResourceAttrsCreate, Check: testAccAwsOpsworksStackCheckResourceAttrsCreate("us-east-1c"),
}, },
resource.TestStep{ resource.TestStep{
Config: testAccAWSOpsworksStackConfigNoVpcUpdate, Config: testAccAWSOpsworksStackConfigNoVpcUpdate,
Check: testAccAwsOpsworksStackCheckResourceAttrsUpdate, Check: testAccAwsOpsworksStackCheckResourceAttrsUpdate("us-east-1c"),
}, },
}, },
}) })
@ -153,11 +153,11 @@ resource "aws_vpc" "tf-acc" {
resource "aws_subnet" "tf-acc" { resource "aws_subnet" "tf-acc" {
vpc_id = "${aws_vpc.tf-acc.id}" vpc_id = "${aws_vpc.tf-acc.id}"
cidr_block = "${aws_vpc.tf-acc.cidr_block}" cidr_block = "${aws_vpc.tf-acc.cidr_block}"
availability_zone = "us-east-1c" availability_zone = "us-west-2a"
} }
resource "aws_opsworks_stack" "tf-acc" { resource "aws_opsworks_stack" "tf-acc" {
name = "tf-opsworks-acc" name = "tf-opsworks-acc"
region = "us-east-1" region = "us-west-2"
vpc_id = "${aws_vpc.tf-acc.id}" vpc_id = "${aws_vpc.tf-acc.id}"
default_subnet_id = "${aws_subnet.tf-acc.id}" default_subnet_id = "${aws_subnet.tf-acc.id}"
service_role_arn = "${aws_iam_role.opsworks_service.arn}" service_role_arn = "${aws_iam_role.opsworks_service.arn}"
@ -177,11 +177,11 @@ resource "aws_vpc" "tf-acc" {
resource "aws_subnet" "tf-acc" { resource "aws_subnet" "tf-acc" {
vpc_id = "${aws_vpc.tf-acc.id}" vpc_id = "${aws_vpc.tf-acc.id}"
cidr_block = "${aws_vpc.tf-acc.cidr_block}" cidr_block = "${aws_vpc.tf-acc.cidr_block}"
availability_zone = "us-east-1c" availability_zone = "us-west-2a"
} }
resource "aws_opsworks_stack" "tf-acc" { resource "aws_opsworks_stack" "tf-acc" {
name = "tf-opsworks-acc" name = "tf-opsworks-acc"
region = "us-east-1" region = "us-west-2"
vpc_id = "${aws_vpc.tf-acc.id}" vpc_id = "${aws_vpc.tf-acc.id}"
default_subnet_id = "${aws_subnet.tf-acc.id}" default_subnet_id = "${aws_subnet.tf-acc.id}"
service_role_arn = "${aws_iam_role.opsworks_service.arn}" service_role_arn = "${aws_iam_role.opsworks_service.arn}"
@ -209,12 +209,12 @@ func TestAccAWSOpsworksStackVpc(t *testing.T) {
Steps: []resource.TestStep{ Steps: []resource.TestStep{
resource.TestStep{ resource.TestStep{
Config: testAccAwsOpsworksStackConfigVpcCreate, Config: testAccAwsOpsworksStackConfigVpcCreate,
Check: testAccAwsOpsworksStackCheckResourceAttrsCreate, Check: testAccAwsOpsworksStackCheckResourceAttrsCreate("us-west-2a"),
}, },
resource.TestStep{ resource.TestStep{
Config: testAccAWSOpsworksStackConfigVpcUpdate, Config: testAccAWSOpsworksStackConfigVpcUpdate,
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccAwsOpsworksStackCheckResourceAttrsUpdate, testAccAwsOpsworksStackCheckResourceAttrsUpdate("us-west-2a"),
testAccAwsOpsworksCheckVpc, testAccAwsOpsworksCheckVpc,
), ),
}, },
@ -226,106 +226,110 @@ func TestAccAWSOpsworksStackVpc(t *testing.T) {
//// Checkers and Utilities //// Checkers and Utilities
//////////////////////////// ////////////////////////////
var testAccAwsOpsworksStackCheckResourceAttrsCreate = resource.ComposeTestCheckFunc( func testAccAwsOpsworksStackCheckResourceAttrsCreate(zone string) resource.TestCheckFunc {
resource.TestCheckResourceAttr( return resource.ComposeTestCheckFunc(
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"name", "aws_opsworks_stack.tf-acc",
"tf-opsworks-acc", "name",
), "tf-opsworks-acc",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"default_availability_zone", "aws_opsworks_stack.tf-acc",
"us-east-1c", "default_availability_zone",
), zone,
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"default_os", "aws_opsworks_stack.tf-acc",
"Amazon Linux 2014.09", "default_os",
), "Amazon Linux 2014.09",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"default_root_device_type", "aws_opsworks_stack.tf-acc",
"ebs", "default_root_device_type",
), "ebs",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"custom_json", "aws_opsworks_stack.tf-acc",
`{"key": "value"}`, "custom_json",
), `{"key": "value"}`,
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"configuration_manager_version", "aws_opsworks_stack.tf-acc",
"11.10", "configuration_manager_version",
), "11.10",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"use_opsworks_security_groups", "aws_opsworks_stack.tf-acc",
"false", "use_opsworks_security_groups",
), "false",
) ),
)
}
var testAccAwsOpsworksStackCheckResourceAttrsUpdate = resource.ComposeTestCheckFunc( func testAccAwsOpsworksStackCheckResourceAttrsUpdate(zone string) resource.TestCheckFunc {
resource.TestCheckResourceAttr( return resource.ComposeTestCheckFunc(
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"name", "aws_opsworks_stack.tf-acc",
"tf-opsworks-acc", "name",
), "tf-opsworks-acc",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"default_availability_zone", "aws_opsworks_stack.tf-acc",
"us-east-1c", "default_availability_zone",
), zone,
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"default_os", "aws_opsworks_stack.tf-acc",
"Amazon Linux 2014.09", "default_os",
), "Amazon Linux 2014.09",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"default_root_device_type", "aws_opsworks_stack.tf-acc",
"ebs", "default_root_device_type",
), "ebs",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"custom_json", "aws_opsworks_stack.tf-acc",
`{"key": "value"}`, "custom_json",
), `{"key": "value"}`,
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"configuration_manager_version", "aws_opsworks_stack.tf-acc",
"11.10", "configuration_manager_version",
), "11.10",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"use_opsworks_security_groups", "aws_opsworks_stack.tf-acc",
"false", "use_opsworks_security_groups",
), "false",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"use_custom_cookbooks", "aws_opsworks_stack.tf-acc",
"true", "use_custom_cookbooks",
), "true",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"manage_berkshelf", "aws_opsworks_stack.tf-acc",
"true", "manage_berkshelf",
), "true",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"custom_cookbooks_source.0.type", "aws_opsworks_stack.tf-acc",
"git", "custom_cookbooks_source.0.type",
), "git",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"custom_cookbooks_source.0.revision", "aws_opsworks_stack.tf-acc",
"master", "custom_cookbooks_source.0.revision",
), "master",
resource.TestCheckResourceAttr( ),
"aws_opsworks_stack.tf-acc", resource.TestCheckResourceAttr(
"custom_cookbooks_source.0.url", "aws_opsworks_stack.tf-acc",
"https://github.com/aws/opsworks-example-cookbooks.git", "custom_cookbooks_source.0.url",
), "https://github.com/aws/opsworks-example-cookbooks.git",
) ),
)
}
func testAccAwsOpsworksCheckVpc(s *terraform.State) error { func testAccAwsOpsworksCheckVpc(s *terraform.State) error {
rs, ok := s.RootModule().Resources["aws_opsworks_stack.tf-acc"] rs, ok := s.RootModule().Resources["aws_opsworks_stack.tf-acc"]
@ -381,7 +385,6 @@ func testAccCheckAwsOpsworksStackDestroy(s *terraform.State) error {
} }
return err return err
} }
} }
return fmt.Errorf("Fall through error for OpsWorks stack test") return fmt.Errorf("Fall through error for OpsWorks stack test")
} }

26
builtin/providers/aws/resource_aws_vpc_peering_connection_test.go
View File

@ -70,14 +70,32 @@ func testAccCheckAWSVpcPeeringConnectionDestroy(s *terraform.State) error {
VpcPeeringConnectionIds: []*string{aws.String(rs.Primary.ID)}, VpcPeeringConnectionIds: []*string{aws.String(rs.Primary.ID)},
}) })
if err == nil { if err != nil {
if len(describe.VpcPeeringConnections) != 0 { return err
return fmt.Errorf("vpc peering connection still exists") }
var pc *ec2.VpcPeeringConnection
for _, c := range describe.VpcPeeringConnections {
if rs.Primary.ID == *c.VpcPeeringConnectionId {
pc = c
} }
} }
if pc == nil {
// not found
return nil
}
if pc.Status != nil {
if *pc.Status.Code == "deleted" {
return nil
}
return fmt.Errorf("Found vpc peering connection in unexpected state: %s", pc)
}
} }
return nil return fmt.Errorf("Fall through error for testAccCheckAWSVpcPeeringConnectionDestroy")
} }
func testAccCheckAWSVpcPeeringConnectionExists(n string, connection *ec2.VpcPeeringConnection) resource.TestCheckFunc { func testAccCheckAWSVpcPeeringConnectionExists(n string, connection *ec2.VpcPeeringConnection) resource.TestCheckFunc {