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

Adds an acceptance test for the AWS Network ACL Rules

This commit is contained in:
stack72 2015-12-18 16:57:17 +00:00
parent 2df8d7d9b0
commit 96ad95abe9
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
builtin/providers/aws/resource_aws_network_acl_rule_test.go
View File

@ -37,9 +37,6 @@ func testAccCheckAWSNetworkAclRuleDestroy(s *terraform.State) error {
continue continue
} }
rule_number := rs.Primary.Attributes["rule_number"].(int)
egress := rs.Primary.Attributes["egress"].(bool)
req := &ec2.DescribeNetworkAclsInput{ req := &ec2.DescribeNetworkAclsInput{
NetworkAclIds: []*string{aws.String(rs.Primary.ID)}, NetworkAclIds: []*string{aws.String(rs.Primary.ID)},
} }
@ -48,11 +45,7 @@ func testAccCheckAWSNetworkAclRuleDestroy(s *terraform.State) error {
if len(resp.NetworkAcls) > 0 && *resp.NetworkAcls[0].NetworkAclId == rs.Primary.ID { if len(resp.NetworkAcls) > 0 && *resp.NetworkAcls[0].NetworkAclId == rs.Primary.ID {
networkAcl := resp.NetworkAcls[0] networkAcl := resp.NetworkAcls[0]
if networkAcl.Entries != nil { if networkAcl.Entries != nil {
for _, i := range networkAcl.Entries { return fmt.Errorf("Network ACL Entries still exist")
if *i.RuleNumber == int64(rule_number) && *i.Egress == egress {
return fmt.Errorf("Network ACL Rule (%s) still exists.", rs.Primary.ID)
}
}
} }
} }
} }
@ -61,7 +54,6 @@ func testAccCheckAWSNetworkAclRuleDestroy(s *terraform.State) error {
if !ok { if !ok {
return err return err
} }
// Confirm error code is what we want
if ec2err.Code() != "InvalidNetworkAclEntry.NotFound" { if ec2err.Code() != "InvalidNetworkAclEntry.NotFound" {
return err return err
} }
@ -71,6 +63,8 @@ func testAccCheckAWSNetworkAclRuleDestroy(s *terraform.State) error {
} }
func testAccCheckAWSNetworkAclRuleExists(n string, networkAcl *ec2.NetworkAcl) resource.TestCheckFunc { func testAccCheckAWSNetworkAclRuleExists(n string, networkAcl *ec2.NetworkAcl) resource.TestCheckFunc {
conn := testAccProvider.Meta().(*AWSClient).ec2conn
return func(s *terraform.State) error { return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n] rs, ok := s.RootModule().Resources[n]
if !ok { if !ok {
@ -78,7 +72,28 @@ func testAccCheckAWSNetworkAclRuleExists(n string, networkAcl *ec2.NetworkAcl) r
} }
if rs.Primary.ID == "" { if rs.Primary.ID == "" {
return fmt.Errorf("No Security Group is set") return fmt.Errorf("No Network ACL Id is set")
}
req := &ec2.DescribeNetworkAclsInput{
NetworkAclIds: []*string{aws.String(rs.Primary.ID)},
}
resp, err := conn.DescribeNetworkAcls(req)
if err == nil {
if len(resp.NetworkAcls) > 0 && *resp.NetworkAcls[0].NetworkAclId == rs.Primary.ID {
networkAcl := resp.NetworkAcls[0]
if networkAcl.Entries == nil {
return fmt.Errorf("No Network ACL Entries exist")
}
}
}
ec2err, ok := err.(awserr.Error)
if !ok {
return err
}
if ec2err.Code() != "InvalidNetworkAclEntry.NotFound" {
return err
} }
return nil return nil