Import test refactor for EIP resources

Author: ryndaniels

aws/resource_aws_eip_association_test.go

@@ -12,48 +12,9 @@ import (
 	"github.com/hashicorp/terraform/terraform"
 )
 
-func TestAccAWSEIPAssociation_importInstance(t *testing.T) {
-	resourceName := "aws_eip_association.test"
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckAWSEIPAssociationDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccAWSEIPAssociationConfig_instance,
-			},
-			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func TestAccAWSEIPAssociation_importNetworkInterface(t *testing.T) {
-	resourceName := "aws_eip_association.test"
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckAWSEIPAssociationDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccAWSEIPAssociationConfig_networkInterface,
-			},
-			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
 func TestAccAWSEIPAssociation_basic(t *testing.T) {
 	var a ec2.Address
+	resourceName := "aws_eip_association.by_allocation_id"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -64,25 +25,31 @@ func TestAccAWSEIPAssociation_basic(t *testing.T) {
 				Config: testAccAWSEIPAssociationConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSEIPExists(
-						"aws_eip.bar.0", &a),
+						"aws_eip.test.0", &a),
 					testAccCheckAWSEIPAssociationExists(
 						"aws_eip_association.by_allocation_id", &a),
 					testAccCheckAWSEIPExists(
-						"aws_eip.bar.1", &a),
+						"aws_eip.test.1", &a),
 					testAccCheckAWSEIPAssociationExists(
 						"aws_eip_association.by_public_ip", &a),
 					testAccCheckAWSEIPExists(
-						"aws_eip.bar.2", &a),
+						"aws_eip.test.2", &a),
 					testAccCheckAWSEIPAssociationExists(
 						"aws_eip_association.to_eni", &a),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
 
 func TestAccAWSEIPAssociation_ec2Classic(t *testing.T) {
 	var a ec2.Address
+	resourceName := "aws_eip_association.test"
 
 	oldvar := os.Getenv("AWS_DEFAULT_REGION")
 	os.Setenv("AWS_DEFAULT_REGION", "us-east-1")
@@ -103,13 +70,19 @@ func TestAccAWSEIPAssociation_ec2Classic(t *testing.T) {
 					testAccCheckAWSEIPAssociationHasIpBasedId("aws_eip_association.test", &a),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
 
 func TestAccAWSEIPAssociation_spotInstance(t *testing.T) {
 	var a ec2.Address
 	rInt := acctest.RandInt()
+	resourceName := "aws_eip_association.test"
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -125,6 +98,11 @@ func TestAccAWSEIPAssociation_spotInstance(t *testing.T) {
 					resource.TestCheckResourceAttrSet("aws_eip_association.test", "instance_id"),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -248,55 +226,55 @@ func testAccCheckAWSEIPAssociationDestroy(s *terraform.State) error {
 }
 
 const testAccAWSEIPAssociationConfig = `
-resource "aws_vpc" "main" {
+resource "aws_vpc" "test" {
 	cidr_block = "192.168.0.0/24"
 	tags = {
 		Name = "terraform-testacc-eip-association"
 	}
 }
-resource "aws_subnet" "sub" {
-	vpc_id = "${aws_vpc.main.id}"
+resource "aws_subnet" "test" {
+	vpc_id = "${aws_vpc.test.id}"
 	cidr_block = "192.168.0.0/25"
 	availability_zone = "us-west-2a"
 	tags = {
 		Name = "tf-acc-eip-association"
 	}
 }
-resource "aws_internet_gateway" "igw" {
-	vpc_id = "${aws_vpc.main.id}"
+resource "aws_internet_gateway" "test" {
+	vpc_id = "${aws_vpc.test.id}"
 }
-resource "aws_instance" "foo" {
+resource "aws_instance" "test" {
 	count = 2
 	ami = "ami-21f78e11"
 	availability_zone = "us-west-2a"
 	instance_type = "t1.micro"
-	subnet_id = "${aws_subnet.sub.id}"
+	subnet_id = "${aws_subnet.test.id}"
 	private_ip = "192.168.0.${count.index+10}"
 }
-resource "aws_eip" "bar" {
+resource "aws_eip" "test" {
 	count = 3
 	vpc = true
 }
 resource "aws_eip_association" "by_allocation_id" {
-	allocation_id = "${aws_eip.bar.0.id}"
-	instance_id = "${aws_instance.foo.0.id}"
-	depends_on = ["aws_instance.foo"]
+	allocation_id = "${aws_eip.test.0.id}"
+	instance_id = "${aws_instance.test.0.id}"
+	depends_on = ["aws_instance.test"]
 }
 resource "aws_eip_association" "by_public_ip" {
-	public_ip = "${aws_eip.bar.1.public_ip}"
-	instance_id = "${aws_instance.foo.1.id}"
-	depends_on = ["aws_instance.foo"]
+	public_ip = "${aws_eip.test.1.public_ip}"
+	instance_id = "${aws_instance.test.1.id}"
+	depends_on = ["aws_instance.test"]
 }
 resource "aws_eip_association" "to_eni" {
-	allocation_id = "${aws_eip.bar.2.id}"
-	network_interface_id = "${aws_network_interface.baz.id}"
+	allocation_id = "${aws_eip.test.2.id}"
+	network_interface_id = "${aws_network_interface.test.id}"
 }
-resource "aws_network_interface" "baz" {
-	subnet_id = "${aws_subnet.sub.id}"
+resource "aws_network_interface" "test" {
+	subnet_id = "${aws_subnet.test.id}"
 	private_ips = ["192.168.0.50"]
-	depends_on = ["aws_instance.foo"]
+	depends_on = ["aws_instance.test"]
 	attachment {
-		instance = "${aws_instance.foo.0.id}"
+		instance = "${aws_instance.test.0.id}"
 		device_index = 1
 	}
 }