service/ec2: Prevent crash with ENI attachments missing DeviceIndex o…

…r AttachmentID (#15567) Added nil checks on network interface attachment id/device index
hashicorp · Nov 9, 2020 · b1615b1 · b1615b1
1 parent 05a856f
commit b1615b1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/aws/structure.go b/aws/structure.go
@@ -1140,8 +1140,12 @@ func flattenAttachment(a *ec2.NetworkInterfaceAttachment) map[string]interface{}
 	if a.InstanceId != nil {
 		att["instance"] = *a.InstanceId
 	}
-	att["device_index"] = *a.DeviceIndex
-	att["attachment_id"] = *a.AttachmentId
+	if a.DeviceIndex != nil {
+		att["device_index"] = *a.DeviceIndex
+	}
+	if a.AttachmentId != nil {
+		att["attachment_id"] = *a.AttachmentId
+	}
 	return att
 }