From 87e0a3b5e782c5069a0693c693899c49f7e5ca99 Mon Sep 17 00:00:00 2001 From: cove Date: Tue, 27 Aug 2019 18:00:08 -0700 Subject: [PATCH] add prevalidating AMI name retries so the build doesn't fail when throttled --- builder/amazon/common/step_pre_validate.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builder/amazon/common/step_pre_validate.go b/builder/amazon/common/step_pre_validate.go index 592f9d539..5aeecc2f6 100644 --- a/builder/amazon/common/step_pre_validate.go +++ b/builder/amazon/common/step_pre_validate.go @@ -85,19 +85,20 @@ func (s *StepPreValidate) Run(ctx context.Context, state multistep.StateBag) mul ec2conn := state.Get("ec2").(*ec2.EC2) ui.Say(fmt.Sprintf("Prevalidating AMI Name: %s", s.DestAmiName)) - resp, err := ec2conn.DescribeImages(&ec2.DescribeImagesInput{ + req, resp := ec2conn.DescribeImagesRequest(&ec2.DescribeImagesInput{ Filters: []*ec2.Filter{{ Name: aws.String("name"), Values: []*string{aws.String(s.DestAmiName)}, }}}) + req.RetryCount = 11 + err := req.Send() if err != nil { err := fmt.Errorf("Error querying AMI: %s", err) state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt } - if len(resp.Images) > 0 { err := fmt.Errorf("Error: AMI Name: '%s' is used by an existing AMI: %s", *resp.Images[0].Name, *resp.Images[0].ImageId) state.Put("error", err)