Merge remote-tracking branch 'origin/master' into pr/teddylear/10457

mpalmer · Mar 12, 2021 · 4e22147 · 4e22147
2 parents 0637601 + f1017a1
commit 4e22147
Show file tree

Hide file tree

Showing 917 changed files with 102,466 additions and 79,018 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ version: 2.1
 executors:
   golang:
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.15
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.16
     resource_class: medium+
   darwin:
     macos:
@@ -61,13 +61,11 @@ jobs:
           file: coverage.txt
   test-darwin:
     executor: darwin
-    working_directory: ~/go/src/github.com/hashicorp/packer
-    environment:
-      GO111MODULE: "off"
+    working_directory: ~/go/github.com/hashicorp/packer
     steps:
       - install-go-run-tests-unix:
           GOOS: darwin
-          GOVERSION: "1.15"
+          GOVERSION: "1.16"
       - codecov/upload:
           file: coverage.txt
   test-windows:
@@ -76,7 +74,7 @@ jobs:
       shell: bash.exe
     steps:
       - install-go-run-tests-windows:
-          GOVERSION: "1.15"
+          GOVERSION: "1.16"
       - codecov/upload:
           file: coverage.txt
   check-lint:

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -19,7 +19,7 @@ can quickly merge or address your contributions.
   already fixed the bug you're experiencing.
 
 - Run the command with debug output with the environment variable `PACKER_LOG`.
-  For example: `PACKER_LOG=1 packer build template.json`. Take the _entire_
+  For example: `PACKER_LOG=1 packer build template.pkr.hcl`. Take the _entire_
   output and create a [gist](https://gist.github.com) for linking to in your
   issue. Packer should strip sensitive keys from the output, but take a look
   through just in case.
@@ -64,15 +64,16 @@ can quickly merge or address your contributions.
 If you have never worked with Go before, you will have to install its
 runtime in order to build packer.
 
-1. This project always releases from the latest version of golang. [Install go](https://golang.org/doc/install#install)
+1. This project always releases from the latest version of golang.
+[Install go](https://golang.org/doc/install#install) To properly build from
+source, you need to have golang >= v1.16
 
 ## Setting up Packer for dev
 
 If/when you have go installed you can already `go get` packer and `make` in
 order to compile and test Packer. These instructions target
 POSIX-like environments (macOS, Linux, Cygwin, etc.) so you may need to
 adjust them for Windows or other shells.
-The instructions below are for go 1.7. or later.
 
 1. Download the Packer source (and its dependencies) by running
    `go get github.com/hashicorp/packer`. This will download the Packer source to
@@ -91,7 +92,7 @@ The instructions below are for go 1.7. or later.
 4. After running building Packer successfully, use
    `$GOPATH/src/github.com/hashicorp/packer/bin/packer` to build a machine and
    verify your changes work. For instance:
-   `$GOPATH/src/github.com/hashicorp/packer/bin/packer build template.json`.
+   `$GOPATH/src/github.com/hashicorp/packer/bin/packer build template.pkr.hcl`.
 
 5. If everything works well and the tests pass, run `go fmt` on your code before
    submitting a pull-request.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,22 +1,63 @@
-## 1.7.0 (Upcoming)
+## 1.7.1 (Upcoming)
+
+### IMPROVEMENTS
+* builder/amazon: allow creation of ebs snapshots wihtout volumes. [GH-9591]
+* builder/scaleway: add support for timeout in shutdown step. [GH-10503]
+* builder/virtualbox: Add template options for chipset, firmware, nic, graphics
+    controller, and audio controller. [GH-10671]
+* builder/virtualbox: Support for "virtio" storage and ISO drive. [GH-10632]
+* builder/vmware: Added "attach_snapshot" parameter to vmware vmx builder.
+    [GH-10651]
+* core: Change template parsing error to include warning about file extensions.
+    [GH-10652]
+* hcl2_upgrade: hcl2_upgrade command can now upgrade json var-files [GH-10676]
+
+### BUG FIXES
+* builder/amazon: Update amazon SDK to fix an SSO login issue. [GH-10668]
+* builder/azure: Don't overwrite subscription id if unset. [GH-10659]
+* builder/oracle-oci: Update Oracle Go SDK to fix issue with reading key file.
+    [GH-10560]
+* builder/vmware: Added a fallback file check when trying to determine the
+    network-mapping configuration. [GH-10543]
+* core/hcl2_upgrade: Make hcl2_upgrade command correctly translate
+    pause_before. [GH-10654]
+* core: Templates previously could not interpolate the environment variable
+    PACKER_LOG_PATH. [GH-10660]
+* provisioner/chef-solo: HCL2 templates can support the json_string option.
+    [GH-10655]
+
+## 1.7.0 (February 17, 2021)
 
 ### FEATURES
-** New Command** (HCL only) `packer init` command will download plugins defined
-    in a new `required_plugins` block [GH-10304]
-** New Plugin Type** Data sources can be implemented (blog post forthcoming).
+* **New Command** (HCL only) `packer init` command will download plugins defined
+    in a new `required_plugins` block [GH-10304] [GH-10633].
+* **New Plugin Type** Data sources can be implemented (blog post forthcoming).
     [GH-10440]
-** New Plugin** Aws Secrets Manager data source [GH-10505] [GH-10467]
+* **New Plugin** Aws Secrets Manager data source [GH-10505] [GH-10467]
+
+### BACKWARDS INCOMPATIBILITIES
+* core: The API that the Packer core uses to communicate with community plugins
+    has changed; maintainers of community plugins will need to upgrade their
+    plugins in order to make them compatible with v1.7.0. An upgrade guide will
+    be available on our guides page https://www.packer.io/guides.
 
 ### IMPROVEMENTS
 * builder/amazon: Add `skip_create_ami` option for testing and situations where
     artifact is not the ami. [GH-10531]
-* builder/amazon: Add IMDSv2 support for AWS EBS builder [GH-10546]
+* builder/amazon: Add IMDSv2 support for AWS EBS builder. [GH-10546]
 * builder/amazon: Add resource tags in the launch template used to request spot
     instances. [GH-10456]
 * builder/openstack:  Add `skip_create_image` option for testing and situations
     where artifact is not the image. [GH-10496]
+* builder/oracle-oci: Add retry strategies to oci calls [GH-10591]
 * core/fmt: The `packer fmt` can now read from stdin. [GH-10500]
-* core/hcl: Templates now support "sensitive" locals [GH-10509]
+* core/hcl: Add regex and regexall hcl2 template functions. [GH-10601]
+* core/hcl: Templates now support "sensitive" locals. [GH-10509]
+* core/hcl: Templates now support error-cleanup-provisioner. [GH-10604]
+* hcl2_upgrade: Command now comes with a flag so you can control whether output
+    templates are annotated with helpful comments. [GH-10619]
+* hcl2_upgrade: Command now gracefully handles options with template engine
+    interpolations. [GH-10625]
 * hcl2_upgrade: Command will convert amazon filters to use the ami data source.
     [GH-10491]
 
@@ -25,24 +66,30 @@
     snapshot. [GH-10150]
 * builder/amazon: Fix bug where validation fails if optional iops value is
     unset. [GH-10518]
-* builder/bsusurrogate: override bsu when omi root device is set [GH-10490]
+* builder/amazon: Wrap API call to get filtered image in a retry. [GH-10610]
+* builder/bsusurrogate: override bsu when omi root device is set. [GH-10490]
 * builder/google: Fix bug where Packer would fail when run by users who do not
     have permission to access the metadata, even though the metadata is not
     necessary to the run. [GH-10458]
 * builder/profitbricks: Profitbricks builder could not connect using SSH
-    communicator [GH-10549]
-* builder/proxmox: Improve cloud init error logging for proxmox builder
+    communicator. [GH-10549]
+* builder/proxmox: Ensure ISOs in additional_iso_files are mounted during VM
+    creation. [GH-10586]
+* builder/proxmox: Improve cloud init error logging for proxmox builder.
     [GH-10499]
 * builder/qemu: Fix bug where vnc_min_port set to value greater then 5900 could
-    prevent Packer from connecting to QEMU. [GH-10450]
+    prevent Packer from connecting to QEMU. [GH-10450] [GH-10451]
 * builder/qemu: Fix regression with cd indexing when disk_interface is `ide`.
     [GH-10519]
 * builder/vmware-esx: Skip credential validation, which requires ovftool to be
     installed, if we are not exporting an image. [GH-10520]
 * builder/yandex: Fix cloud-init config for ubuntu 20.04. [GH-10522]
 * builder/yandex: Fix incorrect access to `instance_id`. [GH-10522]
 * core/hcl: Fix bug where []uint8 types could not be passed to plugins.
-* core/hcl: Fix force flag for hcl2 provisioners and post-processors [GH-10571]
+* core/hcl: fix bug where HCL core could not handle passing []uint8 to plugins.
+    [GH-10516]
+* core/hcl: Fix force flag for hcl2 provisioners and post-processors.
+    [GH-10571]
 * post-processor/vsphere: Fix regression where Packer would not check the exit
     status after streaming UI from the ovftool command. [GH-10468]
 * post-processor/yandex-export: Changed dhclient command and supported
@@ -58,7 +105,7 @@
     [GH-10377]
 * **New function** `env` allows users to set the default value of a variable to
     the value of an environment variable. Please see [env function
-    docs](https://www.packer.io/docs/templates/hcl_templates/functions/contextual/env") for
+    docs](https://www.packer.io/docs/templates/hcl_templates/functions/contextual/env) for
     more details. [GH-10240]
 * **Future Scaffolding** This release contains a large number of no-op
     refactoring changes. The Packer team at HashiCorp is preparing to split the

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -87,7 +87,6 @@
 
 /post-processor/alicloud-import/        [email protected]
 /post-processor/checksum/               [email protected]
-/post-processor/exoscale-import/        @falzm @mcorbin
 /post-processor/googlecompute-export/   [email protected]
 /post-processor/yandex-export/          @GennadySpb
 /post-processor/yandex-import/          @GennadySpb

diff --git a/README.md b/README.md
@@ -1,23 +1,24 @@
 # Packer
 
 [![Build Status][circleci-badge]][circleci]
-[![Windows Build Status][appveyor-badge]][appveyor]
+[![Discuss](https://img.shields.io/badge/discuss-packer-3d89ff?style=flat)](https://discuss.hashicorp.com/c/packer)
 [![PkgGoDev](https://pkg.go.dev/badge/github.com/hashicorp/packer)](https://pkg.go.dev/github.com/hashicorp/packer)
 [![GoReportCard][report-badge]][report]
 [![codecov](https://codecov.io/gh/hashicorp/packer/branch/master/graph/badge.svg)](https://codecov.io/gh/hashicorp/packer)
 
 [circleci-badge]: https://circleci.com/gh/hashicorp/packer.svg?style=svg
 [circleci]: https://app.circleci.com/pipelines/github/hashicorp/packer
 [appveyor-badge]: https://ci.appveyor.com/api/projects/status/miavlgnp989e5obc/branch/master?svg=true
-[appveyor]: https://ci.appveyor.com/project/hashicorp/packer
 [godoc-badge]: https://godoc.org/github.com/hashicorp/packer?status.svg
-[godoc]: https://godoc.org/github.com/hashicorp/packer
-[report-badge]: https://goreportcard.com/badge/github.com/hashicorp/packer
+[godoc]: https://godoc.org/github.com/hashicorp/packer	
+[report-badge]: https://goreportcard.com/badge/github.com/hashicorp/packer	
 [report]: https://goreportcard.com/report/github.com/hashicorp/packer
 
-* Website: https://www.packer.io
-* IRC: `#packer-tool` on Freenode
-* Mailing list: [Google Groups](https://groups.google.com/forum/#!forum/packer-tool)
+<p align="center" style="text-align:center;">
+  <a href="https://www.packer.io">
+    <img alt="HashiCorp Packer logo" src="website/public/img/logo-packer-padded.svg" width="500" />
+  </a>
+</p>
 
 Packer is a tool for building identical machine images for multiple platforms
 from a single source configuration.
@@ -47,33 +48,43 @@ yourself](https://github.com/hashicorp/packer/blob/master/.github/CONTRIBUTING.m
 
 After Packer is installed, create your first template, which tells Packer
 what platforms to build images for and how you want to build them. In our
-case, we'll create a simple AMI that has Redis pre-installed. Save this
-file as `quick-start.json`. Export your AWS credentials as the
+case, we'll create a simple AMI that has Redis pre-installed. 
+
+Save this file as `quick-start.pkr.hcl`. Export your AWS credentials as the
 `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables.
 
-```json
-{
-  "variables": {
-    "access_key": "{{env `AWS_ACCESS_KEY_ID`}}",
-    "secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}"
-  },
-  "builders": [{
-    "type": "amazon-ebs",
-    "access_key": "{{user `access_key`}}",
-    "secret_key": "{{user `secret_key`}}",
-    "region": "us-east-1",
-    "source_ami": "ami-af22d9b9",
-    "instance_type": "t2.micro",
-    "ssh_username": "ubuntu",
-    "ami_name": "packer-example {{timestamp}}"
-  }]
+```hcl
+variable "access_key" {
+  type    = string
+  default = "${env("AWS_ACCESS_KEY_ID")}"
+}
+
+variable "secret_key" {
+  type    = string
+  default = "${env("AWS_SECRET_ACCESS_KEY")}"
+}
+
+locals { timestamp = regex_replace(timestamp(), "[- TZ:]", "") }
+
+source "amazon-ebs" "quick-start" {
+  access_key    = "${var.access_key}"
+  ami_name      = "packer-example ${local.timestamp}"
+  instance_type = "t2.micro"
+  region        = "us-east-1"
+  secret_key    = "${var.secret_key}"
+  source_ami    = "ami-af22d9b9"
+  ssh_username  = "ubuntu"
+}
+
+build {
+  sources = ["source.amazon-ebs.quick-start"]
 }
 ```
 
 Next, tell Packer to build the image:
 
 ```
-$ packer build quick-start.json
+$ packer build quick-start.pkr.hcl
 ...
 ```
 
@@ -85,11 +96,9 @@ they're run, etc., is up to you.
 
 ## Documentation
 
-Comprehensive documentation is viewable on the Packer website:
-
-https://www.packer.io/docs
+Comprehensive documentation is viewable on the Packer website at https://www.packer.io/docs.
 
-## Developing Packer
+## Contributing to Packer
 
 See
 [CONTRIBUTING.md](https://github.com/hashicorp/packer/blob/master/.github/CONTRIBUTING.md)

diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go
@@ -29,7 +29,7 @@ import (
 // HCL config example:
 //
 // ```HCL
-// source "example" "amazon-ebs"{
+// source "amazon-ebs" "example" {
 // 	assume_role {
 // 		role_arn     = "arn:aws:iam::ACCOUNT_ID:role/ROLE_NAME"
 // 		session_name = "SESSION_NAME"
@@ -174,6 +174,16 @@ type AccessConfig struct {
 	//     credential types) and GetFederationToken (for federation\_token
 	//     credential types) for more details.
 	//
+	// HCL2 example:
+	//
+	// ```hcl
+	// vault_aws_engine {
+	//     name = "myrole"
+	//     role_arn = "myarn"
+	//     ttl = "3600s"
+	// }
+	// ```
+	//
 	// JSON example:
 	//
 	// ```json
@@ -185,16 +195,6 @@ type AccessConfig struct {
 	//     }
 	// }
 	// ```
-	//
-	// HCL2 example:
-	//
-	// ```hcl
-	//   vault_aws_engine {
-	//       name = "myrole"
-	//       role_arn = "myarn"
-	//       ttl = "3600s"
-	//   }
-	// ```
 	VaultAWSEngine VaultAWSEngineOptions `mapstructure:"vault_aws_engine" required:"false"`
 	// [Polling configuration](#polling-configuration) for the AWS waiter. Configures the waiter that checks
 	// resource state.

diff --git a/builder/amazon/common/access_config_test.go b/builder/amazon/common/access_config_test.go
@@ -5,20 +5,10 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 )
 
-func testAccessConfig() *AccessConfig {
-	return &AccessConfig{
-		getEC2Connection: func() ec2iface.EC2API {
-			return &mockEC2Client{}
-		},
-		PollingConfig: new(AWSPollingConfig),
-	}
-}
-
 func TestAccessConfigPrepare_Region(t *testing.T) {
-	c := testAccessConfig()
+	c := FakeAccessConfig()
 
 	c.RawRegion = "us-east-12"
 	err := c.ValidateRegion(c.RawRegion)
@@ -40,7 +30,7 @@ func TestAccessConfigPrepare_Region(t *testing.T) {
 }
 
 func TestAccessConfigPrepare_RegionRestricted(t *testing.T) {
-	c := testAccessConfig()
+	c := FakeAccessConfig()
 
 	// Create a Session with a custom region
 	c.session = session.Must(session.NewSession(&aws.Config{