From 125c02e86ae62df6ac417520de5c9cd3f9fb284a Mon Sep 17 00:00:00 2001 From: Zeyu Ye Date: Tue, 27 Aug 2019 16:59:42 +1000 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=93=9D=20incorrect=20documentation=20?= =?UTF-8?q?in=20`alicloud-ecs`=20builder,=20env=20for=20`security=5Ftoken`?= =?UTF-8?q?=20should=20be=20`SECURITY=5FTOKEN`=20instead=20of=20`SecurityT?= =?UTF-8?q?oken`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/source/docs/builders/alicloud-ecs.html.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/builders/alicloud-ecs.html.md b/website/source/docs/builders/alicloud-ecs.html.md index ef113f487..3c3dfa30c 100644 --- a/website/source/docs/builders/alicloud-ecs.html.md +++ b/website/source/docs/builders/alicloud-ecs.html.md @@ -235,7 +235,7 @@ builder. - `security_token` (string) - STS access token, can be set through template or by exporting as environment variable such as - `export SecurityToken=value`. + `export SECURITY_TOKEN=value`. - `skip_region_validation` (boolean) - The region validation can be skipped if this value is true, the default value is false. From b20775288379b1ace89a3679ec757426bc026eaa Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Tue, 27 Aug 2019 16:52:52 -0700 Subject: [PATCH 2/5] provisioner/ansible: Fix dropped error --- provisioner/ansible/provisioner.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index d61d4d44e..f129d8c79 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -240,6 +240,10 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C } hostSigner, err := newSigner(p.config.SSHHostKeyFile) + if err != nil { + return fmt.Errorf("error creating host signer: %s", err) + } + // Remove the private key file if len(k.privKeyFile) > 0 { defer os.Remove(k.privKeyFile) From bd01d0d3c37d5df028621c26212b3584a3df48f0 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Tue, 27 Aug 2019 17:01:33 -0700 Subject: [PATCH 3/5] provisioner/inspec: Fix dropped error --- provisioner/inspec/provisioner.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/provisioner/inspec/provisioner.go b/provisioner/inspec/provisioner.go index 618802f9f..f9d52d36c 100644 --- a/provisioner/inspec/provisioner.go +++ b/provisioner/inspec/provisioner.go @@ -217,6 +217,10 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C } hostSigner, err := newSigner(p.config.SSHHostKeyFile) + if err != nil { + return fmt.Errorf("error creating host signer: %s", err) + } + // Remove the private key file if len(k.privKeyFile) > 0 { defer os.Remove(k.privKeyFile) From 87e0a3b5e782c5069a0693c693899c49f7e5ca99 Mon Sep 17 00:00:00 2001 From: cove Date: Tue, 27 Aug 2019 18:00:08 -0700 Subject: [PATCH 4/5] 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) From f89156fb837090c6386b1c41986af2c30005fd9e Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Wed, 28 Aug 2019 10:11:08 +0200 Subject: [PATCH 5/5] link proxmox builder docs fix #8044 --- website/source/layouts/docs.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 26fd0ab85..11c9f8a49 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -182,6 +182,9 @@ > ProfitBricks + > + Proxmox + > QEMU