Merge pull request #1193 from terraform-providers/f-deprecate-network…

…-interface-id Remove `network_interface_id`
hashicorp · Feb 25, 2019 · 4772c39 · 4772c39
2 parents cb11aa7 + 87efd63
commit 4772c39
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go
@@ -184,11 +184,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": {
@@ -779,7 +778,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 {
@@ -797,7 +795,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", "")
 	}