From d616f0ba71e10489346eb9a5a0f4faf0f8508a88 Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Thu, 20 Sep 2018 11:44:37 -0700
Subject: [PATCH] abort if image import fails

---
 builder/amazon/common/state.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go
index 1bfce11d8..7ac866ecd 100644
--- a/builder/amazon/common/state.go
+++ b/builder/amazon/common/state.go
@@ -217,6 +217,12 @@ func WaitForImageToBeImported(c *ec2.EC2, ctx aws.Context, input *ec2.DescribeIm
 				Argument: "ImportImageTasks[].Status",
 				Expected: "completed",
 			},
+			{
+				State:    request.FailureWaiterState,
+				Matcher:  request.PathAnyWaiterMatch,
+				Argument: "ImportImageTasks[].Status",
+				Expected: "deleted",
+			},
 		},
 		Logger: c.Config.Logger,
 		NewRequest: func(opts []request.Option) (*request.Request, error) {