diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go index a66e5d53b6f..6d5c0d1c1d3 100644 --- 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` attribute 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", "") } diff --git a/website/docs/r/instance.html.markdown b/website/docs/r/instance.html.markdown index bbdfe37fe0e..bc102e55066 100644 --- a/website/docs/r/instance.html.markdown +++ b/website/docs/r/instance.html.markdown @@ -263,7 +263,6 @@ In addition to all arguments above, the following attributes are exported: is only available if you've enabled DNS hostnames for your VPC * `public_ip` - The public IP address assigned to the instance, if applicable. **NOTE**: If you are using an [`aws_eip`](/docs/providers/aws/r/eip.html) with your instance, you should refer to the EIP's address directly and not use `public_ip`, as this field will change after the EIP is attached. * `ipv6_addresses` - A list of assigned IPv6 addresses, if any -* `network_interface_id` - The ID of the network interface that was created with the instance. * `primary_network_interface_id` - The ID of the instance's primary network interface. * `private_dns` - The private DNS name assigned to the instance. Can only be used inside the Amazon EC2, and only available if you've enabled DNS hostnames