From 10e4147d00b8634f083c8da42d70ed1492252cd4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 20 Apr 2016 17:16:37 -0700
Subject: [PATCH] providers/aws: nat gateway id-only

---
 .../providers/aws/resource_aws_nat_gateway_test.go    |  7 ++++---
 .../providers/aws/resource_aws_network_acl_test.go    | 11 ++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/builtin/providers/aws/resource_aws_nat_gateway_test.go b/builtin/providers/aws/resource_aws_nat_gateway_test.go
index 40b6f77c29..c4dd8b6f68 100644
--- a/builtin/providers/aws/resource_aws_nat_gateway_test.go
+++ b/builtin/providers/aws/resource_aws_nat_gateway_test.go
@@ -16,9 +16,10 @@ func TestAccAWSNatGateway_basic(t *testing.T) {
 	var natGateway ec2.NatGateway
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckNatGatewayDestroy,
+		PreCheck:      func() { testAccPreCheck(t) },
+		IDRefreshName: "aws_nat_gateway.gateway",
+		Providers:     testAccProviders,
+		CheckDestroy:  testAccCheckNatGatewayDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
 				Config: testAccNatGatewayConfig,
diff --git a/builtin/providers/aws/resource_aws_network_acl_test.go b/builtin/providers/aws/resource_aws_network_acl_test.go
index a68a5b09d5..4c54c84de3 100644
--- a/builtin/providers/aws/resource_aws_network_acl_test.go
+++ b/builtin/providers/aws/resource_aws_network_acl_test.go
@@ -391,7 +391,8 @@ resource "aws_network_acl" "foos" {
 		from_port = 443
 		to_port = 443
 	}
-	subnet_id = "${aws_subnet.blob.id}"
+
+	subnet_ids = ["${aws_subnet.blob.id}"]
 }
 `
 const testAccAWSNetworkAclIngressConfigChange = `
@@ -416,7 +417,7 @@ resource "aws_network_acl" "foos" {
 		from_port = 0
 		to_port = 22
 	}
-	subnet_id = "${aws_subnet.blob.id}"
+	subnet_ids = ["${aws_subnet.blob.id}"]
 }
 `
 
@@ -528,11 +529,11 @@ resource "aws_subnet" "new" {
 }
 resource "aws_network_acl" "roll" {
 	vpc_id = "${aws_vpc.foo.id}"
-	subnet_id = "${aws_subnet.new.id}"
+	subnet_ids = ["${aws_subnet.new.id}"]
 }
 resource "aws_network_acl" "bar" {
 	vpc_id = "${aws_vpc.foo.id}"
-	subnet_id = "${aws_subnet.old.id}"
+	subnet_ids = ["${aws_subnet.old.id}"]
 }
 `
 
@@ -555,7 +556,7 @@ resource "aws_subnet" "new" {
 }
 resource "aws_network_acl" "bar" {
 	vpc_id = "${aws_vpc.foo.id}"
-	subnet_id = "${aws_subnet.new.id}"
+	subnet_ids = ["${aws_subnet.new.id}"]
 }
 `