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

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

@ -132,11 +132,11 @@ func TestAccAWSOpsworksStackNoVpc(t *testing.T) {
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAwsOpsworksStackConfigNoVpcCreate,
Check: testAccAwsOpsworksStackCheckResourceAttrsCreate,
Check: testAccAwsOpsworksStackCheckResourceAttrsCreate("us-east-1c"),
},
resource.TestStep{
Config: testAccAWSOpsworksStackConfigNoVpcUpdate,
Check: testAccAwsOpsworksStackCheckResourceAttrsUpdate,
Check: testAccAwsOpsworksStackCheckResourceAttrsUpdate("us-east-1c"),
},
},
})
@ -153,11 +153,11 @@ resource "aws_vpc" "tf-acc" {
resource "aws_subnet" "tf-acc" {
vpc_id = "${aws_vpc.tf-acc.id}"
cidr_block = "${aws_vpc.tf-acc.cidr_block}"
availability_zone = "us-east-1c"
availability_zone = "us-west-2a"
}
resource "aws_opsworks_stack" "tf-acc" {
name = "tf-opsworks-acc"
region = "us-east-1"
region = "us-west-2"
vpc_id = "${aws_vpc.tf-acc.id}"
default_subnet_id = "${aws_subnet.tf-acc.id}"
service_role_arn = "${aws_iam_role.opsworks_service.arn}"
@ -177,11 +177,11 @@ resource "aws_vpc" "tf-acc" {
resource "aws_subnet" "tf-acc" {
vpc_id = "${aws_vpc.tf-acc.id}"
cidr_block = "${aws_vpc.tf-acc.cidr_block}"
availability_zone = "us-east-1c"
availability_zone = "us-west-2a"
}
resource "aws_opsworks_stack" "tf-acc" {
name = "tf-opsworks-acc"
region = "us-east-1"
region = "us-west-2"
vpc_id = "${aws_vpc.tf-acc.id}"
default_subnet_id = "${aws_subnet.tf-acc.id}"
service_role_arn = "${aws_iam_role.opsworks_service.arn}"
@ -209,12 +209,12 @@ func TestAccAWSOpsworksStackVpc(t *testing.T) {
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccAwsOpsworksStackConfigVpcCreate,
Check: testAccAwsOpsworksStackCheckResourceAttrsCreate,
Check: testAccAwsOpsworksStackCheckResourceAttrsCreate("us-west-2a"),
},
resource.TestStep{
Config: testAccAWSOpsworksStackConfigVpcUpdate,
Check: resource.ComposeTestCheckFunc(
testAccAwsOpsworksStackCheckResourceAttrsUpdate,
testAccAwsOpsworksStackCheckResourceAttrsUpdate("us-west-2a"),
testAccAwsOpsworksCheckVpc,
),
},
@ -226,7 +226,8 @@ func TestAccAWSOpsworksStackVpc(t *testing.T) {
//// Checkers and Utilities
////////////////////////////
var testAccAwsOpsworksStackCheckResourceAttrsCreate = resource.ComposeTestCheckFunc(
func testAccAwsOpsworksStackCheckResourceAttrsCreate(zone string) resource.TestCheckFunc {
return resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"aws_opsworks_stack.tf-acc",
"name",
@ -235,7 +236,7 @@ var testAccAwsOpsworksStackCheckResourceAttrsCreate = resource.ComposeTestCheckF
resource.TestCheckResourceAttr(
"aws_opsworks_stack.tf-acc",
"default_availability_zone",
"us-east-1c",
zone,
),
resource.TestCheckResourceAttr(
"aws_opsworks_stack.tf-acc",
@ -262,9 +263,11 @@ var testAccAwsOpsworksStackCheckResourceAttrsCreate = resource.ComposeTestCheckF
"use_opsworks_security_groups",
"false",
),
)
)
}
var testAccAwsOpsworksStackCheckResourceAttrsUpdate = resource.ComposeTestCheckFunc(
func testAccAwsOpsworksStackCheckResourceAttrsUpdate(zone string) resource.TestCheckFunc {
return resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"aws_opsworks_stack.tf-acc",
"name",
@ -273,7 +276,7 @@ var testAccAwsOpsworksStackCheckResourceAttrsUpdate = resource.ComposeTestCheckF
resource.TestCheckResourceAttr(
"aws_opsworks_stack.tf-acc",
"default_availability_zone",
"us-east-1c",
zone,
),
resource.TestCheckResourceAttr(
"aws_opsworks_stack.tf-acc",
@ -325,7 +328,8 @@ var testAccAwsOpsworksStackCheckResourceAttrsUpdate = resource.ComposeTestCheckF
"custom_cookbooks_source.0.url",
"https://github.com/aws/opsworks-example-cookbooks.git",
),
)
)
}
func testAccAwsOpsworksCheckVpc(s *terraform.State) error {
rs, ok := s.RootModule().Resources["aws_opsworks_stack.tf-acc"]
@ -381,7 +385,6 @@ func testAccCheckAwsOpsworksStackDestroy(s *terraform.State) error {
}
return err
}
}
return fmt.Errorf("Fall through error for OpsWorks stack test")
}

24
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)},
})
if err == nil {
if len(describe.VpcPeeringConnections) != 0 {
return fmt.Errorf("vpc peering connection still exists")
if err != nil {
return err
}
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 fmt.Errorf("Fall through error for testAccCheckAWSVpcPeeringConnectionDestroy")
}
func testAccCheckAWSVpcPeeringConnectionExists(n string, connection *ec2.VpcPeeringConnection) resource.TestCheckFunc {