network acl cleanups

This commit is contained in:
Clint Shryock 2015-05-12 22:23:55 -05:00
parent 0dda704cbf
commit 898fa91595
2 changed files with 45 additions and 4 deletions

View File

@ -233,15 +233,13 @@ func resourceAwsNetworkAclUpdate(d *schema.ResourceData, meta interface{}) error
if d.HasChange("subnet_ids") { if d.HasChange("subnet_ids") {
o, n := d.GetChange("subnet_ids") o, n := d.GetChange("subnet_ids")
ol := o.([]interface{})
var pre []string var pre []string
for _, x := range ol { for _, x := range o.([]interface{}) {
pre = append(pre, x.(string)) pre = append(pre, x.(string))
} }
nl := n.([]interface{})
var post []string var post []string
for _, x := range nl { for _, x := range n.([]interface{}) {
post = append(post, x.(string)) post = append(post, x.(string))
} }

View File

@ -260,6 +260,15 @@ func TestAccAWSNetworkAcl_Subnets(t *testing.T) {
testAccCheckSubnetIsAssociatedWithAcl("aws_network_acl.bar", "aws_subnet.two"), testAccCheckSubnetIsAssociatedWithAcl("aws_network_acl.bar", "aws_subnet.two"),
), ),
}, },
resource.TestStep{
Config: testAccAWSNetworkAclSubnet_SubnetIdsUpdate,
Check: resource.ComposeTestCheckFunc(
testAccCheckSubnetIsAssociatedWithAcl("aws_network_acl.bar", "aws_subnet.one"),
testAccCheckSubnetIsAssociatedWithAcl("aws_network_acl.bar", "aws_subnet.three"),
testAccCheckSubnetIsAssociatedWithAcl("aws_network_acl.bar", "aws_subnet.four"),
),
},
}, },
}) })
@ -595,3 +604,37 @@ resource "aws_network_acl" "bar" {
subnet_ids = ["${aws_subnet.one.id}", "${aws_subnet.two.id}"] subnet_ids = ["${aws_subnet.one.id}", "${aws_subnet.two.id}"]
} }
` `
const testAccAWSNetworkAclSubnet_SubnetIdsUpdate = `
resource "aws_vpc" "foo" {
cidr_block = "10.1.0.0/16"
tags {
Name = "acl-subnets-test"
}
}
resource "aws_subnet" "one" {
cidr_block = "10.1.111.0/24"
vpc_id = "${aws_vpc.foo.id}"
}
resource "aws_subnet" "two" {
cidr_block = "10.1.1.0/24"
vpc_id = "${aws_vpc.foo.id}"
}
resource "aws_subnet" "three" {
cidr_block = "10.1.222.0/24"
vpc_id = "${aws_vpc.foo.id}"
}
resource "aws_subnet" "four" {
cidr_block = "10.1.4.0/24"
vpc_id = "${aws_vpc.foo.id}"
}
resource "aws_network_acl" "bar" {
vpc_id = "${aws_vpc.foo.id}"
subnet_ids = [
"${aws_subnet.one.id}",
"${aws_subnet.three.id}",
"${aws_subnet.four.id}",
]
}
`