reading the aws instance it was assumed that eth0 was the first in th…

…e list of network interfaces (hashicorp#6761)
paybyphone · May 29, 2016 · c1eee52 · c1eee52
1 parent f3a3cfa
commit c1eee52
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/builtin/providers/aws/resource_aws_instance.go b/builtin/providers/aws/resource_aws_instance.go
@@ -488,7 +488,11 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
  d.Set("iam_instance_profile", iamInstanceProfileArnToName(instance.IamInstanceProfile))
 
  if len(instance.NetworkInterfaces) > 0 {
- d.Set("subnet_id", instance.NetworkInterfaces[0].SubnetId)
+ for _, ni := range instance.NetworkInterfaces {
+ if *ni.Attachment.DeviceIndex == 0 {
+ d.Set("subnet_id", ni.SubnetId)
+ }
+ }
  } else {
  d.Set("subnet_id", instance.SubnetId)
  }