From 00de0f49969f9d8604eba26cd8f3fd18d58b3785 Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Fri, 17 Aug 2018 13:27:19 -0700
Subject: [PATCH] increase the timeout for waiting for an ami to become
 available

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

diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go
index b76352a5e..18eb41289 100644
--- a/builder/amazon/common/state.go
+++ b/builder/amazon/common/state.go
@@ -40,10 +40,16 @@ func WaitUntilAMIAvailable(ctx aws.Context, conn *ec2.EC2, imageId string) error
 		ImageIds: []*string{&imageId},
 	}
 
+	waitOpts := getWaiterOptions()
+	if len(waitOpts) == 0 {
+		// Bump this default to 25 minutes because the aws default
+		// of ten minutes doesn't work for some of our long-running copies.
+		waitOpts = append(waitOpts, request.WithWaiterMaxAttempts(100))
+	}
 	err := conn.WaitUntilImageAvailableWithContext(
 		ctx,
 		&imageInput,
-		getWaiterOptions()...)
+		waitOpts...)
 	return err
 }