add source_ami_filter test to acceptance tests from packer-regressions

.circleci/config.yml

@@ -1,7 +1,5 @@
 orbs:
   win: circleci/windows@1.0.0
-  codecov: codecov/codecov@1.0.5
-
 version: 2.1
 
 executors:
@@ -22,7 +20,7 @@ commands:
     steps:
       - checkout
       - run: curl https://dl.google.com/go/go<< parameters.GOVERSION >>.<< parameters.GOOS >>-amd64.tar.gz | tar -C ~/ -xz
-      - run: ~/go/bin/go test ./... -coverprofile=coverage.txt  -covermode=atomic
+      - run: ~/go/bin/go test ./...
   install-go-run-tests-windows:
     parameters:
       GOVERSION:
@@ -31,7 +29,7 @@ commands:
       - checkout
       - run: curl https://dl.google.com/go/go<< parameters.GOVERSION >>.windows-amd64.zip --output ~/go<< parameters.GOVERSION >>.windows-amd64.zip
       - run: unzip ~/go<< parameters.GOVERSION >>.windows-amd64.zip -d ~/
-      - run: ~/go/bin/go test ./... -coverprofile=coverage.txt  -covermode=atomic
+      - run: ~/go/bin/go test ./...
   build-and-persist-packer-binary:
     parameters:
       GOOS:
@@ -51,13 +49,10 @@ commands:
 jobs:
   test-linux:
     executor: golang
-    resource_class: large
     working_directory: /go/src/github.com/hashicorp/packer
     steps:
       - checkout
-      - run: TESTARGS="-coverprofile=coverage.txt  -covermode=atomic" make ci
-      - codecov/upload:
-          file: coverage.txt
+      - run: make ci
   test-darwin:
     executor: darwin
     working_directory: ~/go/src/github.com/hashicorp/packer
@@ -67,8 +62,6 @@ jobs:
       - install-go-run-tests-unix:
           GOOS: darwin
           GOVERSION: "1.13"
-      - codecov/upload:
-          file: coverage.txt
   test-windows:
     executor:
       name: win/vs2019
@@ -76,17 +69,6 @@ jobs:
     steps:
       - install-go-run-tests-windows:
           GOVERSION: "1.13"
-      - codecov/upload:
-          file: coverage.txt
-  check-lint:
-    executor: golang
-    resource_class: large
-    steps:
-      - checkout
-      - run: git fetch --all
-      - run:
-          command: make ci-lint
-          no_output_timeout: 30m
   check-vendor-vs-mod:
     executor: golang
     working_directory: /go/src/github.com/hashicorp/packer
@@ -159,28 +141,6 @@ jobs:
           at: .
       - run: |
           ghr -prerelease -t ${GITHUB_TOKEN_AZR} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./pkg/
-  build-website-docker-image:
-    docker:
-      - image: circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Build Docker Image if Necessary
-          command: |
-            IMAGE_TAG=$(cat website/Dockerfile website/package-lock.json | sha256sum | awk '{print $1;}')
-            echo "Using $IMAGE_TAG"
-            if curl https://hub.docker.com/v2/repositories/hashicorp/packer-website/tags/$IMAGE_TAG -fsL > /dev/null; then
-                echo "Dependencies have not changed, not building a new website docker image."
-            else
-                cd website/
-                docker build -t hashicorp/packer-website:$IMAGE_TAG .
-                docker tag hashicorp/packer-website:$IMAGE_TAG hashicorp/packer-website:latest
-                docker login -u $WEBSITE_DOCKER_USER -p $WEBSITE_DOCKER_PASS
-                docker push hashicorp/packer-website
-            fi
-
 workflows:
   version: 2
   test:
@@ -190,45 +150,32 @@ workflows:
       - test-windows
   check-code:
     jobs:
-      - check-lint
       - check-vendor-vs-mod
       - check-fmt
       - check-generate
   build_packer_binaries:
     jobs:
       - build_linux:
-          requires:
-            - test
           filters:
             tags:
               only: /.*/
       - build_darwin:
-          requires:
-            - test
           filters:
             tags:
               only: /.*/
       - build_windows:
-          requires:
-            - test
           filters:
             tags:
               only: /.*/
       - build_freebsd:
-          requires:
-            - test
           filters:
             tags:
               only: /.*/
       - build_openbsd:
-          requires:
-            - test
           filters:
             tags:
               only: /.*/
       - build_solaris:
-          requires:
-            - test
           filters:
             tags:
               only: /.*/
@@ -253,10 +200,3 @@ workflows:
               ignore: /.*/
             tags:
               only: nightly
-  build_website_docker_image:
-    jobs:
-      - build-website-docker-image:
-          filters:
-            branches:
-              only:
-                - master

.codecov.yml

@@ -1,19 +0,0 @@
-comment:
-  layout: "flags, files"
-  behavior: default
-  require_changes: true   # only comment on changes in coverage
-  require_base: yes       # [yes :: must have a base report to post]
-  require_head: yes       # [yes :: must have a head report to post]
-  after_n_builds: 3       # wait for all OS test coverage builds to post comment
-  branches:               # branch names that can post comment
-    - "master"
-
-coverage:
-  status:
-    project:
-      default:
-        target: auto
-        threshold: "0.5%"
-
-ignore:  # ignore hcl2spec generated code for coverage
-  - "**/*.hcl2spec.go"

.gitattributes

@@ -3,7 +3,6 @@
 *.sh text eol=lf
 *.json text eol=lf
 *.md text eol=lf
-*.mdx text eol=lf
 *.ps1 text eol=lf
 *.hcl text eol=lf
 go.mod text eol=lf

.github/CONTRIBUTING.md

@@ -15,20 +15,20 @@ can quickly merge or address your contributions.
 
 ### Reporting an Issue
 
-- Make sure you test against the latest released version. It is possible we
+* Make sure you test against the latest released version. It is possible we
   already fixed the bug you're experiencing.
 
-- Run the command with debug output with the environment variable `PACKER_LOG`.
+* Run the command with debug output with the environment variable `PACKER_LOG`.
   For example: `PACKER_LOG=1 packer build template.json`. 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.
 
-- Provide a reproducible test case. If a contributor can't reproduce an issue,
+* Provide a reproducible test case. If a contributor can't reproduce an issue,
   then it dramatically lowers the chances it'll get fixed. And in some cases,
   the issue will eventually be closed.
 
-- Respond promptly to any questions made by the Packer team to your issue. Stale
+* Respond promptly to any questions made by the Packer team to your issue. Stale
   issues will be closed.
 
 ### Issue Lifecycle
@@ -86,23 +86,23 @@ The instructions below are for go 1.7. or later.
    submitting a pull-request.
 
 ### Windows Systems
-
 On windows systems you need at least the [MinGW Tools](http://www.mingw.org/), e.g. install via [choco](https://chocolatey.org/):
 
 ```
 choco install mingw -y
 ```
 
-This installs the GCC compiler, as well as a `mingw32-make` which can be used wherever
-this documentation mentions `make`
+This installs the GCC compiler, as well as a ```mingw32-make``` which can be used wherever
+this documentation mentions ```make```
 
-when building using `go` you also need to mention the windows
+when building using ```go``` you also need to mention the windows
 executable extension
 
 ```
 go build -o bin/packer.exe
 ```
 
+
 ### Opening an Pull Request
 
 Thank you for contributing! When you are ready to open a pull-request, you will
@@ -131,36 +131,37 @@ to use `git push ...`.
 ### Pull Request Lifecycle
 
 1. You are welcome to submit your pull request for commentary or review before
-   it is fully completed. Please prefix the title of your pull request with
-   "[WIP]" to indicate this. It's also a good idea to include specific questions
-   or items you'd like feedback on.
+  it is fully completed. Please prefix the title of your pull request with
+  "[WIP]" to indicate this. It's also a good idea to include specific questions
+  or items you'd like feedback on.
 
 2. Once you believe your pull request is ready to be merged, you can remove any
-   "[WIP]" prefix from the title and a core team member will review.
+  "[WIP]" prefix from the title and a core team member will review.
 
 3. One of Packer's core team members will look over your contribution and
-   either merge, or provide comments letting you know if there is anything left
-   to do. We do our best to provide feedback in a timely manner, but it may take
-   some time for us to respond. We may also have questions that we need answered
-   about the code, either because something doesn't make sense to us or because
-   we want to understand your thought process.
+  either merge, or provide comments letting you know if there is anything left
+  to do. We do our best to provide feedback in a timely manner, but it may take
+  some time for us to respond. We may also have questions that we need answered
+  about the code, either because something doesn't make sense to us or because
+  we want to understand your thought process.
 
 4. If we have requested changes, you can either make those changes or, if you
-   disagree with the suggested changes, we can have a conversation about our
-   reasoning and agree on a path forward. This may be a multi-step process. Our
-   view is that pull requests are a chance to collaborate, and we welcome
-   conversations about how to do things better. It is the contributor's
-   responsibility to address any changes requested. While reviewers are happy to
-   give guidance, it is unsustainable for us to perform the coding work necessary
-   to get a PR into a mergeable state.
+  disagree with the suggested changes, we can have a conversation about our
+  reasoning and agree on a path forward. This may be a multi-step process. Our
+  view is that pull requests are a chance to collaborate, and we welcome
+  conversations about how to do things better. It is the contributor's
+  responsibility to address any changes requested. While reviewers are happy to
+  give guidance, it is unsustainable for us to perform the coding work necessary
+  to get a PR into a mergeable state.
 
 5. Once all outstanding comments and checklist items have been addressed, your
-   contribution will be merged! Merged PRs will be included in the next
-   Packer release. The core team takes care of updating the
-   [CHANGELOG.md](../CHANGELOG.md) as they merge.
+  contribution will be merged! Merged PRs will be included in the next
+  Packer release. The core team takes care of updating the
+  [CHANGELOG.md](../CHANGELOG.md) as they merge.
 
 6. In rare cases, we might decide that a PR should be closed without merging.
-   We'll make sure to provide clear reasoning when this happens.
+  We'll make sure to provide clear reasoning when this happens.
+
 
 ### Tips for Working on Packer
 
@@ -249,7 +250,7 @@ does not attempt to track the latest version for each dependency.
 
 Packer relies on `go generate` to generate a [peg parser for boot
 commands](https://github.com/hashicorp/packer/blob/master/common/bootcommand/boot_command.go),
-[docs](https://github.com/hashicorp/packer/blob/master/website/pages/partials/builder/amazon/chroot/_Config-not-required.mdx)
+[docs](https://github.com/hashicorp/packer/blob/master/website/source/partials/builder/amazon/chroot/_Config-not-required.html.md)
 and HCL2's bridging code. Packer's testing suite will run `make check-generate`
 to check that all the generated files Packer needs are what they should be.
 `make generate` re-generates all these file and can take a while depending on
@@ -265,18 +266,16 @@ Packer relies on [golangci-lint](https://github.com/golangci/golangci-lint) for
 The main configuration for golangci-lint is the `.golangci.yml` in the project root. See `golangci-lint --help` for a list of flags that can be used to override the default configuration.
 
 Run golangci-lint on the entire Packer code base.
-
 ```
 make lint
 ```
 
 Run golangci-lint on a single pkg or directory; PKG_NAME expands to /builder/amazon/...
-
 ```
 make lint PKG_NAME=builder/amazon
 ```
 
-Note: linting on Travis uses the `--new-from-rev` flag to only lint new files added within a branch or pull-request. To run this check locally you can use the `ci-lint` make target. See [golangci-lint in CI](https://github.com/golangci/golangci-lint#faq) for more information.
+Note: linting on Travis uses the `--new-from-rev=origin/master` flag to only lint new files added within a branch or pull-request. To run this check locally you can use the `ci-lint` make target. See [golangci-lint in CI](https://github.com/golangci/golangci-lint#faq) for more information.
 
 ```
 make ci-lint
@@ -329,205 +328,6 @@ Acceptance tests typically require other environment variables to be set for
 things such as API tokens and keys. Each test should error and tell you which
 credentials are missing, so those are not documented here.
 
-#### Running Provisioners Acceptance Tests
-
-**Warning:** The acceptance tests create/destroy/modify _real resources_, which
-may incur costs for real money. In the presence of a bug, it is possible that
-resources may be left behind, which can cost money even though you were not
-using them. We recommend running tests in an account used only for that purpose
-so it is easy to see if there are any dangling resources, and so production
-resources are not accidentally destroyed or overwritten during testing. 
-Also, these typically require an API key (AWS, GCE), or additional software 
-to be installed on your computer (VirtualBox, VMware).
-
-To run the Provisioners Acceptance Tests you should use both **ACC_TEST_BUILDERS** and **ACC_TEST_PROVISIONERS** variables to 
-tell which provisioner and builder the test should be run against.
-
-Examples of usage:
-
-- Run the Shell provisioner acceptance tests against the Amazon EBS builder.
-    ```
-    ACC_TEST_BUILDERS=amazon-ebs ACC_TEST_PROVISIONERS=shell go test ./provisioner/shell/... -v -timeout=1h
-    ```
-- Do the same but using the Makefile
-    ```
-    ACC_TEST_BUILDERS=amazon-ebs ACC_TEST_PROVISIONERS=shell make provisioners-acctest
-    ```
-- Run the all Shell and Powershell provisioners acceptance tests against the Amazon EBS builder.
-    ```
-    ACC_TEST_BUILDERS=amazon-ebs ACC_TEST_PROVISIONERS=shell,powershell make provisioners-acctest
-    ```
-- Run the all provisioners acceptance tests against the Amazon EBS builder.
-    ```
-    ACC_TEST_BUILDERS=amazon-ebs ACC_TEST_PROVISIONERS=all make provisioners-acctest
-    ```
-- Run the all provisioners acceptance tests against all builders whenever they are compatible.
-    ```
-    ACC_TEST_BUILDERS=all ACC_TEST_PROVISIONERS=all make provisioners-acctest
-    ```
-
-Both **ACC_TEST_BUILDERS** and **ACC_TEST_PROVISIONERS** allows defining a list of builders and provisioners separated by comma 
-(e.g. `ACC_TEST_BUILDERS=amazon-ebs,virtualbox-iso`)   
-
-
-#### Writing Provisioner Acceptance Tests
-
-Packer has an already implemented structure that will run the provisioner against builders and you can find it in `helper/tests/acc/provisioners.go`.
-All provisioners should use this structure in their acceptance tests.  
-
-To start writing a new provisioner acceptance test, you should add a test file named as `provisioner_acc_test.go` in the provisioner folder
-and the package should be `<provisioner>_test`. This file should have a struct that will implement the ProvisionerAcceptance interface.
-
-```go
-type ProvisionerAcceptance interface {
-	GetName() string
-	GetConfig() (string, error)
-	GetProvisionerStore() packer.MapOfProvisioner
-	IsCompatible(builder string, vmOS string) bool
-	RunTest(c *command.BuildCommand, args []string) error
-}
-```
-
-- **GetName()** should return the provisioner type. For example for the Shell provisioner the method returns "shell".
-
-- **GetConfig()** should read a text file with the json configuration block for the provisioner and any other necessary provisioner. 
-For the Shell one the file contains:
-
-    ```
-    {
-      "type": "shell",
-      "inline": [
-        "echo {{ build `ID`}} > provisioner.{{ build `PackerRunUUID`}}.txt"
-      ]
-    },
-    {
-        "type": "file",
-        "source": "provisioner.{{ build `PackerRunUUID`}}.txt",
-        "destination": "provisioner.shell.{{ build `PackerRunUUID`}}.txt",
-        "direction": "download"
-    }
-    ```
-  The file should be placed under the `test-fixtures` folder.   
-  In this case, it's necessary to use the File provisioner to validate if the Shell provisioner test is successful or not. 
-  This config should be returned as string that will be later merged with the builder config into a full template.
-
-- **GetProvisionerStore()** this returns the provisioner store where we declare the available provisioners for running the build. 
-For the Shell provisioners this is:
-    ```go
-      func (s *ShellProvisionerAccTest) GetProvisionerStore() packer.MapOfProvisioner {
-      	return packer.MapOfProvisioner{
-      		"shell": func() (packer.Provisioner, error) { return &shell.Provisioner{}, nil },
-      		"file":  func() (packer.Provisioner, error) { return &file.Provisioner{}, nil },
-      	}
-      }
-    ```
-
-- **IsCompatible(builder string, vmOS string)** returns true or false whether the provisioner should run against a
-specific builder or/and specific OS.
-
-- **RunTest(c \*command.BuildCommand, args []string)** it will actually run the build and return any error if it fails the validations.
-For the Shell provisioner this is: 
-    ```go
-      func (s *ShellProvisionerAccTest) RunTest(c *command.BuildCommand, args []string) error {
-      	// Provisioner specific setup
-      	UUID := os.Getenv("PACKER_RUN_UUID")
-      	if UUID == "" {
-      		UUID, _ = uuid.GenerateUUID()
-      		os.Setenv("PACKER_RUN_UUID", UUID)
-      	}  
-      	file := "provisioner.shell." + UUID + ".txt"
-      	defer testshelper.CleanupFiles(file)
-      
-      	// Run build 
-    	// All provisioner acc tests should contain this code and validation
-      	if code := c.Run(args); code != 0 {
-      		ui := c.Meta.Ui.(*packer.BasicUi)
-      		out := ui.Writer.(*bytes.Buffer)
-      		err := ui.ErrorWriter.(*bytes.Buffer)
-      		return fmt.Errorf(
-      			"Bad exit code.\n\nStdout:\n\n%s\n\nStderr:\n\n%s",
-      			out.String(),
-      			err.String())
-      	}
-      
-      	// Any other extra specific validation
-      	if !testshelper.FileExists(file) {
-      		return fmt.Errorf("Expected to find %s", file)
-      	}
-      	return nil
-      }
-    
-    ```   
-    
-After writing the struct and implementing the interface, now is time to write the test that will run all
-of this code you wrote. Your test should be like: 
-
-```go
-func TestShellProvisioner(t *testing.T) {
-	acc.TestProvisionersPreCheck("shell", t)
-	acc.TestProvisionersAgainstBuilders(new(ShellProvisionerAccTest), t)
-}
-``` 
-
-If the environment variable **ACC_TEST_PROVISIONERS** is set as `all` or contains the provisioner type, then the test should run, otherwise the test should skip.
-In case of running it, you'll need to call the helper function `acc.TestProvisionersAgainstBuilders` passing a pointer to the test struct created above and the test testing pointer.  
-
-The method `TestProvisionersAgainstBuilders` will run the provisioner against all available and compatible builders. An available builder
-is the one that has the necessary code for running this type of test. In case the builder you want to run against is not available for testing, you can write it following the next steps.   
-
-To add a new builder to the available builders for provisioners acc testing, you'll need to create a new folder under the builder folder
-called `acceptance` and inside you create the `builder_acceptance.go` file and the package should be `<builder>_acc`. Like the provisioners, you'll need to create a struct that will
-implement the BuilderAcceptance interface.
-```go
-type BuilderAcceptance interface {
-	GetConfigs() (map[string]string, error)
-	GetBuilderStore() packer.MapOfBuilder
-	CleanUp() error
-}
-```
-- **GetConfigs()** should read a text file with the json configuration block for the builder and return a map of configs by OS type. 
-For the Amazon EBS builder the file contains:
-    ```
-      {
-        "type": "amazon-ebs",
-        "ami_name": "packer-acc-test",
-        "instance_type": "m1.small",
-        "region": "us-east-1",
-        "ssh_username": "ubuntu",
-        "source_ami": "ami-0568456c",
-        "force_deregister" : true,
-        "tags": {
-          "packer-test": "true"
-        }
-      }
-    ```
-    The file should be placed under the `test-fixtures` folder. 
-    In case you need to make references to another file, you'll need to add the relative path to provisioners folder like:
-    `../../builder/amazon/ebs/acceptance/test-fixtures/file.txt`. 
-
-- **GetBuilderStore()** this returns the builder store where we declare the available builders for running the build. 
-For the Amazon EBS builder this is:
-    ```go
-    func (s *AmazonEBSAccTest) GetBuilderStore() packer.MapOfBuilder {
-        return packer.MapOfBuilder{
-            "amazon-ebs": func() (packer.Builder, error) { return &amazonebsbuilder.Builder{}, nil },
-        }
-    }
-    ```
-  
-- **CleanUp()** cleans any resource created by the builder whether local or remote.
-
-Once you created the builder necessary code, the last step is adding it to the `BuildersAccTest` map in `helper/tests/acc/provisioners.go`.
-```go
-var BuildersAccTest = map[string]BuilderAcceptance{
-	...
-	"amazon-ebs":     new(amazonEBS.AmazonEBSAccTest),
-	...
-}
-```
-
-Once you finish the steps, you should be ready to run your new provisioner acceptance test. 
-
 #### Debugging Plugins
 
 Each packer plugin runs in a separate process and communicates via RPC over a

.github/ISSUE_TEMPLATE/question.md

@@ -8,8 +8,8 @@ Issues on GitHub are intended to be related to bugs or feature requests, so we
 recommend using our other community resources instead of asking here if you
 have a question.
 
-- Packer Guides: https://www.packer.io/guides
+- Packer Guides: https://www.packer.io/guides/index.html
 - Discussion List: https://groups.google.com/group/packer-tool
 - Any other questions can be sent to the packer section of the HashiCorp
   forum: https://discuss.hashicorp.com/c/packer
-- Packer community links: https://www.packer.io/community
+- Packer community links: https://www.packer.io/community.html

.github/ISSUE_TEMPLATE/ssh_or_winrm_times_out.md

@@ -6,18 +6,19 @@ labels: communicator-question
 
 Got one of the following errors ? See if the related guides can help.
 
-- `Waiting for WinRM to become available` ?
+* `Waiting for WinRM to become available` ?
 
-  - See our basic WinRm Packer guide: https://www.packer.io/guides/automatic-operating-system-installs/autounattend_windows
+  - See our basic WinRm Packer guide: https://www.packer.io/guides/automatic-operating-system-installs/autounattend_windows.html
 
-- `Waiting for SSH to become available` ?
+* `Waiting for SSH to become available` ?
+
+  - See our basic SSH Packer guide: https://www.packer.io/guides/automatic-operating-system-installs/preseed_ubuntu.html
 
-  - See our basic SSH Packer guide: https://www.packer.io/guides/automatic-operating-system-installs/preseed_ubuntu
 
 Issues on GitHub are intended to be related to bugs or feature requests, so we recommend using our other community resources instead of asking here if you have a question.
 
-- Packer Guides: https://www.packer.io/guides
+- Packer Guides: https://www.packer.io/guides/index.html
 - Discussion List: https://groups.google.com/group/packer-tool
 - Any other questions can be sent to the packer section of the HashiCorp
   forum: https://discuss.hashicorp.com/c/packer
-- Packer community links: https://www.packer.io/community
+- Packer community links: https://www.packer.io/community.html

.hashibot.hcl

@@ -14,7 +14,6 @@ poll "closed_issue_locker" "locker" {
   closed_for           = "720h" # 30 days
   max_issues           = 500
   sleep_between_issues = "5s"
-  no_comment_if_no_activity_for = "4320h" # 180 days
 
   message = <<-EOF
     I'm going to lock this issue because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues.

.travis.yml

@@ -0,0 +1,24 @@
+env:
+  - USER=travis GO111MODULE=off
+
+os:
+  - osx
+
+language: go
+
+branches:
+  only:
+    - master
+
+jobs:
+  fast_finish: true
+  include:
+    - go: "1.13.x"
+      name: "go test"
+      script:
+        - df -h
+        - travis_wait make ci
+    - go: "1.13.x"
+      name: "go lint"
+      script: travis_wait make ci-lint
+

CHANGELOG.md

@@ -1,105 +1,11 @@
-## 1.5.6 (Upcoming)
-
-**New Builder** azure-dtl allows creation of devtestlabs images in Azure. [GH-8987]
+## 1.5.5 (Upcoming)
 
 ### IMPROVEMENTS:
-* builder/azure: Add shared image destination for azure-chroot [GH-9021]
-* builder/azure: Data disk names are now randomly generated [GH-8986]
-* builder/google: Allow `source_image_project_id` to be a list of several
-    projects to search. [GH-8679]
-* builder/oracle-oci: Allow Instance Principal Auth for Oracle OCI builder
-    [GH-8893]
-* core/hcl2: Set `packer_build_name` and `packer_builder_type` variables for
-    builder provisioners and post-processors [GH-8956]
-* provisioner/ansible: Add option to not use localhost proxy adapter. Removes
-    need for ansible connection_plugin when using WinRM. [GH-8625]
-* provisioner/powershell: Add cleanup step to remove temporarily created
-    scripts; cleanup can be skipped by setting the `skip_clean` option
-    [GH-8908]
-* builder/yandex: Allow set `target_image_folder_id ` where save built 
-    image in [GH-9079]
-
-### Bug Fixes:
-* builder/amazon: Fix bug with launch_block_device_mappings in spot instances.
-    [GH-8945]
-* builder/azure: Allow Managed Data Disks to be used with Azure Shared Image
-    Gallery  [GH-8912]
-* builder/qemu: Remove `net_device` pre-validation [GH-8979]
-* builder/vsphere-iso: disk_size is no longer required if storage is defined
-    [GH-8975]
-* core: Fix crash in wrapperreadline helper when calling `os.NewFile` on
-    unknown file descriptor [GH-9037]
-* core: Make sure CLI variables supersede variables from var files [GH-8964]
-* provisioner/powershell: Fix integer decoding issue in the execution policy
-    parser [GH-8997]
-
-## 1.5.5 (March 25,2020)
-
-### IMPROVEMENTS:
-* builder/azure: Add support for configurable KeyVault SKU [GH-8879]
-* builder/hyperv: Add `first_boot_device` setting to allow the selection of the
-    initial device or device class used for booting the VM. [GH-8714]
-* builder/hyperv: Fix Hyper-V compacted disk size comparison [GH-8811]
-* builder/openstack: Add new `image_auto_accept_members` option [GH-8931]
-* builder/proxmox: Add ability to specify vga adapter [GH-8892]
-* builder/proxmox: Add onboot directive support [GH-8935]
-* builder/tencentcloud: Show tencentcloud image id after copy to desination
+- builder/tencentcloud: Show tencentcloud image id after copy to desination
     region. [GH-8763]
-* builder/vmware-iso: Add `cleanup_remote_cache` config option to [GH-8917]
-* builder/vmware-iso: Do not perform dial test of NIC when ssh bastion is
-    required [GH-8877]
-* builder/vsphere-clone: Add ability to export VM to OVF file [GH-8764]
-* builder/vsphere-iso: Add ability to define multiple disks. [GH-8787]
-* builder/vsphere-iso: Add ability to export VM to OVF file [GH-8764]
-* builder/vsphere-iso: Add support for eagerly zeroed / scrubbed disks.
-    [GH-8756]
-* builder/vsphere-iso: Add the remote iso first so that it is first in boot
-    order, and clarify boot behavior. [GH-8732]
-* communicator/ssh: Add flag to enable support for keyboard-interactive auth to
-    connect bastion [GH-8847]
-* core/hcl2: Add support for singular blocks [GH-8889]
-* core/hcl2: Add support in HCL2 configs for dynamic blocks, document for loops
-    and splat expressions [GH-8720]
-* core/hcl2: Fix HCL2 local variables decoding to allow local usage within
-    another local in the same locals block [GH-8755]
-* core/hcl2: Import new replace and regex_replace funcs from go-cty +
-    documentation [GH-8863]
-* core: Enable hcl files as var files in HCL mode [GH-8882]
-* core: Make "build" engine template variables SSHPublicKey and SSHPrivateKey
-    strings [GH-8829]
 
 ### Bug Fixes:
-* bilder/proxmox: Bump proxmox-api-go to fix upstream bug where users hit open
-    file limit. [GH-8800]
-* builder/azure: Fix `winrm_password` attribution and allow users to set
-    `winrm_username` [GH-8928]
-* builder/azure: Fix azure key vault cleanup failure [GH-8905]
-* builder/azure: Fix HCL2 bug that prevented Azure and other builders from
-    loading properly. [GH-8785]
-* builder/googlecompute: Fix WinRMPassword template engine. [GH-8890]
-* builder/googlecompute: Replace deprecated "sshKeys" metadata with "ssh-keys"
-    to fix SSH authentication issue [GH-8942]
-* builder/proxmox: Add new validation to catch that template_name cannot
-    contain spaces. [GH-8799]
-* builder/vagrant: Fix path validation in ssh config step. [GH-8826]
-* builder/virtualbox-vm: Fix crash when VM has no snapshots. [GH-8906]
-* builder/virtualbox: Remove all floppy controllers before adding a new one.
-    [GH-8828]
-* builder/vsphere-clone: Fix issue preventing the cloning of VMs with the same
-    name in different folders [GH-8938]
-* builder/vsphere-iso: Fix issue preventing the creation of VMs with the same
-    name in different folders [GH-8938]
-* builder/vsphere: Fix network object interface panic. [GH-8753]
-* core/hcl2: Fix crash when an unset variable is used [GH-8837]
-* core/hcl2: Fix logic for parsing literal value variables [GH-8834]
-* core/hcl2: Make sure locals are evaluated only after variables are. [GH-8918]
-* core: Fix "build" template engine interpolation for certain fields in certain
-    provisioners. [GH-8771]
-* core: Fix bug where user var recursion could fail intermittently when used
-    with env vars [GH-8875]
-* plugins: Make plugin discovery stricter with respect to periods so that users
-    can disable plugins by renaming the extension [GH-8735]
-* provisioner/shell: "inline" config option is now a template engine. [GH-8883]
+- builder/vsphere: Fix network object interface panic. [GH-8753]
 
 ## 1.5.4 (February 14, 2020)
 no-change release to fix code-signing on OSX binaries. Since checksums for these

CODEOWNERS

@@ -3,65 +3,61 @@
 # builders
 
 /builder/alicloud/                      @chhaj5236 @alexyueer
-/website/pages/docs/builders/alicloud* @chhaj5236 @alexyueer
+/website/source/docs/builders/alicloud* @chhaj5236 @alexyueer
 
 /builder/azure/                      @paulmey
-/website/pages/docs/builders/azure* @paulmey
+/website/source/docs/builders/azure* @paulmey
 
 /builder/hyperv/                      @taliesins
-/website/pages/docs/builders/hyperv* @taliesins
+/website/source/docs/builders/hyperv* @taliesins
 
 /builder/jdcloud/                      @XiaohanLiang @remrain
-/website/pages/docs/builders/jdcloud* @XiaohanLiang @remrain
+/website/source/docs/builders/jdcloud* @XiaohanLiang @remrain
 
-/builder/linode/                      @displague @ctreatma @stvnjacobs @charliekenney23 @phillc
-/website/pages/docs/builders/linode* @displague @ctreatma @stvnjacobs @charliekenney23 @phillc
+/builder/linode/                      @displague @ctreatma @stvnjacobs
+/website/source/docs/builders/linode* @displague @ctreatma @stvnjacobs
 
 /builder/lxc/                      @ChrisLundquist
-/website/pages/docs/builders/lxc* @ChrisLundquist
+/website/source/docs/builders/lxc* @ChrisLundquist
 
 /builder/lxd/                      @ChrisLundquist
-/website/pages/docs/builders/lxd* @ChrisLundquist
+/website/source/docs/builders/lxd* @ChrisLundquist
 
 /builder/oneandone/                      @jasmingacic
-/website/pages/docs/builders/oneandone* @jasmingacic
+/website/source/docs/builders/oneandone* @jasmingacic
 
 /builder/oracle/                      @prydie @owainlewis
-/website/pages/docs/builders/oracle* @prydie @owainlewis
+/website/source/docs/builders/oracle* @prydie @owainlewis
 
 /builder/profitbricks/                      @jasmingacic
-/website/pages/docs/builders/profitbricks* @jasmingacic
+/website/source/docs/builders/profitbricks* @jasmingacic
 
 /builder/triton/                      @sean-
-/website/pages/docs/builders/triton* @sean-
+/website/source/docs/builders/triton* @sean-
 
 /builder/ncloud/                      @YuSungDuk
-/website/pages/docs/builders/ncloud* @YuSungDuk
+/website/source/docs/builders/ncloud* @YuSungDuk
 
 /builder/proxmox/                      @carlpett
-/website/pages/docs/builders/proxmox* @carlpett
+/website/source/docs/builders/proxmox* @carlpett
 
 /builder/scaleway/                      @sieben @mvaude @jqueuniet @fflorens @brmzkw
-/website/pages/docs/builders/scaleway* @sieben @mvaude @jqueuniet @fflorens @brmzkw
+/website/source/docs/builders/scaleway* @sieben @mvaude @jqueuniet @fflorens @brmzkw
 
 /builder/hcloud/                      @LKaemmerling
-/website/pages/docs/builders/hcloud* @LKaemmerling
+/website/source/docs/builders/hcloud* @LKaemmerling
 
 /builder/hyperone/                      @m110 @gregorybrzeski @ad-m
-/website/pages/docs/builders/hyperone* @m110 @gregorybrzeski @ad-m
+/website/source/docs/builders/hyperone* @m110 @gregorybrzeski @ad-m
 
 /builder/ucloud/                      @shawnmssu
-/website/pages/docs/builders/ucloud* @shawnmssu
+/website/source/docs/builders/ucloud* @shawnmssu
 
 /builder/yandex/                      @GennadySpb @alexanderKhaustov @seukyaso
-/website/pages/docs/builders/yandex* @GennadySpb @alexanderKhaustov @seukyaso
+/website/source/docs/builders/yandex* @GennadySpb @alexanderKhaustov @seukyaso
 
 /builder/osc/                      @marinsalinas
-/website/pages/docs/builders/osc* @marinsalinas
-
-/builder/tencentcloud/                      @likexian
-/website/pages/docs/builders/tencentcloud* @likexian
-
+/website/source/docs/builders/osc* @marinsalinas
 
 
 # provisioners

Makefile

@@ -1,7 +1,5 @@
 TEST?=$(shell go list ./...)
 VET?=$(shell go list ./...)
-ACC_TEST_BUILDERS?=all
-ACC_TEST_PROVISIONERS?=all
 # Get the current full sha from git
 GITSHA:=$(shell git rev-parse HEAD)
 # Get the current local branch name from git (if we can, this may be blank)
@@ -16,9 +14,7 @@ EXECUTABLE_FILES=$(shell find . -type f -executable | egrep -v '^\./(website/[ve
 GIT_DIRTY=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
 GIT_COMMIT=$(shell git rev-parse --short HEAD)
 GIT_IMPORT=github.com/hashicorp/packer/version
-UNAME_S := $(shell uname -s)
-LDFLAGS=-s -w
-GOLDFLAGS=-X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY) $(LDFLAGS)
+GOLDFLAGS=-X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY)
 
 export GOLDFLAGS
 
@@ -61,9 +57,8 @@ install-gen-deps: ## Install dependencies for code generation
 	@go install ./cmd/mapstructure-to-hcl2
 
 install-lint-deps: ## Install linter dependencies
-	# Pinning golangci-lint at v1.23.8 as --new-from-rev seems to work properly; the latest 1.24.0 has caused issues with memory consumption
 	@echo "==> Updating linter dependencies..."
-	@curl -sSfL -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.23.8
+	@curl -sSfL -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.23.1
 
 dev: ## Build and install a development build
 	@grep 'const VersionPrerelease = ""' version/version.go > /dev/null ; if [ $$? -eq 0 ]; then \
@@ -87,7 +82,8 @@ lint: install-lint-deps ## Lint Go code
 
 ci-lint: install-lint-deps ## On ci only lint newly added Go source files
 	@echo "==> Running linter on newly added Go source files..."
-	GO111MODULE=on golangci-lint run --new-from-rev=$(shell git merge-base origin/master HEAD) ./...
+	GO111MODULE=on golangci-lint run --new-from-rev=origin/master ./...
+
 
 fmt: ## Format Go code
 	@go fmt ./...
@@ -110,7 +106,7 @@ mode-check: ## Check that only certain files are executable
 		echo "Check passed."; \
 	fi
 fmt-docs:
-	@find ./website/pages/docs -name "*.md" -exec pandoc --wrap auto --columns 79 --atx-headers -s -f "markdown_github+yaml_metadata_block" -t "markdown_github+yaml_metadata_block" {} -o {} \;
+	@find ./website/source/docs -name "*.md" -exec pandoc --wrap auto --columns 79 --atx-headers -s -f "markdown_github+yaml_metadata_block" -t "markdown_github+yaml_metadata_block" {} -o {} \;
 
 # Install js-beautify with npm install -g js-beautify
 fmt-examples:
@@ -120,11 +116,12 @@ fmt-examples:
 # source files.
 generate: install-gen-deps ## Generate dynamically generated code
 	@echo "==> removing autogenerated markdown..."
-	@find website/pages/ -type f | xargs grep -l '^<!-- Code generated' | xargs rm
+	@find website/source/ -type f | xargs grep -l '^<!-- Code generated' | xargs rm
 	@echo "==> removing autogenerated code..."
 	@find post-processor common helper template builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm
 	go generate ./...
 	go fmt common/bootcommand/boot_command.go
+	go fmt command/plugin.go
 
 generate-check: generate ## Check go code generation is on par
 	@echo "==> Checking that auto-generated code is not changed..."
@@ -137,10 +134,6 @@ generate-check: generate ## Check go code generation is on par
 test: mode-check vet ## Run unit tests
 	@go test $(TEST) $(TESTARGS) -timeout=3m
 
-# acctest runs provisioners acceptance tests
-provisioners-acctest: install-build-deps generate
-	ACC_TEST_BUILDERS=$(ACC_TEST_BUILDERS) ACC_TEST_PROVISIONERS=$(ACC_TEST_PROVISIONERS) go test ./provisioner/... -timeout=1h
-
 # testacc runs acceptance tests
 testacc: install-build-deps generate ## Run acceptance tests
 	@echo "WARN: Acceptance tests will take a long time to run and may cost money. Ctrl-C if you want to cancel."
@@ -149,12 +142,6 @@ testacc: install-build-deps generate ## Run acceptance tests
 testrace: mode-check vet ## Test with race detection enabled
 	@GO111MODULE=off go test -race $(TEST) $(TESTARGS) -timeout=3m -p=8
 
-# Runs code coverage and open a html page with report
-cover:
-	go test $(TEST) $(TESTARGS) -timeout=3m -coverprofile=coverage.out
-	go tool cover -html=coverage.out
-	rm coverage.out
-
 check-vendor-vs-mod: ## Check that go modules and vendored code are on par
 	@GO111MODULE=on go mod vendor
 	@git diff --exit-code --ignore-space-change --ignore-space-at-eol -- vendor ; if [ $$? -eq 1 ]; then \

README.md

@@ -4,7 +4,6 @@
 [![Windows Build Status][appveyor-badge]][appveyor]
 [![GoDoc][godoc-badge]][godoc]
 [![GoReportCard][report-badge]][report]
-[![codecov](https://codecov.io/gh/hashicorp/packer/branch/master/graph/badge.svg)](https://codecov.io/gh/hashicorp/packer)
 
 [travis-badge]: https://travis-ci.org/hashicorp/packer.svg?branch=master
 [travis]: https://travis-ci.org/hashicorp/packer

appveyor.yml

@@ -0,0 +1,35 @@
+# appveyor.yml reference : http://www.appveyor.com/docs/appveyor-yml
+
+version: "{build}"
+
+skip_tags: true
+
+branches:
+  only:
+    - master
+
+os: Windows Server 2012 R2
+
+environment:
+  GOPATH: c:\gopath
+
+clone_folder: c:\gopath\src\github.com\hashicorp\packer
+
+install:
+  - set GO111MODULE=off
+  - echo %Path%
+  - go version
+  - go env
+
+build_script:
+  - git rev-parse HEAD
+ # go test $(go list ./... | grep -v vendor)
+  - ps: |
+      go.exe test -timeout=2m (go.exe list ./... `
+      |? { -not $_.Contains('/vendor/') } `
+      |? { $_ -ne 'github.com/hashicorp/packer/builder/parallels/common' } `
+      |? { $_ -ne 'github.com/hashicorp/packer/provisioner/ansible' })
+
+test: off
+
+deploy: off

builder/alicloud/ecs/builder.hcl2spec.go

@@ -3,7 +3,6 @@ package ecs
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -47,100 +46,98 @@ func (*FlatAlicloudDiskDevice) HCL2Spec() map[string]hcldec.Spec {
 // FlatConfig is an auto-generated flat version of Config.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatConfig struct {
-	PackerBuildName                   *string                      `mapstructure:"packer_build_name" cty:"packer_build_name"`
-	PackerBuilderType                 *string                      `mapstructure:"packer_builder_type" cty:"packer_builder_type"`
-	PackerDebug                       *bool                        `mapstructure:"packer_debug" cty:"packer_debug"`
-	PackerForce                       *bool                        `mapstructure:"packer_force" cty:"packer_force"`
-	PackerOnError                     *string                      `mapstructure:"packer_on_error" cty:"packer_on_error"`
-	PackerUserVars                    map[string]string            `mapstructure:"packer_user_variables" cty:"packer_user_variables"`
-	PackerSensitiveVars               []string                     `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables"`
-	AlicloudAccessKey                 *string                      `mapstructure:"access_key" required:"false" cty:"access_key"`
-	AlicloudSecretKey                 *string                      `mapstructure:"secret_key" required:"false" cty:"secret_key"`
-	AlicloudRegion                    *string                      `mapstructure:"region" required:"false" cty:"region"`
-	AlicloudSkipValidation            *bool                        `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
-	AlicloudSkipImageValidation       *bool                        `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation"`
-	AlicloudProfile                   *string                      `mapstructure:"profile" required:"false" cty:"profile"`
-	AlicloudSharedCredentialsFile     *string                      `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file"`
-	SecurityToken                     *string                      `mapstructure:"security_token" required:"false" cty:"security_token"`
-	AlicloudImageName                 *string                      `mapstructure:"image_name" required:"true" cty:"image_name"`
-	AlicloudImageVersion              *string                      `mapstructure:"image_version" required:"false" cty:"image_version"`
-	AlicloudImageDescription          *string                      `mapstructure:"image_description" required:"false" cty:"image_description"`
-	AlicloudImageShareAccounts        []string                     `mapstructure:"image_share_account" required:"false" cty:"image_share_account"`
-	AlicloudImageUNShareAccounts      []string                     `mapstructure:"image_unshare_account" cty:"image_unshare_account"`
-	AlicloudImageDestinationRegions   []string                     `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions"`
-	AlicloudImageDestinationNames     []string                     `mapstructure:"image_copy_names" required:"false" cty:"image_copy_names"`
-	ImageEncrypted                    *bool                        `mapstructure:"image_encrypted" required:"false" cty:"image_encrypted"`
-	AlicloudImageForceDelete          *bool                        `mapstructure:"image_force_delete" required:"false" cty:"image_force_delete"`
-	AlicloudImageForceDeleteSnapshots *bool                        `mapstructure:"image_force_delete_snapshots" required:"false" cty:"image_force_delete_snapshots"`
-	AlicloudImageForceDeleteInstances *bool                        `mapstructure:"image_force_delete_instances" cty:"image_force_delete_instances"`
-	AlicloudImageIgnoreDataDisks      *bool                        `mapstructure:"image_ignore_data_disks" required:"false" cty:"image_ignore_data_disks"`
-	AlicloudImageTags                 map[string]string            `mapstructure:"tags" required:"false" cty:"tags"`
-	AlicloudImageTag                  []hcl2template.FlatNameValue `mapstructure:"tag" required:"false" cty:"tag"`
-	ECSSystemDiskMapping              *FlatAlicloudDiskDevice      `mapstructure:"system_disk_mapping" required:"false" cty:"system_disk_mapping"`
-	ECSImagesDiskMappings             []FlatAlicloudDiskDevice     `mapstructure:"image_disk_mappings" required:"false" cty:"image_disk_mappings"`
-	AssociatePublicIpAddress          *bool                        `mapstructure:"associate_public_ip_address" cty:"associate_public_ip_address"`
-	ZoneId                            *string                      `mapstructure:"zone_id" required:"false" cty:"zone_id"`
-	IOOptimized                       *bool                        `mapstructure:"io_optimized" required:"false" cty:"io_optimized"`
-	InstanceType                      *string                      `mapstructure:"instance_type" required:"true" cty:"instance_type"`
-	Description                       *string                      `mapstructure:"description" cty:"description"`
-	AlicloudSourceImage               *string                      `mapstructure:"source_image" required:"true" cty:"source_image"`
-	ForceStopInstance                 *bool                        `mapstructure:"force_stop_instance" required:"false" cty:"force_stop_instance"`
-	DisableStopInstance               *bool                        `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance"`
-	SecurityGroupId                   *string                      `mapstructure:"security_group_id" required:"false" cty:"security_group_id"`
-	SecurityGroupName                 *string                      `mapstructure:"security_group_name" required:"false" cty:"security_group_name"`
-	UserData                          *string                      `mapstructure:"user_data" required:"false" cty:"user_data"`
-	UserDataFile                      *string                      `mapstructure:"user_data_file" required:"false" cty:"user_data_file"`
-	VpcId                             *string                      `mapstructure:"vpc_id" required:"false" cty:"vpc_id"`
-	VpcName                           *string                      `mapstructure:"vpc_name" required:"false" cty:"vpc_name"`
-	CidrBlock                         *string                      `mapstructure:"vpc_cidr_block" required:"false" cty:"vpc_cidr_block"`
-	VSwitchId                         *string                      `mapstructure:"vswitch_id" required:"false" cty:"vswitch_id"`
-	VSwitchName                       *string                      `mapstructure:"vswitch_name" required:"false" cty:"vswitch_name"`
-	InstanceName                      *string                      `mapstructure:"instance_name" required:"false" cty:"instance_name"`
-	InternetChargeType                *string                      `mapstructure:"internet_charge_type" required:"false" cty:"internet_charge_type"`
-	InternetMaxBandwidthOut           *int                         `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out"`
-	WaitSnapshotReadyTimeout          *int                         `mapstructure:"wait_snapshot_ready_timeout" required:"false" cty:"wait_snapshot_ready_timeout"`
-	Type                              *string                      `mapstructure:"communicator" cty:"communicator"`
-	PauseBeforeConnect                *string                      `mapstructure:"pause_before_connecting" cty:"pause_before_connecting"`
-	SSHHost                           *string                      `mapstructure:"ssh_host" cty:"ssh_host"`
-	SSHPort                           *int                         `mapstructure:"ssh_port" cty:"ssh_port"`
-	SSHUsername                       *string                      `mapstructure:"ssh_username" cty:"ssh_username"`
-	SSHPassword                       *string                      `mapstructure:"ssh_password" cty:"ssh_password"`
-	SSHKeyPairName                    *string                      `mapstructure:"ssh_keypair_name" cty:"ssh_keypair_name"`
-	SSHTemporaryKeyPairName           *string                      `mapstructure:"temporary_key_pair_name" cty:"temporary_key_pair_name"`
-	SSHClearAuthorizedKeys            *bool                        `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys"`
-	SSHPrivateKeyFile                 *string                      `mapstructure:"ssh_private_key_file" cty:"ssh_private_key_file"`
-	SSHPty                            *bool                        `mapstructure:"ssh_pty" cty:"ssh_pty"`
-	SSHTimeout                        *string                      `mapstructure:"ssh_timeout" cty:"ssh_timeout"`
-	SSHAgentAuth                      *bool                        `mapstructure:"ssh_agent_auth" cty:"ssh_agent_auth"`
-	SSHDisableAgentForwarding         *bool                        `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts              *int                         `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts"`
-	SSHBastionHost                    *string                      `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host"`
-	SSHBastionPort                    *int                         `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port"`
-	SSHBastionAgentAuth               *bool                        `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth"`
-	SSHBastionUsername                *string                      `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username"`
-	SSHBastionPassword                *string                      `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password"`
-	SSHBastionInteractive             *bool                        `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile          *string                      `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file"`
-	SSHFileTransferMethod             *string                      `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method"`
-	SSHProxyHost                      *string                      `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host"`
-	SSHProxyPort                      *int                         `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port"`
-	SSHProxyUsername                  *string                      `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username"`
-	SSHProxyPassword                  *string                      `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password"`
-	SSHKeepAliveInterval              *string                      `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout               *string                      `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout"`
-	SSHRemoteTunnels                  []string                     `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels"`
-	SSHLocalTunnels                   []string                     `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels"`
-	SSHPublicKey                      []byte                       `mapstructure:"ssh_public_key" cty:"ssh_public_key"`
-	SSHPrivateKey                     []byte                       `mapstructure:"ssh_private_key" cty:"ssh_private_key"`
-	WinRMUser                         *string                      `mapstructure:"winrm_username" cty:"winrm_username"`
-	WinRMPassword                     *string                      `mapstructure:"winrm_password" cty:"winrm_password"`
-	WinRMHost                         *string                      `mapstructure:"winrm_host" cty:"winrm_host"`
-	WinRMPort                         *int                         `mapstructure:"winrm_port" cty:"winrm_port"`
-	WinRMTimeout                      *string                      `mapstructure:"winrm_timeout" cty:"winrm_timeout"`
-	WinRMUseSSL                       *bool                        `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl"`
-	WinRMInsecure                     *bool                        `mapstructure:"winrm_insecure" cty:"winrm_insecure"`
-	WinRMUseNTLM                      *bool                        `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm"`
-	SSHPrivateIp                      *bool                        `mapstructure:"ssh_private_ip" required:"false" cty:"ssh_private_ip"`
+	PackerBuildName                   *string                  `mapstructure:"packer_build_name" cty:"packer_build_name"`
+	PackerBuilderType                 *string                  `mapstructure:"packer_builder_type" cty:"packer_builder_type"`
+	PackerDebug                       *bool                    `mapstructure:"packer_debug" cty:"packer_debug"`
+	PackerForce                       *bool                    `mapstructure:"packer_force" cty:"packer_force"`
+	PackerOnError                     *string                  `mapstructure:"packer_on_error" cty:"packer_on_error"`
+	PackerUserVars                    map[string]string        `mapstructure:"packer_user_variables" cty:"packer_user_variables"`
+	PackerSensitiveVars               []string                 `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables"`
+	AlicloudAccessKey                 *string                  `mapstructure:"access_key" required:"false" cty:"access_key"`
+	AlicloudSecretKey                 *string                  `mapstructure:"secret_key" required:"false" cty:"secret_key"`
+	AlicloudRegion                    *string                  `mapstructure:"region" required:"false" cty:"region"`
+	AlicloudSkipValidation            *bool                    `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
+	AlicloudSkipImageValidation       *bool                    `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation"`
+	AlicloudProfile                   *string                  `mapstructure:"profile" required:"false" cty:"profile"`
+	AlicloudSharedCredentialsFile     *string                  `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file"`
+	SecurityToken                     *string                  `mapstructure:"security_token" required:"false" cty:"security_token"`
+	AlicloudImageName                 *string                  `mapstructure:"image_name" required:"true" cty:"image_name"`
+	AlicloudImageVersion              *string                  `mapstructure:"image_version" required:"false" cty:"image_version"`
+	AlicloudImageDescription          *string                  `mapstructure:"image_description" required:"false" cty:"image_description"`
+	AlicloudImageShareAccounts        []string                 `mapstructure:"image_share_account" required:"false" cty:"image_share_account"`
+	AlicloudImageUNShareAccounts      []string                 `mapstructure:"image_unshare_account" cty:"image_unshare_account"`
+	AlicloudImageDestinationRegions   []string                 `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions"`
+	AlicloudImageDestinationNames     []string                 `mapstructure:"image_copy_names" required:"false" cty:"image_copy_names"`
+	ImageEncrypted                    *bool                    `mapstructure:"image_encrypted" required:"false" cty:"image_encrypted"`
+	AlicloudImageForceDelete          *bool                    `mapstructure:"image_force_delete" required:"false" cty:"image_force_delete"`
+	AlicloudImageForceDeleteSnapshots *bool                    `mapstructure:"image_force_delete_snapshots" required:"false" cty:"image_force_delete_snapshots"`
+	AlicloudImageForceDeleteInstances *bool                    `mapstructure:"image_force_delete_instances" cty:"image_force_delete_instances"`
+	AlicloudImageIgnoreDataDisks      *bool                    `mapstructure:"image_ignore_data_disks" required:"false" cty:"image_ignore_data_disks"`
+	AlicloudImageTags                 map[string]string        `mapstructure:"tags" required:"false" cty:"tags"`
+	ECSSystemDiskMapping              *FlatAlicloudDiskDevice  `mapstructure:"system_disk_mapping" required:"false" cty:"system_disk_mapping"`
+	ECSImagesDiskMappings             []FlatAlicloudDiskDevice `mapstructure:"image_disk_mappings" required:"false" cty:"image_disk_mappings"`
+	AssociatePublicIpAddress          *bool                    `mapstructure:"associate_public_ip_address" cty:"associate_public_ip_address"`
+	ZoneId                            *string                  `mapstructure:"zone_id" required:"false" cty:"zone_id"`
+	IOOptimized                       *bool                    `mapstructure:"io_optimized" required:"false" cty:"io_optimized"`
+	InstanceType                      *string                  `mapstructure:"instance_type" required:"true" cty:"instance_type"`
+	Description                       *string                  `mapstructure:"description" cty:"description"`
+	AlicloudSourceImage               *string                  `mapstructure:"source_image" required:"true" cty:"source_image"`
+	ForceStopInstance                 *bool                    `mapstructure:"force_stop_instance" required:"false" cty:"force_stop_instance"`
+	DisableStopInstance               *bool                    `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance"`
+	SecurityGroupId                   *string                  `mapstructure:"security_group_id" required:"false" cty:"security_group_id"`
+	SecurityGroupName                 *string                  `mapstructure:"security_group_name" required:"false" cty:"security_group_name"`
+	UserData                          *string                  `mapstructure:"user_data" required:"false" cty:"user_data"`
+	UserDataFile                      *string                  `mapstructure:"user_data_file" required:"false" cty:"user_data_file"`
+	VpcId                             *string                  `mapstructure:"vpc_id" required:"false" cty:"vpc_id"`
+	VpcName                           *string                  `mapstructure:"vpc_name" required:"false" cty:"vpc_name"`
+	CidrBlock                         *string                  `mapstructure:"vpc_cidr_block" required:"false" cty:"vpc_cidr_block"`
+	VSwitchId                         *string                  `mapstructure:"vswitch_id" required:"false" cty:"vswitch_id"`
+	VSwitchName                       *string                  `mapstructure:"vswitch_name" required:"false" cty:"vswitch_name"`
+	InstanceName                      *string                  `mapstructure:"instance_name" required:"false" cty:"instance_name"`
+	InternetChargeType                *string                  `mapstructure:"internet_charge_type" required:"false" cty:"internet_charge_type"`
+	InternetMaxBandwidthOut           *int                     `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out"`
+	WaitSnapshotReadyTimeout          *int                     `mapstructure:"wait_snapshot_ready_timeout" required:"false" cty:"wait_snapshot_ready_timeout"`
+	Type                              *string                  `mapstructure:"communicator" cty:"communicator"`
+	PauseBeforeConnect                *string                  `mapstructure:"pause_before_connecting" cty:"pause_before_connecting"`
+	SSHHost                           *string                  `mapstructure:"ssh_host" cty:"ssh_host"`
+	SSHPort                           *int                     `mapstructure:"ssh_port" cty:"ssh_port"`
+	SSHUsername                       *string                  `mapstructure:"ssh_username" cty:"ssh_username"`
+	SSHPassword                       *string                  `mapstructure:"ssh_password" cty:"ssh_password"`
+	SSHKeyPairName                    *string                  `mapstructure:"ssh_keypair_name" cty:"ssh_keypair_name"`
+	SSHTemporaryKeyPairName           *string                  `mapstructure:"temporary_key_pair_name" cty:"temporary_key_pair_name"`
+	SSHClearAuthorizedKeys            *bool                    `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys"`
+	SSHPrivateKeyFile                 *string                  `mapstructure:"ssh_private_key_file" cty:"ssh_private_key_file"`
+	SSHPty                            *bool                    `mapstructure:"ssh_pty" cty:"ssh_pty"`
+	SSHTimeout                        *string                  `mapstructure:"ssh_timeout" cty:"ssh_timeout"`
+	SSHAgentAuth                      *bool                    `mapstructure:"ssh_agent_auth" cty:"ssh_agent_auth"`
+	SSHDisableAgentForwarding         *bool                    `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding"`
+	SSHHandshakeAttempts              *int                     `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts"`
+	SSHBastionHost                    *string                  `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host"`
+	SSHBastionPort                    *int                     `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port"`
+	SSHBastionAgentAuth               *bool                    `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth"`
+	SSHBastionUsername                *string                  `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username"`
+	SSHBastionPassword                *string                  `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password"`
+	SSHBastionPrivateKeyFile          *string                  `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file"`
+	SSHFileTransferMethod             *string                  `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method"`
+	SSHProxyHost                      *string                  `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host"`
+	SSHProxyPort                      *int                     `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port"`
+	SSHProxyUsername                  *string                  `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username"`
+	SSHProxyPassword                  *string                  `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password"`
+	SSHKeepAliveInterval              *string                  `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval"`
+	SSHReadWriteTimeout               *string                  `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout"`
+	SSHRemoteTunnels                  []string                 `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels"`
+	SSHLocalTunnels                   []string                 `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels"`
+	SSHPublicKey                      []byte                   `mapstructure:"ssh_public_key" cty:"ssh_public_key"`
+	SSHPrivateKey                     []byte                   `mapstructure:"ssh_private_key" cty:"ssh_private_key"`
+	WinRMUser                         *string                  `mapstructure:"winrm_username" cty:"winrm_username"`
+	WinRMPassword                     *string                  `mapstructure:"winrm_password" cty:"winrm_password"`
+	WinRMHost                         *string                  `mapstructure:"winrm_host" cty:"winrm_host"`
+	WinRMPort                         *int                     `mapstructure:"winrm_port" cty:"winrm_port"`
+	WinRMTimeout                      *string                  `mapstructure:"winrm_timeout" cty:"winrm_timeout"`
+	WinRMUseSSL                       *bool                    `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl"`
+	WinRMInsecure                     *bool                    `mapstructure:"winrm_insecure" cty:"winrm_insecure"`
+	WinRMUseNTLM                      *bool                    `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm"`
+	SSHPrivateIp                      *bool                    `mapstructure:"ssh_private_ip" required:"false" cty:"ssh_private_ip"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -160,7 +157,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":        &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false},
+		"packer_user_variables":        &hcldec.BlockAttrsSpec{TypeName: "packer_user_variables", ElementType: cty.String, Required: false},
 		"packer_sensitive_variables":   &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
 		"access_key":                   &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
 		"secret_key":                   &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
@@ -182,8 +179,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"image_force_delete_snapshots": &hcldec.AttrSpec{Name: "image_force_delete_snapshots", Type: cty.Bool, Required: false},
 		"image_force_delete_instances": &hcldec.AttrSpec{Name: "image_force_delete_instances", Type: cty.Bool, Required: false},
 		"image_ignore_data_disks":      &hcldec.AttrSpec{Name: "image_ignore_data_disks", Type: cty.Bool, Required: false},
-		"tags":                         &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                          &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"tags":                         &hcldec.BlockAttrsSpec{TypeName: "tags", ElementType: cty.String, Required: false},
 		"system_disk_mapping":          &hcldec.BlockSpec{TypeName: "system_disk_mapping", Nested: hcldec.ObjectSpec((*FlatAlicloudDiskDevice)(nil).HCL2Spec())},
 		"image_disk_mappings":          &hcldec.BlockListSpec{TypeName: "image_disk_mappings", Nested: hcldec.ObjectSpec((*FlatAlicloudDiskDevice)(nil).HCL2Spec())},
 		"associate_public_ip_address":  &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
@@ -227,7 +223,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_bastion_agent_auth":       &hcldec.AttrSpec{Name: "ssh_bastion_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_bastion_username":         &hcldec.AttrSpec{Name: "ssh_bastion_username", Type: cty.String, Required: false},
 		"ssh_bastion_password":         &hcldec.AttrSpec{Name: "ssh_bastion_password", Type: cty.String, Required: false},
-		"ssh_bastion_interactive":      &hcldec.AttrSpec{Name: "ssh_bastion_interactive", Type: cty.Bool, Required: false},
 		"ssh_bastion_private_key_file": &hcldec.AttrSpec{Name: "ssh_bastion_private_key_file", Type: cty.String, Required: false},
 		"ssh_file_transfer_method":     &hcldec.AttrSpec{Name: "ssh_file_transfer_method", Type: cty.String, Required: false},
 		"ssh_proxy_host":               &hcldec.AttrSpec{Name: "ssh_proxy_host", Type: cty.String, Required: false},

builder/alicloud/ecs/image_config.go

@@ -7,7 +7,6 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/template/interpolate"
 )
@@ -17,7 +16,7 @@ type AlicloudDiskDevice struct {
 	// 128] English or Chinese characters, must begin with an
 	// uppercase/lowercase letter or Chinese character. Can contain numbers,
 	// ., _ and -. The disk name will appear on the console. It cannot
-	// begin with `http://` or `https://`.
+	// begin with http:// or https://.
 	DiskName string `mapstructure:"disk_name" required:"false"`
 	// Category of the system disk. Optional values
 	// are:
@@ -35,7 +34,7 @@ type AlicloudDiskDevice struct {
 	SnapshotId string `mapstructure:"disk_snapshot_id" required:"false"`
 	// The value of disk description is blank by
 	// default. [2, 256] characters. The disk description will appear on the
-	// console. It cannot begin with `http://` or `https://`.
+	// console. It cannot begin with http:// or https://.
 	Description string `mapstructure:"disk_description" required:"false"`
 	// Whether or not the disk is
 	// released along with the instance:
@@ -61,9 +60,9 @@ type AlicloudDiskDevices struct {
 	//         -   `cloud_efficiency` - efficiency cloud disk
 	//         -   `cloud_ssd` - cloud SSD
 	//
-	//      For phased-out instance types and non-I/O optimized instances, the
-	//      default value is cloud. Otherwise, the default value is
-	//      cloud\_efficiency.
+	//         For phased-out instance types and non-I/O optimized instances, the
+	//         default value is cloud. Otherwise, the default value is
+	//         cloud\_efficiency.
 	//
 	// -   `disk_description` (string) - The value of disk description is blank by
 	//     default. \[2, 256\] characters. The disk description will appear on the
@@ -139,14 +138,14 @@ type AlicloudImageConfig struct {
 	// The name of the user-defined image, [2, 128]
 	// English or Chinese characters. It must begin with an uppercase/lowercase
 	// letter or a Chinese character, and may contain numbers, _ or -. It
-	// cannot begin with `http://` or `https://`.
+	// cannot begin with http:// or https://.
 	AlicloudImageName string `mapstructure:"image_name" required:"true"`
 	// The version number of the image, with a length
 	// limit of 1 to 40 English characters.
 	AlicloudImageVersion string `mapstructure:"image_version" required:"false"`
 	// The description of the image, with a length
 	// limit of 0 to 256 characters. Leaving it blank means null, which is the
-	// default value. It cannot begin with `http://` or `https://`.
+	// default value. It cannot begin with http:// or https://.
 	AlicloudImageDescription string `mapstructure:"image_description" required:"false"`
 	// The IDs of to-be-added Aliyun
 	// accounts to which the image is shared. The number of accounts is 1 to 10.
@@ -158,7 +157,7 @@ type AlicloudImageConfig struct {
 	// The name of the destination image,
 	// [2, 128] English or Chinese characters. It must begin with an
 	// uppercase/lowercase letter or a Chinese character, and may contain numbers,
-	// _ or -. It cannot begin with `http://` or `https://`.
+	// _ or -. It cannot begin with http:// or https://.
 	AlicloudImageDestinationNames []string `mapstructure:"image_copy_names" required:"false"`
 	// Whether or not to encrypt the target images,            including those copied if image_copy_regions is specified. If this option
 	// is set to true, a temporary image will be created from the provisioned
@@ -171,13 +170,13 @@ type AlicloudImageConfig struct {
 	// images and then create the target images, otherwise, the creation will
 	// fail. The default value is false. Check `image_name` and
 	// `image_copy_names` options for names of target images. If
-	// [-force](/docs/commands/build#force) option is
+	// [-force](https://packer.io/docs/commands/build.html#force) option is
 	// provided in `build` command, this option can be omitted and taken as
 	// true.
 	AlicloudImageForceDelete bool `mapstructure:"image_force_delete" required:"false"`
 	// If this value is true, when delete the duplicated existing images, the
 	// source snapshots of those images will be delete either. If
-	// [-force](/docs/commands/build#force) option is
+	// [-force](https://packer.io/docs/commands/build.html#force) option is
 	// provided in `build` command, this option can be omitted and taken as
 	// true.
 	AlicloudImageForceDeleteSnapshots bool `mapstructure:"image_force_delete_snapshots" required:"false"`
@@ -190,19 +189,14 @@ type AlicloudImageConfig struct {
 	// The region validation can be skipped
 	// if this value is true, the default value is false.
 	AlicloudImageSkipRegionValidation bool `mapstructure:"skip_region_validation" required:"false"`
-	// Tags applied to the destination image and relevant snapshots.
-	AlicloudImageTags map[string]string `mapstructure:"tags" required:"false"`
-	// Same as [`tags`](#tags) but defined as a singular repeatable block
-	// containing a `name` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	AlicloudImageTag    hcl2template.NameValues `mapstructure:"tag" required:"false"`
+	// Tags applied to the destination
+	// image and relevant snapshots.
+	AlicloudImageTags   map[string]string `mapstructure:"tags" required:"false"`
 	AlicloudDiskDevices `mapstructure:",squash"`
 }
 
 func (c *AlicloudImageConfig) Prepare(ctx *interpolate.Context) []error {
 	var errs []error
-	errs = append(errs, c.AlicloudImageTag.CopyOn(&c.AlicloudImageTags)...)
 	if c.AlicloudImageName == "" {
 		errs = append(errs, fmt.Errorf("image_name must be specified"))
 	} else if len(c.AlicloudImageName) < 2 || len(c.AlicloudImageName) > 128 {
@@ -234,5 +228,9 @@ func (c *AlicloudImageConfig) Prepare(ctx *interpolate.Context) []error {
 		c.AlicloudImageDestinationRegions = regions
 	}
 
-	return errs
+	if len(errs) > 0 {
+		return errs
+	}
+
+	return nil
 }

builder/alicloud/ecs/run_config.go

@@ -57,7 +57,7 @@ type RunConfig struct {
 	// The security group name. The default value
 	// is blank. [2, 128] English or Chinese characters, must begin with an
 	// uppercase/lowercase letter or Chinese character. Can contain numbers, .,
-	// _ or -. It cannot begin with `http://` or `https://`.
+	// _ or -. It cannot begin with http:// or https://.
 	SecurityGroupName string `mapstructure:"security_group_name" required:"false"`
 	// User data to apply when launching the instance. Note
 	// that you need to be careful about escaping characters due to the templates
@@ -73,8 +73,8 @@ type RunConfig struct {
 	// The VPC name. The default value is blank. [2, 128]
 	// English or Chinese characters, must begin with an uppercase/lowercase
 	// letter or Chinese character. Can contain numbers, _ and -. The disk
-	// description will appear on the console. Cannot begin with `http://` or
-	// `https://`.
+	// description will appear on the console. Cannot begin with http:// or
+	// https://.
 	VpcName string `mapstructure:"vpc_name" required:"false"`
 	// Value options: 192.168.0.0/16 and
 	// 172.16.0.0/16. When not specified, the default value is 172.16.0.0/16.

builder/amazon/chroot/builder.go

@@ -18,7 +18,6 @@ import (
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/common/chroot"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
@@ -48,11 +47,11 @@ type Config struct {
 	// in the Chroot Mounts section. Please read that section for more
 	// information on how to use this.
 	ChrootMounts [][]string `mapstructure:"chroot_mounts" required:"false"`
-	// How to run shell commands. This defaults to `{{.Command}}`. This may be
+	// How to run shell commands. This defaults to {{.Command}}. This may be
 	// useful to set if you want to set environmental variables or perhaps run
 	// it with sudo or so on. This is a configuration template where the
 	// .Command variable is replaced with the command to be run. Defaults to
-	// `{{.Command}}`.
+	// {{.Command}}.
 	CommandWrapper string `mapstructure:"command_wrapper" required:"false"`
 	// Paths to files on the running EC2 instance that will be copied into the
 	// chroot environment prior to provisioning. Defaults to /etc/resolv.conf
@@ -90,18 +89,18 @@ type Config struct {
 	MountPartition string `mapstructure:"mount_partition" required:"false"`
 	// The path where the volume will be mounted. This is where the chroot
 	// environment will be. This defaults to
-	// `/mnt/packer-amazon-chroot-volumes/{{.Device}}`. This is a configuration
+	// /mnt/packer-amazon-chroot-volumes/{{.Device}}. This is a configuration
 	// template where the .Device variable is replaced with the name of the
 	// device where the volume is attached.
 	MountPath string `mapstructure:"mount_path" required:"false"`
 	// As pre_mount_commands, but the commands are executed after mounting the
 	// root device and before the extra mount and copy steps. The device and
-	// mount path are provided by `{{.Device}}` and `{{.MountPath}}`.
+	// mount path are provided by {{.Device}} and {{.MountPath}}.
 	PostMountCommands []string `mapstructure:"post_mount_commands" required:"false"`
 	// A series of commands to execute after attaching the root volume and
 	// before mounting the chroot. This is not required unless using
 	// from_scratch. If so, this should include any partitioning and filesystem
-	// creation commands. The path to the device is provided by `{{.Device}}`.
+	// creation commands. The path to the device is provided by {{.Device}}.
 	PreMountCommands []string `mapstructure:"pre_mount_commands" required:"false"`
 	// The root device name. For example, xvda.
 	RootDeviceName string `mapstructure:"root_device_name" required:"false"`
@@ -121,54 +120,50 @@ type Config struct {
 	SourceAmi string `mapstructure:"source_ami" required:"true"`
 	// Filters used to populate the source_ami field. Example:
 	//
-	//```json
-	//{
-	//	 "source_ami_filter": {
-	//	 "filters": {
-	//	  "virtualization-type": "hvm",
-	//	  "name": "ubuntu/images/*ubuntu-xenial-16.04-amd64-server-*",
-	//	  "root-device-type": "ebs"
-	//	},
-	//	"owners": ["099720109477"],
-	//	"most_recent": true
-	//	 }
-	//}
-	//```
 	//
-	//This selects the most recent Ubuntu 16.04 HVM EBS AMI from Canonical. NOTE:
-	//This will fail unless *exactly* one AMI is returned. In the above example,
-	//`most_recent` will cause this to succeed by selecting the newest image.
+	//     ``` json
+	//     {
+	//       "source_ami_filter": {
+	//       "filters": {
+	//        "virtualization-type": "hvm",
+	//        "name": "ubuntu/images/*ubuntu-xenial-16.04-amd64-server-*",
+	//        "root-device-type": "ebs"
+	//      },
+	//      "owners": ["099720109477"],
+	//      "most_recent": true
+	//       }
+	//     }
+	//     ```
 	//
-	//-   `filters` (map of strings) - filters used to select a `source_ami`.
-	//	NOTE: This will fail unless *exactly* one AMI is returned. Any filter
-	//	described in the docs for
-	//	[DescribeImages](http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImages.html)
-	//	is valid.
+	//     This selects the most recent Ubuntu 16.04 HVM EBS AMI from Canonical. NOTE:
+	//     This will fail unless *exactly* one AMI is returned. In the above example,
+	//     `most_recent` will cause this to succeed by selecting the newest image.
 	//
-	//-   `owners` (array of strings) - Filters the images by their owner. You
-	//	may specify one or more AWS account IDs, "self" (which will use the
-	//	account whose credentials you are using to run Packer), or an AWS owner
-	//	alias: for example, "amazon", "aws-marketplace", or "microsoft". This
-	//	option is required for security reasons.
+	//     -   `filters` (map of strings) - filters used to select a `source_ami`.
+	//         NOTE: This will fail unless *exactly* one AMI is returned. Any filter
+	//         described in the docs for
+	//         [DescribeImages](http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImages.html)
+	//         is valid.
 	//
-	//-   `most_recent` (boolean) - Selects the newest created image when true.
-	//	This is most useful for selecting a daily distro build.
+	//     -   `owners` (array of strings) - Filters the images by their owner. You
+	//         may specify one or more AWS account IDs, "self" (which will use the
+	//         account whose credentials you are using to run Packer), or an AWS owner
+	//         alias: for example, "amazon", "aws-marketplace", or "microsoft". This
+	//         option is required for security reasons.
 	//
-	//You may set this in place of `source_ami` or in conjunction with it. If you
-	//set this in conjunction with `source_ami`, the `source_ami` will be added
-	//to the filter. The provided `source_ami` must meet all of the filtering
-	//criteria provided in `source_ami_filter`; this pins the AMI returned by the
-	//filter, but will cause Packer to fail if the `source_ami` does not exist.
+	//     -   `most_recent` (boolean) - Selects the newest created image when true.
+	//         This is most useful for selecting a daily distro build.
+	//
+	//     You may set this in place of `source_ami` or in conjunction with it. If you
+	//     set this in conjunction with `source_ami`, the `source_ami` will be added
+	//     to the filter. The provided `source_ami` must meet all of the filtering
+	//     criteria provided in `source_ami_filter`; this pins the AMI returned by the
+	//     filter, but will cause Packer to fail if the `source_ami` does not exist.
 	SourceAmiFilter awscommon.AmiFilterOptions `mapstructure:"source_ami_filter" required:"false"`
 	// Tags to apply to the volumes that are *launched*. This is a [template
-	// engine](/docs/templates/engine), see [Build template
+	// engine](/docs/templates/engine.html), see [Build template
 	// data](#build-template-data) for more information.
-	RootVolumeTags map[string]string `mapstructure:"root_volume_tags" required:"false"`
-	// Same as [`root_volume_tags`](#root_volume_tags) but defined as a
-	// singular block containing a `name` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	RootVolumeTag hcl2template.NameValues `mapstructure:"root_volume_tag" required:"false"`
+	RootVolumeTags awscommon.TagMap `mapstructure:"root_volume_tags" required:"false"`
 	// what architecture to use when registering the final AMI; valid options
 	// are "x86_64" or "arm64". Defaults to "x86_64".
 	Architecture string `mapstructure:"ami_architecture" required:"false"`
@@ -259,9 +254,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	var errs *packer.MultiError
 	var warns []string
 
-	errs = packer.MultiErrorAppend(errs, b.config.RootVolumeTag.CopyOn(&b.config.RootVolumeTags)...)
-	errs = packer.MultiErrorAppend(errs, b.config.SourceAmiFilter.Prepare()...)
-
 	errs = packer.MultiErrorAppend(errs, b.config.AccessConfig.Prepare(&b.config.ctx)...)
 	errs = packer.MultiErrorAppend(errs,
 		b.config.AMIConfig.Prepare(&b.config.AccessConfig, &b.config.ctx)...)

builder/amazon/chroot/builder.hcl2spec.go

@@ -4,7 +4,6 @@ package chroot
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -26,8 +25,7 @@ type FlatConfig struct {
 	AMIProductCodes         []string                          `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes"`
 	AMIRegions              []string                          `mapstructure:"ami_regions" required:"false" cty:"ami_regions"`
 	AMISkipRegionValidation *bool                             `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
-	AMITags                 map[string]string                 `mapstructure:"tags" required:"false" cty:"tags"`
-	AMITag                  []hcl2template.FlatNameValue      `mapstructure:"tag" required:"false" cty:"tag"`
+	AMITags                 common.TagMap                     `mapstructure:"tags" required:"false" cty:"tags"`
 	AMIENASupport           *bool                             `mapstructure:"ena_support" required:"false" cty:"ena_support"`
 	AMISriovNetSupport      *bool                             `mapstructure:"sriov_support" required:"false" cty:"sriov_support"`
 	AMIForceDeregister      *bool                             `mapstructure:"force_deregister" required:"false" cty:"force_deregister"`
@@ -36,8 +34,7 @@ type FlatConfig struct {
 	AMIKmsKeyId             *string                           `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id"`
 	AMIRegionKMSKeyIDs      map[string]string                 `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids"`
 	AMISkipBuildRegion      *bool                             `mapstructure:"skip_save_build_region" cty:"skip_save_build_region"`
-	SnapshotTags            map[string]string                 `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags"`
-	SnapshotTag             []hcl2template.FlatNameValue      `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag"`
+	SnapshotTags            common.TagMap                     `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags"`
 	SnapshotUsers           []string                          `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users"`
 	SnapshotGroups          []string                          `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups"`
 	AccessKey               *string                           `mapstructure:"access_key" required:"true" cty:"access_key"`
@@ -69,8 +66,7 @@ type FlatConfig struct {
 	RootVolumeType          *string                           `mapstructure:"root_volume_type" required:"false" cty:"root_volume_type"`
 	SourceAmi               *string                           `mapstructure:"source_ami" required:"true" cty:"source_ami"`
 	SourceAmiFilter         *common.FlatAmiFilterOptions      `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter"`
-	RootVolumeTags          map[string]string                 `mapstructure:"root_volume_tags" required:"false" cty:"root_volume_tags"`
-	RootVolumeTag           []hcl2template.FlatNameValue      `mapstructure:"root_volume_tag" required:"false" cty:"root_volume_tag"`
+	RootVolumeTags          common.TagMap                     `mapstructure:"root_volume_tags" required:"false" cty:"root_volume_tags"`
 	Architecture            *string                           `mapstructure:"ami_architecture" required:"false" cty:"ami_architecture"`
 }
 
@@ -91,7 +87,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":         &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false},
+		"packer_user_variables":         &hcldec.BlockAttrsSpec{TypeName: "packer_user_variables", ElementType: cty.String, Required: false},
 		"packer_sensitive_variables":    &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
 		"ami_name":                      &hcldec.AttrSpec{Name: "ami_name", Type: cty.String, Required: false},
 		"ami_description":               &hcldec.AttrSpec{Name: "ami_description", Type: cty.String, Required: false},
@@ -101,18 +97,16 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ami_product_codes":             &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false},
 		"ami_regions":                   &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false},
 		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
-		"tags":                          &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"tags":                          &hcldec.BlockAttrsSpec{TypeName: "tags", ElementType: cty.String, Required: false},
 		"ena_support":                   &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false},
 		"sriov_support":                 &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
 		"force_deregister":              &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false},
 		"force_delete_snapshot":         &hcldec.AttrSpec{Name: "force_delete_snapshot", Type: cty.Bool, Required: false},
 		"encrypt_boot":                  &hcldec.AttrSpec{Name: "encrypt_boot", Type: cty.Bool, Required: false},
 		"kms_key_id":                    &hcldec.AttrSpec{Name: "kms_key_id", Type: cty.String, Required: false},
-		"region_kms_key_ids":            &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false},
+		"region_kms_key_ids":            &hcldec.BlockAttrsSpec{TypeName: "region_kms_key_ids", ElementType: cty.String, Required: false},
 		"skip_save_build_region":        &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false},
-		"snapshot_tags":                 &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false},
-		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"snapshot_tags":                 &hcldec.BlockAttrsSpec{TypeName: "snapshot_tags", ElementType: cty.String, Required: false},
 		"snapshot_users":                &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false},
 		"snapshot_groups":               &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false},
 		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
@@ -144,8 +138,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"root_volume_type":              &hcldec.AttrSpec{Name: "root_volume_type", Type: cty.String, Required: false},
 		"source_ami":                    &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
 		"source_ami_filter":             &hcldec.BlockSpec{TypeName: "source_ami_filter", Nested: hcldec.ObjectSpec((*common.FlatAmiFilterOptions)(nil).HCL2Spec())},
-		"root_volume_tags":              &hcldec.AttrSpec{Name: "root_volume_tags", Type: cty.Map(cty.String), Required: false},
-		"root_volume_tag":               &hcldec.BlockListSpec{TypeName: "root_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"root_volume_tags":              &hcldec.BlockAttrsSpec{TypeName: "root_volume_tags", ElementType: cty.String, Required: false},
 		"ami_architecture":              &hcldec.AttrSpec{Name: "ami_architecture", Type: cty.String, Required: false},
 	}
 	return s

builder/amazon/chroot/step_create_volume.go

@@ -23,7 +23,7 @@ type StepCreateVolume struct {
 	volumeId       string
 	RootVolumeSize int64
 	RootVolumeType string
-	RootVolumeTags map[string]string
+	RootVolumeTags awscommon.TagMap
 	Ctx            interpolate.Context
 }
 
@@ -33,7 +33,7 @@ func (s *StepCreateVolume) Run(ctx context.Context, state multistep.StateBag) mu
 	instance := state.Get("instance").(*ec2.Instance)
 	ui := state.Get("ui").(packer.Ui)
 
-	volTags, err := awscommon.TagMap(s.RootVolumeTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+	volTags, err := s.RootVolumeTags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 	if err != nil {
 		err := fmt.Errorf("Error tagging volumes: %s", err)
 		state.Put("error", err)

builder/amazon/common/access_config.go

@@ -44,7 +44,7 @@ func (v *VaultAWSEngineOptions) Empty() bool {
 // AccessConfig is for common configuration related to AWS access
 type AccessConfig struct {
 	// The access key used to communicate with AWS. [Learn how  to set this]
-	// (/docs/builders/amazon#specifying-amazon-credentials). On EBS, this
+	// (/docs/builders/amazon.html#specifying-amazon-credentials). On EBS, this
 	// is not required if you are using `use_vault_aws_engine` for
 	// authentication instead.
 	AccessKey string `mapstructure:"access_key" required:"true"`
@@ -79,7 +79,7 @@ type AccessConfig struct {
 	// When chroot building, this value is guessed from environment.
 	RawRegion string `mapstructure:"region" required:"true"`
 	// The secret key used to communicate with AWS. [Learn how to set
-	// this](/docs/builders/amazon#specifying-amazon-credentials). This is not required
+	// this](amazon.html#specifying-amazon-credentials). This is not required
 	// if you are using `use_vault_aws_engine` for authentication instead.
 	SecretKey string `mapstructure:"secret_key" required:"true"`
 	// Set to true if you want to skip
@@ -95,7 +95,7 @@ type AccessConfig struct {
 	// Get credentials from Hashicorp Vault's aws secrets engine. You must
 	// already have created a role to use. For more information about
 	// generating credentials via the Vault engine, see the [Vault
-	// docs.](https://www.vaultproject.io/api/secret/aws#generate-credentials)
+	// docs.](https://www.vaultproject.io/api/secret/aws/index.html#generate-credentials)
 	// If you set this flag, you must also set the below options:
 	// -   `name` (string) - Required. Specifies the name of the role to generate
 	//     credentials against. This is part of the request URL.
@@ -116,7 +116,7 @@ type AccessConfig struct {
 	//     credential types) and GetFederationToken (for federation\_token
 	//     credential types) for more details.
 	//
-	// ```json
+	// ``` json
 	// {
 	//     "vault_aws_engine": {
 	//         "name": "myrole",
@@ -190,7 +190,7 @@ func (c *AccessConfig) Session() (*session.Session, error) {
 
 	if isAWSErr(err, "NoCredentialProviders", "") {
 		return nil, fmt.Errorf("No valid credential sources found for AWS Builder. " +
-			"Please see https://www.packer.io/docs/builders/amazon#specifying-amazon-credentials " +
+			"Please see https://www.packer.io/docs/builders/amazon.html#specifying-amazon-credentials " +
 			"for more information on providing credentials for the AWS Builder.")
 	}
 

builder/amazon/common/ami_config.go

@@ -7,7 +7,6 @@ import (
 	"log"
 	"regexp"
 
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/template/interpolate"
 )
@@ -17,11 +16,11 @@ type AMIConfig struct {
 	// The name of the resulting AMI that will appear when managing AMIs in the
 	// AWS console or via APIs. This must be unique. To help make this unique,
 	// use a function like timestamp (see [template
-	// engine](/docs/templates/engine) for more info).
+	// engine](../templates/engine.html) for more info).
 	AMIName string `mapstructure:"ami_name" required:"true"`
 	// The description to set for the resulting
 	// AMI(s). By default this description is empty.  This is a
-	// [template engine](/docs/templates/engine), see [Build template
+	// [template engine](/docs/templates/engine.html), see [Build template
 	// data](#build-template-data) for more information.
 	AMIDescription string `mapstructure:"ami_description" required:"false"`
 	// The type of virtualization for the AMI
@@ -48,14 +47,9 @@ type AMIConfig struct {
 	// validation of the ami_regions configuration option. Default false.
 	AMISkipRegionValidation bool `mapstructure:"skip_region_validation" required:"false"`
 	// Tags applied to the AMI. This is a
-	// [template engine](/docs/templates/engine), see [Build template
+	// [template engine](/docs/templates/engine.html), see [Build template
 	// data](#build-template-data) for more information.
-	AMITags map[string]string `mapstructure:"tags" required:"false"`
-	// Same as [`tags`](#tags) but defined as a singular repeatable block
-	// containing a `name` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	AMITag hcl2template.NameValues `mapstructure:"tag" required:"false"`
+	AMITags TagMap `mapstructure:"tags" required:"false"`
 	// Enable enhanced networking (ENA but not SriovNetSupport) on
 	// HVM-compatible AMIs. If set, add `ec2:ModifyInstanceAttribute` to your
 	// AWS IAM policy.
@@ -119,14 +113,9 @@ type AMIConfig struct {
 	AMISkipBuildRegion bool `mapstructure:"skip_save_build_region"`
 	// Tags to apply to snapshot.
 	// They will override AMI tags if already applied to snapshot. This is a
-	// [template engine](/docs/templates/engine), see [Build template
+	// [template engine](../templates/engine.html), see [Build template
 	// data](#build-template-data) for more information.
-	SnapshotTags map[string]string `mapstructure:"snapshot_tags" required:"false"`
-	// Same as [`snapshot_tags`](#snapshot_tags) but defined as a singular
-	// repeatable block containing a `name` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	SnapshotTag hcl2template.NameValues `mapstructure:"snapshot_tag" required:"false"`
+	SnapshotTags TagMap `mapstructure:"snapshot_tags" required:"false"`
 	// A list of account IDs that have
 	// access to create volumes from the snapshot(s). By default no additional
 	// users other than the user creating the AMI has permissions to create
@@ -151,9 +140,6 @@ func stringInSlice(s []string, searchstr string) bool {
 func (c *AMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context) []error {
 	var errs []error
 
-	errs = append(errs, c.SnapshotTag.CopyOn(&c.SnapshotTags)...)
-	errs = append(errs, c.AMITag.CopyOn(&c.AMITags)...)
-
 	if c.AMIName == "" {
 		errs = append(errs, fmt.Errorf("ami_name must be specified"))
 	}
@@ -203,14 +189,14 @@ func (c *AMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context
 	}
 	for _, kmsKey := range kmsKeys {
 		if !validateKmsKey(kmsKey) {
-			errs = append(errs, fmt.Errorf("%q is not a valid KMS Key Id.", kmsKey))
+			errs = append(errs, fmt.Errorf("%s is not a valid KMS Key Id.", kmsKey))
 		}
 	}
 
 	if len(c.SnapshotUsers) > 0 {
 		if len(c.AMIKmsKeyId) == 0 && len(c.AMIRegionKMSKeyIDs) == 0 && c.AMIEncryptBootVolume.True() {
 			errs = append(errs, fmt.Errorf("Cannot share snapshot encrypted "+
-				"with default KMS key, see https://www.packer.io/docs/builders/amazon-ebs#region_kms_key_ids for more information"))
+				"with default KMS key, see https://www.packer.io/docs/builders/amazon-ebs.html#region_kms_key_ids for more information"))
 		}
 		if len(c.AMIRegionKMSKeyIDs) > 0 {
 			for _, kmsKey := range c.AMIRegionKMSKeyIDs {

builder/amazon/common/block_device.go

@@ -21,8 +21,8 @@ import (
 // The following mapping will tell Packer to encrypt the root volume of the
 // build instance at launch using a specific non-default kms key:
 //
-// ```json
-// [{
+// ``` json
+// "[{
 //		"device_name": "/dev/sda1",
 //		"encrypted": true,
 //		"kms_key_id": "1a2b3c4d-5e6f-1a2b-3c4d-5e6f1a2b3c4d"

builder/amazon/common/run_config.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/template/interpolate"
 )
@@ -20,9 +19,9 @@ import (
 var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")
 
 type AmiFilterOptions struct {
-	hcl2template.KVFilter `mapstructure:",squash"`
-	Owners                []string
-	MostRecent            bool `mapstructure:"most_recent"`
+	Filters    map[string]string
+	Owners     []string
+	MostRecent bool `mapstructure:"most_recent"`
 }
 
 func (d *AmiFilterOptions) GetOwners() []*string {
@@ -35,7 +34,7 @@ func (d *AmiFilterOptions) GetOwners() []*string {
 }
 
 func (d *AmiFilterOptions) Empty() bool {
-	return len(d.Owners) == 0 && d.KVFilter.Empty()
+	return len(d.Owners) == 0 && len(d.Filters) == 0
 }
 
 func (d *AmiFilterOptions) NoOwner() bool {
@@ -43,13 +42,17 @@ func (d *AmiFilterOptions) NoOwner() bool {
 }
 
 type SubnetFilterOptions struct {
-	hcl2template.KVFilter `mapstructure:",squash"`
-	MostFree              bool `mapstructure:"most_free"`
-	Random                bool `mapstructure:"random"`
+	Filters  map[string]string
+	MostFree bool `mapstructure:"most_free"`
+	Random   bool `mapstructure:"random"`
+}
+
+func (d *SubnetFilterOptions) Empty() bool {
+	return len(d.Filters) == 0
 }
 
 type VpcFilterOptions struct {
-	hcl2template.KVFilter `mapstructure:",squash"`
+	Filters map[string]string
 }
 
 type Statement struct {
@@ -63,8 +66,16 @@ type PolicyDocument struct {
 	Statement []Statement
 }
 
+func (d *VpcFilterOptions) Empty() bool {
+	return len(d.Filters) == 0
+}
+
 type SecurityGroupFilterOptions struct {
-	hcl2template.KVFilter `mapstructure:",squash"`
+	Filters map[string]string
+}
+
+func (d *SecurityGroupFilterOptions) Empty() bool {
+	return len(d.Filters) == 0
 }
 
 // RunConfig contains configuration for running an instance from a source
@@ -90,13 +101,13 @@ type RunConfig struct {
 	// *will not* stop the instance but will assume that you will send the stop
 	// signal yourself through your final provisioner. You can do this with a
 	// [windows-shell
-	// provisioner](/docs/provisioners/windows-shell).
+	// provisioner](https://www.packer.io/docs/provisioners/windows-shell.html).
 	// Note that Packer will still wait for the instance to be stopped, and
 	// failing to send the stop signal yourself, when you have set this flag to
 	// `true`, will cause a timeout.
 	// Example of a valid shutdown command:
 	//
-	// ```json
+	// ``` json
 	// {
 	//   "type": "windows-shell",
 	//   "inline": ["\"c:\\Program Files\\Amazon\\Ec2ConfigService\\ec2config.exe\" -sysprep"]
@@ -164,7 +175,7 @@ type RunConfig struct {
 	InstanceType string `mapstructure:"instance_type" required:"true"`
 	// Filters used to populate the `security_group_ids` field. Example:
 	//
-	// ```json
+	// ``` json
 	// {
 	//   "security_group_filter": {
 	//     "filters": {
@@ -184,14 +195,9 @@ type RunConfig struct {
 	// `security_group_ids` take precedence over this.
 	SecurityGroupFilter SecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false"`
 	// Tags to apply to the instance that is that is *launched* to create the
-	// EBS volumes. This is a [template engine](/docs/templates/engine),
+	// EBS volumes. This is a [template engine](/docs/templates/engine.html),
 	// see [Build template data](#build-template-data) for more information.
 	RunTags map[string]string `mapstructure:"run_tags" required:"false"`
-	// Same as [`run_tags`](#run_tags) but defined as a singular repeatable
-	// block containing a `name` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	RunTag hcl2template.NameValues `mapstructure:"run_tag" required:"false"`
 	// The ID (not the name) of the security
 	// group to assign to the instance. By default this is not set and Packer will
 	// automatically create a new temporary security group to allow SSH access.
@@ -210,7 +216,7 @@ type RunConfig struct {
 	// Filters used to populate the `source_ami`
 	// field. Example:
 	//
-	//   ```json
+	//   ``` json
 	//   {
 	//     "source_ami_filter": {
 	//       "filters": {
@@ -281,18 +287,13 @@ type RunConfig struct {
 	// Windows, Linux/UNIX (Amazon VPC), SUSE Linux (Amazon VPC),
 	// Windows (Amazon VPC)
 	SpotPriceAutoProduct string `mapstructure:"spot_price_auto_product" required:"false"`
-	// Requires spot_price to be set. This tells Packer to apply tags to the
-	// spot request that is issued.
+	// Requires spot_price to be
+	// set. This tells Packer to apply tags to the spot request that is issued.
 	SpotTags map[string]string `mapstructure:"spot_tags" required:"false"`
-	// Same as [`spot_tags`](#spot_tags) but defined as a singular repeatable block
-	// containing a `name` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	SpotTag hcl2template.NameValues `mapstructure:"spot_tag" required:"false"`
 	// Filters used to populate the `subnet_id` field.
 	// Example:
 	//
-	//   ```json
+	//   ``` json
 	//   {
 	//     "subnet_filter": {
 	//       "filters": {
@@ -349,7 +350,7 @@ type RunConfig struct {
 	// Filters used to populate the `vpc_id` field.
 	// Example:
 	//
-	// ```json
+	// ``` json
 	// {
 	//   "vpc_filter": {
 	//     "filters": {
@@ -422,19 +423,6 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 	// Validation
 	errs := c.Comm.Prepare(ctx)
 
-	// Copy singular tag maps
-	errs = append(errs, c.RunTag.CopyOn(&c.RunTags)...)
-	errs = append(errs, c.SpotTag.CopyOn(&c.SpotTags)...)
-
-	for _, preparer := range []interface{ Prepare() []error }{
-		&c.SourceAmiFilter,
-		&c.SecurityGroupFilter,
-		&c.SubnetFilter,
-		&c.VpcFilter,
-	} {
-		errs = append(errs, preparer.Prepare()...)
-	}
-
 	// Validating ssh_interface
 	if c.SSHInterface != "public_ip" &&
 		c.SSHInterface != "private_ip" &&

builder/amazon/common/run_config.hcl2spec.go

@@ -3,17 +3,15 @@ package common
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
 // FlatAmiFilterOptions is an auto-generated flat version of AmiFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatAmiFilterOptions struct {
-	Filters    map[string]string            `cty:"filters"`
-	Filter     []hcl2template.FlatNameValue `cty:"filter"`
-	Owners     []string                     `cty:"owners"`
-	MostRecent *bool                        `mapstructure:"most_recent" cty:"most_recent"`
+	Filters    map[string]string `cty:"filters"`
+	Owners     []string          `cty:"owners"`
+	MostRecent *bool             `mapstructure:"most_recent" cty:"most_recent"`
 }
 
 // FlatMapstructure returns a new FlatAmiFilterOptions.
@@ -28,8 +26,7 @@ func (*AmiFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl
 // The decoded values from this spec will then be applied to a FlatAmiFilterOptions.
 func (*FlatAmiFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"filters":     &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":      &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filters":     &hcldec.BlockAttrsSpec{TypeName: "filters", ElementType: cty.String, Required: false},
 		"owners":      &hcldec.AttrSpec{Name: "owners", Type: cty.List(cty.String), Required: false},
 		"most_recent": &hcldec.AttrSpec{Name: "most_recent", Type: cty.Bool, Required: false},
 	}
@@ -64,8 +61,7 @@ func (*FlatPolicyDocument) HCL2Spec() map[string]hcldec.Spec {
 // FlatSecurityGroupFilterOptions is an auto-generated flat version of SecurityGroupFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatSecurityGroupFilterOptions struct {
-	Filters map[string]string            `cty:"filters"`
-	Filter  []hcl2template.FlatNameValue `cty:"filter"`
+	Filters map[string]string `cty:"filters"`
 }
 
 // FlatMapstructure returns a new FlatSecurityGroupFilterOptions.
@@ -80,8 +76,7 @@ func (*SecurityGroupFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[
 // The decoded values from this spec will then be applied to a FlatSecurityGroupFilterOptions.
 func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filters": &hcldec.BlockAttrsSpec{TypeName: "filters", ElementType: cty.String, Required: false},
 	}
 	return s
 }
@@ -116,10 +111,9 @@ func (*FlatStatement) HCL2Spec() map[string]hcldec.Spec {
 // FlatSubnetFilterOptions is an auto-generated flat version of SubnetFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatSubnetFilterOptions struct {
-	Filters  map[string]string            `cty:"filters"`
-	Filter   []hcl2template.FlatNameValue `cty:"filter"`
-	MostFree *bool                        `mapstructure:"most_free" cty:"most_free"`
-	Random   *bool                        `mapstructure:"random" cty:"random"`
+	Filters  map[string]string `cty:"filters"`
+	MostFree *bool             `mapstructure:"most_free" cty:"most_free"`
+	Random   *bool             `mapstructure:"random" cty:"random"`
 }
 
 // FlatMapstructure returns a new FlatSubnetFilterOptions.
@@ -134,8 +128,7 @@ func (*SubnetFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]
 // The decoded values from this spec will then be applied to a FlatSubnetFilterOptions.
 func (*FlatSubnetFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"filters":   &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":    &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filters":   &hcldec.BlockAttrsSpec{TypeName: "filters", ElementType: cty.String, Required: false},
 		"most_free": &hcldec.AttrSpec{Name: "most_free", Type: cty.Bool, Required: false},
 		"random":    &hcldec.AttrSpec{Name: "random", Type: cty.Bool, Required: false},
 	}
@@ -145,8 +138,7 @@ func (*FlatSubnetFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 // FlatVpcFilterOptions is an auto-generated flat version of VpcFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatVpcFilterOptions struct {
-	Filters map[string]string            `cty:"filters"`
-	Filter  []hcl2template.FlatNameValue `cty:"filter"`
+	Filters map[string]string `cty:"filters"`
 }
 
 // FlatMapstructure returns a new FlatVpcFilterOptions.
@@ -161,8 +153,7 @@ func (*VpcFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl
 // The decoded values from this spec will then be applied to a FlatVpcFilterOptions.
 func (*FlatVpcFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filters": &hcldec.BlockAttrsSpec{TypeName: "filters", ElementType: cty.String, Required: false},
 	}
 	return s
 }

builder/amazon/common/run_config_test.go

@@ -6,7 +6,6 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 )
 
@@ -74,7 +73,7 @@ func TestRunConfigPrepare_SourceAmiFilterOwnersBlank(t *testing.T) {
 	c := testConfigFilter()
 	filter_key := "name"
 	filter_value := "foo"
-	c.SourceAmiFilter.Filters = map[string]string{filter_key: filter_value}
+	c.SourceAmiFilter = AmiFilterOptions{Filters: map[string]string{filter_key: filter_value}}
 	if err := c.Prepare(nil); len(err) != 1 {
 		t.Fatalf("Should error if Owners is not specified)")
 	}
@@ -85,12 +84,7 @@ func TestRunConfigPrepare_SourceAmiFilterGood(t *testing.T) {
 	owner := "123"
 	filter_key := "name"
 	filter_value := "foo"
-	goodFilter := AmiFilterOptions{
-		Owners: []string{owner},
-		KVFilter: hcl2template.KVFilter{
-			Filters: map[string]string{filter_key: filter_value},
-		},
-	}
+	goodFilter := AmiFilterOptions{Owners: []string{owner}, Filters: map[string]string{filter_key: filter_value}}
 	c.SourceAmiFilter = goodFilter
 	if err := c.Prepare(nil); len(err) != 0 {
 		t.Fatalf("err: %s", err)

builder/amazon/common/step_create_tags.go

@@ -15,8 +15,8 @@ import (
 )
 
 type StepCreateTags struct {
-	Tags         map[string]string
-	SnapshotTags map[string]string
+	Tags         TagMap
+	SnapshotTags TagMap
 	Ctx          interpolate.Context
 }
 
@@ -26,7 +26,7 @@ func (s *StepCreateTags) Run(ctx context.Context, state multistep.StateBag) mult
 	ui := state.Get("ui").(packer.Ui)
 	amis := state.Get("amis").(map[string]string)
 
-	if len(s.Tags) == 0 && len(s.SnapshotTags) == 0 {
+	if !s.Tags.IsSet() && !s.SnapshotTags.IsSet() {
 		return multistep.ActionContinue
 	}
 
@@ -72,7 +72,7 @@ func (s *StepCreateTags) Run(ctx context.Context, state multistep.StateBag) mult
 
 		// Convert tags to ec2.Tag format
 		ui.Say("Creating AMI tags")
-		amiTags, err := TagMap(s.Tags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+		amiTags, err := s.Tags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 		if err != nil {
 			state.Put("error", err)
 			ui.Error(err.Error())
@@ -81,7 +81,7 @@ func (s *StepCreateTags) Run(ctx context.Context, state multistep.StateBag) mult
 		amiTags.Report(ui)
 
 		ui.Say("Creating snapshot tags")
-		snapshotTags, err := TagMap(s.SnapshotTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+		snapshotTags, err := s.SnapshotTags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 		if err != nil {
 			state.Put("error", err)
 			ui.Error(err.Error())

builder/amazon/common/step_run_source_instance.go

@@ -31,10 +31,10 @@ type StepRunSourceInstance struct {
 	InstanceType                      string
 	IsRestricted                      bool
 	SourceAMI                         string
-	Tags                              map[string]string
+	Tags                              TagMap
 	UserData                          string
 	UserDataFile                      string
-	VolumeTags                        map[string]string
+	VolumeTags                        TagMap
 	NoEphemeral                       bool
 
 	instanceId string
@@ -88,7 +88,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 		s.Tags["Name"] = "Packer Builder"
 	}
 
-	ec2Tags, err := TagMap(s.Tags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+	ec2Tags, err := s.Tags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 	if err != nil {
 		err := fmt.Errorf("Error tagging source instance: %s", err)
 		state.Put("error", err)
@@ -96,7 +96,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 		return multistep.ActionHalt
 	}
 
-	volTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+	volTags, err := s.VolumeTags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 	if err != nil {
 		err := fmt.Errorf("Error tagging volumes: %s", err)
 		state.Put("error", err)
@@ -322,10 +322,10 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 			}
 		}
 
-		if len(volumeIds) > 0 && len(s.VolumeTags) > 0 {
+		if len(volumeIds) > 0 && s.VolumeTags.IsSet() {
 			ui.Say("Adding tags to source EBS Volumes")
 
-			volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+			volumeTags, err := s.VolumeTags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 			if err != nil {
 				err := fmt.Errorf("Error tagging source EBS Volumes on %s: %s", *instance.InstanceId, err)
 				state.Put("error", err)

builder/amazon/common/step_run_spot_instance.go

@@ -34,10 +34,10 @@ type StepRunSpotInstance struct {
 	InstanceType                      string
 	SourceAMI                         string
 	SpotPrice                         string
-	SpotTags                          map[string]string
+	SpotTags                          TagMap
 	SpotInstanceTypes                 []string
-	Tags                              map[string]string
-	VolumeTags                        map[string]string
+	Tags                              TagMap
+	VolumeTags                        TagMap
 	UserData                          string
 	UserDataFile                      string
 	Ctx                               interpolate.Context
@@ -49,6 +49,24 @@ type StepRunSpotInstance struct {
 func (s *StepRunSpotInstance) CreateTemplateData(userData *string, az string,
 	state multistep.StateBag, marketOptions *ec2.LaunchTemplateInstanceMarketOptionsRequest) *ec2.RequestLaunchTemplateData {
 	blockDeviceMappings := s.LaunchMappings.BuildEC2BlockDeviceMappings()
+	if s.NoEphemeral {
+		// This is only relevant for windows guests. Ephemeral drives by
+		// default are assigned to drive names xvdca-xvdcz.
+		// When vms are launched from the AWS console, they're automatically
+		// removed from the block devices if the user hasn't said to use them,
+		// but the SDK does not perform this cleanup. The following code just
+		// manually removes the ephemeral drives from the mapping so that they
+		// don't clutter up console views and cause confusion.
+		log.Printf("no_ephemeral was set, so creating drives xvdca-xvdcz as empty mappings")
+		DefaultEphemeralDeviceLetters := "abcdefghijklmnopqrstuvwxyz"
+		for _, letter := range DefaultEphemeralDeviceLetters {
+			bd := &ec2.BlockDeviceMapping{
+				DeviceName: aws.String("xvdc" + string(letter)),
+				NoDevice:   aws.String(""),
+			}
+			blockDeviceMappings = append(blockDeviceMappings, bd)
+		}
+	}
 	// Convert the BlockDeviceMapping into a
 	// LaunchTemplateBlockDeviceMappingRequest. These structs are identical,
 	// except for the EBS field -- on one, that field contains a
@@ -62,29 +80,11 @@ func (s *StepRunSpotInstance) CreateTemplateData(userData *string, az string,
 		launchRequest := &ec2.LaunchTemplateBlockDeviceMappingRequest{
 			DeviceName:  mapping.DeviceName,
 			Ebs:         (*ec2.LaunchTemplateEbsBlockDeviceRequest)(mapping.Ebs),
+			NoDevice:    mapping.NoDevice,
 			VirtualName: mapping.VirtualName,
 		}
 		launchMappingRequests = append(launchMappingRequests, launchRequest)
 	}
-	if s.NoEphemeral {
-		// This is only relevant for windows guests. Ephemeral drives by
-		// default are assigned to drive names xvdca-xvdcz.
-		// When vms are launched from the AWS console, they're automatically
-		// removed from the block devices if the user hasn't said to use them,
-		// but the SDK does not perform this cleanup. The following code just
-		// manually removes the ephemeral drives from the mapping so that they
-		// don't clutter up console views and cause confusion.
-		log.Printf("no_ephemeral was set, so creating drives xvdca-xvdcz as empty mappings")
-		DefaultEphemeralDeviceLetters := "abcdefghijklmnopqrstuvwxyz"
-		for _, letter := range DefaultEphemeralDeviceLetters {
-			launchRequest := &ec2.LaunchTemplateBlockDeviceMappingRequest{
-				DeviceName: aws.String("xvdc" + string(letter)),
-				NoDevice:   aws.String(""),
-			}
-			launchMappingRequests = append(launchMappingRequests, launchRequest)
-		}
-
-	}
 
 	iamInstanceProfile := aws.String(state.Get("iamInstanceProfile").(string))
 
@@ -194,7 +194,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 	}
 
 	// Convert tags from the tag map provided by the user into *ec2.Tag s
-	ec2Tags, err := TagMap(s.Tags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+	ec2Tags, err := s.Tags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 	if err != nil {
 		err := fmt.Errorf("Error generating tags for source instance: %s", err)
 		state.Put("error", err)
@@ -336,7 +336,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 	instance := describeOutput.Reservations[0].Instances[0]
 
 	// Tag the spot instance request (not the eventual spot instance)
-	spotTags, err := TagMap(s.SpotTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+	spotTags, err := s.SpotTags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 	if err != nil {
 		err := fmt.Errorf("Error generating tags for spot request: %s", err)
 		state.Put("error", err)
@@ -344,7 +344,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 		return multistep.ActionHalt
 	}
 
-	if len(spotTags) > 0 && len(s.SpotTags) > 0 {
+	if len(spotTags) > 0 && s.SpotTags.IsSet() {
 		spotTags.Report(ui)
 		// Use the instance ID to find out the SIR, so that we can tag the spot
 		// request associated with this instance.
@@ -400,10 +400,10 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 		}
 	}
 
-	if len(volumeIds) > 0 && len(s.VolumeTags) > 0 {
+	if len(volumeIds) > 0 && s.VolumeTags.IsSet() {
 		ui.Say("Adding tags to source EBS Volumes")
 
-		volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+		volumeTags, err := s.VolumeTags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 		if err != nil {
 			err := fmt.Errorf("Error tagging source EBS Volumes on %s: %s", *instance.InstanceId, err)
 			state.Put("error", err)

builder/amazon/common/step_run_spot_instance_test.go

@@ -44,9 +44,9 @@ func getBasicStep() *StepRunSpotInstance {
 		InstanceType:                      "t2.micro",
 		SourceAMI:                         "",
 		SpotPrice:                         "auto",
-		SpotTags:                          nil,
-		Tags:                              map[string]string{},
-		VolumeTags:                        nil,
+		SpotTags:                          TagMap(nil),
+		Tags:                              TagMap{},
+		VolumeTags:                        TagMap(nil),
 		UserData:                          "",
 		UserDataFile:                      "",
 	}
@@ -94,42 +94,3 @@ func TestCreateTemplateData(t *testing.T) {
 		t.Fatalf("Template shouldn't contain instance profile if iamInstanceProfile is unset.")
 	}
 }
-
-func TestCreateTemplateData_NoEphemeral(t *testing.T) {
-	state := tStateSpot()
-	stepRunSpotInstance := getBasicStep()
-	stepRunSpotInstance.NoEphemeral = true
-	template := stepRunSpotInstance.CreateTemplateData(aws.String("userdata"), "az", state,
-		&ec2.LaunchTemplateInstanceMarketOptionsRequest{})
-	if len(template.BlockDeviceMappings) != 26 {
-		t.Fatalf("Should have created 26 mappings to keep ephemeral drives from appearing.")
-	}
-
-	// Now check that noEphemeral doesn't mess with the mappings in real life.
-	// state = tStateSpot()
-	// stepRunSpotInstance = getBasicStep()
-	// stepRunSpotInstance.NoEphemeral = true
-	// mappings := []*ec2.InstanceBlockDeviceMapping{
-	// 	&ec2.InstanceBlockDeviceMapping{
-	// 		DeviceName: "xvda",
-	// 		Ebs: {
-	// 			DeleteOnTermination: true,
-	// 			Status:              "attaching",
-	// 			VolumeId:            "vol-044cd49c330f21c05",
-	// 		},
-	// 	},
-	// 	&ec2.InstanceBlockDeviceMapping{
-	// 		DeviceName: "/dev/xvdf",
-	// 		Ebs: {
-	// 			DeleteOnTermination: false,
-	// 			Status:              "attaching",
-	// 			VolumeId:            "vol-0eefaf2d6ae35827e",
-	// 		},
-	// 	},
-	// }
-	// template = stepRunSpotInstance.CreateTemplateData(aws.String("userdata"), "az", state,
-	// 	&ec2.LaunchTemplateInstanceMarketOptionsRequest{})
-	// if len(*template.BlockDeviceMappings) != 26 {
-	// 	t.Fatalf("Should have created 26 mappings to keep ephemeral drives from appearing.")
-	// }
-}

builder/amazon/common/tags.go

@@ -21,6 +21,10 @@ func (t EC2Tags) Report(ui packer.Ui) {
 	}
 }
 
+func (t TagMap) IsSet() bool {
+	return len(t) > 0
+}
+
 func (t TagMap) EC2Tags(ictx interpolate.Context, region string, state multistep.StateBag) (EC2Tags, error) {
 	var ec2Tags []*ec2.Tag
 	generatedData := builder.GeneratedData{State: state}

builder/amazon/ebs/acceptance/builder_acceptance.go

@@ -1,61 +0,0 @@
-package amazon_acc
-
-// This is the code necessary for running the provisioner acceptance tests.
-// It provides the builder config and cleans up created resource.
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-
-	amazonebsbuilder "github.com/hashicorp/packer/builder/amazon/ebs"
-
-	"github.com/hashicorp/packer/packer"
-
-	testshelper "github.com/hashicorp/packer/helper/tests"
-)
-
-type AmazonEBSAccTest struct{}
-
-func (s *AmazonEBSAccTest) GetConfigs() (map[string]string, error) {
-	fixtures := map[string]string{
-		"linux":   "amazon-ebs.txt",
-		"windows": "amazon-ebs_windows.txt",
-	}
-
-	configs := make(map[string]string)
-
-	for distro, fixture := range fixtures {
-		fileName := fixture
-		filePath := filepath.Join("../../builder/amazon/ebs/acceptance/test-fixtures/", fileName)
-		config, err := os.Open(filePath)
-		if err != nil {
-			return nil, fmt.Errorf("Expected to find %s", filePath)
-		}
-		defer config.Close()
-
-		file, err := ioutil.ReadAll(config)
-		if err != nil {
-			return nil, fmt.Errorf("Unable to read %s", filePath)
-		}
-
-		configs[distro] = string(file)
-
-	}
-	return configs, nil
-}
-
-func (s *AmazonEBSAccTest) CleanUp() error {
-	helper := testshelper.AWSHelper{
-		Region:  "us-east-1",
-		AMIName: "packer-acc-test",
-	}
-	return helper.CleanUpAmi()
-}
-
-func (s *AmazonEBSAccTest) GetBuilderStore() packer.MapOfBuilder {
-	return packer.MapOfBuilder{
-		"amazon-ebs": func() (packer.Builder, error) { return &amazonebsbuilder.Builder{}, nil },
-	}
-}

builder/amazon/ebs/acceptance/test-fixtures/amazon-ebs.txt

@@ -1,12 +0,0 @@
-{
-  "type": "amazon-ebs",
-  "ami_name": "packer-acc-test",
-  "instance_type": "m1.small",
-  "region": "us-east-1",
-  "ssh_username": "ubuntu",
-  "source_ami": "ami-0568456c",
-  "force_deregister" : true,
-  "tags": {
-    "packer-test": "true"
-  }
-}

builder/amazon/ebs/acceptance/test-fixtures/amazon-ebs_windows.txt

@@ -1,23 +0,0 @@
-{
- "type": "amazon-ebs",
- "region": "us-east-1",
-  "instance_type": "t2.micro",
-  "source_ami_filter": {
-    "filters": {
-      "virtualization-type": "hvm",
-      "name": "*Windows_Server-2012-R2*English-64Bit-Base*",
-      "root-device-type": "ebs"
-    },
-    "most_recent": true,
-    "owners": "amazon"
-  },
-  "ami_name": "packer-acc-test",
-  "user_data_file": "../../builder/amazon/ebs/acceptance/test-fixtures/scripts/bootstrap_win.txt",
-  "communicator": "winrm",
-  "winrm_username": "Administrator",
-  "winrm_password": "SuperS3cr3t!!!!",
-  "force_deregister" : true,
-  "tags": {
-    "packer-test": "true"
-  }
-}

builder/amazon/ebs/acceptance/test-fixtures/scripts/bootstrap_win.txt

@@ -1,40 +0,0 @@
-<powershell>
-# Set administrator password
-net user Administrator SuperS3cr3t!!!!
-wmic useraccount where "name='Administrator'" set PasswordExpires=FALSE
-
-# First, make sure WinRM can't be connected to
-netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" new enable=yes action=block
-
-# Delete any existing WinRM listeners
-winrm delete winrm/config/listener?Address=*+Transport=HTTP  2>$Null
-winrm delete winrm/config/listener?Address=*+Transport=HTTPS 2>$Null
-
-# Disable group policies which block basic authentication and unencrypted login
-
-Set-ItemProperty -Path HKLM:\Software\Policies\Microsoft\Windows\WinRM\Client -Name AllowBasic -Value 1
-Set-ItemProperty -Path HKLM:\Software\Policies\Microsoft\Windows\WinRM\Client -Name AllowUnencryptedTraffic -Value 1
-Set-ItemProperty -Path HKLM:\Software\Policies\Microsoft\Windows\WinRM\Service -Name AllowBasic -Value 1
-Set-ItemProperty -Path HKLM:\Software\Policies\Microsoft\Windows\WinRM\Service -Name AllowUnencryptedTraffic -Value 1
-
-
-# Create a new WinRM listener and configure
-winrm create winrm/config/listener?Address=*+Transport=HTTP
-winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="0"}'
-winrm set winrm/config '@{MaxTimeoutms="7200000"}'
-winrm set winrm/config/service '@{AllowUnencrypted="true"}'
-winrm set winrm/config/service '@{MaxConcurrentOperationsPerUser="12000"}'
-winrm set winrm/config/service/auth '@{Basic="true"}'
-winrm set winrm/config/client/auth '@{Basic="true"}'
-
-# Configure UAC to allow privilege elevation in remote shells
-$Key = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System'
-$Setting = 'LocalAccountTokenFilterPolicy'
-Set-ItemProperty -Path $Key -Name $Setting -Value 1 -Force
-
-# Configure and restart the WinRM Service; Enable the required firewall exception
-Stop-Service -Name WinRM
-Set-Service -Name WinRM -StartupType Automatic
-netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" new action=allow localip=any remoteip=any
-Start-Service -Name WinRM
-</powershell>

builder/amazon/ebs/builder.go

@@ -52,7 +52,7 @@ type Config struct {
 	// Tags to apply to the volumes that are *launched* to create the AMI.
 	// These tags are *not* applied to the resulting AMI unless they're
 	// duplicated in `tags`. This is a [template
-	// engine](/docs/templates/engine), see [Build template
+	// engine](/docs/templates/engine.html), see [Build template
 	// data](#build-template-data) for more information.
 	VolumeRunTags awscommon.TagMap `mapstructure:"run_volume_tags"`
 	// Relevant only to Windows guests: If you set this flag, we'll add clauses
@@ -211,7 +211,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			AMISkipBuildRegion: b.config.AMISkipBuildRegion,
 			VpcId:              b.config.VpcId,
 			SubnetId:           b.config.SubnetId,
-			HasSubnetFilter:    !b.config.SubnetFilter.Empty(),
+			HasSubnetFilter:    len(b.config.SubnetFilter.Filters) > 0,
 		},
 		&awscommon.StepSourceAMIInfo{
 			SourceAmi:                b.config.SourceAmi,

builder/amazon/ebs/builder.hcl2spec.go

@@ -4,7 +4,6 @@ package ebs
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -38,8 +37,7 @@ type FlatConfig struct {
 	AMIGroups                                 []string                               `mapstructure:"ami_groups" required:"false" cty:"ami_groups"`
 	AMIProductCodes                           []string                               `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes"`
 	AMIRegions                                []string                               `mapstructure:"ami_regions" required:"false" cty:"ami_regions"`
-	AMITags                                   map[string]string                      `mapstructure:"tags" required:"false" cty:"tags"`
-	AMITag                                    []hcl2template.FlatNameValue           `mapstructure:"tag" required:"false" cty:"tag"`
+	AMITags                                   common.TagMap                          `mapstructure:"tags" required:"false" cty:"tags"`
 	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support"`
 	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support"`
 	AMIForceDeregister                        *bool                                  `mapstructure:"force_deregister" required:"false" cty:"force_deregister"`
@@ -48,8 +46,7 @@ type FlatConfig struct {
 	AMIKmsKeyId                               *string                                `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id"`
 	AMIRegionKMSKeyIDs                        map[string]string                      `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids"`
 	AMISkipBuildRegion                        *bool                                  `mapstructure:"skip_save_build_region" cty:"skip_save_build_region"`
-	SnapshotTags                              map[string]string                      `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags"`
-	SnapshotTag                               []hcl2template.FlatNameValue           `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag"`
+	SnapshotTags                              common.TagMap                          `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags"`
 	SnapshotUsers                             []string                               `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users"`
 	SnapshotGroups                            []string                               `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups"`
 	AssociatePublicIpAddress                  *bool                                  `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address"`
@@ -65,7 +62,6 @@ type FlatConfig struct {
 	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type"`
 	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter"`
 	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags"`
-	RunTag                                    []hcl2template.FlatNameValue           `mapstructure:"run_tag" required:"false" cty:"run_tag"`
 	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id"`
 	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids"`
 	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami"`
@@ -74,7 +70,6 @@ type FlatConfig struct {
 	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price"`
 	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" cty:"spot_price_auto_product"`
 	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatNameValue           `mapstructure:"spot_tag" required:"false" cty:"spot_tag"`
 	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter"`
 	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id"`
 	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name"`
@@ -103,7 +98,6 @@ type FlatConfig struct {
 	SSHBastionAgentAuth                       *bool                                  `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth"`
 	SSHBastionUsername                        *string                                `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username"`
 	SSHBastionPassword                        *string                                `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password"`
-	SSHBastionInteractive                     *bool                                  `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive"`
 	SSHBastionPrivateKeyFile                  *string                                `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file"`
 	SSHFileTransferMethod                     *string                                `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method"`
 	SSHProxyHost                              *string                                `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host"`
@@ -148,7 +142,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":         &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false},
+		"packer_user_variables":         &hcldec.BlockAttrsSpec{TypeName: "packer_user_variables", ElementType: cty.String, Required: false},
 		"packer_sensitive_variables":    &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
 		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
 		"custom_endpoint_ec2":           &hcldec.AttrSpec{Name: "custom_endpoint_ec2", Type: cty.String, Required: false},
@@ -170,18 +164,16 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ami_groups":                    &hcldec.AttrSpec{Name: "ami_groups", Type: cty.List(cty.String), Required: false},
 		"ami_product_codes":             &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false},
 		"ami_regions":                   &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false},
-		"tags":                          &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"tags":                          &hcldec.BlockAttrsSpec{TypeName: "tags", ElementType: cty.String, Required: false},
 		"ena_support":                   &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false},
 		"sriov_support":                 &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
 		"force_deregister":              &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false},
 		"force_delete_snapshot":         &hcldec.AttrSpec{Name: "force_delete_snapshot", Type: cty.Bool, Required: false},
 		"encrypt_boot":                  &hcldec.AttrSpec{Name: "encrypt_boot", Type: cty.Bool, Required: false},
 		"kms_key_id":                    &hcldec.AttrSpec{Name: "kms_key_id", Type: cty.String, Required: false},
-		"region_kms_key_ids":            &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false},
+		"region_kms_key_ids":            &hcldec.BlockAttrsSpec{TypeName: "region_kms_key_ids", ElementType: cty.String, Required: false},
 		"skip_save_build_region":        &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false},
-		"snapshot_tags":                 &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false},
-		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"snapshot_tags":                 &hcldec.BlockAttrsSpec{TypeName: "snapshot_tags", ElementType: cty.String, Required: false},
 		"snapshot_users":                &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false},
 		"snapshot_groups":               &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false},
 		"associate_public_ip_address":   &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
@@ -196,8 +188,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"shutdown_behavior":                     &hcldec.AttrSpec{Name: "shutdown_behavior", Type: cty.String, Required: false},
 		"instance_type":                         &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false},
 		"security_group_filter":                 &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())},
-		"run_tags":                              &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false},
-		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"run_tags":                              &hcldec.BlockAttrsSpec{TypeName: "run_tags", ElementType: cty.String, Required: false},
 		"security_group_id":                     &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false},
 		"security_group_ids":                    &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false},
 		"source_ami":                            &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
@@ -205,8 +196,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"spot_instance_types":                   &hcldec.AttrSpec{Name: "spot_instance_types", Type: cty.List(cty.String), Required: false},
 		"spot_price":                            &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false},
 		"spot_price_auto_product":               &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false},
-		"spot_tags":                             &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false},
-		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"spot_tags":                             &hcldec.BlockAttrsSpec{TypeName: "spot_tags", ElementType: cty.String, Required: false},
 		"subnet_filter":                         &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())},
 		"subnet_id":                             &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false},
 		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
@@ -235,7 +225,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_bastion_agent_auth":                &hcldec.AttrSpec{Name: "ssh_bastion_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_bastion_username":                  &hcldec.AttrSpec{Name: "ssh_bastion_username", Type: cty.String, Required: false},
 		"ssh_bastion_password":                  &hcldec.AttrSpec{Name: "ssh_bastion_password", Type: cty.String, Required: false},
-		"ssh_bastion_interactive":               &hcldec.AttrSpec{Name: "ssh_bastion_interactive", Type: cty.Bool, Required: false},
 		"ssh_bastion_private_key_file":          &hcldec.AttrSpec{Name: "ssh_bastion_private_key_file", Type: cty.String, Required: false},
 		"ssh_file_transfer_method":              &hcldec.AttrSpec{Name: "ssh_file_transfer_method", Type: cty.String, Required: false},
 		"ssh_proxy_host":                        &hcldec.AttrSpec{Name: "ssh_proxy_host", Type: cty.String, Required: false},
@@ -259,7 +248,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_interface":                         &hcldec.AttrSpec{Name: "ssh_interface", Type: cty.String, Required: false},
 		"ami_block_device_mappings":             &hcldec.BlockListSpec{TypeName: "ami_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())},
 		"launch_block_device_mappings":          &hcldec.BlockListSpec{TypeName: "launch_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())},
-		"run_volume_tags":                       &hcldec.AttrSpec{Name: "run_volume_tags", Type: cty.Map(cty.String), Required: false},
+		"run_volume_tags":                       &hcldec.BlockAttrsSpec{TypeName: "run_volume_tags", ElementType: cty.String, Required: false},
 		"no_ephemeral":                          &hcldec.AttrSpec{Name: "no_ephemeral", Type: cty.Bool, Required: false},
 	}
 	return s

builder/amazon/ebs/builder_acc_test.go

@@ -87,6 +87,14 @@ func TestBuilderAcc_forceDeleteSnapshot(t *testing.T) {
 	})
 }
 
+func TestBuilderAcc_testSourceAmiFilter(t *testing.T) {
+	builderT.Test(t, builderT.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		Builder:  &Builder{},
+		Template: testSourceAmiFilter,
+	})
+}
+
 func checkSnapshotsDeleted(snapshotIds []*string) builderT.TestCheckFunc {
 	return func(artifacts []packer.Artifact) error {
 		// Verify the snapshots are gone
@@ -344,6 +352,29 @@ const testBuilderAccEncrypted = `
 }
 `
 
+const testSourceAmiFilter = `
+{
+	"builders": [{
+        "type": "test",
+        "ami_name": "packer-filter-test-{{timestamp}}",
+        "region": "us-east-1",
+        "instance_type": "t2.micro",
+        "ssh_username": "ubuntu",
+        "source_ami_filter": {
+            "filters": {
+                "name": "*ubuntu-xenial-16.04-amd64-server-*",
+                "root-device-type": "ebs",
+                "virtualization-type": "hvm"
+            },
+            "most_recent": true,
+            "owners": [
+                "099720109477"
+            ]
+        }
+    }]
+}
+`
+
 func buildForceDeregisterConfig(val, name string) string {
 	return fmt.Sprintf(testBuilderAccForceDeregister, val, name)
 }

builder/amazon/ebssurrogate/builder.go

@@ -58,7 +58,7 @@ type Config struct {
 	// Tags to apply to the volumes that are *launched* to create the AMI.
 	// These tags are *not* applied to the resulting AMI unless they're
 	// duplicated in `tags`. This is a [template
-	// engine](/docs/templates/engine), see [Build template
+	// engine](/docs/templates/engine.html), see [Build template
 	// data](#build-template-data) for more information.
 	VolumeRunTags awscommon.TagMap `mapstructure:"run_volume_tags"`
 	// what architecture to use when registering the
@@ -234,7 +234,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ForceDeregister: b.config.AMIForceDeregister,
 			VpcId:           b.config.VpcId,
 			SubnetId:        b.config.SubnetId,
-			HasSubnetFilter: !b.config.SubnetFilter.Empty(),
+			HasSubnetFilter: len(b.config.SubnetFilter.Filters) > 0,
 		},
 		&awscommon.StepSourceAMIInfo{
 			SourceAmi:                b.config.SourceAmi,

builder/amazon/ebssurrogate/builder.hcl2spec.go

@@ -4,7 +4,6 @@ package ebssurrogate
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -87,7 +86,6 @@ type FlatConfig struct {
 	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type"`
 	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter"`
 	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags"`
-	RunTag                                    []hcl2template.FlatNameValue           `mapstructure:"run_tag" required:"false" cty:"run_tag"`
 	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id"`
 	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids"`
 	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami"`
@@ -96,7 +94,6 @@ type FlatConfig struct {
 	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price"`
 	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" cty:"spot_price_auto_product"`
 	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatNameValue           `mapstructure:"spot_tag" required:"false" cty:"spot_tag"`
 	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter"`
 	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id"`
 	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name"`
@@ -125,7 +122,6 @@ type FlatConfig struct {
 	SSHBastionAgentAuth                       *bool                                  `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth"`
 	SSHBastionUsername                        *string                                `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username"`
 	SSHBastionPassword                        *string                                `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password"`
-	SSHBastionInteractive                     *bool                                  `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive"`
 	SSHBastionPrivateKeyFile                  *string                                `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file"`
 	SSHFileTransferMethod                     *string                                `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method"`
 	SSHProxyHost                              *string                                `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host"`
@@ -154,8 +150,7 @@ type FlatConfig struct {
 	AMIGroups                                 []string                               `mapstructure:"ami_groups" required:"false" cty:"ami_groups"`
 	AMIProductCodes                           []string                               `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes"`
 	AMIRegions                                []string                               `mapstructure:"ami_regions" required:"false" cty:"ami_regions"`
-	AMITags                                   map[string]string                      `mapstructure:"tags" required:"false" cty:"tags"`
-	AMITag                                    []hcl2template.FlatNameValue           `mapstructure:"tag" required:"false" cty:"tag"`
+	AMITags                                   common.TagMap                          `mapstructure:"tags" required:"false" cty:"tags"`
 	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support"`
 	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support"`
 	AMIForceDeregister                        *bool                                  `mapstructure:"force_deregister" required:"false" cty:"force_deregister"`
@@ -164,8 +159,7 @@ type FlatConfig struct {
 	AMIKmsKeyId                               *string                                `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id"`
 	AMIRegionKMSKeyIDs                        map[string]string                      `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids"`
 	AMISkipBuildRegion                        *bool                                  `mapstructure:"skip_save_build_region" cty:"skip_save_build_region"`
-	SnapshotTags                              map[string]string                      `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags"`
-	SnapshotTag                               []hcl2template.FlatNameValue           `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag"`
+	SnapshotTags                              common.TagMap                          `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags"`
 	SnapshotUsers                             []string                               `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users"`
 	SnapshotGroups                            []string                               `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups"`
 	AMIMappings                               []common.FlatBlockDevice               `mapstructure:"ami_block_device_mappings" required:"false" cty:"ami_block_device_mappings"`
@@ -192,7 +186,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":         &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false},
+		"packer_user_variables":         &hcldec.BlockAttrsSpec{TypeName: "packer_user_variables", ElementType: cty.String, Required: false},
 		"packer_sensitive_variables":    &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
 		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
 		"custom_endpoint_ec2":           &hcldec.AttrSpec{Name: "custom_endpoint_ec2", Type: cty.String, Required: false},
@@ -219,8 +213,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"shutdown_behavior":                     &hcldec.AttrSpec{Name: "shutdown_behavior", Type: cty.String, Required: false},
 		"instance_type":                         &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false},
 		"security_group_filter":                 &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())},
-		"run_tags":                              &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false},
-		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"run_tags":                              &hcldec.BlockAttrsSpec{TypeName: "run_tags", ElementType: cty.String, Required: false},
 		"security_group_id":                     &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false},
 		"security_group_ids":                    &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false},
 		"source_ami":                            &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
@@ -228,8 +221,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"spot_instance_types":                   &hcldec.AttrSpec{Name: "spot_instance_types", Type: cty.List(cty.String), Required: false},
 		"spot_price":                            &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false},
 		"spot_price_auto_product":               &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false},
-		"spot_tags":                             &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false},
-		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"spot_tags":                             &hcldec.BlockAttrsSpec{TypeName: "spot_tags", ElementType: cty.String, Required: false},
 		"subnet_filter":                         &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())},
 		"subnet_id":                             &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false},
 		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
@@ -258,7 +250,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_bastion_agent_auth":                &hcldec.AttrSpec{Name: "ssh_bastion_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_bastion_username":                  &hcldec.AttrSpec{Name: "ssh_bastion_username", Type: cty.String, Required: false},
 		"ssh_bastion_password":                  &hcldec.AttrSpec{Name: "ssh_bastion_password", Type: cty.String, Required: false},
-		"ssh_bastion_interactive":               &hcldec.AttrSpec{Name: "ssh_bastion_interactive", Type: cty.Bool, Required: false},
 		"ssh_bastion_private_key_file":          &hcldec.AttrSpec{Name: "ssh_bastion_private_key_file", Type: cty.String, Required: false},
 		"ssh_file_transfer_method":              &hcldec.AttrSpec{Name: "ssh_file_transfer_method", Type: cty.String, Required: false},
 		"ssh_proxy_host":                        &hcldec.AttrSpec{Name: "ssh_proxy_host", Type: cty.String, Required: false},
@@ -287,24 +278,22 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ami_groups":                            &hcldec.AttrSpec{Name: "ami_groups", Type: cty.List(cty.String), Required: false},
 		"ami_product_codes":                     &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false},
 		"ami_regions":                           &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false},
-		"tags":                                  &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                                   &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"tags":                                  &hcldec.BlockAttrsSpec{TypeName: "tags", ElementType: cty.String, Required: false},
 		"ena_support":                           &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false},
 		"sriov_support":                         &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
 		"force_deregister":                      &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false},
 		"force_delete_snapshot":                 &hcldec.AttrSpec{Name: "force_delete_snapshot", Type: cty.Bool, Required: false},
 		"encrypt_boot":                          &hcldec.AttrSpec{Name: "encrypt_boot", Type: cty.Bool, Required: false},
 		"kms_key_id":                            &hcldec.AttrSpec{Name: "kms_key_id", Type: cty.String, Required: false},
-		"region_kms_key_ids":                    &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false},
+		"region_kms_key_ids":                    &hcldec.BlockAttrsSpec{TypeName: "region_kms_key_ids", ElementType: cty.String, Required: false},
 		"skip_save_build_region":                &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false},
-		"snapshot_tags":                         &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false},
-		"snapshot_tag":                          &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"snapshot_tags":                         &hcldec.BlockAttrsSpec{TypeName: "snapshot_tags", ElementType: cty.String, Required: false},
 		"snapshot_users":                        &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false},
 		"snapshot_groups":                       &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false},
 		"ami_block_device_mappings":             &hcldec.BlockListSpec{TypeName: "ami_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())},
 		"launch_block_device_mappings":          &hcldec.BlockListSpec{TypeName: "launch_block_device_mappings", Nested: hcldec.ObjectSpec((*FlatBlockDevice)(nil).HCL2Spec())},
 		"ami_root_device":                       &hcldec.BlockSpec{TypeName: "ami_root_device", Nested: hcldec.ObjectSpec((*FlatRootBlockDevice)(nil).HCL2Spec())},
-		"run_volume_tags":                       &hcldec.AttrSpec{Name: "run_volume_tags", Type: cty.Map(cty.String), Required: false},
+		"run_volume_tags":                       &hcldec.BlockAttrsSpec{TypeName: "run_volume_tags", ElementType: cty.String, Required: false},
 		"ami_architecture":                      &hcldec.AttrSpec{Name: "ami_architecture", Type: cty.String, Required: false},
 	}
 	return s

builder/amazon/ebsvolume/block_device.go

@@ -5,21 +5,15 @@ package ebsvolume
 import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type BlockDevice struct {
 	awscommon.BlockDevice `mapstructure:",squash"`
 	// Tags to apply to the volume. These are retained after the builder
-	// completes. This is a [template engine](/docs/templates/engine), see
+	// completes. This is a [template engine](/docs/templates/engine.html), see
 	// [Build template data](#build-template-data) for more information.
-	Tags map[string]string `mapstructure:"tags" required:"false"`
-	// Same as [`tags`](#tags) but defined as a singular repeatable block
-	// containing a `name` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	Tag hcl2template.NameValues `mapstructure:"tag" required:"false"`
+	Tags awscommon.TagMap `mapstructure:"tags" required:"false"`
 }
 
 type BlockDevices []BlockDevice
@@ -34,15 +28,10 @@ func (bds BlockDevices) BuildEC2BlockDeviceMappings() []*ec2.BlockDeviceMapping
 }
 
 func (bds BlockDevices) Prepare(ctx *interpolate.Context) (errs []error) {
-
 	for _, block := range bds {
-
-		errs = append(errs, block.Tag.CopyOn(&block.Tags)...)
-
 		if err := block.Prepare(ctx); err != nil {
 			errs = append(errs, err)
 		}
-
 	}
 	return errs
 }

builder/amazon/ebsvolume/builder.go

@@ -14,7 +14,6 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
@@ -57,7 +56,7 @@ type Config struct {
 	// create EBS Volumes. These tags will *not* appear in the tags of the
 	// resulting EBS volumes unless they're duplicated under `tags` in the
 	// `ebs_volumes` setting. This is a [template
-	// engine](/docs/templates/engine), see [Build template
+	// engine](/docs/templates/engine.html), see [Build template
 	// data](#build-template-data) for more information.
 	//
 	//  Note: The tags specified here will be *temporarily* applied to volumes
@@ -65,13 +64,7 @@ type Config struct {
 	// created. Packer will replace all tags on the volume with the tags
 	// configured in the `ebs_volumes` section as soon as the instance is
 	// reported as 'ready'.
-	VolumeRunTags map[string]string `mapstructure:"run_volume_tags"`
-	// Same as [`run_volume_tags`](#run_volume_tags) but defined as a singular
-	// repeatable block containing a `name` and a `value` field. In HCL2 mode
-	// the
-	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	VolumeRunTag hcl2template.NameValues `mapstructure:"run_volume_tag"`
+	VolumeRunTags awscommon.TagMap `mapstructure:"run_volume_tags"`
 
 	launchBlockDevices BlockDevices
 
@@ -109,7 +102,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	// Accumulate any errors
 	var errs *packer.MultiError
 	var warns []string
-	errs = packer.MultiErrorAppend(errs, b.config.VolumeRunTag.CopyOn(&b.config.VolumeRunTags)...)
 	errs = packer.MultiErrorAppend(errs, b.config.AccessConfig.Prepare(&b.config.ctx)...)
 	errs = packer.MultiErrorAppend(errs, b.config.RunConfig.Prepare(&b.config.ctx)...)
 	errs = packer.MultiErrorAppend(errs, b.config.launchBlockDevices.Prepare(&b.config.ctx)...)

builder/amazon/ebsvolume/builder.hcl2spec.go

@@ -4,25 +4,23 @@ package ebsvolume
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
 // FlatBlockDevice is an auto-generated flat version of BlockDevice.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatBlockDevice struct {
-	DeleteOnTermination *bool                        `mapstructure:"delete_on_termination" required:"false" cty:"delete_on_termination"`
-	DeviceName          *string                      `mapstructure:"device_name" required:"false" cty:"device_name"`
-	Encrypted           *bool                        `mapstructure:"encrypted" required:"false" cty:"encrypted"`
-	IOPS                *int64                       `mapstructure:"iops" required:"false" cty:"iops"`
-	NoDevice            *bool                        `mapstructure:"no_device" required:"false" cty:"no_device"`
-	SnapshotId          *string                      `mapstructure:"snapshot_id" required:"false" cty:"snapshot_id"`
-	VirtualName         *string                      `mapstructure:"virtual_name" required:"false" cty:"virtual_name"`
-	VolumeType          *string                      `mapstructure:"volume_type" required:"false" cty:"volume_type"`
-	VolumeSize          *int64                       `mapstructure:"volume_size" required:"false" cty:"volume_size"`
-	KmsKeyId            *string                      `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id"`
-	Tags                map[string]string            `mapstructure:"tags" required:"false" cty:"tags"`
-	Tag                 []hcl2template.FlatNameValue `mapstructure:"tag" required:"false" cty:"tag"`
+	DeleteOnTermination *bool         `mapstructure:"delete_on_termination" required:"false" cty:"delete_on_termination"`
+	DeviceName          *string       `mapstructure:"device_name" required:"false" cty:"device_name"`
+	Encrypted           *bool         `mapstructure:"encrypted" required:"false" cty:"encrypted"`
+	IOPS                *int64        `mapstructure:"iops" required:"false" cty:"iops"`
+	NoDevice            *bool         `mapstructure:"no_device" required:"false" cty:"no_device"`
+	SnapshotId          *string       `mapstructure:"snapshot_id" required:"false" cty:"snapshot_id"`
+	VirtualName         *string       `mapstructure:"virtual_name" required:"false" cty:"virtual_name"`
+	VolumeType          *string       `mapstructure:"volume_type" required:"false" cty:"volume_type"`
+	VolumeSize          *int64        `mapstructure:"volume_size" required:"false" cty:"volume_size"`
+	KmsKeyId            *string       `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id"`
+	Tags                common.TagMap `mapstructure:"tags" required:"false" cty:"tags"`
 }
 
 // FlatMapstructure returns a new FlatBlockDevice.
@@ -47,8 +45,7 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec {
 		"volume_type":           &hcldec.AttrSpec{Name: "volume_type", Type: cty.String, Required: false},
 		"volume_size":           &hcldec.AttrSpec{Name: "volume_size", Type: cty.Number, Required: false},
 		"kms_key_id":            &hcldec.AttrSpec{Name: "kms_key_id", Type: cty.String, Required: false},
-		"tags":                  &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                   &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"tags":                  &hcldec.BlockAttrsSpec{TypeName: "tags", ElementType: cty.String, Required: false},
 	}
 	return s
 }
@@ -89,7 +86,6 @@ type FlatConfig struct {
 	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type"`
 	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter"`
 	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags"`
-	RunTag                                    []hcl2template.FlatNameValue           `mapstructure:"run_tag" required:"false" cty:"run_tag"`
 	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id"`
 	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids"`
 	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami"`
@@ -98,7 +94,6 @@ type FlatConfig struct {
 	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price"`
 	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" cty:"spot_price_auto_product"`
 	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatNameValue           `mapstructure:"spot_tag" required:"false" cty:"spot_tag"`
 	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter"`
 	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id"`
 	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name"`
@@ -127,7 +122,6 @@ type FlatConfig struct {
 	SSHBastionAgentAuth                       *bool                                  `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth"`
 	SSHBastionUsername                        *string                                `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username"`
 	SSHBastionPassword                        *string                                `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password"`
-	SSHBastionInteractive                     *bool                                  `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive"`
 	SSHBastionPrivateKeyFile                  *string                                `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file"`
 	SSHFileTransferMethod                     *string                                `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method"`
 	SSHProxyHost                              *string                                `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host"`
@@ -152,8 +146,7 @@ type FlatConfig struct {
 	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support"`
 	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support"`
 	VolumeMappings                            []FlatBlockDevice                      `mapstructure:"ebs_volumes" required:"false" cty:"ebs_volumes"`
-	VolumeRunTags                             map[string]string                      `mapstructure:"run_volume_tags" cty:"run_volume_tags"`
-	VolumeRunTag                              []hcl2template.FlatNameValue           `mapstructure:"run_volume_tag" cty:"run_volume_tag"`
+	VolumeRunTags                             common.TagMap                          `mapstructure:"run_volume_tags" cty:"run_volume_tags"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -173,7 +166,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":         &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false},
+		"packer_user_variables":         &hcldec.BlockAttrsSpec{TypeName: "packer_user_variables", ElementType: cty.String, Required: false},
 		"packer_sensitive_variables":    &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
 		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
 		"custom_endpoint_ec2":           &hcldec.AttrSpec{Name: "custom_endpoint_ec2", Type: cty.String, Required: false},
@@ -200,8 +193,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"shutdown_behavior":                     &hcldec.AttrSpec{Name: "shutdown_behavior", Type: cty.String, Required: false},
 		"instance_type":                         &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false},
 		"security_group_filter":                 &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())},
-		"run_tags":                              &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false},
-		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"run_tags":                              &hcldec.BlockAttrsSpec{TypeName: "run_tags", ElementType: cty.String, Required: false},
 		"security_group_id":                     &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false},
 		"security_group_ids":                    &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false},
 		"source_ami":                            &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
@@ -209,8 +201,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"spot_instance_types":                   &hcldec.AttrSpec{Name: "spot_instance_types", Type: cty.List(cty.String), Required: false},
 		"spot_price":                            &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false},
 		"spot_price_auto_product":               &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false},
-		"spot_tags":                             &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false},
-		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"spot_tags":                             &hcldec.BlockAttrsSpec{TypeName: "spot_tags", ElementType: cty.String, Required: false},
 		"subnet_filter":                         &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())},
 		"subnet_id":                             &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false},
 		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
@@ -239,7 +230,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_bastion_agent_auth":                &hcldec.AttrSpec{Name: "ssh_bastion_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_bastion_username":                  &hcldec.AttrSpec{Name: "ssh_bastion_username", Type: cty.String, Required: false},
 		"ssh_bastion_password":                  &hcldec.AttrSpec{Name: "ssh_bastion_password", Type: cty.String, Required: false},
-		"ssh_bastion_interactive":               &hcldec.AttrSpec{Name: "ssh_bastion_interactive", Type: cty.Bool, Required: false},
 		"ssh_bastion_private_key_file":          &hcldec.AttrSpec{Name: "ssh_bastion_private_key_file", Type: cty.String, Required: false},
 		"ssh_file_transfer_method":              &hcldec.AttrSpec{Name: "ssh_file_transfer_method", Type: cty.String, Required: false},
 		"ssh_proxy_host":                        &hcldec.AttrSpec{Name: "ssh_proxy_host", Type: cty.String, Required: false},
@@ -264,8 +254,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ena_support":                           &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false},
 		"sriov_support":                         &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
 		"ebs_volumes":                           &hcldec.BlockListSpec{TypeName: "ebs_volumes", Nested: hcldec.ObjectSpec((*FlatBlockDevice)(nil).HCL2Spec())},
-		"run_volume_tags":                       &hcldec.AttrSpec{Name: "run_volume_tags", Type: cty.Map(cty.String), Required: false},
-		"run_volume_tag":                        &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"run_volume_tags":                       &hcldec.BlockAttrsSpec{TypeName: "run_volume_tags", ElementType: cty.String, Required: false},
 	}
 	return s
 }

builder/amazon/ebsvolume/step_tag_ebs_volumes.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/hashicorp/packer/template/interpolate"
@@ -44,11 +43,11 @@ func (s *stepTagEBSVolumes) Run(ctx context.Context, state multistep.StateBag) m
 		// volume will have had these tags applied when the instance was
 		// created. We now need to remove these tags to ensure only the EBS
 		// volume tags are applied (if any)
-		if len(config.VolumeRunTags) > 0 {
+		if config.VolumeRunTags.IsSet() {
 			ui.Say("Removing any tags applied to EBS volumes when the source instance was created...")
 
 			ui.Message("Compiling list of existing tags to remove...")
-			existingTags, err := awscommon.TagMap(config.VolumeRunTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+			existingTags, err := config.VolumeRunTags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 			if err != nil {
 				err := fmt.Errorf("Error generating list of tags to remove: %s", err)
 				state.Put("error", err)
@@ -92,7 +91,7 @@ func (s *stepTagEBSVolumes) Run(ctx context.Context, state multistep.StateBag) m
 			}
 
 			ui.Message(fmt.Sprintf("Compiling list of tags to apply to volume on %s...", mapping.DeviceName))
-			tags, err := awscommon.TagMap(mapping.Tags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+			tags, err := mapping.Tags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 			if err != nil {
 				err := fmt.Errorf("Error generating tags for device %s: %s", mapping.DeviceName, err)
 				state.Put("error", err)

builder/amazon/instance/builder.go

@@ -61,7 +61,7 @@ type Config struct {
 	// exist and be writable.
 	BundleDestination string `mapstructure:"bundle_destination" required:"false"`
 	// The prefix for files created from bundling the root volume. By default
-	// this is `image-{{timestamp}}`. The timestamp variable should be used to
+	// this is image-{{timestamp}}. The timestamp variable should be used to
 	// make sure this is unique, otherwise it can collide with other created
 	// AMIs by Packer in your account.
 	BundlePrefix string `mapstructure:"bundle_prefix" required:"false"`
@@ -296,7 +296,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ForceDeregister: b.config.AMIForceDeregister,
 			VpcId:           b.config.VpcId,
 			SubnetId:        b.config.SubnetId,
-			HasSubnetFilter: !b.config.SubnetFilter.Empty(),
+			HasSubnetFilter: len(b.config.SubnetFilter.Filters) > 0,
 		},
 		&awscommon.StepSourceAMIInfo{
 			SourceAmi:                b.config.SourceAmi,

builder/amazon/instance/builder.hcl2spec.go

@@ -4,7 +4,6 @@ package instance
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -38,8 +37,7 @@ type FlatConfig struct {
 	AMIGroups                                 []string                               `mapstructure:"ami_groups" required:"false" cty:"ami_groups"`
 	AMIProductCodes                           []string                               `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes"`
 	AMIRegions                                []string                               `mapstructure:"ami_regions" required:"false" cty:"ami_regions"`
-	AMITags                                   map[string]string                      `mapstructure:"tags" required:"false" cty:"tags"`
-	AMITag                                    []hcl2template.FlatNameValue           `mapstructure:"tag" required:"false" cty:"tag"`
+	AMITags                                   common.TagMap                          `mapstructure:"tags" required:"false" cty:"tags"`
 	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support"`
 	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support"`
 	AMIForceDeregister                        *bool                                  `mapstructure:"force_deregister" required:"false" cty:"force_deregister"`
@@ -48,8 +46,7 @@ type FlatConfig struct {
 	AMIKmsKeyId                               *string                                `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id"`
 	AMIRegionKMSKeyIDs                        map[string]string                      `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids"`
 	AMISkipBuildRegion                        *bool                                  `mapstructure:"skip_save_build_region" cty:"skip_save_build_region"`
-	SnapshotTags                              map[string]string                      `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags"`
-	SnapshotTag                               []hcl2template.FlatNameValue           `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag"`
+	SnapshotTags                              common.TagMap                          `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags"`
 	SnapshotUsers                             []string                               `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users"`
 	SnapshotGroups                            []string                               `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups"`
 	AssociatePublicIpAddress                  *bool                                  `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address"`
@@ -65,7 +62,6 @@ type FlatConfig struct {
 	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type"`
 	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter"`
 	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags"`
-	RunTag                                    []hcl2template.FlatNameValue           `mapstructure:"run_tag" required:"false" cty:"run_tag"`
 	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id"`
 	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids"`
 	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami"`
@@ -74,7 +70,6 @@ type FlatConfig struct {
 	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price"`
 	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" cty:"spot_price_auto_product"`
 	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatNameValue           `mapstructure:"spot_tag" required:"false" cty:"spot_tag"`
 	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter"`
 	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id"`
 	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name"`
@@ -103,7 +98,6 @@ type FlatConfig struct {
 	SSHBastionAgentAuth                       *bool                                  `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth"`
 	SSHBastionUsername                        *string                                `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username"`
 	SSHBastionPassword                        *string                                `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password"`
-	SSHBastionInteractive                     *bool                                  `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive"`
 	SSHBastionPrivateKeyFile                  *string                                `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file"`
 	SSHFileTransferMethod                     *string                                `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method"`
 	SSHProxyHost                              *string                                `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host"`
@@ -155,7 +149,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":         &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false},
+		"packer_user_variables":         &hcldec.BlockAttrsSpec{TypeName: "packer_user_variables", ElementType: cty.String, Required: false},
 		"packer_sensitive_variables":    &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
 		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
 		"custom_endpoint_ec2":           &hcldec.AttrSpec{Name: "custom_endpoint_ec2", Type: cty.String, Required: false},
@@ -177,18 +171,16 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ami_groups":                    &hcldec.AttrSpec{Name: "ami_groups", Type: cty.List(cty.String), Required: false},
 		"ami_product_codes":             &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false},
 		"ami_regions":                   &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false},
-		"tags":                          &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"tags":                          &hcldec.BlockAttrsSpec{TypeName: "tags", ElementType: cty.String, Required: false},
 		"ena_support":                   &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false},
 		"sriov_support":                 &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
 		"force_deregister":              &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false},
 		"force_delete_snapshot":         &hcldec.AttrSpec{Name: "force_delete_snapshot", Type: cty.Bool, Required: false},
 		"encrypt_boot":                  &hcldec.AttrSpec{Name: "encrypt_boot", Type: cty.Bool, Required: false},
 		"kms_key_id":                    &hcldec.AttrSpec{Name: "kms_key_id", Type: cty.String, Required: false},
-		"region_kms_key_ids":            &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false},
+		"region_kms_key_ids":            &hcldec.BlockAttrsSpec{TypeName: "region_kms_key_ids", ElementType: cty.String, Required: false},
 		"skip_save_build_region":        &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false},
-		"snapshot_tags":                 &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false},
-		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"snapshot_tags":                 &hcldec.BlockAttrsSpec{TypeName: "snapshot_tags", ElementType: cty.String, Required: false},
 		"snapshot_users":                &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false},
 		"snapshot_groups":               &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false},
 		"associate_public_ip_address":   &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
@@ -203,8 +195,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"shutdown_behavior":                     &hcldec.AttrSpec{Name: "shutdown_behavior", Type: cty.String, Required: false},
 		"instance_type":                         &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false},
 		"security_group_filter":                 &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())},
-		"run_tags":                              &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false},
-		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"run_tags":                              &hcldec.BlockAttrsSpec{TypeName: "run_tags", ElementType: cty.String, Required: false},
 		"security_group_id":                     &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false},
 		"security_group_ids":                    &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false},
 		"source_ami":                            &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
@@ -212,8 +203,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"spot_instance_types":                   &hcldec.AttrSpec{Name: "spot_instance_types", Type: cty.List(cty.String), Required: false},
 		"spot_price":                            &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false},
 		"spot_price_auto_product":               &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false},
-		"spot_tags":                             &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false},
-		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"spot_tags":                             &hcldec.BlockAttrsSpec{TypeName: "spot_tags", ElementType: cty.String, Required: false},
 		"subnet_filter":                         &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())},
 		"subnet_id":                             &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false},
 		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
@@ -242,7 +232,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_bastion_agent_auth":                &hcldec.AttrSpec{Name: "ssh_bastion_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_bastion_username":                  &hcldec.AttrSpec{Name: "ssh_bastion_username", Type: cty.String, Required: false},
 		"ssh_bastion_password":                  &hcldec.AttrSpec{Name: "ssh_bastion_password", Type: cty.String, Required: false},
-		"ssh_bastion_interactive":               &hcldec.AttrSpec{Name: "ssh_bastion_interactive", Type: cty.Bool, Required: false},
 		"ssh_bastion_private_key_file":          &hcldec.AttrSpec{Name: "ssh_bastion_private_key_file", Type: cty.String, Required: false},
 		"ssh_file_transfer_method":              &hcldec.AttrSpec{Name: "ssh_file_transfer_method", Type: cty.String, Required: false},
 		"ssh_proxy_host":                        &hcldec.AttrSpec{Name: "ssh_proxy_host", Type: cty.String, Required: false},

builder/azure/arm/azure_client.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
 	newCompute "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
-	"github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault"
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-01-01/network"
 	"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-02-01/resources"
 	armStorage "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage"
@@ -51,7 +50,7 @@ type AzureClient struct {
 	InspectorMaxLength int
 	Template           *CaptureTemplate
 	LastError          azureErrorResponse
-	VaultClientDelete  keyvault.VaultsClient
+	VaultClientDelete  common.VaultClient
 }
 
 func getCaptureResponse(body string) *CaptureTemplate {
@@ -252,9 +251,15 @@ func NewAzureClient(subscriptionID, resourceGroupName, storageAccountName string
 	azureClient.VaultClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VaultClient.UserAgent)
 	azureClient.VaultClient.Client.PollingDuration = PollingDuration
 
-	// This client is different than the above because it manages the vault
-	// itself rather than the contents of the vault.
-	azureClient.VaultClientDelete = keyvault.NewVaultsClient(subscriptionID)
+	// TODO(boumenot) - SDK still does not have a full KeyVault client.
+	// There are two ways that KeyVault has to be accessed, and each one has their own SPN.  An authenticated SPN
+	// is tied to the URL, and the URL associated with getting the secret is different than the URL
+	// associated with deleting the KeyVault.  As a result, I need to have *two* different clients to
+	// access KeyVault.  I did not want to split it into two separate files, so I am starting with this.
+	//
+	// I do not like this implementation.  It is getting long in the tooth, and should be re-examined now
+	// that we have a "working" solution.
+	azureClient.VaultClientDelete = common.NewVaultClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.VaultClientDelete.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.VaultClientDelete.RequestInspector = withInspection(maxlen)
 	azureClient.VaultClientDelete.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))

builder/azure/arm/builder.go

@@ -111,11 +111,13 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	if b.config.isManagedImage() {
-		_, err := azureClient.GroupsClient.Get(ctx, b.config.ManagedImageResourceGroupName)
+		group, err := azureClient.GroupsClient.Get(ctx, b.config.ManagedImageResourceGroupName)
 		if err != nil {
 			return nil, fmt.Errorf("Cannot locate the managed image resource group %s.", b.config.ManagedImageResourceGroupName)
 		}
 
+		b.config.manageImageLocation = *group.Location
+
 		// If a managed image already exists it cannot be overwritten.
 		_, err = azureClient.ImagesClient.Get(ctx, b.config.ManagedImageResourceGroupName, b.config.ManagedImageName, "")
 		if err == nil {
@@ -226,11 +228,11 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			NewStepDeleteAdditionalDisks(azureClient, ui),
 		}
 	} else if b.config.OSType == constants.Target_Windows {
+		keyVaultDeploymentName := b.stateBag.Get(constants.ArmKeyVaultDeploymentName).(string)
 		steps = []multistep.Step{
 			NewStepCreateResourceGroup(azureClient, ui),
 		}
 		if b.config.BuildKeyVaultName == "" {
-			keyVaultDeploymentName := b.stateBag.Get(constants.ArmKeyVaultDeploymentName).(string)
 			steps = append(steps,
 				NewStepValidateTemplate(azureClient, ui, &b.config, GetKeyVaultDeployment),
 				NewStepDeployTemplate(azureClient, ui, &b.config, keyVaultDeploymentName, GetKeyVaultDeployment),
@@ -252,7 +254,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				WinRMConfig: func(multistep.StateBag) (*communicator.WinRMConfig, error) {
 					return &communicator.WinRMConfig{
 						Username: b.config.UserName,
-						Password: b.config.Password,
+						Password: b.config.Comm.WinRMPassword,
 					}, nil
 				},
 			},
@@ -309,7 +311,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			return NewManagedImageArtifactWithSIGAsDestination(b.config.OSType,
 				b.config.ManagedImageResourceGroupName,
 				b.config.ManagedImageName,
-				b.config.Location,
+				b.config.manageImageLocation,
 				managedImageID,
 				b.config.ManagedImageOSDiskSnapshotName,
 				b.config.ManagedImageDataDiskSnapshotPrefix,
@@ -319,7 +321,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		return NewManagedImageArtifact(b.config.OSType,
 			b.config.ManagedImageResourceGroupName,
 			b.config.ManagedImageName,
-			b.config.Location,
+			b.config.manageImageLocation,
 			managedImageID,
 			b.config.ManagedImageOSDiskSnapshotName,
 			b.config.ManagedImageDataDiskSnapshotPrefix,
@@ -397,7 +399,7 @@ func (b *Builder) configureStateBag(stateBag multistep.StateBag) {
 	stateBag.Put(constants.ArmComputeName, b.config.tmpComputeName)
 	stateBag.Put(constants.ArmDeploymentName, b.config.tmpDeploymentName)
 
-	if b.config.OSType == constants.Target_Windows && b.config.BuildKeyVaultName == "" {
+	if b.config.OSType == constants.Target_Windows {
 		stateBag.Put(constants.ArmKeyVaultDeploymentName, fmt.Sprintf("kv%s", b.config.tmpDeploymentName))
 	}
 
@@ -446,6 +448,7 @@ func (b *Builder) configureStateBag(stateBag multistep.StateBag) {
 // Parameters that are only known at runtime after querying Azure.
 func (b *Builder) setRuntimeParameters(stateBag multistep.StateBag) {
 	stateBag.Put(constants.ArmLocation, b.config.Location)
+	stateBag.Put(constants.ArmManagedImageLocation, b.config.manageImageLocation)
 }
 
 func (b *Builder) setTemplateParameters(stateBag multistep.StateBag) {

builder/azure/arm/config.go

@@ -18,8 +18,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/random"
-
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/masterzen/winrm"
@@ -29,7 +27,6 @@ import (
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/hashicorp/packer/builder/azure/pkcs12"
 	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
@@ -43,7 +40,6 @@ const (
 	DefaultUserName                          = "packer"
 	DefaultPrivateVirtualNetworkWithPublicIp = false
 	DefaultVMSize                            = "Standard_A1"
-	DefaultKeyVaultSKU                       = "standard"
 )
 
 const (
@@ -56,7 +52,6 @@ const (
 	// This is not an exhaustive match, but it should be extremely close.
 	validResourceGroupNameRe = "^[^_\\W][\\w-._\\(\\)]{0,89}$"
 	validManagedDiskName     = "^[^_\\W][\\w-._)]{0,79}$"
-	validResourceNamePrefix  = "^[^_\\W][\\w-._)]{0,10}$"
 )
 
 var (
@@ -66,7 +61,6 @@ var (
 	reResourceGroupName    = regexp.MustCompile(validResourceGroupNameRe)
 	reSnapshotName         = regexp.MustCompile(`^[A-Za-z0-9_]{1,79}$`)
 	reSnapshotPrefix       = regexp.MustCompile(`^[A-Za-z0-9_]{1,59}$`)
-	reResourceNamePrefix   = regexp.MustCompile(validResourceNamePrefix)
 )
 
 type PlanInformation struct {
@@ -235,6 +229,7 @@ type Config struct {
 	// disk(s) is created with the same prefix as this value before the VM is
 	// captured.
 	ManagedImageDataDiskSnapshotPrefix string `mapstructure:"managed_image_data_disk_snapshot_prefix" required:"false"`
+	manageImageLocation                string
 	// Store the image in zone-resilient storage. You need to create it in a
 	// region that supports [availability
 	// zones](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview).
@@ -244,11 +239,6 @@ type Config struct {
 	// 256 characters. Tags are applied to every resource deployed by a Packer
 	// build, i.e. Resource Group, VM, NIC, VNET, Public IP, KeyVault, etc.
 	AzureTags map[string]*string `mapstructure:"azure_tags" required:"false"`
-	// Same as [`azure_tags`](#azure_tags) but defined as a singular repeatable block
-	// containing a `name` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	AzureTag hcl2template.NameValues `mapstructure:"azure_tag" required:"false"`
 	// Resource group under which the final artifact will be stored.
 	ResourceGroupName string `mapstructure:"resource_group_name"`
 	// Storage account under which the final artifact will be stored.
@@ -266,10 +256,7 @@ type Config struct {
 	BuildResourceGroupName string `mapstructure:"build_resource_group_name"`
 	// Specify an existing key vault to use for uploading certificates to the
 	// instance to connect.
-	BuildKeyVaultName string `mapstructure:"build_key_vault_name"`
-	// Specify the KeyVault SKU to create during the build. Valid values are
-	// standard or premium. The default value is standard.
-	BuildKeyVaultSKU           string `mapstructure:"build_key_vault_sku"`
+	BuildKeyVaultName          string `mapstructure:"build_key_vault_name"`
 	storageAccountBlobEndpoint string
 	// This value allows you to
 	// set a virtual_network_name and obtain a public IP. If this value is not
@@ -310,7 +297,7 @@ type Config struct {
 	//
 	// An example plan\_info object is defined below.
 	//
-	// ```json
+	// ``` json
 	// {
 	//   "plan_info": {
 	//       "plan_name": "rabbitmq",
@@ -383,17 +370,6 @@ type Config struct {
 	// `virtual_network_name` is not allowed.
 	AllowedInboundIpAddresses []string `mapstructure:"allowed_inbound_ip_addresses"`
 
-	// Specify storage to store Boot Diagnostics -- Enabling this option
-	// will create 2 Files in the specified storage account. (serial console log & screehshot file)
-	// once the build is completed, it has to be removed manually.
-	// see [here](https://docs.microsoft.com/en-us/azure/virtual-machines/troubleshooting/boot-diagnostics) for more info
-	BootDiagSTGAccount string `mapstructure:"boot_diag_storage_account" required:"false"`
-
-	// specify custom azure resource names during build limited to max 10 charcters
-	// this will set the prefix for the resources. The actuall resource names will be
-	// `custom_resource_build_prefix` + resourcetype + 5 character random alphanumeric string
-	CustomResourcePrefix string `mapstructure:"custom_resource_build_prefix" required:"false"`
-
 	// Runtime Values
 	UserName               string `mapstructure-to-hcl2:",skip"`
 	Password               string `mapstructure-to-hcl2:",skip"`
@@ -406,7 +382,6 @@ type Config struct {
 	tmpDeploymentName      string
 	tmpKeyVaultName        string
 	tmpOSDiskName          string
-	tmpDataDiskName        string
 	tmpSubnetName          string
 	tmpVirtualNetworkName  string
 	tmpNsgName             string
@@ -543,17 +518,7 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 
 	provideDefaultValues(c)
 	setRuntimeValues(c)
-	err = setUserNamePassword(c)
-	if err != nil {
-		return nil, err
-	}
-
-	// copy singular blocks
-	for _, kv := range c.AzureTag {
-		v := kv.Value
-		c.AzureTags[kv.Name] = &v
-	}
-
+	setUserNamePassword(c)
 	err = c.ClientConfig.SetDefaultValues()
 	if err != nil {
 		return nil, err
@@ -641,7 +606,7 @@ func setWinRMCertificate(c *Config) error {
 }
 
 func setRuntimeValues(c *Config) {
-	var tempName = NewTempName(c.CustomResourcePrefix)
+	var tempName = NewTempName()
 
 	c.tmpAdminPassword = tempName.AdminPassword
 	// store so that we can access this later during provisioning
@@ -663,41 +628,29 @@ func setRuntimeValues(c *Config) {
 	c.tmpNicName = tempName.NicName
 	c.tmpPublicIPAddressName = tempName.PublicIPAddressName
 	c.tmpOSDiskName = tempName.OSDiskName
-	c.tmpDataDiskName = tempName.DataDiskname
 	c.tmpSubnetName = tempName.SubnetName
 	c.tmpVirtualNetworkName = tempName.VirtualNetworkName
 	c.tmpNsgName = tempName.NsgName
 	c.tmpKeyVaultName = tempName.KeyVaultName
 }
 
-func setUserNamePassword(c *Config) error {
-	// SSH comm
+func setUserNamePassword(c *Config) {
 	if c.Comm.SSHUsername == "" {
 		c.Comm.SSHUsername = DefaultUserName
 	}
+
 	c.UserName = c.Comm.SSHUsername
 
 	if c.Comm.SSHPassword != "" {
 		c.Password = c.Comm.SSHPassword
-		return nil
+		return
 	}
 
-	// WinRM comm
-	if c.Comm.WinRMUser == "" {
-		c.Comm.WinRMUser = DefaultUserName
-	}
-	c.UserName = c.Comm.WinRMUser
-
+	// Configure password settings using Azure generated credentials
+	c.Password = c.tmpAdminPassword
 	if c.Comm.WinRMPassword == "" {
-		// Configure password settings using Azure generated credentials
-		c.Comm.WinRMPassword = c.tmpAdminPassword
+		c.Comm.WinRMPassword = c.Password
 	}
-	if !isValidPassword(c.Comm.WinRMPassword) {
-		return fmt.Errorf("The supplied \"winrm_password\" must be between 8-123 characters long and must satisfy at least 3 from the following: \n1) Contains an uppercase character \n2) Contains a lowercase character\n3) Contains a numeric digit\n4) Contains a special character\n5) Control characters are not allowed")
-	}
-	c.Password = c.Comm.WinRMPassword
-
-	return nil
 }
 
 func setCustomData(c *Config) error {
@@ -731,10 +684,6 @@ func provideDefaultValues(c *Config) {
 		c.ImageVersion = DefaultImageVersion
 	}
 
-	if c.BuildKeyVaultSKU == "" {
-		c.BuildKeyVaultSKU = DefaultKeyVaultSKU
-	}
-
 	c.ClientConfig.SetDefaultValues()
 }
 
@@ -948,12 +897,6 @@ func assertRequiredParametersSet(c *Config, errs *packer.MultiError) {
 		}
 	}
 
-	if c.CustomResourcePrefix != "" {
-		if ok, err := assertResourceNamePrefix(c.CustomResourcePrefix, "custom_resource_build_prefix"); !ok {
-			errs = packer.MultiErrorAppend(errs, err)
-		}
-	}
-
 	if c.VirtualNetworkName == "" && c.VirtualNetworkResourceGroupName != "" {
 		errs = packer.MultiErrorAppend(errs, fmt.Errorf("If virtual_network_resource_group_name is specified, so must virtual_network_name"))
 	}
@@ -1049,13 +992,6 @@ func assertManagedImageDataDiskSnapshotName(name, setting string) (bool, error)
 	return true, nil
 }
 
-func assertResourceNamePrefix(name, setting string) (bool, error) {
-	if !isValidAzureName(reResourceNamePrefix, name) {
-		return false, fmt.Errorf("The setting %s must only contain characters from a-z, A-Z, 0-9 and _ and the maximum length is 10 characters", setting)
-	}
-	return true, nil
-}
-
 func assertAllowedInboundIpAddresses(ipAddresses []string, setting string) (bool, error) {
 	for _, ipAddress := range ipAddresses {
 		if net.ParseIP(ipAddress) == nil {
@@ -1080,34 +1016,6 @@ func isValidAzureName(re *regexp.Regexp, rgn string) bool {
 		!strings.HasSuffix(rgn, "-")
 }
 
-// The supplied password must be between 8-123 characters long and must satisfy at least 3 of password complexity requirements from the following:
-// 1) Contains an uppercase character
-// 2) Contains a lowercase character
-// 3) Contains a numeric digit
-// 4) Contains a special character
-// 5) Control characters are not allowed (a very specific case - not included in this validation)
-func isValidPassword(password string) bool {
-	if !(len(password) >= 8 && len(password) <= 123) {
-		return false
-	}
-
-	requirements := 0
-	if strings.ContainsAny(password, random.PossibleNumbers) {
-		requirements++
-	}
-	if strings.ContainsAny(password, random.PossibleLowerCase) {
-		requirements++
-	}
-	if strings.ContainsAny(password, random.PossibleUpperCase) {
-		requirements++
-	}
-	if strings.ContainsAny(password, random.PossibleSpecialCharacter) {
-		requirements++
-	}
-
-	return requirements >= 3
-}
-
 func (c *Config) validateLocationZoneResiliency(say func(s string)) {
 	// Docs on regions that support Availibility Zones:
 	//   https://docs.microsoft.com/en-us/azure/availability-zones/az-overview#regions-that-support-availability-zones

builder/azure/arm/config.hcl2spec.go

@@ -3,7 +3,6 @@ package arm
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -49,14 +48,12 @@ type FlatConfig struct {
 	ManagedImageDataDiskSnapshotPrefix         *string                            `mapstructure:"managed_image_data_disk_snapshot_prefix" required:"false" cty:"managed_image_data_disk_snapshot_prefix"`
 	ManagedImageZoneResilient                  *bool                              `mapstructure:"managed_image_zone_resilient" required:"false" cty:"managed_image_zone_resilient"`
 	AzureTags                                  map[string]*string                 `mapstructure:"azure_tags" required:"false" cty:"azure_tags"`
-	AzureTag                                   []hcl2template.FlatNameValue       `mapstructure:"azure_tag" required:"false" cty:"azure_tag"`
 	ResourceGroupName                          *string                            `mapstructure:"resource_group_name" cty:"resource_group_name"`
 	StorageAccount                             *string                            `mapstructure:"storage_account" cty:"storage_account"`
 	TempComputeName                            *string                            `mapstructure:"temp_compute_name" required:"false" cty:"temp_compute_name"`
 	TempResourceGroupName                      *string                            `mapstructure:"temp_resource_group_name" cty:"temp_resource_group_name"`
 	BuildResourceGroupName                     *string                            `mapstructure:"build_resource_group_name" cty:"build_resource_group_name"`
 	BuildKeyVaultName                          *string                            `mapstructure:"build_key_vault_name" cty:"build_key_vault_name"`
-	BuildKeyVaultSKU                           *string                            `mapstructure:"build_key_vault_sku" cty:"build_key_vault_sku"`
 	PrivateVirtualNetworkWithPublicIp          *bool                              `mapstructure:"private_virtual_network_with_public_ip" required:"false" cty:"private_virtual_network_with_public_ip"`
 	VirtualNetworkName                         *string                            `mapstructure:"virtual_network_name" required:"false" cty:"virtual_network_name"`
 	VirtualNetworkSubnetName                   *string                            `mapstructure:"virtual_network_subnet_name" required:"false" cty:"virtual_network_subnet_name"`
@@ -69,8 +66,6 @@ type FlatConfig struct {
 	AdditionalDiskSize                         []int32                            `mapstructure:"disk_additional_size" required:"false" cty:"disk_additional_size"`
 	DiskCachingType                            *string                            `mapstructure:"disk_caching_type" required:"false" cty:"disk_caching_type"`
 	AllowedInboundIpAddresses                  []string                           `mapstructure:"allowed_inbound_ip_addresses" cty:"allowed_inbound_ip_addresses"`
-	BootDiagSTGAccount                         *string                            `mapstructure:"boot_diag_storage_account" required:"false" cty:"boot_diag_storage_account"`
-	CustomResourcePrefix                       *string                            `mapstructure:"custom_resource_build_prefix" required:"false" cty:"custom_resource_build_prefix"`
 	Type                                       *string                            `mapstructure:"communicator" cty:"communicator"`
 	PauseBeforeConnect                         *string                            `mapstructure:"pause_before_connecting" cty:"pause_before_connecting"`
 	SSHHost                                    *string                            `mapstructure:"ssh_host" cty:"ssh_host"`
@@ -91,7 +86,6 @@ type FlatConfig struct {
 	SSHBastionAgentAuth                        *bool                              `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth"`
 	SSHBastionUsername                         *string                            `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username"`
 	SSHBastionPassword                         *string                            `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password"`
-	SSHBastionInteractive                      *bool                              `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive"`
 	SSHBastionPrivateKeyFile                   *string                            `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file"`
 	SSHFileTransferMethod                      *string                            `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method"`
 	SSHProxyHost                               *string                            `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host"`
@@ -132,7 +126,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"packer_debug":                     &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                     &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                  &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":            &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false},
+		"packer_user_variables":            &hcldec.BlockAttrsSpec{TypeName: "packer_user_variables", ElementType: cty.String, Required: false},
 		"packer_sensitive_variables":       &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
 		"cloud_environment_name":           &hcldec.AttrSpec{Name: "cloud_environment_name", Type: cty.String, Required: false},
 		"client_id":                        &hcldec.AttrSpec{Name: "client_id", Type: cty.String, Required: false},
@@ -165,15 +159,13 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"managed_image_os_disk_snapshot_name":     &hcldec.AttrSpec{Name: "managed_image_os_disk_snapshot_name", Type: cty.String, Required: false},
 		"managed_image_data_disk_snapshot_prefix": &hcldec.AttrSpec{Name: "managed_image_data_disk_snapshot_prefix", Type: cty.String, Required: false},
 		"managed_image_zone_resilient":            &hcldec.AttrSpec{Name: "managed_image_zone_resilient", Type: cty.Bool, Required: false},
-		"azure_tags":                              &hcldec.AttrSpec{Name: "azure_tags", Type: cty.Map(cty.String), Required: false},
-		"azure_tag":                               &hcldec.BlockListSpec{TypeName: "azure_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"azure_tags":                              &hcldec.BlockAttrsSpec{TypeName: "azure_tags", ElementType: cty.String, Required: false},
 		"resource_group_name":                     &hcldec.AttrSpec{Name: "resource_group_name", Type: cty.String, Required: false},
 		"storage_account":                         &hcldec.AttrSpec{Name: "storage_account", Type: cty.String, Required: false},
 		"temp_compute_name":                       &hcldec.AttrSpec{Name: "temp_compute_name", Type: cty.String, Required: false},
 		"temp_resource_group_name":                &hcldec.AttrSpec{Name: "temp_resource_group_name", Type: cty.String, Required: false},
 		"build_resource_group_name":               &hcldec.AttrSpec{Name: "build_resource_group_name", Type: cty.String, Required: false},
 		"build_key_vault_name":                    &hcldec.AttrSpec{Name: "build_key_vault_name", Type: cty.String, Required: false},
-		"build_key_vault_sku":                     &hcldec.AttrSpec{Name: "build_key_vault_sku", Type: cty.String, Required: false},
 		"private_virtual_network_with_public_ip":  &hcldec.AttrSpec{Name: "private_virtual_network_with_public_ip", Type: cty.Bool, Required: false},
 		"virtual_network_name":                    &hcldec.AttrSpec{Name: "virtual_network_name", Type: cty.String, Required: false},
 		"virtual_network_subnet_name":             &hcldec.AttrSpec{Name: "virtual_network_subnet_name", Type: cty.String, Required: false},
@@ -186,8 +178,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"disk_additional_size":                    &hcldec.AttrSpec{Name: "disk_additional_size", Type: cty.List(cty.Number), Required: false},
 		"disk_caching_type":                       &hcldec.AttrSpec{Name: "disk_caching_type", Type: cty.String, Required: false},
 		"allowed_inbound_ip_addresses":            &hcldec.AttrSpec{Name: "allowed_inbound_ip_addresses", Type: cty.List(cty.String), Required: false},
-		"boot_diag_storage_account":               &hcldec.AttrSpec{Name: "boot_diag_storage_account", Type: cty.String, Required: false},
-		"custom_resource_build_prefix":            &hcldec.AttrSpec{Name: "custom_resource_build_prefix", Type: cty.String, Required: false},
 		"communicator":                            &hcldec.AttrSpec{Name: "communicator", Type: cty.String, Required: false},
 		"pause_before_connecting":                 &hcldec.AttrSpec{Name: "pause_before_connecting", Type: cty.String, Required: false},
 		"ssh_host":                                &hcldec.AttrSpec{Name: "ssh_host", Type: cty.String, Required: false},
@@ -208,7 +198,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_bastion_agent_auth":                  &hcldec.AttrSpec{Name: "ssh_bastion_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_bastion_username":                    &hcldec.AttrSpec{Name: "ssh_bastion_username", Type: cty.String, Required: false},
 		"ssh_bastion_password":                    &hcldec.AttrSpec{Name: "ssh_bastion_password", Type: cty.String, Required: false},
-		"ssh_bastion_interactive":                 &hcldec.AttrSpec{Name: "ssh_bastion_interactive", Type: cty.Bool, Required: false},
 		"ssh_bastion_private_key_file":            &hcldec.AttrSpec{Name: "ssh_bastion_private_key_file", Type: cty.String, Required: false},
 		"ssh_file_transfer_method":                &hcldec.AttrSpec{Name: "ssh_file_transfer_method", Type: cty.String, Required: false},
 		"ssh_proxy_host":                          &hcldec.AttrSpec{Name: "ssh_proxy_host", Type: cty.String, Required: false},

builder/azure/arm/config_test.go

@@ -71,6 +71,22 @@ func TestConfigShouldBeAbleToOverrideDefaultedValues(t *testing.T) {
 		t.Fatalf("newConfig failed: %s", err)
 	}
 
+	if c.Password != "override_password" {
+		t.Errorf("Expected 'Password' to be set to 'override_password', but found %q!", c.Password)
+	}
+
+	if c.Comm.SSHPassword != "override_password" {
+		t.Errorf("Expected 'c.Comm.SSHPassword' to be set to 'override_password', but found %q!", c.Comm.SSHPassword)
+	}
+
+	if c.UserName != "override_username" {
+		t.Errorf("Expected 'UserName' to be set to 'override_username', but found %q!", c.UserName)
+	}
+
+	if c.Comm.SSHUsername != "override_username" {
+		t.Errorf("Expected 'c.Comm.SSHUsername' to be set to 'override_username', but found %q!", c.Comm.SSHUsername)
+	}
+
 	if c.VMSize != "override_vm_size" {
 		t.Errorf("Expected 'vm_size' to be set to 'override_vm_size', but found %q!", c.VMSize)
 	}
@@ -82,43 +98,6 @@ func TestConfigShouldBeAbleToOverrideDefaultedValues(t *testing.T) {
 	if c.diskCachingType != compute.CachingTypesNone {
 		t.Errorf("Expected 'disk_caching_type' to be set to 'None', but found %q!", c.diskCachingType)
 	}
-
-	// SSH comm
-	if c.Password != "override_password" {
-		t.Errorf("Expected 'Password' to be set to 'override_password', but found %q!", c.Password)
-	}
-	if c.Comm.SSHPassword != "override_password" {
-		t.Errorf("Expected 'c.Comm.SSHPassword' to be set to 'override_password', but found %q!", c.Comm.SSHPassword)
-	}
-	if c.UserName != "override_username" {
-		t.Errorf("Expected 'UserName' to be set to 'override_username', but found %q!", c.UserName)
-	}
-	if c.Comm.SSHUsername != "override_username" {
-		t.Errorf("Expected 'c.Comm.SSHUsername' to be set to 'override_username', but found %q!", c.Comm.SSHUsername)
-	}
-
-	// Winrm comm
-	c = Config{}
-	builderValues = getArmBuilderConfiguration()
-	builderValues["communicator"] = "winrm"
-	builderValues["winrm_password"] = "Override_winrm_password1"
-	builderValues["winrm_username"] = "override_winrm_username"
-	_, err = c.Prepare(builderValues, getPackerConfiguration())
-	if err != nil {
-		t.Fatalf("newConfig failed: %s", err)
-	}
-	if c.Password != "Override_winrm_password1" {
-		t.Errorf("Expected 'Password' to be set to 'Override_winrm_password1', but found %q!", c.Password)
-	}
-	if c.Comm.WinRMPassword != "Override_winrm_password1" {
-		t.Errorf("Expected 'c.Comm.WinRMPassword' to be set to 'Override_winrm_password1', but found %q!", c.Comm.SSHPassword)
-	}
-	if c.UserName != "override_winrm_username" {
-		t.Errorf("Expected 'UserName' to be set to 'override_winrm_username', but found %q!", c.UserName)
-	}
-	if c.Comm.WinRMUser != "override_winrm_username" {
-		t.Errorf("Expected 'c.Comm.WinRMUser' to be set to 'override_winrm_username', but found %q!", c.Comm.SSHUsername)
-	}
 }
 
 func TestConfigShouldDefaultVMSizeToStandardA1(t *testing.T) {
@@ -595,7 +574,7 @@ func TestWinRMConfigShouldSetRoundTripDecorator(t *testing.T) {
 	config := getArmBuilderConfiguration()
 	config["communicator"] = "winrm"
 	config["winrm_username"] = "username"
-	config["winrm_password"] = "Password123"
+	config["winrm_password"] = "password"
 
 	var c Config
 	_, err := c.Prepare(config, getPackerConfiguration())
@@ -1941,60 +1920,6 @@ func Test_GivenZoneSupportingResiliency_ConfigValidate_ShouldNotWarn(t *testing.
 	}
 }
 
-func TestConfig_PrepareProvidedWinRMPassword(t *testing.T) {
-	config := getArmBuilderConfiguration()
-	config["communicator"] = "winrm"
-
-	var c Config
-	tc := []struct {
-		name       string
-		password   string
-		shouldFail bool
-	}{
-		{
-			name:       "password should be longer than 8 characters",
-			password:   "packer",
-			shouldFail: true,
-		},
-		{
-			name:       "password should be shorter than 123 characters",
-			password:   "1Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-			shouldFail: true,
-		},
-		{
-			name:       "password should have valid size but only lower and upper case letters",
-			password:   "AAAbbbCCC",
-			shouldFail: true,
-		},
-		{
-			name:       "password should have valid size but only digits and upper case letters",
-			password:   "AAA12345",
-			shouldFail: true,
-		},
-		{
-			name:       "password should have valid size, digits, upper and lower case letters",
-			password:   "AAA12345bbb",
-			shouldFail: false,
-		},
-		{
-			name:       "password should have valid size, digits, special characters and lower case letters",
-			password:   "//12345bbb",
-			shouldFail: false,
-		},
-	}
-
-	for _, tt := range tc {
-		t.Run(tt.name, func(t *testing.T) {
-			config["winrm_password"] = tt.password
-			_, err := c.Prepare(config)
-			fail := err != nil
-			if tt.shouldFail != fail {
-				t.Fatalf("bad: %s. Expected fail is: %t but it was %t", tt.name, tt.shouldFail, fail)
-			}
-		})
-	}
-}
-
 func getArmBuilderConfiguration() map[string]string {
 	m := make(map[string]string)
 	for _, v := range requiredConfigValues {

builder/azure/arm/step_capture_image.go

@@ -77,7 +77,7 @@ func (s *StepCaptureImage) Run(ctx context.Context, state multistep.StateBag) mu
 	var isManagedImage = state.Get(constants.ArmIsManagedImage).(bool)
 	var targetManagedImageResourceGroupName = state.Get(constants.ArmManagedImageResourceGroupName).(string)
 	var targetManagedImageName = state.Get(constants.ArmManagedImageName).(string)
-	var targetManagedImageLocation = state.Get(constants.ArmLocation).(string)
+	var targetManagedImageLocation = state.Get(constants.ArmManagedImageLocation).(string)
 
 	s.say(fmt.Sprintf(" -> Compute ResourceGroupName : '%s'", resourceGroupName))
 	s.say(fmt.Sprintf(" -> Compute Name              : '%s'", computeName))

builder/azure/arm/step_capture_image_test.go

@@ -131,6 +131,7 @@ func createTestStateBagStepCaptureImage() multistep.StateBag {
 	stateBag.Put(constants.ArmIsManagedImage, false)
 	stateBag.Put(constants.ArmManagedImageResourceGroupName, "")
 	stateBag.Put(constants.ArmManagedImageName, "")
+	stateBag.Put(constants.ArmManagedImageLocation, "")
 	stateBag.Put(constants.ArmImageParameters, &compute.Image{})
 
 	return stateBag

builder/azure/arm/step_delete_resource_group.go

@@ -45,8 +45,7 @@ func (s *StepDeleteResourceGroup) deleteResourceGroup(ctx context.Context, state
 
 		if keyVaultDeploymentName, ok := state.GetOk(constants.ArmKeyVaultDeploymentName); ok {
 			// Only delete if custom keyvault was not provided.
-			if exists := state.Get(constants.ArmIsExistingKeyVault).(bool); !exists {
-				s.say("\n Deleting the keyvault deployment because it was created by Packer...")
+			if exists := state.Get(constants.ArmIsExistingKeyVault).(bool); exists {
 				err = s.deleteDeploymentResources(ctx, keyVaultDeploymentName.(string), resourceGroupName)
 				if err != nil {
 					return err

builder/azure/arm/step_deploy_template.go

@@ -117,7 +117,8 @@ func deleteResource(ctx context.Context, client *AzureClient, resourceType strin
 		}
 		return err
 	case "Microsoft.KeyVault/vaults":
-		_, err := client.VaultClientDelete.Delete(ctx, resourceGroupName, resourceName)
+		// TODO(paulmey): not sure why VaultClient doesn't do cancellation
+		_, err := client.VaultClientDelete.Delete(resourceGroupName, resourceName)
 		return err
 	case "Microsoft.Network/networkInterfaces":
 		f, err := client.InterfacesClient.Delete(ctx, resourceGroupName, resourceName)

builder/azure/arm/step_publish_to_shared_image_gallery.go

@@ -131,15 +131,15 @@ func (s *StepPublishToSharedImageGallery) Run(ctx context.Context, stateBag mult
 		miSigReplicaCount = constants.SharedImageGalleryImageVersionDefaultMaxReplicaCount
 	}
 
-	s.say(fmt.Sprintf(" -> MDI ID used for SIG publish           : '%s'", mdiID))
-	s.say(fmt.Sprintf(" -> SIG publish resource group            : '%s'", miSigPubRg))
-	s.say(fmt.Sprintf(" -> SIG gallery name                      : '%s'", miSIGalleryName))
-	s.say(fmt.Sprintf(" -> SIG image name                        : '%s'", miSGImageName))
-	s.say(fmt.Sprintf(" -> SIG image version                     : '%s'", miSGImageVersion))
-	s.say(fmt.Sprintf(" -> SIG replication regions               : '%v'", miSigReplicationRegions))
-	s.say(fmt.Sprintf(" -> SIG image version endoflife date      : '%s'", miSGImageVersionEndOfLifeDate))
-	s.say(fmt.Sprintf(" -> SIG image version exclude from latest : '%t'", miSGImageVersionExcludeFromLatest))
-	s.say(fmt.Sprintf(" -> SIG replica count [1, 10]             : '%d'", miSigReplicaCount))
+	s.say(fmt.Sprintf(" -> MDI ID used for SIG publish		: '%s'", mdiID))
+	s.say(fmt.Sprintf(" -> SIG publish resource group		: '%s'", miSigPubRg))
+	s.say(fmt.Sprintf(" -> SIG gallery name				: '%s'", miSIGalleryName))
+	s.say(fmt.Sprintf(" -> SIG image name				: '%s'", miSGImageName))
+	s.say(fmt.Sprintf(" -> SIG image version			: '%s'", miSGImageVersion))
+	s.say(fmt.Sprintf(" -> SIG replication regions			: '%v'", miSigReplicationRegions))
+	s.say(fmt.Sprintf(" -> SIG image version endoflife date		: '%s'", miSGImageVersionEndOfLifeDate))
+	s.say(fmt.Sprintf(" -> SIG image version exclude from latest	: '%t'", miSGImageVersionExcludeFromLatest))
+	s.say(fmt.Sprintf(" -> SIG replica count [1, 10] 		: '%d'", miSigReplicaCount))
 
 	createdGalleryImageVersionID, err := s.publish(ctx, mdiID, miSigPubRg, miSIGalleryName, miSGImageName, miSGImageVersion, miSigReplicationRegions, miSGImageVersionEndOfLifeDate, miSGImageVersionExcludeFromLatest, miSigReplicaCount, location, tags)
 

builder/azure/arm/template_factory.go

@@ -17,7 +17,6 @@ type templateFactoryFunc func(*Config) (*resources.Deployment, error)
 func GetKeyVaultDeployment(config *Config) (*resources.Deployment, error) {
 	params := &template.TemplateParameters{
 		KeyVaultName:        &template.TemplateParameter{Value: config.tmpKeyVaultName},
-		KeyVaultSKU:         &template.TemplateParameter{Value: config.BuildKeyVaultSKU},
 		KeyVaultSecretValue: &template.TemplateParameter{Value: config.winrmCertificate},
 		ObjectId:            &template.TemplateParameter{Value: config.ClientConfig.ObjectID},
 		TenantId:            &template.TemplateParameter{Value: config.ClientConfig.TenantID},
@@ -37,7 +36,6 @@ func GetVirtualMachineDeployment(config *Config) (*resources.Deployment, error)
 		DnsNameForPublicIP:         &template.TemplateParameter{Value: config.tmpComputeName},
 		NicName:                    &template.TemplateParameter{Value: config.tmpNicName},
 		OSDiskName:                 &template.TemplateParameter{Value: config.tmpOSDiskName},
-		DataDiskName:               &template.TemplateParameter{Value: config.tmpDataDiskName},
 		PublicIPAddressName:        &template.TemplateParameter{Value: config.tmpPublicIPAddressName},
 		SubnetName:                 &template.TemplateParameter{Value: config.tmpSubnetName},
 		StorageAccountBlobEndpoint: &template.TemplateParameter{Value: config.storageAccountBlobEndpoint},
@@ -96,8 +94,8 @@ func GetVirtualMachineDeployment(config *Config) (*resources.Deployment, error)
 	}
 
 	if len(config.AdditionalDiskSize) > 0 {
-		isManaged := config.CustomManagedImageName != "" || (config.ManagedImageName != "" && config.ImagePublisher != "") || config.SharedGallery.Subscription != ""
-		builder.SetAdditionalDisks(config.AdditionalDiskSize, config.tmpDataDiskName, isManaged, config.diskCachingType)
+		isManaged := config.CustomManagedImageName != "" || (config.ManagedImageName != "" && config.ImagePublisher != "")
+		builder.SetAdditionalDisks(config.AdditionalDiskSize, isManaged, config.diskCachingType)
 	}
 
 	if config.customData != "" {
@@ -127,13 +125,6 @@ func GetVirtualMachineDeployment(config *Config) (*resources.Deployment, error)
 		}
 	}
 
-	if config.BootDiagSTGAccount != "" {
-		err = builder.SetBootDiagnostics(config.BootDiagSTGAccount)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	builder.SetTags(&config.AzureTags)
 	doc, _ := builder.ToJSON()
 	return createDeploymentParameters(*doc, params)

builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json

@@ -5,9 +5,6 @@
     "keyVaultName": {
       "type": "string"
     },
-    "keyVaultSKU": {
-      "type": "string"
-    },
     "keyVaultSecretValue": {
       "type": "securestring"
     },
@@ -42,7 +39,7 @@
         "enabledForTemplateDeployment": "true",
         "sku": {
           "family": "A",
-          "name": "[parameters('keyVaultSKU')]"
+          "name": "standard"
         },
         "tenantId": "[parameters('tenantId')]"
       },

builder/azure/arm/template_factory_test.TestPlanInfo01.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestPlanInfo02.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment03.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment04.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment05.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment06.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment07.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment08.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment09.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment10.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment11.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
@@ -147,9 +144,9 @@
               "createOption": "Empty",
               "diskSizeGB": 32,
               "lun": 0,
-              "name": "[concat(parameters('dataDiskName'),'-1')]",
+              "name": "datadisk-1",
               "vhd": {
-                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-1','.vhd')]"
+                "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '1','.vhd')]"
               }
             }
           ],

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment12.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },
@@ -150,7 +147,7 @@
               "managedDisk": {
                 "storageAccountType": "Standard_LRS"
               },
-              "name": "[concat(parameters('dataDiskName'),'-1')]"
+              "name": "datadisk-1"
             }
           ],
           "imageReference": {

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment13.approved.json

@@ -8,9 +8,6 @@
     "adminUsername": {
       "type": "string"
     },
-    "dataDiskName": {
-      "type": "string"
-    },
     "dnsNameForPublicIP": {
       "type": "string"
     },

builder/azure/arm/template_factory_test.TestVirtualMachineDeployment14.approved.json

@@ -1,181 +0,0 @@
-{
-  "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json",
-  "contentVersion": "1.0.0.0",
-  "parameters": {
-    "adminPassword": {
-      "type": "string"
-    },
-    "adminUsername": {
-      "type": "string"
-    },
-    "dataDiskName": {
-      "type": "string"
-    },
-    "dnsNameForPublicIP": {
-      "type": "string"
-    },
-    "nicName": {
-      "type": "string"
-    },
-    "nsgName": {
-      "type": "string"
-    },
-    "osDiskName": {
-      "type": "string"
-    },
-    "publicIPAddressName": {
-      "type": "string"
-    },
-    "storageAccountBlobEndpoint": {
-      "type": "string"
-    },
-    "subnetName": {
-      "type": "string"
-    },
-    "virtualNetworkName": {
-      "type": "string"
-    },
-    "vmName": {
-      "type": "string"
-    },
-    "vmSize": {
-      "type": "string"
-    }
-  },
-  "resources": [
-    {
-      "apiVersion": "[variables('publicIPAddressApiVersion')]",
-      "location": "[variables('location')]",
-      "name": "[parameters('publicIPAddressName')]",
-      "properties": {
-        "dnsSettings": {
-          "domainNameLabel": "[parameters('dnsNameForPublicIP')]"
-        },
-        "publicIPAllocationMethod": "[variables('publicIPAddressType')]"
-      },
-      "type": "Microsoft.Network/publicIPAddresses"
-    },
-    {
-      "apiVersion": "[variables('virtualNetworksApiVersion')]",
-      "location": "[variables('location')]",
-      "name": "[variables('virtualNetworkName')]",
-      "properties": {
-        "addressSpace": {
-          "addressPrefixes": [
-            "[variables('addressPrefix')]"
-          ]
-        },
-        "subnets": [
-          {
-            "name": "[variables('subnetName')]",
-            "properties": {
-              "addressPrefix": "[variables('subnetAddressPrefix')]"
-            }
-          }
-        ]
-      },
-      "type": "Microsoft.Network/virtualNetworks"
-    },
-    {
-      "apiVersion": "[variables('networkInterfacesApiVersion')]",
-      "dependsOn": [
-        "[concat('Microsoft.Network/publicIPAddresses/', parameters('publicIPAddressName'))]",
-        "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]"
-      ],
-      "location": "[variables('location')]",
-      "name": "[parameters('nicName')]",
-      "properties": {
-        "ipConfigurations": [
-          {
-            "name": "ipconfig",
-            "properties": {
-              "privateIPAllocationMethod": "Dynamic",
-              "publicIPAddress": {
-                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddressName'))]"
-              },
-              "subnet": {
-                "id": "[variables('subnetRef')]"
-              }
-            }
-          }
-        ]
-      },
-      "type": "Microsoft.Network/networkInterfaces"
-    },
-    {
-      "apiVersion": "[variables('apiVersion')]",
-      "dependsOn": [
-        "[concat('Microsoft.Network/networkInterfaces/', parameters('nicName'))]"
-      ],
-      "location": "[variables('location')]",
-      "name": "[parameters('vmName')]",
-      "properties": {
-        "diagnosticsProfile": {
-          "bootDiagnostics": {
-            "enabled": true,
-            "storageUri": "https://diagstgaccnt.blob.core.windows.net"
-          }
-        },
-        "hardwareProfile": {
-          "vmSize": "[parameters('vmSize')]"
-        },
-        "networkProfile": {
-          "networkInterfaces": [
-            {
-              "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('nicName'))]"
-            }
-          ]
-        },
-        "osProfile": {
-          "adminPassword": "[parameters('adminPassword')]",
-          "adminUsername": "[parameters('adminUsername')]",
-          "computerName": "[parameters('vmName')]",
-          "linuxConfiguration": {
-            "ssh": {
-              "publicKeys": [
-                {
-                  "keyData": "",
-                  "path": "[variables('sshKeyPath')]"
-                }
-              ]
-            }
-          }
-        },
-        "storageProfile": {
-          "imageReference": {
-            "id": ""
-          },
-          "osDisk": {
-            "caching": "ReadWrite",
-            "createOption": "FromImage",
-            "managedDisk": {
-              "storageAccountType": "Standard_LRS"
-            },
-            "name": "[parameters('osDiskName')]",
-            "osType": "Linux"
-          }
-        }
-      },
-      "type": "Microsoft.Compute/virtualMachines"
-    }
-  ],
-  "variables": {
-    "addressPrefix": "10.0.0.0/16",
-    "apiVersion": "2017-03-30",
-    "location": "[resourceGroup().location]",
-    "managedDiskApiVersion": "2017-03-30",
-    "networkInterfacesApiVersion": "2017-04-01",
-    "networkSecurityGroupsApiVersion": "2019-04-01",
-    "publicIPAddressApiVersion": "2017-04-01",
-    "publicIPAddressType": "Dynamic",
-    "sshKeyPath": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]",
-    "subnetAddressPrefix": "10.0.0.0/24",
-    "subnetName": "[parameters('subnetName')]",
-    "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
-    "virtualNetworkName": "[parameters('virtualNetworkName')]",
-    "virtualNetworkResourceGroup": "[resourceGroup().name]",
-    "virtualNetworksApiVersion": "2017-04-01",
-    "vmStorageAccountContainerName": "images",
-    "vnetID": "[resourceId(variables('virtualNetworkResourceGroup'), 'Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]"
-  }
-}

builder/azure/arm/template_factory_test.go

@@ -473,37 +473,6 @@ func TestVirtualMachineDeployment13(t *testing.T) {
 	}
 }
 
-// Ensure the VM template is correct when building with bootdiagnostics
-func TestVirtualMachineDeployment14(t *testing.T) {
-	config := map[string]interface{}{
-		"location":        "ignore",
-		"subscription_id": "ignore",
-		"os_type":         constants.Target_Linux,
-		"communicator":    "none",
-		"custom_managed_image_resource_group_name": "CustomManagedImageResourceGroupName",
-		"custom_managed_image_name":                "CustomManagedImageName",
-		"managed_image_name":                       "ManagedImageName",
-		"managed_image_resource_group_name":        "ManagedImageResourceGroupName",
-		"boot_diag_storage_account":                "diagstgaccnt",
-	}
-
-	var c Config
-	_, err := c.Prepare(config, getPackerConfiguration())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	deployment, err := GetVirtualMachineDeployment(&c)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = approvaltests.VerifyJSONStruct(t, deployment.Properties.Template)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
 // Ensure the link values are not set, and the concrete values are set.
 func TestKeyVaultDeployment00(t *testing.T) {
 	var c Config

builder/azure/arm/tempname.go

@@ -15,7 +15,6 @@ type TempName struct {
 	KeyVaultName        string
 	ResourceGroupName   string
 	OSDiskName          string
-	DataDiskname        string
 	NicName             string
 	SubnetName          string
 	PublicIPAddressName string
@@ -23,25 +22,20 @@ type TempName struct {
 	NsgName             string
 }
 
-func NewTempName(p string) *TempName {
+func NewTempName() *TempName {
 	tempName := &TempName{}
 
-	suffix := random.AlphaNumLower(5)
-	if p == "" {
-		p = "pkr"
-		suffix = random.AlphaNumLower(10)
-	}
-
-	tempName.ComputeName = fmt.Sprintf("%svm%s", p, suffix)
-	tempName.DeploymentName = fmt.Sprintf("%sdp%s", p, suffix)
-	tempName.KeyVaultName = fmt.Sprintf("%skv%s", p, suffix)
-	tempName.OSDiskName = fmt.Sprintf("%sos%s", p, suffix)
-	tempName.NicName = fmt.Sprintf("%sni%s", p, suffix)
-	tempName.PublicIPAddressName = fmt.Sprintf("%sip%s", p, suffix)
-	tempName.SubnetName = fmt.Sprintf("%ssn%s", p, suffix)
-	tempName.VirtualNetworkName = fmt.Sprintf("%svn%s", p, suffix)
-	tempName.NsgName = fmt.Sprintf("%ssg%s", p, suffix)
-	tempName.ResourceGroupName = fmt.Sprintf("%s-Resource-Group-%s", p, suffix)
+	suffix := random.AlphaNumLower(10)
+	tempName.ComputeName = fmt.Sprintf("pkrvm%s", suffix)
+	tempName.DeploymentName = fmt.Sprintf("pkrdp%s", suffix)
+	tempName.KeyVaultName = fmt.Sprintf("pkrkv%s", suffix)
+	tempName.OSDiskName = fmt.Sprintf("pkros%s", suffix)
+	tempName.NicName = fmt.Sprintf("pkrni%s", suffix)
+	tempName.PublicIPAddressName = fmt.Sprintf("pkrip%s", suffix)
+	tempName.SubnetName = fmt.Sprintf("pkrsn%s", suffix)
+	tempName.VirtualNetworkName = fmt.Sprintf("pkrvn%s", suffix)
+	tempName.NsgName = fmt.Sprintf("pkrsg%s", suffix)
+	tempName.ResourceGroupName = fmt.Sprintf("packer-Resource-Group-%s", suffix)
 
 	tempName.AdminPassword = generatePassword()
 	tempName.CertificatePassword = random.AlphaNum(32)

builder/azure/arm/tempname_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestTempNameShouldCreatePrefixedRandomNames(t *testing.T) {
-	tempName := NewTempName("")
+	tempName := NewTempName()
 
 	if strings.Index(tempName.ComputeName, "pkrvm") != 0 {
 		t.Errorf("Expected ComputeName to begin with 'pkrvm', but got '%s'!", tempName.ComputeName)
@@ -30,8 +30,8 @@ func TestTempNameShouldCreatePrefixedRandomNames(t *testing.T) {
 		t.Errorf("Expected PublicIPAddressName to begin with 'pkrip', but got '%s'!", tempName.PublicIPAddressName)
 	}
 
-	if strings.Index(tempName.ResourceGroupName, "pkr-Resource-Group-") != 0 {
-		t.Errorf("Expected ResourceGroupName to begin with 'pkr-Resource-Group-', but got '%s'!", tempName.ResourceGroupName)
+	if strings.Index(tempName.ResourceGroupName, "packer-Resource-Group-") != 0 {
+		t.Errorf("Expected ResourceGroupName to begin with 'packer-Resource-Group-', but got '%s'!", tempName.ResourceGroupName)
 	}
 
 	if strings.Index(tempName.SubnetName, "pkrsn") != 0 {
@@ -48,7 +48,7 @@ func TestTempNameShouldCreatePrefixedRandomNames(t *testing.T) {
 }
 
 func TestTempAdminPassword(t *testing.T) {
-	tempName := NewTempName("")
+	tempName := NewTempName()
 
 	if !strings.ContainsAny(tempName.AdminPassword, random.PossibleNumbers) {
 		t.Errorf("Expected AdminPassword to contain at least one of '%s'!", random.PossibleNumbers)
@@ -62,7 +62,7 @@ func TestTempAdminPassword(t *testing.T) {
 }
 
 func TestTempNameShouldHaveSameSuffix(t *testing.T) {
-	tempName := NewTempName("")
+	tempName := NewTempName()
 	suffix := tempName.ComputeName[5:]
 
 	if strings.HasSuffix(tempName.ComputeName, suffix) != true {
@@ -101,43 +101,3 @@ func TestTempNameShouldHaveSameSuffix(t *testing.T) {
 		t.Errorf("Expected NsgName to end with '%s', but the value is '%s'!", suffix, tempName.NsgName)
 	}
 }
-
-func TestTempNameShouldCreateCustomPrefix(t *testing.T) {
-	tempName := NewTempName("CustPrefix")
-
-	if strings.Index(tempName.ComputeName, "CustPrefixvm") != 0 {
-		t.Errorf("Expected ComputeName to begin with 'CustPrefixvm', but got '%s'!", tempName.ComputeName)
-	}
-
-	if strings.Index(tempName.DeploymentName, "CustPrefixdp") != 0 {
-		t.Errorf("Expected ComputeName to begin with 'CustPrefixdp', but got '%s'!", tempName.ComputeName)
-	}
-
-	if strings.Index(tempName.OSDiskName, "CustPrefixos") != 0 {
-		t.Errorf("Expected OSDiskName to begin with 'CustPrefixos', but got '%s'!", tempName.OSDiskName)
-	}
-
-	if strings.Index(tempName.NicName, "CustPrefixni") != 0 {
-		t.Errorf("Expected NicName to begin with 'CustPrefixni', but got '%s'!", tempName.NicName)
-	}
-
-	if strings.Index(tempName.PublicIPAddressName, "CustPrefixip") != 0 {
-		t.Errorf("Expected PublicIPAddressName to begin with 'CustPrefixip', but got '%s'!", tempName.PublicIPAddressName)
-	}
-
-	if strings.Index(tempName.ResourceGroupName, "CustPrefix-Resource-Group-") != 0 {
-		t.Errorf("Expected ResourceGroupName to begin with 'packer-Resource-Group-', but got '%s'!", tempName.ResourceGroupName)
-	}
-
-	if strings.Index(tempName.SubnetName, "CustPrefixsn") != 0 {
-		t.Errorf("Expected SubnetName to begin with 'pkrip', but got '%s'!", tempName.SubnetName)
-	}
-
-	if strings.Index(tempName.VirtualNetworkName, "CustPrefixvn") != 0 {
-		t.Errorf("Expected VirtualNetworkName to begin with 'CustPrefixvn', but got '%s'!", tempName.VirtualNetworkName)
-	}
-
-	if strings.Index(tempName.NsgName, "CustPrefixsg") != 0 {
-		t.Errorf("Expected NsgName to begin with 'CustPrefixsg', but got '%s'!", tempName.NsgName)
-	}
-}

builder/azure/chroot/builder.go

@@ -24,14 +24,14 @@ import (
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/hashicorp/packer/template/interpolate"
-	"github.com/mitchellh/mapstructure"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
+	"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
 	"github.com/Azure/go-autorest/autorest/azure"
+	"github.com/Azure/go-autorest/autorest/to"
 )
 
-// BuilderID is the unique ID for this builder
-const BuilderID = "azure.chroot"
+// BuilderId is the unique ID for this builder
+const BuilderId = "azure.chroot"
 
 // Config is the configuration that is chained through the steps and settable
 // from the template.
@@ -76,6 +76,9 @@ type Config struct {
 	// `/etc/resolv.conf`. You may need to do this if you're building an image that uses systemd.
 	CopyFiles []string `mapstructure:"copy_files"`
 
+	// The name of the temporary disk that will be created in the resource group of the VM that Packer is
+	// running on. Will be generated if not set.
+	TemporaryOSDiskName string `mapstructure:"temporary_os_disk_name"`
 	// Try to resize the OS disk to this size on the first copy. Disks can only be englarged. If not specified,
 	// the disk will keep its original size. Required when using `from_scratch`
 	OSDiskSizeGB int32 `mapstructure:"os_disk_size_gb"`
@@ -85,25 +88,15 @@ type Config struct {
 	// The [cache type](https://docs.microsoft.com/en-us/rest/api/compute/images/createorupdate#cachingtypes)
 	// specified in the resulting image and for attaching it to the Packer VM. Defaults to `ReadOnly`
 	OSDiskCacheType string `mapstructure:"os_disk_cache_type"`
-	// The [Hyper-V generation type](https://docs.microsoft.com/en-us/rest/api/compute/images/createorupdate#hypervgenerationtypes) for Managed Image output.
+	// If set to `true`, leaves the temporary disk behind in the Packer VM resource group. Defaults to `false`
+	OSDiskSkipCleanup bool `mapstructure:"os_disk_skip_cleanup"`
+
+	// The image to create using this build.
+	ImageResourceID string `mapstructure:"image_resource_id" required:"true"`
+	// The [Hyper-V generation type](https://docs.microsoft.com/en-us/rest/api/compute/images/createorupdate#hypervgenerationtypes).
 	// Defaults to `V1`.
 	ImageHyperVGeneration string `mapstructure:"image_hyperv_generation"`
 
-	// The id of the temporary disk that will be created. Will be generated if not set.
-	TemporaryOSDiskID string `mapstructure:"temporary_os_disk_id"`
-
-	// The id of the temporary snapshot that will be created. Will be generated if not set.
-	TemporaryOSDiskSnapshotID string `mapstructure:"temporary_os_disk_snapshot_id"`
-
-	// If set to `true`, leaves the temporary disks and snapshots behind in the Packer VM resource group. Defaults to `false`
-	SkipCleanup bool `mapstructure:"skip_cleanup"`
-
-	// The managed image to create using this build.
-	ImageResourceID string `mapstructure:"image_resource_id"`
-
-	// The shared image to create using this build.
-	SharedImageGalleryDestination SharedImageGalleryDestination `mapstructure:"shared_image_destination"`
-
 	ctx interpolate.Context
 }
 
@@ -125,15 +118,11 @@ type Builder struct {
 	runner multistep.Runner
 }
 
-// verify interface implementation
-var _ packer.Builder = &Builder{}
-
 func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstructure().HCL2Spec() }
 
 func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	b.config.ctx.Funcs = azcommon.TemplateFuncs
 	b.config.ctx.Funcs["vm"] = CreateVMMetadataTemplateFunc()
-	md := &mapstructure.Metadata{}
 	err := config.Decode(&b.config, &config.DecodeOpts{
 		Interpolate:        true,
 		InterpolateContext: &b.config.ctx,
@@ -147,7 +136,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 				"mount_path",
 			},
 		},
-		Metadata: md,
 	}, raws...)
 	if err != nil {
 		return nil, nil, err
@@ -195,23 +183,12 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 		b.config.MountPartition = "1"
 	}
 
-	if b.config.TemporaryOSDiskID == "" {
-		if def, err := interpolate.Render(
-			"/subscriptions/{{ vm `subscription_id` }}/resourceGroups/{{ vm `resource_group` }}/providers/Microsoft.Compute/disks/PackerTemp-osdisk-{{timestamp}}",
-			&b.config.ctx); err == nil {
-			b.config.TemporaryOSDiskID = def
-		} else {
-			errs = packer.MultiErrorAppend(errs, fmt.Errorf("unable to render temporary disk id: %s", err))
-		}
-	}
+	if b.config.TemporaryOSDiskName == "" {
 
-	if b.config.TemporaryOSDiskSnapshotID == "" {
-		if def, err := interpolate.Render(
-			"/subscriptions/{{ vm `subscription_id` }}/resourceGroups/{{ vm `resource_group` }}/providers/Microsoft.Compute/snapshots/PackerTemp-osdisk-snapshot-{{timestamp}}",
-			&b.config.ctx); err == nil {
-			b.config.TemporaryOSDiskSnapshotID = def
+		if def, err := interpolate.Render("PackerTemp-{{timestamp}}", &b.config.ctx); err == nil {
+			b.config.TemporaryOSDiskName = def
 		} else {
-			errs = packer.MultiErrorAppend(errs, fmt.Errorf("unable to render temporary snapshot id: %s", err))
+			errs = packer.MultiErrorAppend(errs, fmt.Errorf("unable to render temporary disk name: %s", err))
 		}
 	}
 
@@ -264,7 +241,9 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 		errs = packer.MultiErrorAppend(errs, fmt.Errorf("os_disk_storage_account_type: %v", err))
 	}
 
-	if b.config.ImageResourceID != "" {
+	if b.config.ImageResourceID == "" {
+		errs = packer.MultiErrorAppend(errs, errors.New("image_resource_id is required"))
+	} else {
 		r, err := azure.ParseResourceID(b.config.ImageResourceID)
 		if err != nil ||
 			!strings.EqualFold(r.Provider, "Microsoft.Compute") ||
@@ -274,20 +253,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 		}
 	}
 
-	if azcommon.StringsContains(md.Keys, "shared_image_destination") {
-		e, w := b.config.SharedImageGalleryDestination.Validate("shared_image_destination")
-		if len(e) > 0 {
-			errs = packer.MultiErrorAppend(errs, e...)
-		}
-		if len(w) > 0 {
-			warns = append(warns, w...)
-		}
-	}
-
-	if !azcommon.StringsContains(md.Keys, "shared_image_destination") && b.config.ImageResourceID == "" {
-		errs = packer.MultiErrorAppend(errs, errors.New("image_resource_id or shared_image_destination is required"))
-	}
-
 	if err := checkHyperVGeneration(b.config.ImageHyperVGeneration); err != nil {
 		errs = packer.MultiErrorAppend(errs, fmt.Errorf("image_hyperv_generation: %v", err))
 	}
@@ -371,8 +336,104 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 
 	state.Put("instance", info)
 
-	// Build the step array from the config
-	steps := buildsteps(b.config, info)
+	// Build the steps
+	var steps []multistep.Step
+
+	if b.config.FromScratch {
+		steps = append(steps,
+			&StepCreateNewDisk{
+				SubscriptionID:         info.SubscriptionID,
+				ResourceGroup:          info.ResourceGroupName,
+				DiskName:               b.config.TemporaryOSDiskName,
+				DiskSizeGB:             b.config.OSDiskSizeGB,
+				DiskStorageAccountType: b.config.OSDiskStorageAccountType,
+				HyperVGeneration:       b.config.ImageHyperVGeneration,
+				Location:               info.Location,
+			})
+	} else {
+		switch b.config.sourceType {
+		case sourcePlatformImage:
+
+			if pi, err := client.ParsePlatformImageURN(b.config.Source); err == nil {
+				if strings.EqualFold(pi.Version, "latest") {
+
+					vmi, err := azcli.VirtualMachineImagesClient().GetLatest(ctx, pi.Publisher, pi.Offer, pi.Sku, info.Location)
+					if err != nil {
+						return nil, fmt.Errorf("error retieving latest version of %q: %v", b.config.Source, err)
+					}
+					pi.Version = to.String(vmi.Name)
+					log.Println("Resolved latest version of source image:", pi.Version)
+				}
+				steps = append(steps,
+
+					&StepCreateNewDisk{
+						SubscriptionID:         info.SubscriptionID,
+						ResourceGroup:          info.ResourceGroupName,
+						DiskName:               b.config.TemporaryOSDiskName,
+						DiskSizeGB:             b.config.OSDiskSizeGB,
+						DiskStorageAccountType: b.config.OSDiskStorageAccountType,
+						HyperVGeneration:       b.config.ImageHyperVGeneration,
+						Location:               info.Location,
+						PlatformImage:          pi,
+
+						SkipCleanup: b.config.OSDiskSkipCleanup,
+					})
+			} else {
+				panic("Unknown image source: " + b.config.Source)
+			}
+		case sourceDisk:
+			steps = append(steps,
+				&StepVerifySourceDisk{
+					SourceDiskResourceID: b.config.Source,
+					SubscriptionID:       info.SubscriptionID,
+					Location:             info.Location,
+				},
+				&StepCreateNewDisk{
+					SubscriptionID:         info.SubscriptionID,
+					ResourceGroup:          info.ResourceGroupName,
+					DiskName:               b.config.TemporaryOSDiskName,
+					DiskSizeGB:             b.config.OSDiskSizeGB,
+					DiskStorageAccountType: b.config.OSDiskStorageAccountType,
+					HyperVGeneration:       b.config.ImageHyperVGeneration,
+					SourceDiskResourceID:   b.config.Source,
+					Location:               info.Location,
+
+					SkipCleanup: b.config.OSDiskSkipCleanup,
+				})
+		default:
+			panic(fmt.Errorf("Unknown source type: %+q", b.config.sourceType))
+		}
+	}
+
+	steps = append(steps,
+		&StepAttachDisk{}, // uses os_disk_resource_id and sets 'device' in stateBag
+		&chroot.StepPreMountCommands{
+			Commands: b.config.PreMountCommands,
+		},
+		&StepMountDevice{
+			MountOptions:   b.config.MountOptions,
+			MountPartition: b.config.MountPartition,
+			MountPath:      b.config.MountPath,
+		},
+		&chroot.StepPostMountCommands{
+			Commands: b.config.PostMountCommands,
+		},
+		&chroot.StepMountExtra{
+			ChrootMounts: b.config.ChrootMounts,
+		},
+		&chroot.StepCopyFiles{
+			Files: b.config.CopyFiles,
+		},
+		&chroot.StepChrootProvision{},
+		&chroot.StepEarlyCleanup{},
+		&StepCreateImage{
+			ImageResourceID:          b.config.ImageResourceID,
+			ImageOSState:             string(compute.Generalized),
+			OSDiskCacheType:          b.config.OSDiskCacheType,
+			OSDiskStorageAccountType: b.config.OSDiskStorageAccountType,
+			Location:                 info.Location,
+		},
+	)
 
 	// Run!
 	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
@@ -385,149 +446,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 
 	// Build the artifact and return it
 	artifact := &azcommon.Artifact{
-		BuilderIdValue: BuilderID,
+		Resources:      []string{b.config.ImageResourceID},
+		BuilderIdValue: BuilderId,
 		StateData:      map[string]interface{}{"generated_data": state.Get("generated_data")},
-		AzureClientSet: azcli,
-	}
-	if b.config.ImageResourceID != "" {
-		artifact.Resources = append(artifact.Resources, b.config.ImageResourceID)
-	}
-	if e, _ := b.config.SharedImageGalleryDestination.Validate(""); len(e) == 0 {
-		artifact.Resources = append(artifact.Resources, b.config.SharedImageGalleryDestination.ResourceID(info.SubscriptionID))
-	}
-	if b.config.SkipCleanup {
-		if d, ok := state.GetOk(stateBagKey_OSDiskResourceID); ok {
-			artifact.Resources = append(artifact.Resources, d.(string))
-		}
-		if d, ok := state.GetOk(stateBagKey_OSDiskSnapshotResourceID); ok {
-			artifact.Resources = append(artifact.Resources, d.(string))
-		}
 	}
 
 	return artifact, nil
 }
 
-func buildsteps(config Config, info *client.ComputeInfo) []multistep.Step {
-	// Build the steps
-	var steps []multistep.Step
-	addSteps := func(s ...multistep.Step) { // convenience
-		steps = append(steps, s...)
-	}
-
-	e, _ := config.SharedImageGalleryDestination.Validate("")
-	hasValidSharedImage := len(e) == 0
-
-	if hasValidSharedImage {
-		// validate destination early
-		addSteps(
-			&StepVerifySharedImageDestination{
-				Image:    config.SharedImageGalleryDestination,
-				Location: info.Location,
-			},
-		)
-	}
-
-	if config.FromScratch {
-		addSteps(&StepCreateNewDisk{
-			ResourceID:             config.TemporaryOSDiskID,
-			DiskSizeGB:             config.OSDiskSizeGB,
-			DiskStorageAccountType: config.OSDiskStorageAccountType,
-			HyperVGeneration:       config.ImageHyperVGeneration,
-			Location:               info.Location})
-	} else {
-		switch config.sourceType {
-		case sourcePlatformImage:
-			if pi, err := client.ParsePlatformImageURN(config.Source); err == nil {
-				if strings.EqualFold(pi.Version, "latest") {
-					addSteps(
-						&StepResolvePlatformImageVersion{
-							PlatformImage: pi,
-							Location:      info.Location,
-						})
-				}
-				addSteps(
-					&StepCreateNewDisk{
-						ResourceID:             config.TemporaryOSDiskID,
-						DiskSizeGB:             config.OSDiskSizeGB,
-						DiskStorageAccountType: config.OSDiskStorageAccountType,
-						HyperVGeneration:       config.ImageHyperVGeneration,
-						Location:               info.Location,
-						PlatformImage:          pi,
-
-						SkipCleanup: config.SkipCleanup,
-					})
-			} else {
-				panic("Couldn't parse platfrom image urn: " + config.Source + " err: " + err.Error())
-			}
-
-		case sourceDisk:
-			addSteps(
-				&StepVerifySourceDisk{
-					SourceDiskResourceID: config.Source,
-					Location:             info.Location,
-				},
-				&StepCreateNewDisk{
-					ResourceID:             config.TemporaryOSDiskID,
-					DiskSizeGB:             config.OSDiskSizeGB,
-					DiskStorageAccountType: config.OSDiskStorageAccountType,
-					HyperVGeneration:       config.ImageHyperVGeneration,
-					SourceDiskResourceID:   config.Source,
-					Location:               info.Location,
-
-					SkipCleanup: config.SkipCleanup,
-				})
-
-		default:
-			panic(fmt.Errorf("Unknown source type: %+q", config.sourceType))
-		}
-	}
-
-	addSteps(
-		&StepAttachDisk{}, // uses os_disk_resource_id and sets 'device' in stateBag
-		&chroot.StepPreMountCommands{
-			Commands: config.PreMountCommands,
-		},
-		&StepMountDevice{
-			MountOptions:   config.MountOptions,
-			MountPartition: config.MountPartition,
-			MountPath:      config.MountPath,
-		},
-		&chroot.StepPostMountCommands{
-			Commands: config.PostMountCommands,
-		},
-		&chroot.StepMountExtra{
-			ChrootMounts: config.ChrootMounts,
-		},
-		&chroot.StepCopyFiles{
-			Files: config.CopyFiles,
-		},
-		&chroot.StepChrootProvision{},
-		&chroot.StepEarlyCleanup{},
-	)
-
-	if config.ImageResourceID != "" {
-		addSteps(&StepCreateImage{
-			ImageResourceID:          config.ImageResourceID,
-			ImageOSState:             string(compute.Generalized),
-			OSDiskCacheType:          config.OSDiskCacheType,
-			OSDiskStorageAccountType: config.OSDiskStorageAccountType,
-			Location:                 info.Location,
-		})
-	}
-	if hasValidSharedImage {
-		addSteps(
-			&StepCreateSnapshot{
-				ResourceID:  config.TemporaryOSDiskSnapshotID,
-				Location:    info.Location,
-				SkipCleanup: config.SkipCleanup,
-			},
-			&StepCreateSharedImageVersion{
-				Destination:     config.SharedImageGalleryDestination,
-				OSDiskCacheType: config.OSDiskCacheType,
-				Location:        info.Location,
-			},
-		)
-	}
-
-	return steps
-}
+var _ packer.Builder = &Builder{}

builder/azure/chroot/builder.hcl2spec.go

@@ -9,40 +9,38 @@ import (
 // FlatConfig is an auto-generated flat version of Config.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatConfig struct {
-	PackerBuildName               *string                            `mapstructure:"packer_build_name" cty:"packer_build_name"`
-	PackerBuilderType             *string                            `mapstructure:"packer_builder_type" cty:"packer_builder_type"`
-	PackerDebug                   *bool                              `mapstructure:"packer_debug" cty:"packer_debug"`
-	PackerForce                   *bool                              `mapstructure:"packer_force" cty:"packer_force"`
-	PackerOnError                 *string                            `mapstructure:"packer_on_error" cty:"packer_on_error"`
-	PackerUserVars                map[string]string                  `mapstructure:"packer_user_variables" cty:"packer_user_variables"`
-	PackerSensitiveVars           []string                           `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables"`
-	CloudEnvironmentName          *string                            `mapstructure:"cloud_environment_name" required:"false" cty:"cloud_environment_name"`
-	ClientID                      *string                            `mapstructure:"client_id" cty:"client_id"`
-	ClientSecret                  *string                            `mapstructure:"client_secret" cty:"client_secret"`
-	ClientCertPath                *string                            `mapstructure:"client_cert_path" cty:"client_cert_path"`
-	ClientJWT                     *string                            `mapstructure:"client_jwt" cty:"client_jwt"`
-	ObjectID                      *string                            `mapstructure:"object_id" cty:"object_id"`
-	TenantID                      *string                            `mapstructure:"tenant_id" required:"false" cty:"tenant_id"`
-	SubscriptionID                *string                            `mapstructure:"subscription_id" cty:"subscription_id"`
-	FromScratch                   *bool                              `mapstructure:"from_scratch" cty:"from_scratch"`
-	Source                        *string                            `mapstructure:"source" required:"true" cty:"source"`
-	CommandWrapper                *string                            `mapstructure:"command_wrapper" cty:"command_wrapper"`
-	PreMountCommands              []string                           `mapstructure:"pre_mount_commands" cty:"pre_mount_commands"`
-	MountOptions                  []string                           `mapstructure:"mount_options" cty:"mount_options"`
-	MountPartition                *string                            `mapstructure:"mount_partition" cty:"mount_partition"`
-	MountPath                     *string                            `mapstructure:"mount_path" cty:"mount_path"`
-	PostMountCommands             []string                           `mapstructure:"post_mount_commands" cty:"post_mount_commands"`
-	ChrootMounts                  [][]string                         `mapstructure:"chroot_mounts" cty:"chroot_mounts"`
-	CopyFiles                     []string                           `mapstructure:"copy_files" cty:"copy_files"`
-	OSDiskSizeGB                  *int32                             `mapstructure:"os_disk_size_gb" cty:"os_disk_size_gb"`
-	OSDiskStorageAccountType      *string                            `mapstructure:"os_disk_storage_account_type" cty:"os_disk_storage_account_type"`
-	OSDiskCacheType               *string                            `mapstructure:"os_disk_cache_type" cty:"os_disk_cache_type"`
-	ImageHyperVGeneration         *string                            `mapstructure:"image_hyperv_generation" cty:"image_hyperv_generation"`
-	TemporaryOSDiskID             *string                            `mapstructure:"temporary_os_disk_id" cty:"temporary_os_disk_id"`
-	TemporaryOSDiskSnapshotID     *string                            `mapstructure:"temporary_os_disk_snapshot_id" cty:"temporary_os_disk_snapshot_id"`
-	SkipCleanup                   *bool                              `mapstructure:"skip_cleanup" cty:"skip_cleanup"`
-	ImageResourceID               *string                            `mapstructure:"image_resource_id" cty:"image_resource_id"`
-	SharedImageGalleryDestination *FlatSharedImageGalleryDestination `mapstructure:"shared_image_destination" cty:"shared_image_destination"`
+	PackerBuildName          *string           `mapstructure:"packer_build_name" cty:"packer_build_name"`
+	PackerBuilderType        *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type"`
+	PackerDebug              *bool             `mapstructure:"packer_debug" cty:"packer_debug"`
+	PackerForce              *bool             `mapstructure:"packer_force" cty:"packer_force"`
+	PackerOnError            *string           `mapstructure:"packer_on_error" cty:"packer_on_error"`
+	PackerUserVars           map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables"`
+	PackerSensitiveVars      []string          `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables"`
+	CloudEnvironmentName     *string           `mapstructure:"cloud_environment_name" required:"false" cty:"cloud_environment_name"`
+	ClientID                 *string           `mapstructure:"client_id" cty:"client_id"`
+	ClientSecret             *string           `mapstructure:"client_secret" cty:"client_secret"`
+	ClientCertPath           *string           `mapstructure:"client_cert_path" cty:"client_cert_path"`
+	ClientJWT                *string           `mapstructure:"client_jwt" cty:"client_jwt"`
+	ObjectID                 *string           `mapstructure:"object_id" cty:"object_id"`
+	TenantID                 *string           `mapstructure:"tenant_id" required:"false" cty:"tenant_id"`
+	SubscriptionID           *string           `mapstructure:"subscription_id" cty:"subscription_id"`
+	FromScratch              *bool             `mapstructure:"from_scratch" cty:"from_scratch"`
+	Source                   *string           `mapstructure:"source" required:"true" cty:"source"`
+	CommandWrapper           *string           `mapstructure:"command_wrapper" cty:"command_wrapper"`
+	PreMountCommands         []string          `mapstructure:"pre_mount_commands" cty:"pre_mount_commands"`
+	MountOptions             []string          `mapstructure:"mount_options" cty:"mount_options"`
+	MountPartition           *string           `mapstructure:"mount_partition" cty:"mount_partition"`
+	MountPath                *string           `mapstructure:"mount_path" cty:"mount_path"`
+	PostMountCommands        []string          `mapstructure:"post_mount_commands" cty:"post_mount_commands"`
+	ChrootMounts             [][]string        `mapstructure:"chroot_mounts" cty:"chroot_mounts"`
+	CopyFiles                []string          `mapstructure:"copy_files" cty:"copy_files"`
+	TemporaryOSDiskName      *string           `mapstructure:"temporary_os_disk_name" cty:"temporary_os_disk_name"`
+	OSDiskSizeGB             *int32            `mapstructure:"os_disk_size_gb" cty:"os_disk_size_gb"`
+	OSDiskStorageAccountType *string           `mapstructure:"os_disk_storage_account_type" cty:"os_disk_storage_account_type"`
+	OSDiskCacheType          *string           `mapstructure:"os_disk_cache_type" cty:"os_disk_cache_type"`
+	OSDiskSkipCleanup        *bool             `mapstructure:"os_disk_skip_cleanup" cty:"os_disk_skip_cleanup"`
+	ImageResourceID          *string           `mapstructure:"image_resource_id" required:"true" cty:"image_resource_id"`
+	ImageHyperVGeneration    *string           `mapstructure:"image_hyperv_generation" cty:"image_hyperv_generation"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -57,40 +55,38 @@ func (*Config) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec }
 // The decoded values from this spec will then be applied to a FlatConfig.
 func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"packer_build_name":             &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
-		"packer_builder_type":           &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
-		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
-		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
-		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":         &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false},
-		"packer_sensitive_variables":    &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
-		"cloud_environment_name":        &hcldec.AttrSpec{Name: "cloud_environment_name", Type: cty.String, Required: false},
-		"client_id":                     &hcldec.AttrSpec{Name: "client_id", Type: cty.String, Required: false},
-		"client_secret":                 &hcldec.AttrSpec{Name: "client_secret", Type: cty.String, Required: false},
-		"client_cert_path":              &hcldec.AttrSpec{Name: "client_cert_path", Type: cty.String, Required: false},
-		"client_jwt":                    &hcldec.AttrSpec{Name: "client_jwt", Type: cty.String, Required: false},
-		"object_id":                     &hcldec.AttrSpec{Name: "object_id", Type: cty.String, Required: false},
-		"tenant_id":                     &hcldec.AttrSpec{Name: "tenant_id", Type: cty.String, Required: false},
-		"subscription_id":               &hcldec.AttrSpec{Name: "subscription_id", Type: cty.String, Required: false},
-		"from_scratch":                  &hcldec.AttrSpec{Name: "from_scratch", Type: cty.Bool, Required: false},
-		"source":                        &hcldec.AttrSpec{Name: "source", Type: cty.String, Required: false},
-		"command_wrapper":               &hcldec.AttrSpec{Name: "command_wrapper", Type: cty.String, Required: false},
-		"pre_mount_commands":            &hcldec.AttrSpec{Name: "pre_mount_commands", Type: cty.List(cty.String), Required: false},
-		"mount_options":                 &hcldec.AttrSpec{Name: "mount_options", Type: cty.List(cty.String), Required: false},
-		"mount_partition":               &hcldec.AttrSpec{Name: "mount_partition", Type: cty.String, Required: false},
-		"mount_path":                    &hcldec.AttrSpec{Name: "mount_path", Type: cty.String, Required: false},
-		"post_mount_commands":           &hcldec.AttrSpec{Name: "post_mount_commands", Type: cty.List(cty.String), Required: false},
-		"chroot_mounts":                 &hcldec.AttrSpec{Name: "chroot_mounts", Type: cty.List(cty.List(cty.String)), Required: false},
-		"copy_files":                    &hcldec.AttrSpec{Name: "copy_files", Type: cty.List(cty.String), Required: false},
-		"os_disk_size_gb":               &hcldec.AttrSpec{Name: "os_disk_size_gb", Type: cty.Number, Required: false},
-		"os_disk_storage_account_type":  &hcldec.AttrSpec{Name: "os_disk_storage_account_type", Type: cty.String, Required: false},
-		"os_disk_cache_type":            &hcldec.AttrSpec{Name: "os_disk_cache_type", Type: cty.String, Required: false},
-		"image_hyperv_generation":       &hcldec.AttrSpec{Name: "image_hyperv_generation", Type: cty.String, Required: false},
-		"temporary_os_disk_id":          &hcldec.AttrSpec{Name: "temporary_os_disk_id", Type: cty.String, Required: false},
-		"temporary_os_disk_snapshot_id": &hcldec.AttrSpec{Name: "temporary_os_disk_snapshot_id", Type: cty.String, Required: false},
-		"skip_cleanup":                  &hcldec.AttrSpec{Name: "skip_cleanup", Type: cty.Bool, Required: false},
-		"image_resource_id":             &hcldec.AttrSpec{Name: "image_resource_id", Type: cty.String, Required: false},
-		"shared_image_destination":      &hcldec.BlockSpec{TypeName: "shared_image_destination", Nested: hcldec.ObjectSpec((*FlatSharedImageGalleryDestination)(nil).HCL2Spec())},
+		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
+		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
+		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
+		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
+		"packer_user_variables":        &hcldec.BlockAttrsSpec{TypeName: "packer_user_variables", ElementType: cty.String, Required: false},
+		"packer_sensitive_variables":   &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
+		"cloud_environment_name":       &hcldec.AttrSpec{Name: "cloud_environment_name", Type: cty.String, Required: false},
+		"client_id":                    &hcldec.AttrSpec{Name: "client_id", Type: cty.String, Required: false},
+		"client_secret":                &hcldec.AttrSpec{Name: "client_secret", Type: cty.String, Required: false},
+		"client_cert_path":             &hcldec.AttrSpec{Name: "client_cert_path", Type: cty.String, Required: false},
+		"client_jwt":                   &hcldec.AttrSpec{Name: "client_jwt", Type: cty.String, Required: false},
+		"object_id":                    &hcldec.AttrSpec{Name: "object_id", Type: cty.String, Required: false},
+		"tenant_id":                    &hcldec.AttrSpec{Name: "tenant_id", Type: cty.String, Required: false},
+		"subscription_id":              &hcldec.AttrSpec{Name: "subscription_id", Type: cty.String, Required: false},
+		"from_scratch":                 &hcldec.AttrSpec{Name: "from_scratch", Type: cty.Bool, Required: false},
+		"source":                       &hcldec.AttrSpec{Name: "source", Type: cty.String, Required: false},
+		"command_wrapper":              &hcldec.AttrSpec{Name: "command_wrapper", Type: cty.String, Required: false},
+		"pre_mount_commands":           &hcldec.AttrSpec{Name: "pre_mount_commands", Type: cty.List(cty.String), Required: false},
+		"mount_options":                &hcldec.AttrSpec{Name: "mount_options", Type: cty.List(cty.String), Required: false},
+		"mount_partition":              &hcldec.AttrSpec{Name: "mount_partition", Type: cty.String, Required: false},
+		"mount_path":                   &hcldec.AttrSpec{Name: "mount_path", Type: cty.String, Required: false},
+		"post_mount_commands":          &hcldec.AttrSpec{Name: "post_mount_commands", Type: cty.List(cty.String), Required: false},
+		"chroot_mounts":                &hcldec.AttrSpec{Name: "chroot_mounts", Type: cty.List(cty.List(cty.String)), Required: false},
+		"copy_files":                   &hcldec.AttrSpec{Name: "copy_files", Type: cty.List(cty.String), Required: false},
+		"temporary_os_disk_name":       &hcldec.AttrSpec{Name: "temporary_os_disk_name", Type: cty.String, Required: false},
+		"os_disk_size_gb":              &hcldec.AttrSpec{Name: "os_disk_size_gb", Type: cty.Number, Required: false},
+		"os_disk_storage_account_type": &hcldec.AttrSpec{Name: "os_disk_storage_account_type", Type: cty.String, Required: false},
+		"os_disk_cache_type":           &hcldec.AttrSpec{Name: "os_disk_cache_type", Type: cty.String, Required: false},
+		"os_disk_skip_cleanup":         &hcldec.AttrSpec{Name: "os_disk_skip_cleanup", Type: cty.Bool, Required: false},
+		"image_resource_id":            &hcldec.AttrSpec{Name: "image_resource_id", Type: cty.String, Required: false},
+		"image_hyperv_generation":      &hcldec.AttrSpec{Name: "image_hyperv_generation", Type: cty.String, Required: false},
 	}
 	return s
 }

builder/azure/chroot/builder_test.go

@@ -1,12 +1,9 @@
 package chroot
 
 import (
-	"strings"
 	"testing"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
-	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
 )
 
 func TestBuilder_Prepare(t *testing.T) {
@@ -20,13 +17,13 @@ func TestBuilder_Prepare(t *testing.T) {
 		wantErr  bool
 	}{
 		{
-			name: "platform image to managed disk",
+			name: "HappyPathFromPlatformImage",
 			config: config{
 				"client_id":         "123",
 				"client_secret":     "456",
 				"subscription_id":   "789",
-				"source":            "credativ:Debian:9:latest",
 				"image_resource_id": "/subscriptions/789/resourceGroups/otherrgname/providers/Microsoft.Compute/images/MyDebianOSImage-{{timestamp}}",
+				"source":            "credativ:Debian:9:latest",
 			},
 			validate: func(c Config) {
 				if c.OSDiskSizeGB != 0 {
@@ -47,168 +44,27 @@ func TestBuilder_Prepare(t *testing.T) {
 			},
 		},
 		{
-			name: "disk to managed image, validate temp disk id expansion",
+			name: "HappyPathFromPlatformImage",
 			config: config{
-				"source":            "/subscriptions/789/resourceGroups/testrg/providers/Microsoft.Compute/disks/diskname",
 				"image_resource_id": "/subscriptions/789/resourceGroups/otherrgname/providers/Microsoft.Compute/images/MyDebianOSImage-{{timestamp}}",
-			},
-			validate: func(c Config) {
-				prefix := "/subscriptions/testSubscriptionID/resourceGroups/testResourceGroup/providers/Microsoft.Compute/disks/PackerTemp-osdisk-"
-				if !strings.HasPrefix(c.TemporaryOSDiskID, prefix) {
-					t.Errorf("Expected TemporaryOSDiskID to start with %q, but got %q", prefix, c.TemporaryOSDiskID)
-				}
-			},
-		},
-		{
-			name: "disk to both managed image and shared image",
-			config: config{
 				"source":            "/subscriptions/789/resourceGroups/testrg/providers/Microsoft.Compute/disks/diskname",
-				"image_resource_id": "/subscriptions/789/resourceGroups/otherrgname/providers/Microsoft.Compute/images/MyDebianOSImage-{{timestamp}}",
-				"shared_image_destination": config{
-					"resource_group": "rg",
-					"gallery_name":   "galleryName",
-					"image_name":     "imageName",
-					"image_version":  "0.1.0",
-				},
 			},
 		},
-		{
-			name: "disk to both managed image and shared image with missing property",
-			config: config{
-				"source":            "/subscriptions/789/resourceGroups/testrg/providers/Microsoft.Compute/disks/diskname",
-				"image_resource_id": "/subscriptions/789/resourceGroups/otherrgname/providers/Microsoft.Compute/images/MyDebianOSImage-{{timestamp}}",
-				"shared_image_destination": config{
-					"resource_group": "rg",
-					"gallery_name":   "galleryName",
-					"image_version":  "0.1.0",
-				},
-			},
-			wantErr: true,
-		},
-		{
-			name: "err: no output",
-			config: config{
-				"source": "/subscriptions/789/resourceGroups/testrg/providers/Microsoft.Compute/disks/diskname",
-			},
-			wantErr: true,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			withMetadataStub(func() {
-				b := &Builder{}
+			b := &Builder{}
 
-				_, _, err := b.Prepare(tt.config)
+			_, _, err := b.Prepare(tt.config)
 
-				if (err != nil) != tt.wantErr {
-					t.Errorf("Builder.Prepare() error = %v, wantErr %v", err, tt.wantErr)
-					return
-				}
+			if (err != nil) != tt.wantErr {
+				t.Errorf("Builder.Prepare() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
 
-				if tt.validate != nil {
-					tt.validate(b.config)
-				}
-			})
-		})
-	}
-}
-
-func Test_buildsteps(t *testing.T) {
-	info := &client.ComputeInfo{
-		Location:          "northpole",
-		Name:              "unittestVM",
-		ResourceGroupName: "unittestResourceGroup",
-		SubscriptionID:    "96854241-60c7-426d-9a27-3fdeec8957f4",
-	}
-
-	tests := []struct {
-		name   string
-		config Config
-		verify func([]multistep.Step, *testing.T)
-	}{
-		{
-			name:   "Source FromScrath creates empty disk",
-			config: Config{FromScratch: true},
-			verify: func(steps []multistep.Step, _ *testing.T) {
-				for _, s := range steps {
-					if s, ok := s.(*StepCreateNewDisk); ok {
-						if s.SourceDiskResourceID == "" &&
-							s.PlatformImage == nil {
-							return
-						}
-						t.Errorf("found misconfigured StepCreateNewDisk: %+v", s)
-					}
-				}
-				t.Error("did not find a StepCreateNewDisk")
-			}},
-		{
-			name:   "Source Platform image disk creation",
-			config: Config{Source: "publisher:offer:sku:version", sourceType: sourcePlatformImage},
-			verify: func(steps []multistep.Step, _ *testing.T) {
-				for _, s := range steps {
-					if s, ok := s.(*StepCreateNewDisk); ok {
-						if s.SourceDiskResourceID == "" &&
-							s.PlatformImage != nil &&
-							s.PlatformImage.Publisher == "publisher" {
-							return
-						}
-						t.Errorf("found misconfigured StepCreateNewDisk: %+v", s)
-					}
-				}
-				t.Error("did not find a StepCreateNewDisk")
-			}},
-		{
-			name:   "Source Platform image with version latest adds StepResolvePlatformImageVersion",
-			config: Config{Source: "publisher:offer:sku:latest", sourceType: sourcePlatformImage},
-			verify: func(steps []multistep.Step, _ *testing.T) {
-				for _, s := range steps {
-					if s, ok := s.(*StepResolvePlatformImageVersion); ok {
-						if s.PlatformImage != nil &&
-							s.Location == info.Location {
-							return
-						}
-						t.Errorf("found misconfigured StepResolvePlatformImageVersion: %+v", s)
-					}
-				}
-				t.Error("did not find a StepResolvePlatformImageVersion")
-			}},
-		{
-			name:   "Source Disk adds correct disk creation",
-			config: Config{Source: "diskresourceid", sourceType: sourceDisk},
-			verify: func(steps []multistep.Step, _ *testing.T) {
-				for _, s := range steps {
-					if s, ok := s.(*StepCreateNewDisk); ok {
-						if s.SourceDiskResourceID == "diskresourceid" &&
-							s.PlatformImage == nil {
-							return
-						}
-						t.Errorf("found misconfigured StepCreateNewDisk: %+v", s)
-					}
-				}
-				t.Error("did not find a StepCreateNewDisk")
-			}},
-		{
-			name:   "Source disk adds StepVerifySourceDisk",
-			config: Config{Source: "diskresourceid", sourceType: sourceDisk},
-			verify: func(steps []multistep.Step, _ *testing.T) {
-				for _, s := range steps {
-					if s, ok := s.(*StepVerifySourceDisk); ok {
-						if s.SourceDiskResourceID == "diskresourceid" &&
-							s.Location == info.Location {
-							return
-						}
-						t.Errorf("found misconfigured StepVerifySourceDisk: %+v", s)
-					}
-				}
-				t.Error("did not find a StepVerifySourceDisk")
-			}},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			withMetadataStub(func() { // ensure that values are taken from info, instead of retrieved again
-				got := buildsteps(tt.config, info)
-				tt.verify(got, t)
-			})
+			if tt.validate != nil {
+				tt.validate(b.config)
+			}
 		})
 	}
 }

builder/azure/chroot/const.go

@@ -1,6 +0,0 @@
-package chroot
-
-const (
-	stateBagKey_OSDiskResourceID         = "os_disk_resource_id"
-	stateBagKey_OSDiskSnapshotResourceID = "os_disk_snapshot_resource_id"
-)

builder/azure/chroot/diskattacher.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
+	"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/to"
 )

builder/azure/chroot/diskattacher_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/Azure/go-autorest/autorest/to"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
+	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
 	"github.com/hashicorp/packer/builder/azure/common/client"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

builder/azure/chroot/metadatastub_test.go

@@ -1,18 +0,0 @@
-package chroot
-
-import "github.com/hashicorp/packer/builder/azure/common/client"
-
-func withMetadataStub(f func()) {
-	mdc := client.DefaultMetadataClient
-	defer func() { client.DefaultMetadataClient = mdc }()
-	client.DefaultMetadataClient = client.MetadataClientStub{
-		ComputeInfo: client.ComputeInfo{
-			SubscriptionID:    "testSubscriptionID",
-			ResourceGroupName: "testResourceGroup",
-			Name:              "testVM",
-			Location:          "testLocation",
-		},
-	}
-
-	f()
-}

builder/azure/chroot/packerui_test.go

@@ -1,19 +0,0 @@
-package chroot
-
-import (
-	"io/ioutil"
-	"strings"
-
-	"github.com/hashicorp/packer/packer"
-)
-
-// testUI returns a test ui plus a function to retrieve the errors written to the ui
-func testUI() (packer.Ui, func() string) {
-	errorBuffer := &strings.Builder{}
-	ui := &packer.BasicUi{
-		Reader:      strings.NewReader(""),
-		Writer:      ioutil.Discard,
-		ErrorWriter: errorBuffer,
-	}
-	return ui, errorBuffer.String
-}

builder/azure/chroot/shared_image_gallery_destination.go

@@ -1,65 +0,0 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type SharedImageGalleryDestination,TargetRegion
-
-package chroot
-
-import (
-	"fmt"
-	"regexp"
-)
-
-// SharedImageGalleryDestination models an image version in a Shared
-// Image Gallery that can be used as a destination.
-type SharedImageGalleryDestination struct {
-	ResourceGroup string `mapstructure:"resource_group" required:"true"`
-	GalleryName   string `mapstructure:"gallery_name" required:"true"`
-	ImageName     string `mapstructure:"image_name" required:"true"`
-	ImageVersion  string `mapstructure:"image_version" required:"true"`
-
-	TargetRegions     []TargetRegion `mapstructure:"target_regions"`
-	ExcludeFromLatest bool           `mapstructure:"exlude_from_latest"`
-}
-
-// TargetRegion describes a region where the shared image should be replicated
-type TargetRegion struct {
-	// Name of the Azure region
-	Name string `mapstructure:"name" required:"true"`
-	// Number of replicas in this region. Default: 1
-	ReplicaCount int32 `mapstructure:"replicas"`
-	// Storage account type: Standard_LRS or Standard_ZRS. Default: Standard_ZRS
-	StorageAccountType string `mapstructure:"storage_account_type"`
-}
-
-// ResourceID returns the resource ID string
-func (sigd SharedImageGalleryDestination) ResourceID(subscriptionID string) string {
-	return fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Compute/galleries/%s/images/%s/versions/%s",
-		subscriptionID,
-		sigd.ResourceGroup,
-		sigd.GalleryName,
-		sigd.ImageName,
-		sigd.ImageVersion)
-}
-
-// Validate validates that the values in the shared image are valid (without checking them on the network)
-func (sigd *SharedImageGalleryDestination) Validate(prefix string) (errs []error, warns []string) {
-	if sigd.ResourceGroup == "" {
-		errs = append(errs, fmt.Errorf("%s.resource_group is required", prefix))
-	}
-	if sigd.GalleryName == "" {
-		errs = append(errs, fmt.Errorf("%s.gallery_name is required", prefix))
-	}
-	if sigd.ImageName == "" {
-		errs = append(errs, fmt.Errorf("%s.image_name is required", prefix))
-	}
-	if match, err := regexp.MatchString("^[0-9]+\\.[0-9]+\\.[0-9]+$", sigd.ImageVersion); !match {
-		if err != nil {
-			warns = append(warns, fmt.Sprintf("Error matching pattern for %s.image_version: %s (this is probably a bug)", prefix, err))
-		}
-		errs = append(errs, fmt.Errorf("%s.image_version should match '^[0-9]+\\.[0-9]+\\.[0-9]+$'", prefix))
-	}
-	if len(sigd.TargetRegions) == 0 {
-		warns = append(warns,
-			fmt.Sprintf("%s.target_regions is empty; image will only be available in the region of the gallery", prefix))
-	}
-	return
-}

builder/azure/chroot/shared_image_gallery_destination.hcl2spec.go

@@ -1,67 +0,0 @@
-// Code generated by "mapstructure-to-hcl2 -type SharedImageGalleryDestination,TargetRegion"; DO NOT EDIT.
-package chroot
-
-import (
-	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/zclconf/go-cty/cty"
-)
-
-// FlatSharedImageGalleryDestination is an auto-generated flat version of SharedImageGalleryDestination.
-// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
-type FlatSharedImageGalleryDestination struct {
-	ResourceGroup     *string            `mapstructure:"resource_group" required:"true" cty:"resource_group"`
-	GalleryName       *string            `mapstructure:"gallery_name" required:"true" cty:"gallery_name"`
-	ImageName         *string            `mapstructure:"image_name" required:"true" cty:"image_name"`
-	ImageVersion      *string            `mapstructure:"image_version" required:"true" cty:"image_version"`
-	TargetRegions     []FlatTargetRegion `mapstructure:"target_regions" cty:"target_regions"`
-	ExcludeFromLatest *bool              `mapstructure:"exlude_from_latest" cty:"exlude_from_latest"`
-}
-
-// FlatMapstructure returns a new FlatSharedImageGalleryDestination.
-// FlatSharedImageGalleryDestination is an auto-generated flat version of SharedImageGalleryDestination.
-// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
-func (*SharedImageGalleryDestination) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
-	return new(FlatSharedImageGalleryDestination)
-}
-
-// HCL2Spec returns the hcl spec of a SharedImageGalleryDestination.
-// This spec is used by HCL to read the fields of SharedImageGalleryDestination.
-// The decoded values from this spec will then be applied to a FlatSharedImageGalleryDestination.
-func (*FlatSharedImageGalleryDestination) HCL2Spec() map[string]hcldec.Spec {
-	s := map[string]hcldec.Spec{
-		"resource_group":     &hcldec.AttrSpec{Name: "resource_group", Type: cty.String, Required: false},
-		"gallery_name":       &hcldec.AttrSpec{Name: "gallery_name", Type: cty.String, Required: false},
-		"image_name":         &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false},
-		"image_version":      &hcldec.AttrSpec{Name: "image_version", Type: cty.String, Required: false},
-		"target_regions":     &hcldec.BlockListSpec{TypeName: "target_regions", Nested: hcldec.ObjectSpec((*FlatTargetRegion)(nil).HCL2Spec())},
-		"exlude_from_latest": &hcldec.AttrSpec{Name: "exlude_from_latest", Type: cty.Bool, Required: false},
-	}
-	return s
-}
-
-// FlatTargetRegion is an auto-generated flat version of TargetRegion.
-// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
-type FlatTargetRegion struct {
-	Name               *string `mapstructure:"name" required:"true" cty:"name"`
-	ReplicaCount       *int32  `mapstructure:"replicas" cty:"replicas"`
-	StorageAccountType *string `mapstructure:"storage_account_type" cty:"storage_account_type"`
-}
-
-// FlatMapstructure returns a new FlatTargetRegion.
-// FlatTargetRegion is an auto-generated flat version of TargetRegion.
-// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
-func (*TargetRegion) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
-	return new(FlatTargetRegion)
-}
-
-// HCL2Spec returns the hcl spec of a TargetRegion.
-// This spec is used by HCL to read the fields of TargetRegion.
-// The decoded values from this spec will then be applied to a FlatTargetRegion.
-func (*FlatTargetRegion) HCL2Spec() map[string]hcldec.Spec {
-	s := map[string]hcldec.Spec{
-		"name":                 &hcldec.AttrSpec{Name: "name", Type: cty.String, Required: false},
-		"replicas":             &hcldec.AttrSpec{Name: "replicas", Type: cty.Number, Required: false},
-		"storage_account_type": &hcldec.AttrSpec{Name: "storage_account_type", Type: cty.String, Required: false},
-	}
-	return s
-}

builder/azure/chroot/shared_image_gallery_destination_test.go

@@ -1,133 +0,0 @@
-package chroot
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func TestSharedImageGalleryDestination_ResourceID(t *testing.T) {
-	sigd := SharedImageGalleryDestination{
-		ResourceGroup: "ResourceGroup",
-		GalleryName:   "GalleryName",
-		ImageName:     "ImageName",
-		ImageVersion:  "ImageVersion",
-	}
-	want := "/subscriptions/SubscriptionID/resourceGroups/ResourceGroup/providers/Microsoft.Compute/galleries/GalleryName/images/ImageName/versions/ImageVersion"
-	if got := sigd.ResourceID("SubscriptionID"); !strings.EqualFold(got, want) {
-		t.Errorf("SharedImageGalleryDestination.ResourceID() = %v, want %v", got, want)
-	}
-}
-
-func TestSharedImageGalleryDestination_Validate(t *testing.T) {
-	type fields struct {
-		ResourceGroup     string
-		GalleryName       string
-		ImageName         string
-		ImageVersion      string
-		TargetRegions     []TargetRegion
-		ExcludeFromLatest bool
-	}
-	tests := []struct {
-		name      string
-		fields    fields
-		wantErrs  []string
-		wantWarns []string
-	}{
-		{
-			name: "complete",
-			fields: fields{
-				ResourceGroup: "ResourceGroup",
-				GalleryName:   "GalleryName",
-				ImageName:     "ImageName",
-				ImageVersion:  "0.1.2",
-				TargetRegions: []TargetRegion{
-					TargetRegion{
-						Name:               "region1",
-						ReplicaCount:       5,
-						StorageAccountType: "Standard_ZRS",
-					},
-					TargetRegion{
-						Name:               "region2",
-						ReplicaCount:       3,
-						StorageAccountType: "Standard_LRS",
-					},
-				},
-				ExcludeFromLatest: true,
-			},
-		},
-		{
-			name: "warn if target regions not specified",
-			fields: fields{
-				ResourceGroup: "ResourceGroup",
-				GalleryName:   "GalleryName",
-				ImageName:     "ImageName",
-				ImageVersion:  "0.1.2",
-			},
-			wantWarns: []string{"sigdest.target_regions is empty; image will only be available in the region of the gallery"},
-		},
-		{
-			name: "version format",
-			wantErrs: []string{
-				"sigdest.image_version should match '^[0-9]+\\.[0-9]+\\.[0-9]+$'",
-			},
-			fields: fields{
-				ResourceGroup: "ResourceGroup",
-				GalleryName:   "GalleryName",
-				ImageName:     "ImageName",
-				ImageVersion:  "0.1.2alpha",
-				TargetRegions: []TargetRegion{
-					TargetRegion{
-						Name:               "region1",
-						ReplicaCount:       5,
-						StorageAccountType: "Standard_ZRS",
-					},
-					TargetRegion{
-						Name:               "region2",
-						ReplicaCount:       3,
-						StorageAccountType: "Standard_LRS",
-					},
-				},
-				ExcludeFromLatest: true,
-			},
-		},
-		{
-			name: "required fields",
-			wantErrs: []string{
-				"sigdest.resource_group is required",
-				"sigdest.gallery_name is required",
-				"sigdest.image_name is required",
-				"sigdest.image_version should match '^[0-9]+\\.[0-9]+\\.[0-9]+$'",
-			},
-			wantWarns: []string{"sigdest.target_regions is empty; image will only be available in the region of the gallery"},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			sigd := &SharedImageGalleryDestination{
-				ResourceGroup:     tt.fields.ResourceGroup,
-				GalleryName:       tt.fields.GalleryName,
-				ImageName:         tt.fields.ImageName,
-				ImageVersion:      tt.fields.ImageVersion,
-				TargetRegions:     tt.fields.TargetRegions,
-				ExcludeFromLatest: tt.fields.ExcludeFromLatest,
-			}
-			gotErrs, gotWarns := sigd.Validate("sigdest")
-
-			var gotStrErrs []string
-			if gotErrs != nil {
-				gotStrErrs = make([]string, len(gotErrs))
-				for i, e := range gotErrs {
-					gotStrErrs[i] = e.Error()
-				}
-			}
-
-			if !reflect.DeepEqual(gotStrErrs, tt.wantErrs) {
-				t.Errorf("SharedImageGalleryDestination.Validate() gotErrs = %q, want %q", gotStrErrs, tt.wantErrs)
-			}
-			if !reflect.DeepEqual(gotWarns, tt.wantWarns) {
-				t.Errorf("SharedImageGalleryDestination.Validate() gotWarns = %q, want %q", gotWarns, tt.wantWarns)
-			}
-		})
-	}
-}

builder/azure/chroot/step_attach_disk.go

@@ -20,7 +20,7 @@ type StepAttachDisk struct {
 func (s *StepAttachDisk) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	azcli := state.Get("azureclient").(client.AzureClientSet)
 	ui := state.Get("ui").(packer.Ui)
-	diskResourceID := state.Get(stateBagKey_OSDiskResourceID).(string)
+	diskResourceID := state.Get("os_disk_resource_id").(string)
 
 	ui.Say(fmt.Sprintf("Attaching disk '%s'", diskResourceID))
 
@@ -67,7 +67,7 @@ func (s *StepAttachDisk) CleanupFunc(state multistep.StateBag) error {
 	if s.attached {
 		azcli := state.Get("azureclient").(client.AzureClientSet)
 		ui := state.Get("ui").(packer.Ui)
-		diskResourceID := state.Get(stateBagKey_OSDiskResourceID).(string)
+		diskResourceID := state.Get("os_disk_resource_id").(string)
 
 		ui.Say(fmt.Sprintf("Detaching disk '%s'", diskResourceID))
 

builder/azure/chroot/step_attach_disk_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
+	"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/hashicorp/packer/builder/azure/common/client"
 	"github.com/hashicorp/packer/helper/multistep"
@@ -78,7 +78,7 @@ func TestStepAttachDisk_Run(t *testing.T) {
 			state := new(multistep.BasicStateBag)
 			state.Put("azureclient", &client.AzureClientSetMock{})
 			state.Put("ui", ui)
-			state.Put(stateBagKey_OSDiskResourceID, "/subscriptions/12345/resourceGroups/group1/providers/Microsoft.Compute/disks/disk1")
+			state.Put("os_disk_resource_id", "/subscriptions/12345/resourceGroups/group1/providers/Microsoft.Compute/disks/disk1")
 
 			got := s.Run(context.TODO(), state)
 			if !reflect.DeepEqual(got, tt.want) {

builder/azure/chroot/step_create_image.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
+	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/hashicorp/packer/builder/azure/common/client"
@@ -28,7 +28,7 @@ type StepCreateImage struct {
 func (s *StepCreateImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	azcli := state.Get("azureclient").(client.AzureClientSet)
 	ui := state.Get("ui").(packer.Ui)
-	diskResourceID := state.Get(stateBagKey_OSDiskResourceID).(string)
+	diskResourceID := state.Get("os_disk_resource_id").(string)
 
 	ui.Say(fmt.Sprintf("Creating image %s\n   using %s for os disk.",
 		s.ImageResourceID,

builder/azure/chroot/step_create_new_disk.go

@@ -4,11 +4,8 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"strings"
-	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
-	"github.com/Azure/go-autorest/autorest/azure"
+	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/hashicorp/packer/builder/azure/common/client"
 	"github.com/hashicorp/packer/helper/multistep"
@@ -18,12 +15,10 @@ import (
 var _ multistep.Step = &StepCreateNewDisk{}
 
 type StepCreateNewDisk struct {
-	ResourceID                              string // Disk ID
-	subscriptionID, resourceGroup, diskName string // split out resource id
-
-	DiskSizeGB             int32  // optional, ignored if 0
-	DiskStorageAccountType string // from compute.DiskStorageAccountTypes
-	HyperVGeneration       string
+	SubscriptionID, ResourceGroup, DiskName string
+	DiskSizeGB                              int32  // optional, ignored if 0
+	DiskStorageAccountType                  string // from compute.DiskStorageAccountTypes
+	HyperVGeneration                        string
 
 	Location      string
 	PlatformImage *client.PlatformImage
@@ -33,37 +28,16 @@ type StepCreateNewDisk struct {
 	SkipCleanup bool
 }
 
-func parseDiskResourceID(resourceID string) (subscriptionID, resourceGroup, diskName string, err error) {
-	r, err := azure.ParseResourceID(resourceID)
-	if err != nil {
-		return "", "", "", err
-	}
-
-	if !strings.EqualFold(r.Provider, "Microsoft.Compute") ||
-		!strings.EqualFold(r.ResourceType, "disks") {
-		return "", "", "", fmt.Errorf("Resource %q is not of type Microsoft.Compute/disks", resourceID)
-	}
-
-	return r.SubscriptionID, r.ResourceGroup, r.ResourceName, nil
-}
-
-func (s *StepCreateNewDisk) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+func (s StepCreateNewDisk) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	azcli := state.Get("azureclient").(client.AzureClientSet)
 	ui := state.Get("ui").(packer.Ui)
 
-	state.Put(stateBagKey_OSDiskResourceID, s.ResourceID)
-	ui.Say(fmt.Sprintf("Creating disk '%s'", s.ResourceID))
-
-	var err error
-	s.subscriptionID, s.resourceGroup, s.diskName, err = parseDiskResourceID(s.ResourceID)
-	if err != nil {
-		log.Printf("StepCreateNewDisk.Run: error: %+v", err)
-		err := fmt.Errorf(
-			"error parsing resource id '%s': %v", s.ResourceID, err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
+	diskResourceID := fmt.Sprintf("/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Compute/disks/%s",
+		s.SubscriptionID,
+		s.ResourceGroup,
+		s.DiskName)
+	state.Put("os_disk_resource_id", diskResourceID)
+	ui.Say(fmt.Sprintf("Creating disk '%s'", diskResourceID))
 
 	disk := compute.Disk{
 		Location: to.StringPtr(s.Location),
@@ -93,20 +67,18 @@ func (s *StepCreateNewDisk) Run(ctx context.Context, state multistep.StateBag) m
 		disk.CreationData.ImageReference = &compute.ImageDiskReference{
 			ID: to.StringPtr(fmt.Sprintf(
 				"/subscriptions/%s/providers/Microsoft.Compute/locations/%s/publishers/%s/artifacttypes/vmimage/offers/%s/skus/%s/versions/%s",
-				s.subscriptionID, s.Location, s.PlatformImage.Publisher, s.PlatformImage.Offer, s.PlatformImage.Sku, s.PlatformImage.Version)),
+				s.SubscriptionID, s.Location, s.PlatformImage.Publisher, s.PlatformImage.Offer, s.PlatformImage.Sku, s.PlatformImage.Version)),
 		}
 	}
 
-	f, err := azcli.DisksClient().CreateOrUpdate(ctx, s.resourceGroup, s.diskName, disk)
+	f, err := azcli.DisksClient().CreateOrUpdate(ctx, s.ResourceGroup, s.DiskName, disk)
 	if err == nil {
-		cli := azcli.PollClient() // quick polling for quick operations
-		cli.PollingDelay = time.Second
-		err = f.WaitForCompletionRef(ctx, cli)
+		err = f.WaitForCompletionRef(ctx, azcli.PollClient())
 	}
 	if err != nil {
 		log.Printf("StepCreateNewDisk.Run: error: %+v", err)
 		err := fmt.Errorf(
-			"error creating new disk '%s': %v", s.ResourceID, err)
+			"error creating new disk '%s': %v", diskResourceID, err)
 		state.Put("error", err)
 		ui.Error(err.Error())
 		return multistep.ActionHalt
@@ -115,26 +87,27 @@ func (s *StepCreateNewDisk) Run(ctx context.Context, state multistep.StateBag) m
 	return multistep.ActionContinue
 }
 
-func (s *StepCreateNewDisk) Cleanup(state multistep.StateBag) {
+func (s StepCreateNewDisk) Cleanup(state multistep.StateBag) {
 	if !s.SkipCleanup {
 		azcli := state.Get("azureclient").(client.AzureClientSet)
 		ui := state.Get("ui").(packer.Ui)
+		diskResourceID := state.Get("os_disk_resource_id").(string)
 
-		ui.Say(fmt.Sprintf("Waiting for disk %q detach to complete", s.ResourceID))
-		err := NewDiskAttacher(azcli).WaitForDetach(context.Background(), s.ResourceID)
+		ui.Say(fmt.Sprintf("Waiting for disk %q detach to complete", diskResourceID))
+		err := NewDiskAttacher(azcli).WaitForDetach(context.Background(), diskResourceID)
 		if err != nil {
-			ui.Error(fmt.Sprintf("error detaching disk %q: %s", s.ResourceID, err))
+			ui.Error(fmt.Sprintf("error detaching disk %q: %s", diskResourceID, err))
 		}
 
-		ui.Say(fmt.Sprintf("Deleting disk %q", s.ResourceID))
+		ui.Say(fmt.Sprintf("Deleting disk %q", diskResourceID))
 
-		f, err := azcli.DisksClient().Delete(context.TODO(), s.resourceGroup, s.diskName)
+		f, err := azcli.DisksClient().Delete(context.TODO(), s.ResourceGroup, s.DiskName)
 		if err == nil {
 			err = f.WaitForCompletionRef(context.TODO(), azcli.PollClient())
 		}
 		if err != nil {
 			log.Printf("StepCreateNewDisk.Cleanup: error: %+v", err)
-			ui.Error(fmt.Sprintf("error deleting disk '%s': %v.", s.ResourceID, err))
+			ui.Error(fmt.Sprintf("error deleting new disk '%s': %v.", diskResourceID, err))
 		}
 	}
 }

builder/azure/chroot/step_create_new_disk_test.go

@@ -8,17 +8,18 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
+	"github.com/Azure/go-autorest/autorest"
 	"github.com/hashicorp/packer/builder/azure/common/client"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
-	"github.com/Azure/go-autorest/autorest"
 )
 
 func TestStepCreateNewDisk_Run(t *testing.T) {
 	type fields struct {
-		ResourceID             string
+		SubscriptionID         string
+		ResourceGroup          string
+		DiskName               string
 		DiskSizeGB             int32
 		DiskStorageAccountType string
 		HyperVGeneration       string
@@ -34,9 +35,11 @@ func TestStepCreateNewDisk_Run(t *testing.T) {
 		want   multistep.StepAction
 	}{
 		{
-			name: "from disk",
+			name: "HappyPathDiskSource",
 			fields: fields{
-				ResourceID:             "/subscriptions/SubscriptionID/resourcegroups/ResourceGroupName/providers/Microsoft.Compute/disks/TemporaryOSDiskName",
+				SubscriptionID:         "SubscriptionID",
+				ResourceGroup:          "ResourceGroupName",
+				DiskName:               "TemporaryOSDiskName",
 				DiskSizeGB:             42,
 				DiskStorageAccountType: string(compute.PremiumLRS),
 				HyperVGeneration:       string(compute.V1),
@@ -63,9 +66,11 @@ func TestStepCreateNewDisk_Run(t *testing.T) {
 			want: multistep.ActionContinue,
 		},
 		{
-			name: "from image",
+			name: "HappyPathDiskSource",
 			fields: fields{
-				ResourceID:             "/subscriptions/SubscriptionID/resourcegroups/ResourceGroupName/providers/Microsoft.Compute/disks/TemporaryOSDiskName",
+				SubscriptionID:         "SubscriptionID",
+				ResourceGroup:          "ResourceGroupName",
+				DiskName:               "TemporaryOSDiskName",
 				DiskStorageAccountType: string(compute.StandardLRS),
 				HyperVGeneration:       string(compute.V1),
 				Location:               "westus",
@@ -100,7 +105,9 @@ func TestStepCreateNewDisk_Run(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			s := StepCreateNewDisk{
-				ResourceID:             tt.fields.ResourceID,
+				SubscriptionID:         tt.fields.SubscriptionID,
+				ResourceGroup:          tt.fields.ResourceGroup,
+				DiskName:               tt.fields.DiskName,
 				DiskSizeGB:             tt.fields.DiskSizeGB,
 				DiskStorageAccountType: tt.fields.DiskStorageAccountType,
 				HyperVGeneration:       tt.fields.HyperVGeneration,

builder/azure/chroot/step_create_shared_image_version.go

@@ -1,81 +0,0 @@
-package chroot
-
-import (
-	"context"
-	"fmt"
-	"log"
-
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
-	"github.com/Azure/go-autorest/autorest/to"
-	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
-)
-
-type StepCreateSharedImageVersion struct {
-	Destination     SharedImageGalleryDestination
-	OSDiskCacheType string
-	Location        string
-}
-
-func (s *StepCreateSharedImageVersion) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	azcli := state.Get("azureclient").(client.AzureClientSet)
-	ui := state.Get("ui").(packer.Ui)
-	osDiskSnapshotResourceID := state.Get(stateBagKey_OSDiskSnapshotResourceID).(string)
-
-	ui.Say(fmt.Sprintf("Creating image version %s\n   using %s for os disk.",
-		s.Destination.ResourceID(azcli.SubscriptionID()),
-		osDiskSnapshotResourceID))
-
-	var targetRegions []compute.TargetRegion
-	// transform target regions to API objects
-	for _, tr := range s.Destination.TargetRegions {
-		apiObject := compute.TargetRegion{
-			Name:                 to.StringPtr(tr.Name),
-			RegionalReplicaCount: to.Int32Ptr(tr.ReplicaCount),
-			StorageAccountType:   compute.StorageAccountType(tr.StorageAccountType),
-		}
-		targetRegions = append(targetRegions, apiObject)
-	}
-
-	imageVersion := compute.GalleryImageVersion{
-		Location: to.StringPtr(s.Location),
-		GalleryImageVersionProperties: &compute.GalleryImageVersionProperties{
-			StorageProfile: &compute.GalleryImageVersionStorageProfile{
-				OsDiskImage: &compute.GalleryOSDiskImage{
-					Source:      &compute.GalleryArtifactVersionSource{ID: &osDiskSnapshotResourceID},
-					HostCaching: compute.HostCaching(s.OSDiskCacheType),
-				},
-			},
-			PublishingProfile: &compute.GalleryImageVersionPublishingProfile{
-				TargetRegions:     &targetRegions,
-				ExcludeFromLatest: to.BoolPtr(s.Destination.ExcludeFromLatest),
-			},
-		},
-	}
-
-	f, err := azcli.GalleryImageVersionsClient().CreateOrUpdate(
-		ctx,
-		s.Destination.ResourceGroup,
-		s.Destination.GalleryName,
-		s.Destination.ImageName,
-		s.Destination.ImageVersion,
-		imageVersion)
-	if err == nil {
-		log.Println("Shared image version creation in process...")
-		err = f.WaitForCompletionRef(ctx, azcli.PollClient())
-	}
-	if err != nil {
-		log.Printf("StepCreateSharedImageVersion.Run: error: %+v", err)
-		err := fmt.Errorf(
-			"error creating shared image version '%s': %v", s.Destination.ResourceID(azcli.SubscriptionID()), err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-	log.Printf("Image creation complete: %s", f.Status())
-
-	return multistep.ActionContinue
-}
-
-func (*StepCreateSharedImageVersion) Cleanup(multistep.StateBag) {}

builder/azure/chroot/step_create_shared_image_version_test.go

@@ -1,110 +0,0 @@
-package chroot
-
-import (
-	"context"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"regexp"
-	"testing"
-
-	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
-
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
-	"github.com/Azure/go-autorest/autorest"
-)
-
-func TestStepCreateSharedImageVersion_Run(t *testing.T) {
-	type fields struct {
-		Destination     SharedImageGalleryDestination
-		OSDiskCacheType string
-		Location        string
-	}
-	tests := []struct {
-		name            string
-		fields          fields
-		want            multistep.StepAction
-		expectedPutBody string
-	}{
-		{
-			name: "happy path",
-			fields: fields{
-				Destination: SharedImageGalleryDestination{
-					ResourceGroup: "ResourceGroup",
-					GalleryName:   "GalleryName",
-					ImageName:     "ImageName",
-					ImageVersion:  "0.1.2",
-					TargetRegions: []TargetRegion{
-						TargetRegion{
-							Name:               "region1",
-							ReplicaCount:       5,
-							StorageAccountType: "Standard_ZRS",
-						},
-					},
-					ExcludeFromLatest: true,
-				},
-				Location: "region2",
-			},
-			expectedPutBody: `{
-				"location": "region2",
-				"properties": {
-					"publishingProfile": {
-						"targetRegions": [
-							{
-								"name": "region1",
-								"regionalReplicaCount": 5,
-								"storageAccountType": "Standard_ZRS"
-							}
-						],
-						"excludeFromLatest": true
-					},
-					"storageProfile": {
-						"osDiskImage": {
-							"source": {
-								"id": "osdisksnapshotresourceid"
-							}
-						}
-					}
-				}
-			}`,
-		},
-	}
-	for _, tt := range tests {
-		expectedPutBody := regexp.MustCompile(`[\s\n]`).ReplaceAllString(tt.expectedPutBody, "")
-
-		m := compute.NewGalleryImageVersionsClient("subscriptionId")
-		m.Sender = autorest.SenderFunc(func(r *http.Request) (*http.Response, error) {
-			if r.Method != "PUT" {
-				t.Fatal("Expected only a PUT call")
-			}
-			b, _ := ioutil.ReadAll(r.Body)
-			if string(b) != expectedPutBody {
-				t.Errorf("expected body to be %v, but got %v", expectedPutBody, string(b))
-			}
-			return &http.Response{
-				Request:    r,
-				StatusCode: 200,
-			}, nil
-		})
-
-		state := new(multistep.BasicStateBag)
-		state.Put("azureclient", &client.AzureClientSetMock{
-			GalleryImageVersionsClientMock: m,
-		})
-		state.Put("ui", packer.TestUi(t))
-		state.Put(stateBagKey_OSDiskSnapshotResourceID, "osdisksnapshotresourceid")
-
-		t.Run(tt.name, func(t *testing.T) {
-			s := &StepCreateSharedImageVersion{
-				Destination:     tt.fields.Destination,
-				OSDiskCacheType: tt.fields.OSDiskCacheType,
-				Location:        tt.fields.Location,
-			}
-			if got := s.Run(context.TODO(), state); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("StepCreateSharedImageVersion.Run() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

builder/azure/chroot/step_create_snapshot.go

@@ -1,123 +0,0 @@
-package chroot
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"strings"
-	"time"
-
-	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
-
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
-	"github.com/Azure/go-autorest/autorest/azure"
-	"github.com/Azure/go-autorest/autorest/to"
-)
-
-var _ multistep.Step = &StepCreateSnapshot{}
-
-type StepCreateSnapshot struct {
-	ResourceID string
-	Location   string
-
-	SkipCleanup bool
-
-	subscriptionID, resourceGroup, snapshotName string
-}
-
-func parseSnapshotResourceID(resourceID string) (subscriptionID, resourceGroup, snapshotName string, err error) {
-	r, err := azure.ParseResourceID(resourceID)
-	if err != nil {
-		return "", "", "", err
-	}
-
-	if !strings.EqualFold(r.Provider, "Microsoft.Compute") ||
-		!strings.EqualFold(r.ResourceType, "snapshots") {
-		return "", "", "", fmt.Errorf("Resource %q is not of type Microsoft.Compute/snapshots", resourceID)
-	}
-
-	return r.SubscriptionID, r.ResourceGroup, r.ResourceName, nil
-}
-
-func (s *StepCreateSnapshot) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	azcli := state.Get("azureclient").(client.AzureClientSet)
-	ui := state.Get("ui").(packer.Ui)
-	osDiskResourceID := state.Get(stateBagKey_OSDiskResourceID).(string)
-
-	state.Put(stateBagKey_OSDiskSnapshotResourceID, s.ResourceID)
-	ui.Say(fmt.Sprintf("Creating snapshot '%s'", s.ResourceID))
-
-	var err error
-	s.subscriptionID, s.resourceGroup, s.snapshotName, err = parseSnapshotResourceID(s.ResourceID)
-	if err != nil {
-		log.Printf("StepCreateSnapshot.Run: error: %+v", err)
-		err := fmt.Errorf(
-			"error parsing resource id '%s': %v", s.ResourceID, err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-
-	snapshot := compute.Snapshot{
-		Location: to.StringPtr(s.Location),
-		SnapshotProperties: &compute.SnapshotProperties{
-			CreationData: &compute.CreationData{
-				CreateOption:     compute.Copy,
-				SourceResourceID: to.StringPtr(osDiskResourceID),
-			},
-			Incremental: to.BoolPtr(false),
-		},
-	}
-
-	f, err := azcli.SnapshotsClient().CreateOrUpdate(ctx, s.resourceGroup, s.snapshotName, snapshot)
-	if err == nil {
-		cli := azcli.PollClient() // quick polling for quick operations
-		cli.PollingDelay = time.Second
-		err = f.WaitForCompletionRef(ctx, cli)
-	}
-	if err != nil {
-		log.Printf("StepCreateSnapshot.Run: error: %+v", err)
-		err := fmt.Errorf(
-			"error creating snapshot '%s': %v", s.ResourceID, err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-
-	return multistep.ActionContinue
-}
-
-func (s *StepCreateSnapshot) Cleanup(state multistep.StateBag) {
-	if !s.SkipCleanup {
-		azcli := state.Get("azureclient").(client.AzureClientSet)
-		ui := state.Get("ui").(packer.Ui)
-
-		ui.Say(fmt.Sprintf("Removing any active SAS for snapshot %q", s.ResourceID))
-		{
-			f, err := azcli.SnapshotsClient().RevokeAccess(context.TODO(), s.resourceGroup, s.snapshotName)
-			if err == nil {
-				log.Printf("StepCreateSnapshot.Cleanup: removing SAS...")
-				err = f.WaitForCompletionRef(context.TODO(), azcli.PollClient())
-			}
-			if err != nil {
-				log.Printf("StepCreateSnapshot.Cleanup: error: %+v", err)
-				ui.Error(fmt.Sprintf("error deleting snapshot '%s': %v.", s.ResourceID, err))
-			}
-		}
-
-		ui.Say(fmt.Sprintf("Deleting snapshot %q", s.ResourceID))
-		{
-			f, err := azcli.SnapshotsClient().Delete(context.TODO(), s.resourceGroup, s.snapshotName)
-			if err == nil {
-				log.Printf("StepCreateSnapshot.Cleanup: deleting snapshot...")
-				err = f.WaitForCompletionRef(context.TODO(), azcli.PollClient())
-			}
-			if err != nil {
-				log.Printf("StepCreateSnapshot.Cleanup: error: %+v", err)
-				ui.Error(fmt.Sprintf("error deleting snapshot '%s': %v.", s.ResourceID, err))
-			}
-		}
-	}
-}

builder/azure/chroot/step_create_snapshot_test.go

@@ -1,215 +0,0 @@
-package chroot
-
-import (
-	"context"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"regexp"
-	"strings"
-	"testing"
-
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
-	"github.com/Azure/go-autorest/autorest"
-	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
-)
-
-func Test_parseSnapshotResourceID(t *testing.T) {
-
-	tests := []struct {
-		name               string
-		resourceID         string
-		wantSubscriptionID string
-		wantResourceGroup  string
-		wantSnapshotName   string
-		wantErr            bool
-	}{
-		{
-			name:               "happy path",
-			resourceID:         "/subscriptions/1234/resourceGroups/rg/providers/microsoft.compute/snapshots/disksnapshot1",
-			wantErr:            false,
-			wantSubscriptionID: "1234",
-			wantResourceGroup:  "rg",
-			wantSnapshotName:   "disksnapshot1",
-		},
-		{
-			name:       "error: nonsense",
-			resourceID: "nonsense",
-			wantErr:    true,
-		},
-		{
-			name:       "error: other resource type",
-			resourceID: "/subscriptions/1234/resourceGroups/rg/providers/microsoft.compute/disks/disksnapshot1",
-			wantErr:    true,
-		},
-		{
-			name:       "error: no name",
-			resourceID: "/subscriptions/1234/resourceGroups/rg/providers/microsoft.compute/snapshots",
-			wantErr:    true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotSubscriptionID, gotResourceGroup, gotSnapshotName, err := parseSnapshotResourceID(tt.resourceID)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("parseSnapshotResourceID() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if gotSubscriptionID != tt.wantSubscriptionID {
-				t.Errorf("parseSnapshotResourceID() gotSubscriptionID = %v, want %v", gotSubscriptionID, tt.wantSubscriptionID)
-			}
-			if gotResourceGroup != tt.wantResourceGroup {
-				t.Errorf("parseSnapshotResourceID() gotResourceGroup = %v, want %v", gotResourceGroup, tt.wantResourceGroup)
-			}
-			if gotSnapshotName != tt.wantSnapshotName {
-				t.Errorf("parseSnapshotResourceID() gotSnapshotName = %v, want %v", gotSnapshotName, tt.wantSnapshotName)
-			}
-		})
-	}
-}
-
-func TestStepCreateSnapshot_Run(t *testing.T) {
-	type fields struct {
-		ResourceID string
-		Location   string
-	}
-	tests := []struct {
-		name            string
-		fields          fields
-		want            multistep.StepAction
-		wantSnapshotID  string
-		expectedPutBody string
-	}{
-		{
-			name: "happy path",
-			fields: fields{
-				ResourceID: "/subscriptions/1234/resourceGroups/rg/providers/Microsoft.Compute/snapshots/snap1",
-				Location:   "region1",
-			},
-			expectedPutBody: `{
-				"location": "region1",
-				"properties": {
-					"creationData": {
-						"createOption": "Copy",
-						"sourceResourceId": "osdiskresourceid"
-					},
-					"incremental": false
-				}
-			}`,
-		},
-		{
-			name: "invalid ResourceID",
-			fields: fields{
-				ResourceID: "notaresourceid",
-				Location:   "region1",
-			},
-			want: multistep.ActionHalt,
-		},
-	}
-	for _, tt := range tests {
-		expectedPutBody := regexp.MustCompile(`[\s\n]`).ReplaceAllString(tt.expectedPutBody, "")
-
-		m := compute.NewSnapshotsClient("subscriptionId")
-		m.Sender = autorest.SenderFunc(func(r *http.Request) (*http.Response, error) {
-			if r.Method != "PUT" {
-				t.Fatal("Expected only a PUT call")
-			}
-			b, _ := ioutil.ReadAll(r.Body)
-			if string(b) != expectedPutBody {
-				t.Errorf("expected body to be %v, but got %v", expectedPutBody, string(b))
-			}
-			return &http.Response{
-				Request:    r,
-				StatusCode: 200,
-			}, nil
-		})
-
-		state := new(multistep.BasicStateBag)
-		state.Put("azureclient", &client.AzureClientSetMock{
-			SnapshotsClientMock: m,
-		})
-		state.Put("ui", packer.TestUi(t))
-		state.Put(stateBagKey_OSDiskResourceID, "osdiskresourceid")
-
-		t.Run(tt.name, func(t *testing.T) {
-			s := &StepCreateSnapshot{
-				ResourceID: tt.fields.ResourceID,
-				Location:   tt.fields.Location,
-			}
-			if got := s.Run(context.TODO(), state); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("StepCreateSnapshot.Run() = %v, want %v", got, tt.want)
-			}
-
-			if tt.wantSnapshotID != "" {
-				got := state.Get(stateBagKey_OSDiskSnapshotResourceID).(string)
-				if !strings.EqualFold(got, tt.wantSnapshotID) {
-					t.Errorf("OSDiskSnapshotResourceID = %v, want %v", got, tt.wantSnapshotID)
-				}
-			}
-
-		})
-	}
-}
-
-func TestStepCreateSnapshot_Cleanup_skipped(t *testing.T) {
-	m := compute.NewSnapshotsClient("subscriptionId")
-	m.Sender = autorest.SenderFunc(func(r *http.Request) (*http.Response, error) {
-		t.Fatalf("clean up should be skipped, did not expect HTTP calls")
-		return nil, nil
-	})
-
-	state := new(multistep.BasicStateBag)
-	state.Put("azureclient", &client.AzureClientSetMock{
-		SnapshotsClientMock: m,
-	})
-	state.Put("ui", packer.TestUi(t))
-
-	s := &StepCreateSnapshot{
-		SkipCleanup: true,
-	}
-	s.Cleanup(state)
-}
-
-func TestStepCreateSnapshot_Cleanup(t *testing.T) {
-	m := compute.NewSnapshotsClient("subscriptionId")
-	{
-		expectedCalls := []string{
-			"POST /subscriptions/subscriptionId/resourceGroups/rg/providers/Microsoft.Compute/snapshots/snap1/endGetAccess?api-version=2019-07-01",
-			"DELETE /subscriptions/subscriptionId/resourceGroups/rg/providers/Microsoft.Compute/snapshots/snap1?api-version=2019-07-01",
-		}
-		i := 0
-		m.Sender = autorest.SenderFunc(func(r *http.Request) (*http.Response, error) {
-			want := expectedCalls[i]
-			got := r.Method + " " + r.URL.RequestURI()
-			if want != got {
-				t.Errorf("unexpected HTTP call: %v, wanted %v", got, want)
-				return &http.Response{
-					Request:    r,
-					StatusCode: 599, // 500 is retried
-				}, nil
-			}
-			i++
-			return &http.Response{
-				Request:    r,
-				StatusCode: 200,
-			}, nil
-		})
-	}
-	state := new(multistep.BasicStateBag)
-	state.Put("azureclient", &client.AzureClientSetMock{
-		SnapshotsClientMock: m,
-	})
-	state.Put("ui", packer.TestUi(t))
-
-	s := &StepCreateSnapshot{
-		ResourceID:     "/subscriptions/1234/resourceGroups/rg/providers/Microsoft.Compute/snapshots/snap1",
-		Location:       "region1",
-		SkipCleanup:    false,
-		resourceGroup:  "rg",
-		snapshotName:   "snap1",
-		subscriptionID: "1234",
-	}
-	s.Cleanup(state)
-}

builder/azure/chroot/step_resolve_plaform_image_version.go

@@ -1,45 +0,0 @@
-package chroot
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"strings"
-
-	"github.com/Azure/go-autorest/autorest/to"
-	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
-)
-
-// StepResolvePlatformImageVersion resolves the exact PIR version when the version is 'latest'
-type StepResolvePlatformImageVersion struct {
-	*client.PlatformImage
-	Location string
-}
-
-// Run retrieves all available versions of a PIR image and stores the latest in the PlatformImage
-func (pi *StepResolvePlatformImageVersion) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ui := state.Get("ui").(packer.Ui)
-
-	if strings.EqualFold(pi.Version, "latest") {
-		azcli := state.Get("azureclient").(client.AzureClientSet)
-
-		vmi, err := azcli.VirtualMachineImagesClient().GetLatest(ctx, pi.Publisher, pi.Offer, pi.Sku, pi.Location)
-		if err != nil {
-			log.Printf("StepResolvePlatformImageVersion.Run: error: %+v", err)
-			err := fmt.Errorf("error retieving latest version of %q: %v", pi.URN(), err)
-			state.Put("error", err)
-			ui.Error(err.Error())
-			return multistep.ActionHalt
-		}
-		pi.Version = to.String(vmi.Name)
-		ui.Say("Resolved latest version of source image: " + pi.Version)
-	} else {
-		ui.Say("Nothing to do, version is not 'latest'")
-	}
-
-	return multistep.ActionContinue
-}
-
-func (*StepResolvePlatformImageVersion) Cleanup(multistep.StateBag) {}

builder/azure/chroot/step_resolve_plaform_image_version_test.go

@@ -1,61 +0,0 @@
-package chroot
-
-import (
-	"context"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
-	"github.com/Azure/go-autorest/autorest"
-	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
-)
-
-func TestStepResolvePlatformImageVersion_Run(t *testing.T) {
-
-	pi := &StepResolvePlatformImageVersion{
-		PlatformImage: &client.PlatformImage{
-			Version: "latest",
-		}}
-
-	m := compute.NewVirtualMachineImagesClient("subscriptionId")
-	m.Sender = autorest.SenderFunc(func(r *http.Request) (*http.Response, error) {
-		if !strings.Contains(r.URL.String(), "%24orderby=name+desc") {
-			t.Errorf("Expected url to use odata based sorting, but got %q", r.URL.String())
-		}
-		return &http.Response{
-			Request: r,
-			Body: ioutil.NopCloser(strings.NewReader(
-				`[
-					{"name":"1.2.3"},
-					{"name":"4.5.6"}
-				]`)),
-			StatusCode: 200,
-		}, nil
-	})
-
-	state := new(multistep.BasicStateBag)
-	state.Put("azureclient", &client.AzureClientSetMock{
-		VirtualMachineImagesClientMock: client.VirtualMachineImagesClient{
-			VirtualMachineImagesClientAPI: m}})
-
-	ui, getErrs := testUI()
-	state.Put("ui", ui)
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
-	defer cancel()
-
-	got := pi.Run(ctx, state)
-	if got != multistep.ActionContinue {
-		t.Errorf("Expected 'continue', but got %q", got)
-	}
-
-	if pi.PlatformImage.Version != "1.2.3" {
-		t.Errorf("Expected version '1.2.3', but got %q", pi.PlatformImage.Version)
-	}
-
-	_ = getErrs
-}

builder/azure/chroot/step_verify_shared_image_destination.go

@@ -1,114 +0,0 @@
-package chroot
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"strings"
-
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
-	"github.com/Azure/go-autorest/autorest/to"
-	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
-)
-
-var _ multistep.Step = &StepVerifySharedImageDestination{}
-
-// StepVerifySharedImageDestination verifies that the shared image location matches the Location field in the step.
-// Also verifies that the OS Type is Linux.
-type StepVerifySharedImageDestination struct {
-	Image    SharedImageGalleryDestination
-	Location string
-}
-
-// Run retrieves the image metadata from Azure and compares the location to Location. Verifies the OS Type.
-func (s *StepVerifySharedImageDestination) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	azcli := state.Get("azureclient").(client.AzureClientSet)
-	ui := state.Get("ui").(packer.Ui)
-
-	errorMessage := func(message string, parameters ...interface{}) multistep.StepAction {
-		err := fmt.Errorf(message, parameters...)
-		log.Printf("StepVerifySharedImageDestination.Run: error: %+v", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-
-	imageURI := fmt.Sprintf("/subscriptions/%s/resourcegroup/%s/providers/Microsoft.Compute/galleries/%s/images/%s",
-		azcli.SubscriptionID(),
-		s.Image.ResourceGroup,
-		s.Image.GalleryName,
-		s.Image.ImageName,
-	)
-
-	ui.Say(fmt.Sprintf("Validating that shared image %s exists",
-		imageURI))
-
-	image, err := azcli.GalleryImagesClient().Get(ctx,
-		s.Image.ResourceGroup,
-		s.Image.GalleryName,
-		s.Image.ImageName)
-
-	if err != nil {
-		return errorMessage("Error retrieving shared image %q: %+v ", imageURI, err)
-	}
-
-	if image.ID == nil || *image.ID == "" {
-		return errorMessage("Error retrieving shared image %q: ID field in response is empty", imageURI)
-	}
-	if image.GalleryImageProperties == nil {
-		return errorMessage("Could not retrieve shared image properties for image %q.", to.String(image.ID))
-	}
-
-	location := to.String(image.Location)
-
-	log.Printf("StepVerifySharedImageDestination:Run: Image %q, Location: %q, HvGen: %q, osState: %q",
-		to.String(image.ID),
-		location,
-		image.GalleryImageProperties.HyperVGeneration,
-		image.GalleryImageProperties.OsState)
-
-	if !strings.EqualFold(location, s.Location) {
-		return errorMessage("Destination shared image resource %q is in a different location (%q) than this VM (%q). "+
-			"Packer does not know how to handle that.",
-			to.String(image.ID),
-			location,
-			s.Location)
-	}
-
-	if image.GalleryImageProperties.OsType != compute.Linux {
-		return errorMessage("The shared image (%q) is not a Linux image (found %q). Currently only Linux images are supported.",
-			to.String(image.ID),
-			image.GalleryImageProperties.OsType)
-	}
-
-	ui.Say(fmt.Sprintf("Found image %s in location %s",
-		to.String(image.ID),
-		to.String(image.Location)))
-
-	versions, err := azcli.GalleryImageVersionsClient().ListByGalleryImageComplete(ctx,
-		s.Image.ResourceGroup,
-		s.Image.GalleryName,
-		s.Image.ImageName)
-
-	for versions.NotDone() {
-		version := versions.Value()
-
-		if version.Name == nil {
-			return errorMessage("Could not retrieve versions for image %q: unexpected nil name", to.String(image.ID))
-		}
-		if *version.Name == s.Image.ImageVersion {
-			return errorMessage("Shared image version %q already exists for image %q.", s.Image.ImageVersion, to.String(image.ID))
-		}
-
-		err := versions.NextWithContext(ctx)
-		if err != nil {
-			return errorMessage("Could not retrieve versions for image %q: %+v", to.String(image.ID), err)
-		}
-	}
-
-	return multistep.ActionContinue
-}
-
-func (*StepVerifySharedImageDestination) Cleanup(multistep.StateBag) {}

builder/azure/chroot/step_verify_shared_image_destination_test.go

@@ -1,185 +0,0 @@
-package chroot
-
-import (
-	"context"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
-	"github.com/Azure/go-autorest/autorest"
-	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
-)
-
-func TestStepVerifySharedImageDestination_Run(t *testing.T) {
-
-	type fields struct {
-		Image    SharedImageGalleryDestination
-		Location string
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		want    multistep.StepAction
-		wantErr string
-	}{
-		{
-			name: "happy path",
-			want: multistep.ActionContinue,
-			fields: fields{
-				Image: SharedImageGalleryDestination{
-					ResourceGroup: "rg",
-					GalleryName:   "gallery",
-					ImageName:     "image",
-					ImageVersion:  "1.2.3",
-				},
-				Location: "region1",
-			},
-		},
-		{
-			name:    "not found",
-			want:    multistep.ActionHalt,
-			wantErr: `Error retrieving shared image "/subscriptions/subscriptionID/resourcegroup/other-rg/providers/Microsoft.Compute/galleries/gallery/images/image": compute.GalleryImagesClient#Get: Failure responding to request: StatusCode=404 -- Original Error: autorest/azure: Service returned an error. Status=404 Code="NotFound" Message="Not found" `,
-			fields: fields{
-				Image: SharedImageGalleryDestination{
-					ResourceGroup: "other-rg",
-					GalleryName:   "gallery",
-					ImageName:     "image",
-					ImageVersion:  "1.2.3",
-				},
-				Location: "region1",
-			},
-		},
-		{
-			name:    "wrong region",
-			want:    multistep.ActionHalt,
-			wantErr: "Destination shared image resource \"image-resourceid-goes-here\" is in a different location (\"region1\") than this VM (\"other-region\"). Packer does not know how to handle that.",
-			fields: fields{
-				Image: SharedImageGalleryDestination{
-					ResourceGroup: "rg",
-					GalleryName:   "gallery",
-					ImageName:     "image",
-					ImageVersion:  "1.2.3",
-				},
-				Location: "other-region",
-			},
-		},
-		{
-			name:    "version exists",
-			want:    multistep.ActionHalt,
-			wantErr: "Shared image version \"2.3.4\" already exists for image \"image-resourceid-goes-here\".",
-			fields: fields{
-				Image: SharedImageGalleryDestination{
-					ResourceGroup: "rg",
-					GalleryName:   "gallery",
-					ImageName:     "image",
-					ImageVersion:  "2.3.4",
-				},
-				Location: "region1",
-			},
-		},
-		{
-			name:    "not Linux",
-			want:    multistep.ActionHalt,
-			wantErr: "The shared image (\"windows-image-resourceid-goes-here\") is not a Linux image (found \"Windows\"). Currently only Linux images are supported.",
-			fields: fields{
-				Image: SharedImageGalleryDestination{
-					ResourceGroup: "rg",
-					GalleryName:   "gallery",
-					ImageName:     "windowsimage",
-					ImageVersion:  "1.2.3",
-				},
-				Location: "region1",
-			},
-		},
-	}
-	for _, tt := range tests {
-		gi := compute.NewGalleryImagesClient("subscriptionID")
-		gi.Sender = autorest.SenderFunc(func(r *http.Request) (*http.Response, error) {
-			switch {
-			case r.Method == "GET" && strings.HasPrefix(r.URL.RequestURI(),
-				"/subscriptions/subscriptionID/resourceGroups/rg/providers/Microsoft.Compute/galleries/gallery/images/image"):
-				return &http.Response{
-					Request: r,
-					Body: ioutil.NopCloser(strings.NewReader(`{
-						"id": "image-resourceid-goes-here",
-						"location": "region1",
-						"properties": {
-							"osType": "Linux"
-						}
-					}`)),
-					StatusCode: 200,
-				}, nil
-			case r.Method == "GET" && strings.HasPrefix(r.URL.RequestURI(),
-				"/subscriptions/subscriptionID/resourceGroups/rg/providers/Microsoft.Compute/galleries/gallery/images/windowsimage"):
-				return &http.Response{
-					Request: r,
-					Body: ioutil.NopCloser(strings.NewReader(`{
-						"id": "windows-image-resourceid-goes-here",
-						"location": "region1",
-						"properties": {
-							"osType": "Windows"
-						}
-					}`)),
-					StatusCode: 200,
-				}, nil
-			}
-			return &http.Response{
-				Request: r,
-				Body: ioutil.NopCloser(strings.NewReader(`{
-					"Code": "NotFound",
-					"Message": "Not found"
-				}`)),
-				StatusCode: 404,
-			}, nil
-		})
-
-		giv := compute.NewGalleryImageVersionsClient("subscriptionID")
-		giv.Sender = autorest.SenderFunc(func(r *http.Request) (*http.Response, error) {
-			if !(r.Method == "GET" && strings.HasPrefix(r.URL.RequestURI(),
-				"/subscriptions/subscriptionID/resourceGroups/rg/providers/Microsoft.Compute/galleries/gallery/images/image/versions")) {
-				t.Errorf("Unexpected HTTP call: %s %s", r.Method, r.URL.RequestURI())
-			}
-			return &http.Response{
-				Request: r,
-				Body: ioutil.NopCloser(strings.NewReader(`{
-						"value": [
-							{
-								"name": "2.3.4"
-							}
-						]
-					}`)),
-				StatusCode: 200,
-			}, nil
-		})
-
-		state := new(multistep.BasicStateBag)
-		state.Put("azureclient", &client.AzureClientSetMock{
-			SubscriptionIDMock:             "subscriptionID",
-			GalleryImagesClientMock:        gi,
-			GalleryImageVersionsClientMock: giv,
-		})
-		state.Put("ui", packer.TestUi(t))
-
-		t.Run(tt.name, func(t *testing.T) {
-			s := &StepVerifySharedImageDestination{
-				Image:    tt.fields.Image,
-				Location: tt.fields.Location,
-			}
-			if got := s.Run(context.TODO(), state); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("StepVerifySharedImageDestination.Run() = %v, want %v", got, tt.want)
-			}
-		})
-		if err, ok := state.GetOk("error"); ok {
-			if err.(error).Error() != tt.wantErr {
-				t.Errorf("Unexpected error, got: %q, want: %q", err, tt.wantErr)
-			}
-		} else if tt.wantErr != "" {
-			t.Errorf("Expected error, but didn't get any")
-		}
-	}
-}

builder/azure/chroot/step_verify_source_disk.go

@@ -15,6 +15,7 @@ import (
 )
 
 type StepVerifySourceDisk struct {
+	SubscriptionID       string
 	SourceDiskResourceID string
 	Location             string
 }
@@ -33,10 +34,10 @@ func (s StepVerifySourceDisk) Run(ctx context.Context, state multistep.StateBag)
 		return multistep.ActionHalt
 	}
 
-	if !strings.EqualFold(resource.SubscriptionID, azcli.SubscriptionID()) {
+	if !strings.EqualFold(resource.SubscriptionID, s.SubscriptionID) {
 		err := fmt.Errorf("Source disk resource %q is in a different subscription than this VM (%q). "+
 			"Packer does not know how to handle that.",
-			s.SourceDiskResourceID, azcli.SubscriptionID())
+			s.SourceDiskResourceID, s.SubscriptionID)
 		log.Printf("StepVerifySourceDisk.Run: error: %+v", err)
 		state.Put("error", err)
 		ui.Error(err.Error())

builder/azure/chroot/step_verify_source_disk_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
+	"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/hashicorp/packer/builder/azure/common/client"
 	"github.com/hashicorp/packer/helper/multistep"
@@ -18,6 +18,7 @@ import (
 
 func Test_StepVerifySourceDisk_Run(t *testing.T) {
 	type fields struct {
+		SubscriptionID       string
 		SourceDiskResourceID string
 		Location             string
 
@@ -37,6 +38,7 @@ func Test_StepVerifySourceDisk_Run(t *testing.T) {
 		{
 			name: "HappyPath",
 			fields: fields{
+				SubscriptionID:       "subid1",
 				SourceDiskResourceID: "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.Compute/disks/disk1",
 				Location:             "westus2",
 
@@ -48,6 +50,7 @@ func Test_StepVerifySourceDisk_Run(t *testing.T) {
 		{
 			name: "NotAResourceID",
 			fields: fields{
+				SubscriptionID:       "subid1",
 				SourceDiskResourceID: "/other",
 				Location:             "westus2",
 
@@ -60,6 +63,7 @@ func Test_StepVerifySourceDisk_Run(t *testing.T) {
 		{
 			name: "DiskNotFound",
 			fields: fields{
+				SubscriptionID:       "subid1",
 				SourceDiskResourceID: "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.Compute/disks/disk1",
 				Location:             "westus2",
 
@@ -72,6 +76,7 @@ func Test_StepVerifySourceDisk_Run(t *testing.T) {
 		{
 			name: "NotADisk",
 			fields: fields{
+				SubscriptionID:       "subid1",
 				SourceDiskResourceID: "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.Compute/images/image1",
 				Location:             "westus2",
 
@@ -83,6 +88,7 @@ func Test_StepVerifySourceDisk_Run(t *testing.T) {
 		{
 			name: "OtherSubscription",
 			fields: fields{
+				SubscriptionID:       "subid1",
 				SourceDiskResourceID: "/subscriptions/subid2/resourcegroups/rg1/providers/Microsoft.Compute/disks/disk1",
 				Location:             "westus2",
 
@@ -95,6 +101,7 @@ func Test_StepVerifySourceDisk_Run(t *testing.T) {
 		{
 			name: "OtherLocation",
 			fields: fields{
+				SubscriptionID:       "subid1",
 				SourceDiskResourceID: "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.Compute/disks/disk1",
 				Location:             "eastus",
 
@@ -108,6 +115,7 @@ func Test_StepVerifySourceDisk_Run(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			s := StepVerifySourceDisk{
+				SubscriptionID:       tt.fields.SubscriptionID,
 				SourceDiskResourceID: tt.fields.SourceDiskResourceID,
 				Location:             tt.fields.Location,
 			}
@@ -121,12 +129,16 @@ func Test_StepVerifySourceDisk_Run(t *testing.T) {
 				}, nil
 			})
 
-			ui, getErr := testUI()
+			errorBuffer := &strings.Builder{}
+			ui := &packer.BasicUi{
+				Reader:      strings.NewReader(""),
+				Writer:      ioutil.Discard,
+				ErrorWriter: errorBuffer,
+			}
 
 			state := new(multistep.BasicStateBag)
 			state.Put("azureclient", &client.AzureClientSetMock{
-				DisksClientMock:    m,
-				SubscriptionIDMock: "subid1",
+				DisksClientMock: m,
 			})
 			state.Put("ui", ui)
 
@@ -136,9 +148,8 @@ func Test_StepVerifySourceDisk_Run(t *testing.T) {
 			}
 
 			if tt.errormatch != "" {
-				errs := getErr()
-				if !regexp.MustCompile(tt.errormatch).MatchString(errs) {
-					t.Errorf("Expected the error output (%q) to match %q", errs, tt.errormatch)
+				if !regexp.MustCompile(tt.errormatch).MatchString(errorBuffer.String()) {
+					t.Errorf("Expected the error output (%q) to match %q", errorBuffer.String(), tt.errormatch)
 				}
 			}