helper/resource: stdlib to check resource attribute

This commit is contained in:
Mitchell Hashimoto 2014-07-10 14:00:20 -07:00
parent 3ff66b430f
commit 63ef4cf28a
2 changed files with 32 additions and 16 deletions

View File

@ -10,6 +10,8 @@ import (
) )
func TestAccVpc(t *testing.T) { func TestAccVpc(t *testing.T) {
var vpc ec2.VPC
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
@ -18,8 +20,10 @@ func TestAccVpc(t *testing.T) {
resource.TestStep{ resource.TestStep{
Config: testAccVpcConfig, Config: testAccVpcConfig,
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckVpcExists("aws_vpc.foo"), testAccCheckVpcExists("aws_vpc.foo", &vpc),
testAccCheckVpcCidr("aws_vpc.foo", "10.1.0.0/16"), testAccCheckVpcCidr(&vpc, "10.1.0.0/16"),
resource.TestCheckResourceAttr(
"aws_vpc.foo", "cidr_block", "10.1.0.0/16"),
), ),
}, },
}, },
@ -57,27 +61,17 @@ func testAccCheckVpcDestroy(s *terraform.State) error {
return nil return nil
} }
func testAccCheckVpcCidr(n, expected string) resource.TestCheckFunc { func testAccCheckVpcCidr(vpc *ec2.VPC, expected string) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.Resources[n] if vpc.CidrBlock != expected {
if !ok { return fmt.Errorf("Bad cidr: %s", vpc.CidrBlock)
return fmt.Errorf("Not found: %s", n)
}
v, ok := rs.Attributes["cidr_block"]
if !ok {
return fmt.Errorf("No cidr_block")
}
if v != expected {
return fmt.Errorf("Bad cidr: %s", v)
} }
return nil return nil
} }
} }
func testAccCheckVpcExists(n string) resource.TestCheckFunc { func testAccCheckVpcExists(n string, vpc *ec2.VPC) resource.TestCheckFunc {
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.Resources[n] rs, ok := s.Resources[n]
if !ok { if !ok {
@ -97,6 +91,8 @@ func testAccCheckVpcExists(n string) resource.TestCheckFunc {
return fmt.Errorf("VPC not found") return fmt.Errorf("VPC not found")
} }
*vpc = resp.VPCs[0]
return nil return nil
} }
} }

View File

@ -236,6 +236,26 @@ func ComposeTestCheckFunc(fs ...TestCheckFunc) TestCheckFunc {
} }
} }
func TestCheckResourceAttr(name, key, value string) TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.Resources[name]
if !ok {
return fmt.Errorf("Not found: %s", name)
}
if rs.Attributes[key] != value {
return fmt.Errorf(
"%s: Attribute '%s' expected %#v, got %#v",
name,
key,
value,
rs.Attributes[key])
}
return nil
}
}
// TestT is the interface used to handle the test lifecycle of a test. // TestT is the interface used to handle the test lifecycle of a test.
// //
// Users should just use a *testing.T object, which implements this. // Users should just use a *testing.T object, which implements this.