From 87efd63c7d3ad62d55677451d27f09ac84589078 Mon Sep 17 00:00:00 2001
From: Jake Champlin <jake.champlin.27@gmail.com>
Date: Thu, 20 Jul 2017 10:21:07 -0400
Subject: [PATCH] Remove `network_interface_id`

Finally remove `network_interface_id` in favor of
`primary_network_interface_id`.
---
 aws/resource_aws_instance.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go
index 83f2f35a1f6..1caec5e49dc 100644
--- a/aws/resource_aws_instance.go
+++ b/aws/resource_aws_instance.go
@@ -139,11 +139,10 @@ func resourceAwsInstance() *schema.Resource {
 				Computed: true,
 			},
 
-			// TODO: Deprecate me v0.10.0
 			"network_interface_id": {
-				Type:       schema.TypeString,
-				Computed:   true,
-				Deprecated: "Please use `primary_network_interface_id` instead",
+				Type:     schema.TypeString,
+				Computed: true,
+				Removed:  "Use `primary_network_interface_id` instead",
 			},
 
 			"primary_network_interface_id": {
@@ -646,7 +645,6 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
 			d.Set("subnet_id", primaryNetworkInterface.SubnetId)
 		}
 		if primaryNetworkInterface.NetworkInterfaceId != nil {
-			d.Set("network_interface_id", primaryNetworkInterface.NetworkInterfaceId) // TODO: Deprecate me v0.10.0
 			d.Set("primary_network_interface_id", primaryNetworkInterface.NetworkInterfaceId)
 		}
 		if primaryNetworkInterface.Ipv6Addresses != nil {
@@ -664,7 +662,6 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
 
 	} else {
 		d.Set("subnet_id", instance.SubnetId)
-		d.Set("network_interface_id", "") // TODO: Deprecate me v0.10.0
 		d.Set("primary_network_interface_id", "")
 	}