From e5e5fd1198873e514a8d0283ff9c761fd4cfce22 Mon Sep 17 00:00:00 2001
From: Patrick Ng <yingtat.ng@veeva.com>
Date: Wed, 5 Feb 2020 15:09:09 -0800
Subject: [PATCH] Instance Running waiter not aware of global waiter settings

---
 builder/amazon/common/state.go                    | 13 +++++++++++++
 builder/amazon/common/step_run_source_instance.go |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go
index 61b7b9f62..4e08d2733 100644
--- a/builder/amazon/common/state.go
+++ b/builder/amazon/common/state.go
@@ -66,6 +66,19 @@ func WaitUntilAMIAvailable(ctx aws.Context, conn ec2iface.EC2API, imageId string
 	return err
 }
 
+func WaitUntilInstanceRunning(ctx aws.Context, conn *ec2.EC2, instanceId string) error {
+
+	instanceInput := ec2.DescribeInstancesInput{
+		InstanceIds: []*string{&instanceId},
+	}
+
+	err := conn.WaitUntilInstanceRunningWithContext(
+		ctx,
+		&instanceInput,
+		getWaiterOptions()...)
+	return err
+}
+
 func WaitUntilInstanceTerminated(ctx aws.Context, conn *ec2.EC2, instanceId string) error {
 
 	instanceInput := ec2.DescribeInstancesInput{
diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go
index b83db0383..56d43e9d6 100644
--- a/builder/amazon/common/step_run_source_instance.go
+++ b/builder/amazon/common/step_run_source_instance.go
@@ -233,7 +233,8 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 	describeInstance := &ec2.DescribeInstancesInput{
 		InstanceIds: []*string{aws.String(instanceId)},
 	}
-	if err := ec2conn.WaitUntilInstanceRunningWithContext(ctx, describeInstance); err != nil {
+
+	if err := WaitUntilInstanceRunning(ctx, ec2conn, instanceId); err != nil {
 		err := fmt.Errorf("Error waiting for instance (%s) to become ready: %s", instanceId, err)
 		state.Put("error", err)
 		ui.Error(err.Error())