circleci: Update binary builds to only run if tests are successful

.circleci/config.yml

@@ -7,11 +7,10 @@ version: 2.1
 executors:
   golang:
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.15
-    resource_class: medium+
+      - image: circleci/golang:1.13
   darwin:
     macos:
-      xcode: "12.0.0"
+      xcode: "9.0"
 
 commands:
   install-go-run-tests-unix:
@@ -67,7 +66,7 @@ jobs:
     steps:
       - install-go-run-tests-unix:
           GOOS: darwin
-          GOVERSION: "1.15"
+          GOVERSION: "1.13"
       - codecov/upload:
           file: coverage.txt
   test-windows:
@@ -76,12 +75,12 @@ jobs:
       shell: bash.exe
     steps:
       - install-go-run-tests-windows:
-          GOVERSION: "1.15"
+          GOVERSION: "1.13"
       - codecov/upload:
           file: coverage.txt
   check-lint:
     executor: golang
-    resource_class: xlarge
+    resource_class: large
     steps:
       - checkout
       - run: git fetch --all
@@ -151,9 +150,18 @@ jobs:
       - store_artifacts:
           path: ./pkg/
           destination: /
+  publish-github-tag-release:
+    docker:
+      - image: cibuilds/github:0.10
+    working_directory: /go/src/github.com/hashicorp/packer
+    steps:
+      - attach_workspace:
+          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: docker.mirror.hashicorp.services/circleci/buildpack-deps
+      - image: circleci/buildpack-deps
     shell: /usr/bin/env bash -euo pipefail -c
     steps:
       - checkout
@@ -167,26 +175,11 @@ jobs:
                 echo "Dependencies have not changed, not building a new website docker image."
             else
                 cd website/
-                docker login -u $WEBSITE_DOCKER_USER -p $WEBSITE_DOCKER_PASS
                 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
-  algolia-index:
-    docker:
-      - image: docker.mirror.hashicorp.services/node:12
-    steps:
-      - checkout
-      - run:
-          name: Push content to Algolia Index
-          command: |
-            if  [ "$CIRCLE_REPOSITORY_URL" != "git@github.com:hashicorp/packer.git" ]; then
-              echo "Not Packer OSS Repo, not indexing Algolia"
-              exit 0
-            fi
-            cd website/
-            npm install
-            node scripts/index_search_content.js
 
 workflows:
   version: 2
@@ -203,12 +196,42 @@ workflows:
       - check-generate
   build_packer_binaries:
     jobs:
-      - build_linux
-      - build_darwin
-      - build_windows
-      - build_freebsd
-      - build_openbsd
-      - build_solaris
+      - 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: /.*/
       - store_artifacts:
           requires:
             - build_linux
@@ -217,15 +240,23 @@ workflows:
             - build_freebsd
             - build_openbsd
             - build_solaris
-  website:
+      - publish-github-tag-release:
+          requires:
+            - build_linux
+            - build_darwin
+            - build_windows
+            - build_freebsd
+            - build_openbsd
+            - build_solaris
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: nightly
+  build_website_docker_image:
     jobs:
       - build-website-docker-image:
           filters:
             branches:
               only:
                 - master
-      - algolia-index:
-          filters:
-            branches:
-              only:
-                - stable-website

.codecov.yml

@@ -10,9 +10,10 @@ comment:
 
 coverage:
   status:
-    project: off
-    patch: off
+    project:
+      default:
+        target: auto
+        threshold: "0.5%"
 
-ignore:  # ignore hcl2spec generated code for coverage and mocks
-  - "**/*.hcl2spec.go"
-  - "**/*_mock.go"
+ignore:  # ignore hcl2spec generated code for coverage
+  - "**/*.hcl2spec.go"

.gitattributes

@@ -6,7 +6,6 @@
 *.mdx text eol=lf
 *.ps1 text eol=lf
 *.hcl text eol=lf
-*.txt text eol=lf
 go.mod text eol=lf
 go.sum text eol=lf
 common/test-fixtures/root/*	eol=lf

.github/CONTRIBUTING.md

@@ -46,18 +46,7 @@ can quickly merge or address your contributions.
    referenced in the commit message so that the code that fixes it is clearly
    linked.
 
-5. Sometimes, if you have a specialized environment or use case, the maintainers
-   may ask for your help testing the patch. You are able to download an
-   experimental binary of Packer containing the Pull Request's patch via from
-   the Pull Request page on github. You can do this by scrolling to the
-   "checks" section on github, and clicking "details" on the
-   "store_artifacts" check. This will take you to Packer's Circle CI page for
-   the build, and you will be able to click a tab named "Artifacts" which will
-   contain zipped Packer binaries for each major OS architecture.
-
-6. The issue is closed.
-
-
+5. The issue is closed.
 
 ## Setting up Go
 
@@ -347,11 +336,11 @@ 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
+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
+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:
@@ -377,14 +366,14 @@ Examples of usage:
     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`)
+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.
+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.
@@ -401,7 +390,7 @@ type ProvisionerAcceptance interface {
 
 - **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.
+- **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:
 
     ```
@@ -418,11 +407,11 @@ For the Shell one the file contains:
         "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.
+  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.
+- **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 {
@@ -437,7 +426,7 @@ For the Shell provisioners this is:
 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:
+For the Shell provisioner this is: 
     ```go
       func (s *ShellProvisionerAccTest) RunTest(c *command.BuildCommand, args []string) error {
       	// Provisioner specific setup
@@ -445,11 +434,11 @@ For the Shell provisioner this is:
       	if UUID == "" {
       		UUID, _ = uuid.GenerateUUID()
       		os.Setenv("PACKER_RUN_UUID", UUID)
-      	}
+      	}  
       	file := "provisioner.shell." + UUID + ".txt"
       	defer testshelper.CleanupFiles(file)
-
-      	// Run build
+      
+      	// 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)
@@ -460,31 +449,31 @@ For the Shell provisioner this is:
       			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:
+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.
+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.
+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
@@ -496,7 +485,7 @@ type BuilderAcceptance interface {
 	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.
+- **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:
     ```
       {
@@ -512,11 +501,11 @@ For the Amazon EBS builder the file contains:
         }
       }
     ```
-    The file should be placed under the `test-fixtures` folder.
+    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`.
+    `../../builder/amazon/ebs/acceptance/test-fixtures/file.txt`. 
 
-- **GetBuilderStore()** this returns the builder store where we declare the available builders for running the build.
+- **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 {
@@ -525,7 +514,7 @@ For the Amazon EBS builder this is:
         }
     }
     ```
-
+  
 - **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`.
@@ -537,7 +526,7 @@ var BuildersAccTest = map[string]BuilderAcceptance{
 }
 ```
 
-Once you finish the steps, you should be ready to run your new provisioner acceptance test.
+Once you finish the steps, you should be ready to run your new provisioner acceptance test. 
 
 #### Debugging Plugins
 

.github/ISSUE_TEMPLATE/feature_requests.md

@@ -9,23 +9,10 @@ reaction feature
 (https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
 to add upvotes to pre-existing requests.
 
-#### Community Note
-
-Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request.
-Please do not leave "+1" or "me too" comments, they generate extra noise for issue followers and do not help prioritize the request.
-If you are interested in working on this issue or have submitted a pull request, please leave a comment.
-
-#### Description
+#### Feature Description
 
 A written overview of the feature.
 
 #### Use Case(s)
 
 Any relevant use-cases that you see.
-
-#### Potential configuration
-
-```
-```
-
-#### Potential References

.github/workflows/issues.yml

@@ -1,14 +0,0 @@
-name: Milestone Labeler
-on:
-  issues:
-    types: [milestoned]
-jobs:
-  apply_labels:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Add track-internal
-        uses: andymckay/labeler@1.0.2
-        if: github.event.issue.pull_request == null
-        with:
-          repo-token: ${{ secrets.Github_Token }}
-          add-labels: "track-internal"

.gitignore

@@ -27,4 +27,3 @@ Thumbs.db
 /packer.exe
 .project
 cache
-/.vscode/

CHANGELOG.md

@@ -1,635 +1,32 @@
-## 1.6.6 (Upcoming)
+## 1.5.6 (Upcoming)
 
-### FEATURES:
-* **New command** `fmt` allows users to format existing HCL2 configuration
-    files into a canonical style. Please see [fmt command
-    docs](https://packer.io/docs/commands/fmt) for more details. [GH-10225]
-* **New function** `env` allows users to set the default value of a variable to
-    the value of an environment variable. Please see [env function
-    docs](https://www.packer.io/docs/from-1.5/functions/contextual/env") for
-    more details. [GH-10240]
-* builder/azure-arm: Create keyvaults with SoftDelete enabled [GH-10210]
-* builder/outscale: Add x509 certificate support [GH-10161]
-* post-processor/yandex-export: Verify the access to a specific bucket
-    [GH-10188]
-
-### IMPROVEMENTS
-* builder/amazon-ebs: Add tags to launch templates. [GH-10203]
-* builder/azure-arm: Add Azure CLI authentication support to builder.
-    [GH-10157]
-* core/hcl: Update to `hcl2_upgrade` command to support complex variable
-    values and packer version blocks. [GH-10221]
-* post-processor/vagrant-cloud: Add support for uploading directly to storage
-    on Vagrant Cloud. [GH-10193]
-
-### BUG FIXES
-* builder/amazon: Fix single `tag` interpolation to allow for templating engine
-    usage. [GH-10224]
-
-## 1.6.5 (October 30, 2020)
-
-### FEATURES:
-* New Builder(s): Proxmox builder has been split into two new builders
-    `proxmox-iso` and `promox-clone`. See [Proxmox
-    Builder](https://packer.io/docs/builders/proxmox) for more information on
-    the builder. For users of the previous `proxmox` builder please use `packer
-    fix` to migrate your templates to the new `promox-iso` builder. [GH-9262]
-
-### BUG FIXES:
-
-* builder/amazon: SSM connection now recovers from reboots. [GH-10003]
-* builder/azure-arm: Fix build failures due to the deletion of additional
-    managed disks defined in "disk_additional_size". [GH-10163]
-* builder/azure-chroot: Fix typo in option `exlude_from_latest` to
-    `exclude_from_latest`. Old name will still be respected. [GH-10034]
-* builder/googlecompute: Fix HCL image_encryption_key fields and use the same
-    casing in JSON and HCL2 [GH-10173]
-* builder/openstack: Fix source image validation regression when using filters.
-    [GH-10065]
-* builder/proxmox: Fix unhandled buildvar type for HCL2 enabled build
-    templates. [GH-10154]
-* builder/qemu: Fix a regression where Packer would not wait properly in
-    step_shutdown when a null communicator was used. [GH-10178]
-* builder/qemu: Fix crash in step_run of qemu when loading commhostport form
-    the statebag in a situation where the communicator is none. [GH-10145]
-* builder/vsphere-clone: Packer was not respecting the "destroy" flag set in
-    the content library config, and always keeping the source vm. This has been
-    fixed. [GH-10165]
-* builder/vsphere: Ensure builds are able to continue when no communicator has
-    been specified `"communicator": "none"`. [GH-9964]
-* builder/vsphere: Fix CD uploads so that Packer does not try to delete a CD
-    that was not successfully uploaded. [GH-10155]
-* core/hcl: Hide sensitive variables from output. [GH-10031]
-* core/hcl: Packer HCL's "Coalesce" function now behaves same way as
-    Terraform's. [GH-10016]
-* core: Fix artifact handling so that input artifacts are properly preserved in
-    postprocessors that don't modify artifacts. [GH-9996]
-* core: Fix pathing in cd_files to copy proper directory tree when user
-    provided absolute paths. [GH-10022]
-* provisioner/ansible: Ansible galaxy no longer forces use of collections in v1
-    files. [GH-10010]
+**New Builder** azure-dtl allows creation of devtestlabs images in Azure. [GH-8987]
 
 ### IMPROVEMENTS:
-
-* builder/amazon-ebssurrogate: Apply snapshot tags at snapshot creation time.
-    [GH-10150]
-* builder/amazon: Add `io2` as a supported volume type. [GH-10102]
-* builder/amazon: Add support for source instance tenancy [GH-10085]
-* builder/google: Add service account impersonation. [GH-9968] [GH-10054]
-* builder/googlecompute: Add `skip_create_image` option. [GH-10115]
-* builder/googlecompute: Allow users to select the algorithm to use when
-    generating temporary SSH keypair [GH-10111]
-* builder/linode: Add `state_timeout` attribute to Linode builder. [GH-10128]
-* builder/oracle-oci:  New option to specify image compartment separate from
-    build compartment. [GH-10040]
-* builder/oracle-oci: New option to specify boot volume size. [GH-10017]
-* builder/oracle: Add `base_image_filter` option as alternative to
-    `base_image_ocid` [GH-10116]
-* builder/outscale: Migrate to new Outscale SDK. [GH-10056]
-* builder/proxmox: split Proxmox into proxmox-iso and proxmox-clone. [GH-9626]
-    [GH-10166]
-* builder/scaleway: Allow the user to use an image label (eg ubuntu_focal)
-    instead of a hardcoded UUID on the Scaleway builder. [GH-10061]
-* builder/vsphere: Skip iso download if hashed file is already present on
-    remote datastore. [GH-10143]
-* builder/yandex: Add support for IAM credentials in the token field and
-    YC_TOKEN environment variable. [GH-10158]
-* core/hcl: Add ability to set version restrictions [GH-10149]
-* core/hcl: Add build.name variable so users can access build name in addition
-    to source name. [GH-10114]
-* core/hcl: Add consul_key function to HCL templates. [GH-10119]
-* core/hcl: Add HCL2 aws_secretsmanager function [GH-10124]
-* core/hcl: Add packer.version variable to hcl configs so users can access the
-    Packer release version. [GH-10117]
-* core: Let user provide type of generated ssh key instead of always doing ssh-
-    rsa [GH-10101]
-
-## 1.6.4 (September 30, 2020)
-
-### BUG FIXES:
-* builder/amazon: Fix authentication issue when using instance profiles or
-    assumed roles for loading session-derived credentials. [GH-10007]
-* builder/azure: Fix crash when using `azure_tag` or `azure_tags` configuration
-    options. [GH-10014]
-* builder/qemu: Ensure `qemu_img_args` are honored during the disk convert
-    step. [GH-10001]
-
- ## 1.6.3 (September 25, 2020)
-
-### IMPROVEMENTS:
-* builder/amazon: Add `pause_before_ssm` option to pause for some time before
-    establishing a Session Manager session; defaults to 10s. [GH-9988]
-* builder/amazon: Implement assume_role option that matches Terraform behavior.
-    [GH-9981]
-* builder/azure: Support publishing to a Shared Image Gallery with a different
-    subscription id [GH-9875]
-* builder/openstack: Add `external_source_image_url` and
-    `external_source_image_format` to support building images from external
-    source URLs. [GH-9992]
-* builder/openstack: Include API requests and responses as part of the debug
-    log output. [GH-9972]
-* builder/oracle-oci: Add `create_vnic_details` option for launch details.
-    [GH-9856]
-* builder/oracle-oci: Allow freeform and defined tags to be added to an instance.
-    [GH-9802]
-* builder/proxmox: Add `io_thread` option for supporting io threads when using
-    a `virtio-scsi-single` controller with a `scsi` or `virtio` disk type.
-    [GH-9969]
-* builder/proxmox: Add ability to specify interfaces for http_directory and VM.
-    [GH-9874]
-* builder/proxmox: Allow the mounting of multiple ISOs via the `cd_drive`
-    option. [GH-9653]
-* builder/proxmox: Fix boot command special keys. [GH-9885]
-* builder/qemu: Add `qemu_img_args` option to set special cli flags for calls
-    to qemu-img [GH-9956]
-* builder/qemu: Add `skip_resize_disk` option to skip the resizing of QCOW2
-    images. [GH-9896] [GH-9860]
-* builder/qemu: Skip qemu-img convert on MacOS to prevent the creation of
-    corrupt images [QEMU
-    #1776920](https://bugs.launchpad.net/qemu/+bug/1776920) [GH-9949]
-* builder/scaleway: Change default boottype to local. [GH-9853]
-* builder/scaleway: Update scaleway to use non-deprecated sdk. [GH-9902]
-* builder/vmware: Add `vnc_over_websocket` to allow the sending of a
-    `boot_command` to hosts running ESXi 6.7 and above. [GH-9938]
-* builder/vmware: Allow user to set vmware tools source path. [GH-9983]
-* builder/vsphere-clone: Add ability to set `mac_address` [GH-9930]
-* builder/vsphere-clone: Add floppy_files, cd_files, and iso_paths options.
-    [GH-9963]
-* builder/vsphere-iso: Add NVMe controller support. [GH-9880]
-* builder/vsphere: Look for a default resource pool when root resource pool is
-    not found. [GH-9809]
-* core: Add support for running cygwin/msys2 based cd/iso creation tool
-    [GH-9954]
-* core: New `cd_files` option to mount iso for modern OSes which don't support
-    floppies. [GH-9796] [GH-9919] [GH-9928] [GH-9932] [GH-9941]
-* HCL2: When the type of a variable is not known evaluate setting as a literal
-    string instead of a variable name. [GH-9863]
-* post-processor/vagrant: Support the use of template variables within
-    Vagrantfile templates. [GH-9923]
-* post-processor/yandex-import: Allow custom API endpoint. [GH-9850]
-* provisioner/ansible: Add support for Ansible Galaxy Collections. [GH-9903]
-
-### BUG FIXES:
-* builder/amazon-ebs: Fix issue where retrying on invalid IAM instance profile
-    error was creating multiple spot instances. [GH-9946]
-* builder/amazon-ebssurrogate: Fix issue where builder defaults to AWS managed
-    key even when custom `kms_key_id` is set. [GH-9959]
-* builder/amazon: Update ssm_driver log polling logic to prevent infinite loops
-    when SSM driver is terminated outside of Packer. [GH-9991]
-* builder/azure: Fix crash when using HCL2 configs. [GH-9984] [GH-9985]
-* builder/qemu: Fix hardcoded lowerbound causing negative ports [GH-9905]
-* builder/qemu: Skip compaction when backing file is used. [GH-9918]
-* builder/scaleway: Add pre validate step to prevent the creation of multiple
-    images with the same name. [GH-9840]
-* builder/vmware-iso: Prevent the use of reserved SCSI ID 0:7 when attaching
-    multiple disks. [GH-9940]
-* builder/vsphere: Fix overly strict iso_path validation regex. [GH-9855]
-* command/console: Prevent failure when there are unknown vars. [GH-9864]
-* command/inspect: Allow unset variables in HCL2 and JSON. [GH-9832]
-* core: Prevent the UI progressbar from hanging and crashing when there is no
-    TTY available. [GH-9974]
-* core: Use $APPDATA over $HOME on Windows hosts when determining homedir.
-    [GH-9830]
-* post-processor/digitalocean-import: Fix crash caused by empty artifact.Files
-    slice. [GH-9857]
-* post-processor/yandex-export: Check for error after runner completes.
-    [GH-9925]
-* post-processor/yandex-export: Set metadata key to expected value on error.
-    [GH-9849]
-* post-processor/yandex-import: Fix S3 URL construct process. [GH-9931]
-
-## 1.6.2 (August 28, 2020)
-
-### FEATURES:
-* **New command** `hcl2_upgrade` is a JSON to HCL2 transpiler that allows users
-    to transform an existing JSON configuration template into its HCL2 template
-    equivalent. Please see [hcl2_upgrade command
-    docs](https://packer.io/docs/commands/hcl2_upgrade) for more details.
-    [GH-9659]
-
-### IMPROVEMENTS:
-* builder/amazon:  Add all of the custom AWS template engines to `build`
-    template function for use by provisioners. [GH-9751]
-* builder/amazon: Add aws_polling config option to override env variables.
-    [GH-9777]
-* builder/azure: Add FreeBSD support to azure/chroot builder. [GH-9697]
-* builder/vmware-esx: Add `network_name` option to vmware so that users can set
-    a network without using vmx data. [GH-9718]
-* builder/vmware-vmx: Add additional disk configuration option.  Previously
-    only implemented for vmware-iso builder [GH-9815]
-* builder/vmware: Add a `remote_output_directory option` so users can tell
-    Packer where on a datastore to create a vm. [GH-9784]
-* builder/vmware: Add option to export to ovf or ova from a local vmware build
-    [GH-9825]
-* builder/vmware: Add progress tracker to vmware-esx5 iso upload. [GH-9779]
-* builder/vsphere-iso:  Add support for building on a single ESXi host
-    [GH-9793]
-* builder/vsphere: Add new `directory_permission` config export option.
-    [GH-9704]
-* builder/vsphere: Add option to import OVF templates to the Content Library
-    [GH-9755]
-* builder/vsphere: Add step and options to customize cloned VMs. [GH-9665]
-* builder/vsphere: Update `iso_paths` to support reading ISOs from Content
-    Library paths [GH-9801]
-* core/hcl: Add provisioner "override" option to HCL2 templates. [GH-9764]
-* core/hcl: Add vault integration as an HCL2 function function. [GH-9746]
-* core: Add colored prefix to progress bar so it's clearer what build each
-    progress bar belongs to. [GH-9780]
-* core: Ui now pretty prints build durations. [GH-9749]
-* core: When a build is cancelled, Packer will skip postprocessors gracefully
-    rather than failing them. [GH-9720]
-* integrations/secretsmanager: Add support for plaintext non-key/pair secrets.
-    [GH-9773]
-* post-processor/vsphere: Improve UI to catch bad credentials and print errors.
-    [GH-9649]
-* provisioner/ansible-remote: Add `ansible_ssh_extra_args` so users can specify
-    extra arguments to pass to ssh [GH-9821]
-* provisioner/file: Clean up, bugfix, and document previously-hidden `sources`
-    option. [GH-9725] [GH-9735]
-* provisioner/salt-masterless: Add option to option to download community
-    SaltStack formulas. [GH-9726]
-
-### BUG FIXES:
-* build: Fix bug in code generator that caused generation to fail in nested
-    packer/packer dirs [GH-9728]
-* build: Fix Makefile so that default target doesn't crash and creates dev
-    binaries. [GH-9706]
-* builder/amazon-ebssurrogate: Make skip_save_build_region option work in the
-    ebssurrogate builder, not just the ebs builder. [GH-9666]
-* builder/amazon: Add retry logic to the spot instance creation step to handle
-    "Invalid IAM Instance Profile name" errors [GH-9810]
-* builder/amazon: Update the `aws_secretsmanager` function to read from the AWS
-    credentials file for obtaining default region information; fixes the
-    'MissingRegion' error when AWS_REGION is not set [GH-9781]
-* builder/file: Make sure that UploadDir receives the interpolated destination.
-    [GH-9698]
-* builder/googlecompute: Fix bug where startup script hang would cause export
-    to hang. [GH-9708]
-* builder/hyperv: Send boot command in small chunks to make it more stable.
-    [GH-9765]
-* builder/scaleway: Fix config issue that made scaleway builder fail when used
-    with HCL2 config. [GH-9677]
-* builder/vmware: Fully destroy vm if it was cancelled or errored. This will
-    make orphaned vms easier to destroy through vCenter. [GH-9782]
-* builder/vsphere: Fix `alt`, `ctrl`, and `shift` keypresses in the
-    boot_command. [GH-9702] [GH-9739]
-* builder/vsphere: Fix bug where Packer timed out if two interfaces were
-    defined but only one had an available IP. [GH-9748]
-* builder/vsphere: Fix the configuration_parameters option so that it is always
-    applied, not just when the tool sync policy is set. [GH-9713]
-* communicator: Fix `pause_before_connect` option to force a reconnect after
-    the pause. [GH-9772]
-* core: Make `max_retries` provisioner option a string to allow variable
-    interpolation. [GH-9673]
-* post-processor/vsphere-template: Fix ReregisterVM to default to true instead
-    of false. [GH-9736]
-* post-processor/yandex-export: Fix issue when validating region_name [GH-9814]
-* provisioner/inspec: Fix the 'Unsupported argument; An argument named
-    "command"' error when using the inspec provisioner in an HCL2 configuration
-    [GH-9800]
-
-## 1.6.1 (July 30, 2020)
-
-### BACKWARDS INCOMPATABILITIES:
-
-* HCL: builder/vsphere: Add option to add a xhci/usb3 controller; changes
-    controller value to an array of strings.  [GH-9574]
-* HCL: New HCL-only `post-processors` block to run chained post-processors
-    after a build [GH-9638]. Before this, defining multiple `post-processor`
-    blocks after provisioning steps would run them sequentially, now doing this
-    makes them start from the build artifact. To queue post-processors you now
-    have to define them in a `post-processors` block. [GH-9638]
-* post-processor/vSphere: We have fixed a bug in the ovftool URL encoding. This
-    may mean that you have performed an encoding workaround that is no longer
-    necessary. [GH-9589]
-
-### FEATURES:
-* **New post-processor** Yandex Import [GH-9553]
-
-### IMPROVEMENTS:
-* builder/amazon-ebs: Wrap CreateImage call in a retry to account for eventual
-    consistency [GH-9579]
-* builder/azure: Disable SSH password authentication unless password is
-    explicitly specified. [GH-9603]
-* builder/docker: Add options for --cap-add, --cap-drop, --tmpfs, --device
-    [GH-9565]
-* builder/file: Create parent directories of target file, if they don't exist.
-    [GH-9452]
-* builder/googlecompute: Add `wrap_startup_script` configuration option to
-    allow the disabling of Packer's startup script wrapper [GH-9505]
-* builder/googlecompute: Add support for oslogin via the `use_os_login`
-    configuration option [GH-9339]
-* builder/googlecompute: Make IAP tunnel timeout configurable. [GH-9545]
-* builder/googlecompute: Support using WinRM over an IAP tunnel [GH-9610]
-* builder/hyper-v: Include secure boot template in box.xml [GH-9552]
-* builder/hyperone: Add support for custom username in vm creation. [GH-9497]
-* builder/hyperone: Skip chroot device discovery. [GH-9489]
-* builder/openstack: Bump gophercloud to latest version [GH-9573]
-* builder/proxmox: Add option to disable KVM hardware virtualization in Proxmox
-    builder [GH-9587]
-* builder/proxmox: Add support for multiple NIC packet queues [GH-9597]
-* builder/proxmox: Enable Proxmox builder to toggle the firewall parameter for
-    network interfaces. [GH-9487]
-* builder/proxmox: Update Proxmox storagePoolTypes [GH-9418]
-* builder/qemu: Add 'cdrom_interface' option to QEMU builder [GH-9483]
-* builder/tencentcloud: Add `source_image_name` to support getting source image
-    by name [GH-9619]
-* builder/tencentcloud: Update cvm root disk type to `CLOUD_PREMIUM` [GH-9663]
-* builder/ucloud: New access config options and run config options. [GH-9466]
-* builder/vsphere-clone: Add `boot_command` support to vsphere-clone builder,
-    including support for starting an HTTP server
-* builder/vsphere-clone: Add `vapp` configuration option [GH-9507]
-* builder/vsphere: Add ability to define multiple disk controllers [GH-9519]
-* builder/vsphere: Add `boot_command` support to vsphere-clone builder. [GH-9397]
-* builder/vsphere: Add `content_library_destination` to import VM template to a
-    Content Library [GH-9551]
-* builder/vsphere: Add `force_bios_setup` configuration option [GH-9563]
-* builder/vsphere: Add option to add a xhci/usb3 controller [GH-9574]
-* builder/vsphere: Create vm output folders if they don't exist [GH-9402]
-* builder/vsphere: Fix file size descriptor when exporting OFV [GH-9568]
-* builder/vsphere: Look at all available IPs in the waiting for IP loop.
-    [GH-9450]
-* builder/vsphere: Match network to host when multiple networks are found
-    [GH-9556]
-* builder/vsphere: Update vsphere `boot_command` to bring it in line with other
-    builders' boot_command functionality. [GH-9406]
-* builder/vsphere: Use datacenter inventory path for find folder [GH-9390]
-* builder/vsphere: Use value from "ip_wait_address" option to determine the
-    default for the http server IP [GH-9441]
-* builder/yandex: Allow set `min_disk_size` for an image.
-* builder/yandex: Support authentication by Service Account on instance
-    [GH-9383]
-* builder/yandex: yandex: Add new property `min_disk_size` of built image
-    [GH-9594]
-* communicator/ssh: Add support for OpenSSH certificate signing [GH-9521]
-* communicator/ssh: Allow users to provide a list of ciphers that they want
-    Packer to support. [GH-9453]
-* core/hcl2: Add possibility to name singular build.source blocks to
-    differentiate their output and to filter on them [GH-9490]
-* core/hcl2: Add the "inspect" command for hcl2 configs. [GH-9468]
-* core/hcl2: HCL configs now respect only/except using build names instead of
-    types. [GH-9454]
-* core/hcl: Allow use of `keep_input_artifact` in post processors. [GH-9477]
-* core/hcl: Share build info with Provisioner and Post-Processor via HCL2
-    variables [GH-9444] [GH-9534] [GH-9622]
-* core: Add on-error flag option to run error-cleanup-provisioner [GH-9429]
-* core: communicator/ssh: Add new `ssh_key_exchange_algorithms` option to
-    supply custom key exchange algorithms in SSH client [GH-9634]
-* core: refactor initialization out from Packer core to allow `validate
-    --syntax-only` to no error when a variable is not set [GH-9627]
-* hcl2: Handle uint64 buildvars [GH-9585]
-* post-processor/yandex-export: Allow users to utilize generated variables in
-    templating. [GH-9555]
-* post-processor/yandex-export: Support Authentication by Service Account Key
-    file [GH-9379]
-* post-processor/yandex-import: Support creating an Image based on another one
-    [GH-9614]
-* post-processor/yandex-import: Support using URL from yandex-export [GH-9601]
-* provisioner/ansible: Add template option for templating the inventory file
-    lines [GH-9438]
-
-### BUG FIXES:
-* builder/amazon: Change "Resource" field in
-    `temporary_iam_instance_profile_policy_document` to be an array of strings,
-    not just a single string. [GH-9509]
-* builder/amazon: HCL2: Add singular `run_volume_tag` block to ebs & ebssurrogate
-    builders. [GH-9457]
-* builder/amazon: Retry fetching block device mappings if empty. [GH-9480]
-* builder/azure: Fix data disks URI. [GH-9467]
-* builder/googlecompute: Fix issue with `use_iap` globally changing a user's
-    gcloud project configuration, by temporarily setting "project" via project
-    flag and not via `gcloud config` [GH-9662]
-* builder/googlecompute: Fix the "secure boot" validation for uefi_compatible
-    images. [GH-9371]
-* builder/qemu: Only set up localhost port forwarding if skipnatmapping is
-    false. [GH-9479]
-* builder/vagrant: Fix box file validation for remote box files specified using
-    `source_path` [GH-9660]
-* builder/vagrant: Improve validation and error handling around synced_folder.
-    Make sure that synced folder can be defined relative to Packer run
-    directory, not the Vagrant output directory. [GH-9577]
-* builder/virtualbox-vm: Fix regression where builder would fail if the vm had
-    no snapshots. [GH-9435]
-* builder/vmware-iso: Try checksum remote file instead of local file. [GH-9584]
-* builder/vmware: Fix a race that occurred when parsing the network config.
-    [GH-9387]
-* builder/vmware: Update vendor library, enabling retries on 502 errors
-    [GH-9391]
-* builder/vsphere-clone: Fix SSH public key injection for cloned templates
-    [GH-9507]
-* builder/vsphere: Clean up folder path to remove leading slashes. [GH-9542]
-* builder/vsphere: Deduplicate where Firmware is set in vsphere-iso builder
-    [GH-9557]
-* builder/vsphere: Fix vsphere ToolsSyncTime and ToolsUpgradePolicy [GH-9515]
-* builder/vsphere: vSphere driver context is no longer cancelled when Packer
-    context is cancelled. [GH-9576]
-* communicator/winrm: Add the "no_proxy" environment variable option to have
-    winrm bypass the proxy set by the http_proxy or https_proxy environment
-    vars, when connecting to the remote instance. [GH-9267]
-* core: Do not print download progress bar if a machine-readable UI is chosen.
-    [GH-9448]
-* post-processor/amazon-import: Add support for retrying RequestLimitExceeded
-    errors when importing an image [GH-9537]
-* post-processor/docker-import: Fix crash when using docker-import with HCL.
-    [GH-9670]
-* post-processor/vsphere: Fix password encoding in vsphere post-processor
-    ovftool call [GH-9589]
-* post-processor/yandex-export: Fix error handling and docs. [GH-9554]
-* provisioner/ansible-local: Fix agent auth in SSH communicator  [GH-9639]
-* provisioner/ansible: Correct check for whether PackerHttpAddr is implemented
-    or not [GH-9498]
-* provisioner/ansible: Quote extra-var packer_build_name to handle names with
-    spaces [GH-9590]
-
-## 1.6.0 (June 09, 2020)
-
-### BACKWARDS INCOMPATIBILITIES:
-* builder/vsphere-iso: The deprecated fields `network`, `network_card`,
-    `disk_size`, `disk_thin_provisioned`, and `disk_eagerly_scrub` have been
-    removed. Run `packer fix template.json` to migrate an existing template
-    [GH-9149]
-
-* For all iso-based builders, the `iso_checksum_type` and `iso_checksum_url`
-    fields have been removed in favor of simply setting the `iso_checksum`
-    field. Use the [packer fix](https://www.packer.io/docs/commands/fix/)
-    command to update a config file. See the [iso_checksum field
-    docs](https://www.packer.io/docs/builders/virtualbox/iso/#iso_checksum) to
-    read more about this. [GH-8437]
-
-### FEATURES:
-* **New post-processor** Yandex Export [GH-9124]
-* builder/amazon: Add SSM Session Manager as a SSH interface connection
-    [GH-9082]
-* builder/google: Implement iap proxy for googlecompute [GH-9105]
-* HCL2/core: Add command/console support for HCL2 config files [GH-9359]
-* HCL2/core: Add command/validate support for HCL2 config files [GH-9346]
-* HCL2/core: it is now possible to set source fields from the `build` block
-    [GH-9291]
-
-### IMPROVEMENTS:
-* builder/amazon: Added new `build` template function field:
-    SourceAMICreationDate [GH-9277]
-* builder/azure-arm: Support User Assigned Managed Identity [GH-9293]
-* builder/azure-chroot: Copy data disks between shared image galleries
-    [GH-9323]
-* builder/googlecompute: Changed default disk size. [GH-9071]
-* builder/googlecompute: New option to specify storage location for GCP images
-    [GH-9326]
-* builder/qemu: Add support for using a network bridge [GH-9159]
-* builder/qemu: Added `skip_nat_mapping` option to skip the communicator (SSH
-    or WinRM) automatic port forward and use the guest port directly. [GH-9307]
-* builder/qemu: Replace deprecated `ssh_host_port_min` and `ssh_host_port_max`
-    by `host_port_min` and `host_port_max`. [GH-9307]
-* builder/virtualbox: Add `output_filename` config option to allow user to set
-    a custom filename instead of forcing it to be the same as vm_name.
-    [GH-9174]
-* builder/vsphere: Add `floppy_label` option. [GH-9187]
-* builder/vsphere: Add `ip_wait_address` to allow packer to wait for an ip
-    address that fits within the range (cidr address).  [GH-9358]
-* builder/vsphere: Add `tools_sync_time` and `tools_upgrade_policy` options to
-    set time synchronization and automatic VMware Tools upgrade. [GH-9366]
-* core/hcl: Enable "force", "debug", and "on-error" command line flags for hcl2
-    builds. [GH-9234]
-* core/hcl: Enable only/except for provisioners and post-processors [GH-9357]
-* core/hcl: Support named builds in HCL2 templates [GH-9245]
-* core/interpolation: Add support for specifying a particular key to fetch from
-    the AWS Secrets Manager [GH-9202] [GH-9286]
-* core: HCL logs now display source type and source name (`type.name`) in logs
-    to differentiate more easily who says what. [GH-9257]
-* core: update consul and vault dependencies [GH-9205]
-* core: Update vendored "go-getter" library with checksum fixes.
-* core: Users can now configure the http bind address of the server launched to
-    serve files from http_directory [GH-9313]
-* core: When a template contains a deprecated option, Packer will now encourage
-    the user to call `packer fix`. [GH-9325]
-* post-processor/docker-push: Support pushing multiple tags [GH-9182]
-* post-processor/docker-tag: Change field name of docker tag to "tags" instead
-    of "tag" since it's a list. Keep "tag" for backwards compatibility.
-    [GH-9183]
-* provisioner/windows-restart: Display full hostname, instead of just the
-    NetBIOS name [GH-9335]
-
-### BUG FIXES:
-* buidler/vsphere-iso: Fix bug validating iso_urls [GH-9321]
-* builder/azure-arm: Update runtime constants with a valid DataDiskName
-    [GH-9251]
-* builder/digitalocean: Use correct image type for Droplet creates. [GH-9212]
-* builder/openstack: Don't error if metadata can't be set. Old versions of
-    openstack don't support that API call. [GH-9198]
-* builder/vagrant: Use absolute path for package_include files to prevent them
-    from having to be relative to the output vagrant directory. [GH-9260]
-* builder/virtualbox: Fix bug using checksum files. [GH-9101]
-* builder/vmware: Fix ssh connection when the guest platform's dhcpcd switches
-    the IP address in-between a build. [GH-9322]
-* builder/vsphere-iso: Use the Datacenter's VmFolder call instead of manually
-    generating folder path [GH-9342]
-* builder/vsphere: Add option not to set host during datastore upload. [GH-9100
-* builder/vsphere: Fix crash in the driver for an interface conversion of
-    types.AnyType nil to types.ManagedObjectReference. [GH-9354]
-* builder/vsphere: Fix iso config prepare being called incorrectly, which
-    caused `iso_url` field to fail. [GH-9197]
-* builder/yandex: Do not require 'gpu-standard-v1' platform_id for any GPU-
-    based config. [GH-9356]
-* core: Ensure HTTP server information `PackerHTTPIP`, `PackerHTTPPort`, and
-    `PackerHTTPAddr` are available via the `build` template engine for all
-    supported builders [GH-9238]
-* core: Fix `iso_url` to accept SMB shared files UNC and windows network paths.
-    [GH-8954]
-* core: Fix regression that broke use of pwd when retrieving the checksum from
-    a file [GH-9129].
-* post-processor/vagrant: Add "provider_override" template option to allow
-    artifacts from the Artifice post-processor [GH-9239]
-* post-processor/vsphere-template: Add VSphere builder's artifact to vsphere-
-    template's supported types [GH-9146]
-* postprocessor/artifice: Update various core post-processors to accept
-    artifacts from the Artifice post-processor [GH-9239]
-* provisioner/ansible-remote: Fix the arg order to make sure that the playbook
-    file is the last item in the call [GH-9279]
-* provisioner/ansible: Ansible provisioner doesn't force ssh key checking if
-    user wants to use password to connect instead. [GH-9350]
-* provisioner/inspec: Fix build variables interpolation [GH-9262]
-* provisioner/powershell: fix interpolation of execute_command in cleanup
-    script call. [GH-9275]
-* provisioner/powershell: Fix long-wait retry loop caused by cleanup logic
-    [GH-9226]
-* provisioner/salt-masterless: Ignore the CmdArgs field in hcl2 [GH-9290]
-
-## 1.5.6 (May 1, 2020)
-
-### BACKWARDS INCOMPATIBILITIES:
-* core/hcl2: HCL2 singular blocks: use key/value or name/value depending on how
-    the service names things [GH-9078]
-* core/hcl2: Maps are now treated as settable arguments as opposed to blocks.
-    For example `tags = {}` instead of `tags {}` [GH-9035]
-* `packer build` command: removed option to set `parallel=false`, use
-    `-parallel-builds=1` for this.
-
-### FEATURES:
-* **New Builder** azure-dtl allows creation of devtestlabs images in Azure
-    [GH-8987]
-
-* **New Core Feature** provisioners now support a `max_retries` option that can
-    be used for retrying a provisioner on error [GH-9061]
-
-* **New Post-Processor**: `yandex-export` Upload built image in Yandex Object Storage.
-
-### IMPROVEMENTS:
-* builder/azure-arm: Add `boot_diag_storage_account` option for enabling boot
-    diagnostics on a virtual machine [GH-9053]
-* builder/azure-arm: Add support for setting custom resource names [GH-9028]
-* builder/azure-arm: Data disk names are now randomly generated [GH-8986]
 * builder/azure: Add shared image destination for azure-chroot [GH-9021]
-* builder/azure: Add shared image source for chroot builder [GH-9070]
-* builder/google: Add support for custom shielded images [GH-8970]
+* 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/hyperv: Add `boot_order` option to override the default boot order
-    [GH-9046]
 * builder/oracle-oci: Allow Instance Principal Auth for Oracle OCI builder
     [GH-8893]
-* builder/oracle-oci: Update Oracle SDK. [GH-9104]
-* builder/proxmox: Add ability to add a cloud-init drive [GH-9045]
-* builder/vsphere: Add `disable_shutdown` option to support manual vm shutdown
-    over the default automatic shutdown step [GH-9095]
-* builder/vsphere: Add `vgpu_profile` option for specifying vGPU profiles
-    [GH-8946]
-* builder/vsphere: Add support for EFI Secure Boot [GH-9018]
-* builder/vsphere: Add support for specifying vGPU profiles [GH-8946]
-* builder/yandex: Add `target_image_folder_id ` option for changing the folder
-    where a built image will be saved to [GH-9080]
-* core/hcl2: HCL mode builds now honor -only and -except options [GH-8947]
 * core/hcl2: Set `packer_build_name` and `packer_builder_type` variables for
     builder provisioners and post-processors [GH-8956]
-* core/HCL: HCL mode now honors -only and -except options. [GH-8947]
-* core: New template function: aws_secretsmanager [GH-9099]
-* provisioner/ansible: Add `use_proxy` option to not use localhost proxy adapter. Removes
+* provisioner/ansible: Add option to not use localhost proxy adapter. Removes
     need for ansible connection_plugin when using WinRM. [GH-8625]
-* provisioner/powershell: Add `debug_mode` option to help with debugging
-    generated scripts [GH-8996]
 * 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-arm: Fix issue where managed image builds were using a
-    different `location` then what was specified in the build configuration
-    [GH-9068]
+### 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/azure: Fix SSH connection for temporary admin users specified in
-    `ssh_username` [GH-9103]
-* builder/osc: Make compliant with oAPI spec for Outscale osc-bsu builder
-    [GH-9093]
 * builder/qemu: Remove `net_device` pre-validation [GH-8979]
-* builder/tencentcloud: Update builder to handle the
-    InstanceOperationInProgress error [GH-9069]
 * builder/vsphere-iso: disk_size is no longer required if storage is defined
     [GH-8975]
-* builder/vsphere: Add exported files to VSphere artifact [GH-9020]
-* builder/vsphere: Fix issue where -force is not working with vsphere builders
-    [GH-9039]
 * 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]
@@ -638,11 +35,6 @@
 
 ## 1.5.5 (March 25,2020)
 
-### BACKWARDS INCOMPATIBILITIES:
-* core: Interpolation of undefined variables will now error as expected, in
-    previous versions variables were allowed to be set as a command line
-    argument but that was because the validation was being ignored
-
 ### IMPROVEMENTS:
 * builder/azure: Add support for configurable KeyVault SKU [GH-8879]
 * builder/hyperv: Add `first_boot_device` setting to allow the selection of the
@@ -651,7 +43,7 @@
 * 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 destination
+* 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
@@ -677,6 +69,8 @@
     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]
@@ -687,8 +81,6 @@
     to fix SSH authentication issue [GH-8942]
 * builder/proxmox: Add new validation to catch that template_name cannot
     contain spaces. [GH-8799]
-* builder/proxmox: Bump proxmox-api-go to fix upstream bug where users hit open
-    file limit. [GH-8800]
 * 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.
@@ -705,11 +97,8 @@
     provisioners. [GH-8771]
 * core: Fix bug where user var recursion could fail intermittently when used
     with env vars [GH-8875]
-* core: Interpolation of undefined variables will now error as expected
 * plugins: Make plugin discovery stricter with respect to periods so that users
     can disable plugins by renaming the extension [GH-8735]
-* provisioner/salt: Fix `no_exit_on_failure` config to work correctly as
-    expected. [GH-9119]
 * provisioner/shell: "inline" config option is now a template engine. [GH-8883]
 
 ## 1.5.4 (February 14, 2020)
@@ -866,7 +255,7 @@ making changes for HCL2.
 
 ### BUG FIXES:
 * builder/amazon: Fix request retry mechanism to launch aws instance [GH-8430]
-* builder/azure: Fix PollDuration option which was overridden in some clients.
+* builder/azure: Fix PollDuration option which was overriden in some clients.
     [GH-8490]
 * builder/hyperv: Fix bug in checking VM name that could cause flakiness if
     many VMs are defined. [GH-8357]
@@ -960,7 +349,7 @@ making changes for HCL2.
 ## 1.4.4 (October 1, 2019)
 
 ### IMPROVEMENTS:
-**New Core Feature** Error cleanup provisioner [GH-8155]
+** new core feature** Error cleanup provisioner [GH-8155]
 * builder/amazon: Add ability to set `run_volume_tags` [GH-8051]
 * builder/amazon: Add AWS API call reties on AMI prevalidation [GH-8034]
 * builder/azure: Refactor client config [GH-8121]
@@ -990,7 +379,7 @@ making changes for HCL2.
 * post-processor/vagrant-cloud: Allow use of the Artifice post-processor with
     the Vagrant Cloud post-processor [GH-8018] [GH-8027]
 * post-processor/vsphere: Removed redundant whitelist check for builders,
-    allowing users to use post-processor without the VMWare builder [GH-8064]
+    allowing users to use post-processor withough the VMWare builder [GH-8064]
 
 ### BUG FIXES:
 * builder/amazon: Fix FleetID crash. [GH-8013]
@@ -1023,7 +412,7 @@ making changes for HCL2.
 * builder/virtualbox: LoadSnapshots succeeds even if machine has no snapshots
     [GH-8096]
 * builder/vmware: fix dropped test errors [GH-8170]
-* core: Fix bug where sensitive variables containing commas were not being
+* core: Fix bug where sensitive variables contianing commas were not being
     properly sanitized in UI calls. [GH-7997]
 * core: Fix handling of booleans where "unset" is a value distinct from
     "false". [GH-8021]
@@ -1038,7 +427,7 @@ making changes for HCL2.
 
 ### BACKWARDS INCOMPATIBILITIES:
 * core: "sed" template function has been deprecated in favor of "replace" and
-    "replace_all" functions [GH-8119]
+    "replace_all" functins [GH-8119]
 
 ## 1.4.3 (August 14, 2019)
 
@@ -1174,14 +563,14 @@ making changes for HCL2.
     build region. [GH-7691]
 * builder/amazon: Fix failure that happened when spot_tags was set but ami_tags
     wasn't [GH-7712]
-* builder/cloudstack: Update go-cloudstack sdk, fixing compatibility with
+* builder/cloudstack: Update go-cloudstack sdk, fixing compatability with
     CloudStack v 4.12 [GH-7694]
 * builder/proxmox: Update proxmox-api-go dependency, fixing issue calculating
     VMIDs. [GH-7755]
 * builder/tencent: Correctly remove tencentcloud temporary keypair. [GH-7787]
 * core: Allow timestamped AND colorless ui messages [GH-7769]
 * core: Apply logSecretFilter to output from ui.Say [GH-7739]
-* core: Fix "make bin" command to use reasonable defaults. [GH-7752]
+* core: Fix "make bin" command to use reasonbale defaults. [GH-7752]
 * core: Fix user var interpolation for variables set via -var-file and from
     command line [GH-7733]
 * core: machine-readable UI now writes UI calls to logs. [GH-7745]
@@ -1418,7 +807,7 @@ making changes for HCL2.
 * core: make packer inspect not print sensitive variables [GH-7084]
 * post-processor/google: Add new `guest-os-features` option. [GH-7218]
 * postprocessor/docker-import: Added `change` support [GH-7127]
-* provisioner/ansible-remote: add `-o IdentitiesOnly=yes` as a default flag
+* provisioner/ansible-remote: add `-o IdentitiesOnly=yes`as a default flag
     [GH-7115]
 * provisioner/chef-client: Elevated support for chef-client provisioner
     [GH-7078]
@@ -1596,7 +985,7 @@ making changes for HCL2.
 * builder/amazon: fix bugs relating to spot instances provisioning [GH-6697]
     [GH-6693]
 * builder/openstack: fix ssh keypair not attached [GH-6701]
-* core: progressbar: fix deadlock locking builds after first display [GH-6698]
+* core: progressbar: fix deadlock locking builds afer first display [GH-6698]
 
 ## 1.3.0 (September 11, 2018)
 
@@ -1669,7 +1058,7 @@ making changes for HCL2.
     waiters. [GH-6649]
 * builder/azure: Generated password satisfies Azure password requirements
     [GH-6480]
-* builder/hyper-v: Builder no longer errors if skip_compaction isn't true when
+* builder/hyper-v: Buider no longer errors if skip_compaction isn't true when
     skip_export is true, and compaction efficiency is improved [GH-6393]
 * builder/lxc: Correctly pass "config" option to "lxc launch". [GH-6563]
 * builder/lxc: Determine lxc root according to the running user [GH-6543]
@@ -1690,7 +1079,7 @@ making changes for HCL2.
     `execute_command`s [GH-6636]
 * provisioner/shell-local: Windows inline scripts now default to being appended
     with ".cmd", fixing a backwards incompatibility in v1.2.5 [GH-6626]
-* provisioner/windows-restart: Provisioner now works when used in conjunction
+* provisioner/windows-restart: Provisioner now works when used in conjuction
     with SSH communicator [GH-6606]
 
 ### BACKWARDS INCOMPATIBILITIES:
@@ -1832,7 +1221,7 @@ making changes for HCL2.
 * builder/virtualbox: Fix broken scancodes in boot_command. [GH-6067]
 * builder/vmware-iso: Fail in validation if user gives wrong remote_type value.
     [GH-4563]
-* builder/vmware: Fixed a case-sensitivity issue when determining the network
+* builder/vmware: Fixed a case-sensitivity issue when determing the network
     type during the cloning step in the vmware-vmx builder. [GH-6057]
 * builder/vmware: Fixes the DHCP lease and configuration pathfinders for VMware
     Player. [GH-6096]
@@ -3953,7 +3342,7 @@ making changes for HCL2.
 ### BUG FIXES:
 
 * core: default user variable values don't need to be strings. [GH-456]
-* builder/amazon-chroot: Fix errors with waiting for state change. [GH-459]
+* builder/amazon-chroot: Fix errors with waitin for state change. [GH-459]
 * builder/digitalocean: Use proper error message JSON key (DO API change).
 * communicator/ssh: SCP uploads now work properly when directories
     contain symlinks. [GH-449]

CODEOWNERS

@@ -2,21 +2,15 @@
 
 # builders
 
-/examples/alicloud/                     @chhaj5236 @alexyueer
 /builder/alicloud/                      @chhaj5236 @alexyueer
 /website/pages/docs/builders/alicloud* @chhaj5236 @alexyueer
 
-/examples/azure/                     @paulmey
 /builder/azure/                      @paulmey
 /website/pages/docs/builders/azure* @paulmey
 
-/builder/digitalocean/                     @andrewsomething
-/website/pages/docs/builders/digitalocean* @andrewsomething
-
 /builder/hyperv/                      @taliesins
 /website/pages/docs/builders/hyperv* @taliesins
 
-/examples/jdcloud/                     @XiaohanLiang @remrain
 /builder/jdcloud/                      @XiaohanLiang @remrain
 /website/pages/docs/builders/jdcloud* @XiaohanLiang @remrain
 
@@ -24,9 +18,7 @@
 /website/pages/docs/builders/linode* @displague @ctreatma @stvnjacobs @charliekenney23 @phillc
 
 /builder/lxc/                      @ChrisLundquist
-/website/pages/docs/builders/lxc*  @ChrisLundquist
-/test/fixtures/builder-lxc/        @ChrisLundquist
-/test/builder_lxc*                 @ChrisLundquist
+/website/pages/docs/builders/lxc* @ChrisLundquist
 
 /builder/lxd/                      @ChrisLundquist
 /website/pages/docs/builders/lxd* @ChrisLundquist
@@ -49,29 +41,24 @@
 /builder/proxmox/                      @carlpett
 /website/pages/docs/builders/proxmox* @carlpett
 
-/builder/scaleway/                      @scaleway/devtools
-/website/pages/docs/builders/scaleway* @scaleway/devtools
+/builder/scaleway/                      @sieben @mvaude @jqueuniet @fflorens @brmzkw
+/website/pages/docs/builders/scaleway* @sieben @mvaude @jqueuniet @fflorens @brmzkw
 
 /builder/hcloud/                      @LKaemmerling
 /website/pages/docs/builders/hcloud* @LKaemmerling
 
-/examples/hyperone/                    @m110 @gregorybrzeski @ad-m
-/builder/hyperone/                     @m110 @gregorybrzeski @ad-m
+/builder/hyperone/                      @m110 @gregorybrzeski @ad-m
 /website/pages/docs/builders/hyperone* @m110 @gregorybrzeski @ad-m
-/test/builder_hyperone*                @m110 @gregorybrzeski @ad-m
-/test/fixtures/builder-hyperone/       @m110 @gregorybrzeski @ad-m
 
-/examples/ucloud/                     @shawnmssu
 /builder/ucloud/                      @shawnmssu
 /website/pages/docs/builders/ucloud* @shawnmssu
 
 /builder/yandex/                      @GennadySpb @alexanderKhaustov @seukyaso
 /website/pages/docs/builders/yandex* @GennadySpb @alexanderKhaustov @seukyaso
 
-/builder/osc/                      @marinsalinas @Hakujou
-/website/pages/docs/builders/osc* @marinsalinas @Hakujou
+/builder/osc/                      @marinsalinas
+/website/pages/docs/builders/osc* @marinsalinas
 
-/examples/tencentcloud/                      @likexian
 /builder/tencentcloud/                      @likexian
 /website/pages/docs/builders/tencentcloud* @likexian
 
@@ -79,7 +66,6 @@
 
 # provisioners
 
-/examples/ansible/                      @bhcleek
 /provisioner/ansible/                   @bhcleek
 /provisioner/converge/                  @stevendborrelli
 
@@ -89,7 +75,5 @@
 /post-processor/checksum/               v.tolstov@selfip.ru
 /post-processor/exoscale-import/        @falzm @mcorbin
 /post-processor/googlecompute-export/   crunkleton@google.com
-/post-processor/yandex-export/          @GennadySpb
-/post-processor/yandex-import/          @GennadySpb
 /post-processor/vsphere-template/       nelson@bennu.cl
 /post-processor/ucloud-import/          @shawnmssu

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.mirror.hashicorp.services/ubuntu:16.04
+FROM ubuntu:16.04
 
 ENV DEBIAN_FRONTEND noninteractive
 

Makefile

@@ -1,5 +1,4 @@
 TEST?=$(shell go list ./...)
-COUNT?=1
 VET?=$(shell go list ./...)
 ACC_TEST_BUILDERS?=all
 ACC_TEST_PROVISIONERS?=all
@@ -26,7 +25,7 @@ export GOLDFLAGS
 .PHONY: bin checkversion ci ci-lint default install-build-deps install-gen-deps fmt fmt-docs fmt-examples generate install-lint-deps lint \
 	releasebin test testacc testrace
 
-default: install-build-deps install-gen-deps generate dev
+default: install-build-deps install-gen-deps generate testrace dev releasebin package dev fmt fmt-check mode-check fmt-docs fmt-examples
 
 ci: testrace ## Test in continuous integration
 
@@ -121,12 +120,11 @@ 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 -f
+	@find website/pages/ -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 -f
+	@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 run ./cmd/generate-fixer-deprecations
 
 generate-check: generate ## Check go code generation is on par
 	@echo "==> Checking that auto-generated code is not changed..."
@@ -137,7 +135,7 @@ generate-check: generate ## Check go code generation is on par
 	fi
 
 test: mode-check vet ## Run unit tests
-	@go test -count $(COUNT) $(TEST) $(TESTARGS) -timeout=3m
+	@go test $(TEST) $(TESTARGS) -timeout=3m
 
 # acctest runs provisioners acceptance tests
 provisioners-acctest: install-build-deps generate
@@ -146,14 +144,14 @@ provisioners-acctest: install-build-deps generate
 # 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."
-	PACKER_ACC=1 go test -count $(COUNT) -v $(TEST) $(TESTARGS) -timeout=120m
+	PACKER_ACC=1 go test -v $(TEST) $(TESTARGS) -timeout=45m
 
 testrace: mode-check vet ## Test with race detection enabled
-	@GO111MODULE=off go test -count $(COUNT) -race $(TEST) $(TESTARGS) -timeout=3m -p=8
+	@GO111MODULE=off go test -race $(TEST) $(TESTARGS) -timeout=3m -p=8
 
 # Runs code coverage and open a html page with report
 cover:
-	go test -count $(COUNT) $(TEST) $(TESTARGS) -timeout=3m -coverprofile=coverage.out
+	go test $(TEST) $(TESTARGS) -timeout=3m -coverprofile=coverage.out
 	go tool cover -html=coverage.out
 	rm coverage.out
 

README.md

@@ -1,13 +1,13 @@
 # Packer
 
-[![Build Status][circleci-badge]][circleci]
+[![Build Status][travis-badge]][travis]
 [![Windows Build Status][appveyor-badge]][appveyor]
-[![PkgGoDev](https://pkg.go.dev/badge/github.com/hashicorp/packer)](https://pkg.go.dev/github.com/hashicorp/packer)
+[![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)
 
-[circleci-badge]: https://circleci.com/gh/hashicorp/packer.svg?style=svg
-[circleci]: https://app.circleci.com/pipelines/github/hashicorp/packer
+[travis-badge]: https://travis-ci.org/hashicorp/packer.svg?branch=master
+[travis]: https://travis-ci.org/hashicorp/packer
 [appveyor-badge]: https://ci.appveyor.com/api/projects/status/miavlgnp989e5obc/branch/master?svg=true
 [appveyor]: https://ci.appveyor.com/project/hashicorp/packer
 [godoc-badge]: https://godoc.org/github.com/hashicorp/packer?status.svg
@@ -95,20 +95,3 @@ See
 [CONTRIBUTING.md](https://github.com/hashicorp/packer/blob/master/.github/CONTRIBUTING.md)
 for best practices and instructions on setting up your development environment
 to work on Packer.
-
-## Unmaintained Plugins
-As contributors' circumstances change, development on a community maintained
-plugin can slow. When this happens, the Packer team may mark a plugin as
-unmaintained, to clearly signal the plugin's status to users.
-
-What does **unmaintained** mean?
-
-1. The code repository and all commit history will still be available.
-1. Documentation will remain on the Packer website.
-1. Issues and pull requests are monitored as a best effort.
-1. No active development will be performed by the Packer team.
-
-If anyone form them community is interested in maintaining a community
-supported plugin, please feel free to submit contributions via a pull-
-request for review; reviews are generally prioritized over feature work
-when possible. For a list of open plugin issues and pending feature requests see the [Packer Issue Tracker](https://github.com/hashicorp/packer/issues/).

builder/alicloud/ecs/access_config.go

@@ -18,26 +18,26 @@ import (
 
 // Config of alicloud
 type AlicloudAccessConfig struct {
-	// Alicloud access key must be provided unless `profile` is set, but it can
-	// also be sourced from the `ALICLOUD_ACCESS_KEY` environment variable.
-	AlicloudAccessKey string `mapstructure:"access_key" required:"true"`
-	// Alicloud secret key must be provided unless `profile` is set, but it can
-	// also be sourced from the `ALICLOUD_SECRET_KEY` environment variable.
-	AlicloudSecretKey string `mapstructure:"secret_key" required:"true"`
-	// Alicloud region must be provided unless `profile` is set, but it can
-	// also be sourced from the `ALICLOUD_REGION` environment variable.
-	AlicloudRegion string `mapstructure:"region" required:"true"`
+	// This is the Alicloud access key. It must be provided when profile not exist, but it can also be
+	// sourced from the ALICLOUD_ACCESS_KEY environment variable.
+	AlicloudAccessKey string `mapstructure:"access_key" required:"false"`
+	// This is the Alicloud secret key. It must be provided when profile not exist, but it can also be
+	// sourced from the ALICLOUD_SECRET_KEY environment variable.
+	AlicloudSecretKey string `mapstructure:"secret_key" required:"false"`
+	// This is the Alicloud region. It must be provided when profile not exist, but it can also be
+	// sourced from the ALICLOUD_REGION environment variables.
+	AlicloudRegion string `mapstructure:"region" required:"false"`
 	// The region validation can be skipped if this value is true, the default
 	// value is false.
 	AlicloudSkipValidation bool `mapstructure:"skip_region_validation" required:"false"`
 	// The image validation can be skipped if this value is true, the default
 	// value is false.
 	AlicloudSkipImageValidation bool `mapstructure:"skip_image_validation" required:"false"`
-	// Alicloud profile must be set unless `access_key` is set; it can also be
-	// sourced from the `ALICLOUD_PROFILE` environment variable.
+	// This is th Alicloud profile. If access_key not exist, is must be provided, but it can also be
+	// sourced from the ALICLOUD_PROFILE environment variables.
 	AlicloudProfile string `mapstructure:"profile" required:"false"`
-	// Alicloud shared credentials file path. If this file exists, access and
-	// secret keys will be read from this file.
+	// This is the Alicloud shared credentials file path. If this file path exist, os will read access key
+	// and secret key from this file.
 	AlicloudSharedCredentialsFile string `mapstructure:"shared_credentials_file" required:"false"`
 	// STS access token, can be set through template or by exporting as
 	// environment variable such as `export SECURITY_TOKEN=value`.

builder/alicloud/ecs/builder.go

@@ -46,7 +46,6 @@ func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstruct
 
 func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	err := config.Decode(&b.config, &config.DecodeOpts{
-		PluginType:         BuilderId,
 		Interpolate:        true,
 		InterpolateContext: &b.config.ctx,
 		InterpolateFilter: &interpolate.RenderFilter{

builder/alicloud/ecs/builder.hcl2spec.go

@@ -10,14 +10,14 @@ import (
 // FlatAlicloudDiskDevice is an auto-generated flat version of AlicloudDiskDevice.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatAlicloudDiskDevice struct {
-	DiskName           *string `mapstructure:"disk_name" required:"false" cty:"disk_name" hcl:"disk_name"`
-	DiskCategory       *string `mapstructure:"disk_category" required:"false" cty:"disk_category" hcl:"disk_category"`
-	DiskSize           *int    `mapstructure:"disk_size" required:"false" cty:"disk_size" hcl:"disk_size"`
-	SnapshotId         *string `mapstructure:"disk_snapshot_id" required:"false" cty:"disk_snapshot_id" hcl:"disk_snapshot_id"`
-	Description        *string `mapstructure:"disk_description" required:"false" cty:"disk_description" hcl:"disk_description"`
-	DeleteWithInstance *bool   `mapstructure:"disk_delete_with_instance" required:"false" cty:"disk_delete_with_instance" hcl:"disk_delete_with_instance"`
-	Device             *string `mapstructure:"disk_device" required:"false" cty:"disk_device" hcl:"disk_device"`
-	Encrypted          *bool   `mapstructure:"disk_encrypted" required:"false" cty:"disk_encrypted" hcl:"disk_encrypted"`
+	DiskName           *string `mapstructure:"disk_name" required:"false" cty:"disk_name"`
+	DiskCategory       *string `mapstructure:"disk_category" required:"false" cty:"disk_category"`
+	DiskSize           *int    `mapstructure:"disk_size" required:"false" cty:"disk_size"`
+	SnapshotId         *string `mapstructure:"disk_snapshot_id" required:"false" cty:"disk_snapshot_id"`
+	Description        *string `mapstructure:"disk_description" required:"false" cty:"disk_description"`
+	DeleteWithInstance *bool   `mapstructure:"disk_delete_with_instance" required:"false" cty:"disk_delete_with_instance"`
+	Device             *string `mapstructure:"disk_device" required:"false" cty:"disk_device"`
+	Encrypted          *bool   `mapstructure:"disk_encrypted" required:"false" cty:"disk_encrypted"`
 }
 
 // FlatMapstructure returns a new FlatAlicloudDiskDevice.
@@ -47,108 +47,100 @@ 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" hcl:"packer_build_name"`
-	PackerBuilderType                 *string                     `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug                       *bool                       `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce                       *bool                       `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError                     *string                     `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars                    map[string]string           `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars               []string                    `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	AlicloudAccessKey                 *string                     `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"`
-	AlicloudSecretKey                 *string                     `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	AlicloudRegion                    *string                     `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
-	AlicloudSkipValidation            *bool                       `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
-	AlicloudSkipImageValidation       *bool                       `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation" hcl:"skip_image_validation"`
-	AlicloudProfile                   *string                     `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
-	AlicloudSharedCredentialsFile     *string                     `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file" hcl:"shared_credentials_file"`
-	SecurityToken                     *string                     `mapstructure:"security_token" required:"false" cty:"security_token" hcl:"security_token"`
-	AlicloudImageName                 *string                     `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"`
-	AlicloudImageVersion              *string                     `mapstructure:"image_version" required:"false" cty:"image_version" hcl:"image_version"`
-	AlicloudImageDescription          *string                     `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"`
-	AlicloudImageShareAccounts        []string                    `mapstructure:"image_share_account" required:"false" cty:"image_share_account" hcl:"image_share_account"`
-	AlicloudImageUNShareAccounts      []string                    `mapstructure:"image_unshare_account" cty:"image_unshare_account" hcl:"image_unshare_account"`
-	AlicloudImageDestinationRegions   []string                    `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions" hcl:"image_copy_regions"`
-	AlicloudImageDestinationNames     []string                    `mapstructure:"image_copy_names" required:"false" cty:"image_copy_names" hcl:"image_copy_names"`
-	ImageEncrypted                    *bool                       `mapstructure:"image_encrypted" required:"false" cty:"image_encrypted" hcl:"image_encrypted"`
-	AlicloudImageForceDelete          *bool                       `mapstructure:"image_force_delete" required:"false" cty:"image_force_delete" hcl:"image_force_delete"`
-	AlicloudImageForceDeleteSnapshots *bool                       `mapstructure:"image_force_delete_snapshots" required:"false" cty:"image_force_delete_snapshots" hcl:"image_force_delete_snapshots"`
-	AlicloudImageForceDeleteInstances *bool                       `mapstructure:"image_force_delete_instances" cty:"image_force_delete_instances" hcl:"image_force_delete_instances"`
-	AlicloudImageIgnoreDataDisks      *bool                       `mapstructure:"image_ignore_data_disks" required:"false" cty:"image_ignore_data_disks" hcl:"image_ignore_data_disks"`
-	AlicloudImageTags                 map[string]string           `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AlicloudImageTag                  []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
-	ECSSystemDiskMapping              *FlatAlicloudDiskDevice     `mapstructure:"system_disk_mapping" required:"false" cty:"system_disk_mapping" hcl:"system_disk_mapping"`
-	ECSImagesDiskMappings             []FlatAlicloudDiskDevice    `mapstructure:"image_disk_mappings" required:"false" cty:"image_disk_mappings" hcl:"image_disk_mappings"`
-	AssociatePublicIpAddress          *bool                       `mapstructure:"associate_public_ip_address" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
-	ZoneId                            *string                     `mapstructure:"zone_id" required:"false" cty:"zone_id" hcl:"zone_id"`
-	IOOptimized                       *bool                       `mapstructure:"io_optimized" required:"false" cty:"io_optimized" hcl:"io_optimized"`
-	InstanceType                      *string                     `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
-	Description                       *string                     `mapstructure:"description" cty:"description" hcl:"description"`
-	AlicloudSourceImage               *string                     `mapstructure:"source_image" required:"true" cty:"source_image" hcl:"source_image"`
-	ForceStopInstance                 *bool                       `mapstructure:"force_stop_instance" required:"false" cty:"force_stop_instance" hcl:"force_stop_instance"`
-	DisableStopInstance               *bool                       `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance" hcl:"disable_stop_instance"`
-	SecurityGroupId                   *string                     `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
-	SecurityGroupName                 *string                     `mapstructure:"security_group_name" required:"false" cty:"security_group_name" hcl:"security_group_name"`
-	UserData                          *string                     `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
-	UserDataFile                      *string                     `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
-	VpcId                             *string                     `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"`
-	VpcName                           *string                     `mapstructure:"vpc_name" required:"false" cty:"vpc_name" hcl:"vpc_name"`
-	CidrBlock                         *string                     `mapstructure:"vpc_cidr_block" required:"false" cty:"vpc_cidr_block" hcl:"vpc_cidr_block"`
-	VSwitchId                         *string                     `mapstructure:"vswitch_id" required:"false" cty:"vswitch_id" hcl:"vswitch_id"`
-	VSwitchName                       *string                     `mapstructure:"vswitch_name" required:"false" cty:"vswitch_name" hcl:"vswitch_name"`
-	InstanceName                      *string                     `mapstructure:"instance_name" required:"false" cty:"instance_name" hcl:"instance_name"`
-	InternetChargeType                *string                     `mapstructure:"internet_charge_type" required:"false" cty:"internet_charge_type" hcl:"internet_charge_type"`
-	InternetMaxBandwidthOut           *int                        `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out" hcl:"internet_max_bandwidth_out"`
-	WaitSnapshotReadyTimeout          *int                        `mapstructure:"wait_snapshot_ready_timeout" required:"false" cty:"wait_snapshot_ready_timeout" hcl:"wait_snapshot_ready_timeout"`
-	Type                              *string                     `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
-	PauseBeforeConnect                *string                     `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
-	SSHHost                           *string                     `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
-	SSHPort                           *int                        `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
-	SSHUsername                       *string                     `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
-	SSHPassword                       *string                     `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
-	SSHKeyPairName                    *string                     `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
-	SSHTemporaryKeyPairName           *string                     `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
-	SSHTemporaryKeyPairType           *string                     `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
-	SSHTemporaryKeyPairBits           *int                        `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
-	SSHCiphers                        []string                    `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
-	SSHClearAuthorizedKeys            *bool                       `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
-	SSHKEXAlgos                       []string                    `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
-	SSHPrivateKeyFile                 *string                     `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
-	SSHCertificateFile                *string                     `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
-	SSHPty                            *bool                       `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
-	SSHTimeout                        *string                     `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
-	SSHWaitTimeout                    *string                     `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
-	SSHAgentAuth                      *bool                       `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
-	SSHDisableAgentForwarding         *bool                       `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts              *int                        `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
-	SSHBastionHost                    *string                     `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
-	SSHBastionPort                    *int                        `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
-	SSHBastionAgentAuth               *bool                       `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
-	SSHBastionUsername                *string                     `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
-	SSHBastionPassword                *string                     `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
-	SSHBastionInteractive             *bool                       `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile          *string                     `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
-	SSHBastionCertificateFile         *string                     `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
-	SSHFileTransferMethod             *string                     `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
-	SSHProxyHost                      *string                     `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
-	SSHProxyPort                      *int                        `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
-	SSHProxyUsername                  *string                     `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
-	SSHProxyPassword                  *string                     `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
-	SSHKeepAliveInterval              *string                     `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout               *string                     `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
-	SSHRemoteTunnels                  []string                    `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
-	SSHLocalTunnels                   []string                    `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
-	SSHPublicKey                      []byte                      `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
-	SSHPrivateKey                     []byte                      `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
-	WinRMUser                         *string                     `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
-	WinRMPassword                     *string                     `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
-	WinRMHost                         *string                     `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
-	WinRMNoProxy                      *bool                       `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
-	WinRMPort                         *int                        `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
-	WinRMTimeout                      *string                     `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
-	WinRMUseSSL                       *bool                       `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
-	WinRMInsecure                     *bool                       `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
-	WinRMUseNTLM                      *bool                       `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
-	SSHPrivateIp                      *bool                       `mapstructure:"ssh_private_ip" required:"false" cty:"ssh_private_ip" hcl:"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"`
+	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"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -191,7 +183,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                          &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -223,16 +215,10 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_password":                 &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
 		"ssh_keypair_name":             &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
 		"temporary_key_pair_name":      &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
-		"temporary_key_pair_type":      &hcldec.AttrSpec{Name: "temporary_key_pair_type", Type: cty.String, Required: false},
-		"temporary_key_pair_bits":      &hcldec.AttrSpec{Name: "temporary_key_pair_bits", Type: cty.Number, Required: false},
-		"ssh_ciphers":                  &hcldec.AttrSpec{Name: "ssh_ciphers", Type: cty.List(cty.String), Required: false},
 		"ssh_clear_authorized_keys":    &hcldec.AttrSpec{Name: "ssh_clear_authorized_keys", Type: cty.Bool, Required: false},
-		"ssh_key_exchange_algorithms":  &hcldec.AttrSpec{Name: "ssh_key_exchange_algorithms", Type: cty.List(cty.String), Required: false},
 		"ssh_private_key_file":         &hcldec.AttrSpec{Name: "ssh_private_key_file", Type: cty.String, Required: false},
-		"ssh_certificate_file":         &hcldec.AttrSpec{Name: "ssh_certificate_file", Type: cty.String, Required: false},
 		"ssh_pty":                      &hcldec.AttrSpec{Name: "ssh_pty", Type: cty.Bool, Required: false},
 		"ssh_timeout":                  &hcldec.AttrSpec{Name: "ssh_timeout", Type: cty.String, Required: false},
-		"ssh_wait_timeout":             &hcldec.AttrSpec{Name: "ssh_wait_timeout", Type: cty.String, Required: false},
 		"ssh_agent_auth":               &hcldec.AttrSpec{Name: "ssh_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_disable_agent_forwarding": &hcldec.AttrSpec{Name: "ssh_disable_agent_forwarding", Type: cty.Bool, Required: false},
 		"ssh_handshake_attempts":       &hcldec.AttrSpec{Name: "ssh_handshake_attempts", Type: cty.Number, Required: false},
@@ -243,7 +229,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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_bastion_certificate_file": &hcldec.AttrSpec{Name: "ssh_bastion_certificate_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},
 		"ssh_proxy_port":               &hcldec.AttrSpec{Name: "ssh_proxy_port", Type: cty.Number, Required: false},
@@ -258,7 +243,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"winrm_username":               &hcldec.AttrSpec{Name: "winrm_username", Type: cty.String, Required: false},
 		"winrm_password":               &hcldec.AttrSpec{Name: "winrm_password", Type: cty.String, Required: false},
 		"winrm_host":                   &hcldec.AttrSpec{Name: "winrm_host", Type: cty.String, Required: false},
-		"winrm_no_proxy":               &hcldec.AttrSpec{Name: "winrm_no_proxy", Type: cty.Bool, Required: false},
 		"winrm_port":                   &hcldec.AttrSpec{Name: "winrm_port", Type: cty.Number, Required: false},
 		"winrm_timeout":                &hcldec.AttrSpec{Name: "winrm_timeout", Type: cty.String, Required: false},
 		"winrm_use_ssl":                &hcldec.AttrSpec{Name: "winrm_use_ssl", Type: cty.Bool, Required: false},

builder/alicloud/ecs/builder_acc_test.go

@@ -422,6 +422,7 @@ func TestBuilderAcc_ECSImageSharing(t *testing.T) {
 	})
 }
 
+// share with catsby
 const testBuilderAccSharing = `
 {
 	"builders": [{

builder/alicloud/ecs/image_config.go

@@ -12,8 +12,6 @@ import (
 	"github.com/hashicorp/packer/template/interpolate"
 )
 
-// The "AlicloudDiskDevice" object us used for the `ECSSystemDiskMapping` and
-// `ECSImagesDiskMappings` options, and contains the following fields:
 type AlicloudDiskDevice struct {
 	// The value of disk name is blank by default. [2,
 	// 128] English or Chinese characters, must begin with an
@@ -21,7 +19,8 @@ type AlicloudDiskDevice struct {
 	// ., _ and -. The disk name will appear on the console. It cannot
 	// begin with `http://` or `https://`.
 	DiskName string `mapstructure:"disk_name" required:"false"`
-	// Category of the system disk. Optional values are:
+	// Category of the system disk. Optional values
+	// are:
 	//     -   cloud - general cloud disk
 	//     -   cloud_efficiency - efficiency cloud disk
 	//     -   cloud_ssd - cloud SSD
@@ -33,8 +32,6 @@ type AlicloudDiskDevice struct {
 	// Snapshots are used to create the data
 	// disk After this parameter is specified, Size is ignored. The actual
 	// size of the created disk is the size of the specified snapshot.
-	// This field is only used in the ECSImagesDiskMappings option, not
-	// the ECSSystemDiskMapping option.
 	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
@@ -47,116 +44,159 @@ type AlicloudDiskDevice struct {
 	// such as /dev/xvdb It is null unless the Status is In_use.
 	Device string `mapstructure:"disk_device" required:"false"`
 	// Whether or not to encrypt the data disk.
-	// If this option is set to true, the data disk will be encryped and
-	// corresponding snapshot in the target image will also be encrypted. By
+	// If this option is set to true, the data disk will be encryped and corresponding snapshot in the target image will also be encrypted. By
 	// default, if this is an extra data disk, Packer will not encrypt the
 	// data disk. Otherwise, Packer will keep the encryption setting to what
-	// it was in the source image. Please refer to Introduction of ECS disk
-	// encryption for more details.
+	// it was in the source image. Please refer to Introduction of ECS disk encryption
+	// for more details.
 	Encrypted config.Trilean `mapstructure:"disk_encrypted" required:"false"`
 }
 
-// The "AlicloudDiskDevices" object is used to define disk mappings for your
-// instance.
 type AlicloudDiskDevices struct {
-	// Image disk mapping for the system disk.
-	// See the [disk device configuration](#disk-devices-configuration) section
-	// for more information on options.
-	// Usage example:
+	// Image disk mapping for system
+	// disk.
+	// -   `disk_category` (string) - Category of the system disk. Optional values
+	//     are:
+	//         -   `cloud` - general cloud disk
+	//         -   `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.
+	//
+	// -   `disk_description` (string) - 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://`.
+	//
+	// -   `disk_name` (string) - The value of disk name is blank by default. \[2,
+	//     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://`.
+	//
+	// -   `disk_size` (number) - Size of the system disk, measured in GiB. Value
+	//     range: \[20, 500\]. The specified value must be equal to or greater
+	//     than max{20, ImageSize}. Default value: max{40, ImageSize}.
 	//
-	// ```json
-	// "builders": [{
-	//   "type":"alicloud-ecs",
-	//   "system_disk_mapping": {
-	//     "disk_size": 50,
-	//     "disk_name": "mydisk"
-	//   },
-	//   ...
-	// }
-	// ```
 	ECSSystemDiskMapping AlicloudDiskDevice `mapstructure:"system_disk_mapping" required:"false"`
-	// Add one or more data disks to the image.
-	// See the [disk device configuration](#disk-devices-configuration) section
-	// for more information on options.
-	// Usage example:
+	// Add one or more data
+	// disks to the image.
+	//
+	// -   `disk_category` (string) - Category of the data disk. Optional values
+	//     are:
+	//     -   `cloud` - general cloud disk
+	//     -   `cloud_efficiency` - efficiency cloud disk
+	//     -   `cloud_ssd` - cloud SSD
+	//
+	//     Default value: cloud.
+	//
+	// -   `disk_delete_with_instance` (boolean) - Whether or not the disk is
+	//     released along with the instance:
+	//     -   True indicates that when the instance is released, this disk will
+	//         be released with it
+	//     -   False indicates that when the instance is released, this disk will
+	//         be retained.
+	// -   `disk_description` (string) - 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://`.
+	//
+	// -   `disk_device` (string) - Device information of the related instance:
+	//     such as `/dev/xvdb` It is null unless the Status is In\_use.
+	//
+	// -   `disk_name` (string) - The value of disk name is blank by default. \[2,
+	//     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://`.
+	//
+	// -   `disk_size` (number) - Size of the data disk, in GB, values range:
+	//     -   `cloud` - 5 \~ 2000
+	//     -   `cloud_efficiency` - 20 \~ 2048
+	//     -   `cloud_ssd` - 20 \~ 2048
+	//
+	//     The value should be equal to or greater than the size of the specific
+	//     SnapshotId.
+	//
+	// -   `disk_snapshot_id` (string) - Snapshots are used to create the data
+	//     disk After this parameter is specified, Size is ignored. The actual
+	//     size of the created disk is the size of the specified snapshot.
+	//
+	//     Snapshots from on or before July 15, 2013 cannot be used to create a
+	//     disk.
+	//
+	// -   `disk_encrypted` (boolean) - Whether or not to encrypt the data disk.
+	//     If this option is set to true, the data disk will be encryped and corresponding snapshot in the target image will also be encrypted. By
+	//     default, if this is an extra data disk, Packer will not encrypt the
+	//     data disk. Otherwise, Packer will keep the encryption setting to what
+	//     it was in the source image. Please refer to Introduction of [ECS disk encryption](https://www.alibabacloud.com/help/doc-detail/59643.htm)
+	//     for more details.
 	//
-	// ```json
-	//  "builders": [{
-	//    "type":"alicloud-ecs",
-	//    "image_disk_mappings": [
-	//      {
-	//        "disk_snapshot_id": "someid",
-	//        "disk_device": "dev/xvdb"
-	//      }
-	//    ],
-	//    ...
-	//  }
-	//  ```
 	ECSImagesDiskMappings []AlicloudDiskDevice `mapstructure:"image_disk_mappings" required:"false"`
 }
 
 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://`.
-	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
+	// 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://`.
+	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://`.
 	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. If number of accounts is greater than 10,
-	// this parameter is ignored.
+	// The IDs of to-be-added Aliyun
+	// accounts to which the image is shared. The number of accounts is 1 to 10.
+	// If number of accounts is greater than 10, this parameter is ignored.
 	AlicloudImageShareAccounts   []string `mapstructure:"image_share_account" required:"false"`
 	AlicloudImageUNShareAccounts []string `mapstructure:"image_unshare_account"`
 	// Copy to the destination regionIds.
 	AlicloudImageDestinationRegions []string `mapstructure:"image_copy_regions" required:"false"`
-	// 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://`.
+	// 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://`.
 	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 instance in
-	// the main region and an encrypted copy will be generated in the same
-	// region. By default, Packer will keep the encryption setting to what it
-	// was in the source image.
+	// 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
+	// instance in the main region and an encrypted copy will be generated in the
+	// same region. By default, Packer will keep the encryption setting to what
+	// it was in the source image.
 	ImageEncrypted config.Trilean `mapstructure:"image_encrypted" required:"false"`
 	// If this value is true, when the target image names including those
 	// copied are duplicated with existing images, it will delete the existing
 	// 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 provided in `build`
-	// command, this option can be omitted and taken as true.
+	// [-force](/docs/commands/build#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 provided in `build`
-	// command, this option can be omitted and taken as true.
+	// [-force](/docs/commands/build#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"`
 	AlicloudImageForceDeleteInstances bool `mapstructure:"image_force_delete_instances"`
-	// If this value is true, the image created will not include any snapshot
-	// of data disks. This option would be useful for any circumstance that
-	// default data disks with instance types are not concerned. The default
-	// value is false.
+	// If this value is true, the image
+	// created will not include any snapshot of data disks. This option would be
+	// useful for any circumstance that default data disks with instance types are
+	// not concerned. The default value is false.
 	AlicloudImageIgnoreDataDisks bool `mapstructure:"image_ignore_data_disks" required:"false"`
-	// The region validation can be skipped if this value is true, the default
-	// value is false.
+	// The region validation can be skipped
+	// if this value is true, the default value is false.
 	AlicloudImageSkipRegionValidation bool `mapstructure:"skip_region_validation" required:"false"`
-	// Key/value pair tags applied to the destination image and relevant
-	// snapshots.
+	// 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 `key` and a `value` field. In HCL2 mode the
+	// 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.KeyValues `mapstructure:"tag" required:"false"`
+	AlicloudImageTag    hcl2template.NameValues `mapstructure:"tag" required:"false"`
 	AlicloudDiskDevices `mapstructure:",squash"`
 }
 

builder/amazon/chroot/builder.go

@@ -14,10 +14,10 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/hcl/v2/hcldec"
+	"github.com/hashicorp/packer/builder"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/common/chroot"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
@@ -160,15 +160,15 @@ type Config struct {
 	//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"`
-	// Key/value pair tags to apply to the volumes that are *launched*. This is
-	// a [template engine](/docs/templates/engine), see [Build template
+	// Tags to apply to the volumes that are *launched*. This is a [template
+	// engine](/docs/templates/engine), 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 `key` and a `value` field. In HCL2 mode the
+	// 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.KeyValues `mapstructure:"root_volume_tag" required:"false"`
+	RootVolumeTag hcl2template.NameValues `mapstructure:"root_volume_tag" 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"`
@@ -194,18 +194,14 @@ func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstruct
 func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	b.config.ctx.Funcs = awscommon.TemplateFuncs
 	err := config.Decode(&b.config, &config.DecodeOpts{
-		PluginType:         BuilderId,
 		Interpolate:        true,
 		InterpolateContext: &b.config.ctx,
 		InterpolateFilter: &interpolate.RenderFilter{
 			Exclude: []string{
 				"ami_description",
 				"snapshot_tags",
-				"snapshot_tag",
 				"tags",
-				"tag",
 				"root_volume_tags",
-				"root_volume_tag",
 				"command_wrapper",
 				"post_mount_commands",
 				"pre_mount_commands",
@@ -339,9 +335,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	}
 
 	packer.LogSecretFilter.Set(b.config.AccessKey, b.config.SecretKey, b.config.Token)
-	generatedData := awscommon.GetGeneratedDataList()
-	generatedData = append(generatedData, "Device", "MountPath")
-
+	generatedData := []string{"SourceAMIName", "Device", "MountPath"}
 	return generatedData, warns, nil
 }
 
@@ -372,7 +366,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("hook", hook)
 	state.Put("ui", ui)
 	state.Put("wrappedCommand", common.CommandWrapper(wrappedCommand))
-	generatedData := &packerbuilderdata.GeneratedData{State: state}
+	generatedData := &builder.GeneratedData{State: state}
 
 	// Build the steps
 	steps := []multistep.Step{
@@ -402,15 +396,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			GeneratedData: generatedData,
 		},
 		&StepCreateVolume{
-			PollingConfig:  b.config.PollingConfig,
 			RootVolumeType: b.config.RootVolumeType,
 			RootVolumeSize: b.config.RootVolumeSize,
 			RootVolumeTags: b.config.RootVolumeTags,
 			Ctx:            b.config.ctx,
 		},
-		&StepAttachVolume{
-			PollingConfig: b.config.PollingConfig,
-		},
+		&StepAttachVolume{},
 		&StepEarlyUnflock{},
 		&chroot.StepPreMountCommands{
 			Commands: b.config.PreMountCommands,
@@ -429,14 +420,9 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&chroot.StepCopyFiles{
 			Files: b.config.CopyFiles,
 		},
-		&awscommon.StepSetGeneratedData{
-			GeneratedData: generatedData,
-		},
 		&chroot.StepChrootProvision{},
 		&chroot.StepEarlyCleanup{},
-		&StepSnapshot{
-			PollingConfig: b.config.PollingConfig,
-		},
+		&StepSnapshot{},
 		&awscommon.StepDeregisterAMI{
 			AccessConfig:        &b.config.AccessConfig,
 			ForceDeregister:     b.config.AMIForceDeregister,
@@ -449,7 +435,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			EnableAMISriovNetSupport: b.config.AMISriovNetSupport,
 			EnableAMIENASupport:      b.config.AMIENASupport,
 			AMISkipBuildRegion:       b.config.AMISkipBuildRegion,
-			PollingConfig:            b.config.PollingConfig,
 		},
 		&awscommon.StepAMIRegionCopy{
 			AccessConfig:      &b.config.AccessConfig,

builder/amazon/chroot/builder.hcl2spec.go

@@ -11,71 +11,67 @@ 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" hcl:"packer_build_name"`
-	PackerBuilderType       *string                           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug             *bool                             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce             *bool                             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError           *string                           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars          map[string]string                 `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars     []string                          `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	AMIName                 *string                           `mapstructure:"ami_name" required:"true" cty:"ami_name" hcl:"ami_name"`
-	AMIDescription          *string                           `mapstructure:"ami_description" required:"false" cty:"ami_description" hcl:"ami_description"`
-	AMIVirtType             *string                           `mapstructure:"ami_virtualization_type" required:"false" cty:"ami_virtualization_type" hcl:"ami_virtualization_type"`
-	AMIUsers                []string                          `mapstructure:"ami_users" required:"false" cty:"ami_users" hcl:"ami_users"`
-	AMIGroups               []string                          `mapstructure:"ami_groups" required:"false" cty:"ami_groups" hcl:"ami_groups"`
-	AMIProductCodes         []string                          `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes" hcl:"ami_product_codes"`
-	AMIRegions              []string                          `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"`
-	AMISkipRegionValidation *bool                             `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
-	AMITags                 map[string]string                 `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AMITag                  []hcl2template.FlatKeyValue       `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
-	AMIENASupport           *bool                             `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"`
-	AMISriovNetSupport      *bool                             `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"`
-	AMIForceDeregister      *bool                             `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"`
-	AMIForceDeleteSnapshot  *bool                             `mapstructure:"force_delete_snapshot" required:"false" cty:"force_delete_snapshot" hcl:"force_delete_snapshot"`
-	AMIEncryptBootVolume    *bool                             `mapstructure:"encrypt_boot" required:"false" cty:"encrypt_boot" hcl:"encrypt_boot"`
-	AMIKmsKeyId             *string                           `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"`
-	AMIRegionKMSKeyIDs      map[string]string                 `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"`
-	AMISkipBuildRegion      *bool                             `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"`
-	SnapshotTags            map[string]string                 `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"`
-	SnapshotTag             []hcl2template.FlatKeyValue       `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
-	SnapshotUsers           []string                          `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"`
-	SnapshotGroups          []string                          `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"`
-	AccessKey               *string                           `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"`
-	AssumeRole              *common.FlatAssumeRoleConfig      `mapstructure:"assume_role" required:"false" cty:"assume_role" hcl:"assume_role"`
-	CustomEndpointEc2       *string                           `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2" hcl:"custom_endpoint_ec2"`
-	CredsFilename           *string                           `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file" hcl:"shared_credentials_file"`
-	DecodeAuthZMessages     *bool                             `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages" hcl:"decode_authorization_messages"`
-	InsecureSkipTLSVerify   *bool                             `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"`
-	MaxRetries              *int                              `mapstructure:"max_retries" required:"false" cty:"max_retries" hcl:"max_retries"`
-	MFACode                 *string                           `mapstructure:"mfa_code" required:"false" cty:"mfa_code" hcl:"mfa_code"`
-	ProfileName             *string                           `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
-	RawRegion               *string                           `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
-	SecretKey               *string                           `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	SkipMetadataApiCheck    *bool                             `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check" hcl:"skip_metadata_api_check"`
-	SkipCredsValidation     *bool                             `mapstructure:"skip_credential_validation" cty:"skip_credential_validation" hcl:"skip_credential_validation"`
-	Token                   *string                           `mapstructure:"token" required:"false" cty:"token" hcl:"token"`
-	VaultAWSEngine          *common.FlatVaultAWSEngineOptions `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine" hcl:"vault_aws_engine"`
-	PollingConfig           *common.FlatAWSPollingConfig      `mapstructure:"aws_polling" required:"false" cty:"aws_polling" hcl:"aws_polling"`
-	AMIMappings             []common.FlatBlockDevice          `mapstructure:"ami_block_device_mappings" hcl2-schema-generator:"ami_block_device_mappings,direct" required:"false" cty:"ami_block_device_mappings" hcl:"ami_block_device_mappings"`
-	ChrootMounts            [][]string                        `mapstructure:"chroot_mounts" required:"false" cty:"chroot_mounts" hcl:"chroot_mounts"`
-	CommandWrapper          *string                           `mapstructure:"command_wrapper" required:"false" cty:"command_wrapper" hcl:"command_wrapper"`
-	CopyFiles               []string                          `mapstructure:"copy_files" required:"false" cty:"copy_files" hcl:"copy_files"`
-	DevicePath              *string                           `mapstructure:"device_path" required:"false" cty:"device_path" hcl:"device_path"`
-	NVMEDevicePath          *string                           `mapstructure:"nvme_device_path" required:"false" cty:"nvme_device_path" hcl:"nvme_device_path"`
-	FromScratch             *bool                             `mapstructure:"from_scratch" required:"false" cty:"from_scratch" hcl:"from_scratch"`
-	MountOptions            []string                          `mapstructure:"mount_options" required:"false" cty:"mount_options" hcl:"mount_options"`
-	MountPartition          *string                           `mapstructure:"mount_partition" required:"false" cty:"mount_partition" hcl:"mount_partition"`
-	MountPath               *string                           `mapstructure:"mount_path" required:"false" cty:"mount_path" hcl:"mount_path"`
-	PostMountCommands       []string                          `mapstructure:"post_mount_commands" required:"false" cty:"post_mount_commands" hcl:"post_mount_commands"`
-	PreMountCommands        []string                          `mapstructure:"pre_mount_commands" required:"false" cty:"pre_mount_commands" hcl:"pre_mount_commands"`
-	RootDeviceName          *string                           `mapstructure:"root_device_name" required:"false" cty:"root_device_name" hcl:"root_device_name"`
-	RootVolumeSize          *int64                            `mapstructure:"root_volume_size" required:"false" cty:"root_volume_size" hcl:"root_volume_size"`
-	RootVolumeType          *string                           `mapstructure:"root_volume_type" required:"false" cty:"root_volume_type" hcl:"root_volume_type"`
-	SourceAmi               *string                           `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"`
-	SourceAmiFilter         *common.FlatAmiFilterOptions      `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter" hcl:"source_ami_filter"`
-	RootVolumeTags          map[string]string                 `mapstructure:"root_volume_tags" required:"false" cty:"root_volume_tags" hcl:"root_volume_tags"`
-	RootVolumeTag           []hcl2template.FlatKeyValue       `mapstructure:"root_volume_tag" required:"false" cty:"root_volume_tag" hcl:"root_volume_tag"`
-	Architecture            *string                           `mapstructure:"ami_architecture" required:"false" cty:"ami_architecture" hcl:"ami_architecture"`
+	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"`
+	AMIName                 *string                           `mapstructure:"ami_name" required:"true" cty:"ami_name"`
+	AMIDescription          *string                           `mapstructure:"ami_description" required:"false" cty:"ami_description"`
+	AMIVirtType             *string                           `mapstructure:"ami_virtualization_type" required:"false" cty:"ami_virtualization_type"`
+	AMIUsers                []string                          `mapstructure:"ami_users" required:"false" cty:"ami_users"`
+	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"`
+	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"`
+	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"`
+	AMIForceDeleteSnapshot  *bool                             `mapstructure:"force_delete_snapshot" required:"false" cty:"force_delete_snapshot"`
+	AMIEncryptBootVolume    *bool                             `mapstructure:"encrypt_boot" required:"false" cty:"encrypt_boot"`
+	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"`
+	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"`
+	CustomEndpointEc2       *string                           `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2"`
+	DecodeAuthZMessages     *bool                             `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages"`
+	InsecureSkipTLSVerify   *bool                             `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify"`
+	MaxRetries              *int                              `mapstructure:"max_retries" required:"false" cty:"max_retries"`
+	MFACode                 *string                           `mapstructure:"mfa_code" required:"false" cty:"mfa_code"`
+	ProfileName             *string                           `mapstructure:"profile" required:"false" cty:"profile"`
+	RawRegion               *string                           `mapstructure:"region" required:"true" cty:"region"`
+	SecretKey               *string                           `mapstructure:"secret_key" required:"true" cty:"secret_key"`
+	SkipMetadataApiCheck    *bool                             `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check"`
+	Token                   *string                           `mapstructure:"token" required:"false" cty:"token"`
+	VaultAWSEngine          *common.FlatVaultAWSEngineOptions `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine"`
+	AMIMappings             []common.FlatBlockDevice          `mapstructure:"ami_block_device_mappings" hcl2-schema-generator:"ami_block_device_mappings,direct" required:"false" cty:"ami_block_device_mappings"`
+	ChrootMounts            [][]string                        `mapstructure:"chroot_mounts" required:"false" cty:"chroot_mounts"`
+	CommandWrapper          *string                           `mapstructure:"command_wrapper" required:"false" cty:"command_wrapper"`
+	CopyFiles               []string                          `mapstructure:"copy_files" required:"false" cty:"copy_files"`
+	DevicePath              *string                           `mapstructure:"device_path" required:"false" cty:"device_path"`
+	NVMEDevicePath          *string                           `mapstructure:"nvme_device_path" required:"false" cty:"nvme_device_path"`
+	FromScratch             *bool                             `mapstructure:"from_scratch" required:"false" cty:"from_scratch"`
+	MountOptions            []string                          `mapstructure:"mount_options" required:"false" cty:"mount_options"`
+	MountPartition          *string                           `mapstructure:"mount_partition" required:"false" cty:"mount_partition"`
+	MountPath               *string                           `mapstructure:"mount_path" required:"false" cty:"mount_path"`
+	PostMountCommands       []string                          `mapstructure:"post_mount_commands" required:"false" cty:"post_mount_commands"`
+	PreMountCommands        []string                          `mapstructure:"pre_mount_commands" required:"false" cty:"pre_mount_commands"`
+	RootDeviceName          *string                           `mapstructure:"root_device_name" required:"false" cty:"root_device_name"`
+	RootVolumeSize          *int64                            `mapstructure:"root_volume_size" required:"false" cty:"root_volume_size"`
+	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"`
+	Architecture            *string                           `mapstructure:"ami_architecture" required:"false" cty:"ami_architecture"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -106,7 +102,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -116,13 +112,11 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"region_kms_key_ids":            &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(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.FlatKeyValue)(nil).HCL2Spec())},
+		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
-		"assume_role":                   &hcldec.BlockSpec{TypeName: "assume_role", Nested: hcldec.ObjectSpec((*common.FlatAssumeRoleConfig)(nil).HCL2Spec())},
 		"custom_endpoint_ec2":           &hcldec.AttrSpec{Name: "custom_endpoint_ec2", Type: cty.String, Required: false},
-		"shared_credentials_file":       &hcldec.AttrSpec{Name: "shared_credentials_file", Type: cty.String, Required: false},
 		"decode_authorization_messages": &hcldec.AttrSpec{Name: "decode_authorization_messages", Type: cty.Bool, Required: false},
 		"insecure_skip_tls_verify":      &hcldec.AttrSpec{Name: "insecure_skip_tls_verify", Type: cty.Bool, Required: false},
 		"max_retries":                   &hcldec.AttrSpec{Name: "max_retries", Type: cty.Number, Required: false},
@@ -131,10 +125,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"region":                        &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
 		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
 		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
-		"skip_credential_validation":    &hcldec.AttrSpec{Name: "skip_credential_validation", Type: cty.Bool, Required: false},
 		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
 		"vault_aws_engine":              &hcldec.BlockSpec{TypeName: "vault_aws_engine", Nested: hcldec.ObjectSpec((*common.FlatVaultAWSEngineOptions)(nil).HCL2Spec())},
-		"aws_polling":                   &hcldec.BlockSpec{TypeName: "aws_polling", Nested: hcldec.ObjectSpec((*common.FlatAWSPollingConfig)(nil).HCL2Spec())},
 		"ami_block_device_mappings":     &hcldec.BlockListSpec{TypeName: "ami_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())},
 		"chroot_mounts":                 &hcldec.AttrSpec{Name: "chroot_mounts", Type: cty.List(cty.List(cty.String)), Required: false},
 		"command_wrapper":               &hcldec.AttrSpec{Name: "command_wrapper", Type: cty.String, Required: false},
@@ -153,7 +145,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"root_volume_tag":               &hcldec.BlockListSpec{TypeName: "root_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"ami_architecture":              &hcldec.AttrSpec{Name: "ami_architecture", Type: cty.String, Required: false},
 	}
 	return s

builder/amazon/chroot/builder_test.go

@@ -227,25 +227,10 @@ func TestBuilderPrepare_ReturnGeneratedData(t *testing.T) {
 	if generatedData[0] != "SourceAMIName" {
 		t.Fatalf("Generated data should contain SourceAMIName")
 	}
-	if generatedData[1] != "BuildRegion" {
-		t.Fatalf("Generated data should contain BuildRegion")
-	}
-	if generatedData[2] != "SourceAMI" {
-		t.Fatalf("Generated data should contain SourceAMI")
-	}
-	if generatedData[3] != "SourceAMICreationDate" {
-		t.Fatalf("Generated data should contain SourceAMICreationDate")
-	}
-	if generatedData[4] != "SourceAMIOwner" {
-		t.Fatalf("Generated data should contain SourceAMIOwner")
-	}
-	if generatedData[5] != "SourceAMIOwnerName" {
-		t.Fatalf("Generated data should contain SourceAMIOwnerName")
-	}
-	if generatedData[6] != "Device" {
+	if generatedData[1] != "Device" {
 		t.Fatalf("Generated data should contain Device")
 	}
-	if generatedData[7] != "MountPath" {
+	if generatedData[2] != "MountPath" {
 		t.Fatalf("Generated data should contain MountPath")
 	}
 }

builder/amazon/chroot/step_attach_volume.go

@@ -19,9 +19,8 @@ import (
 //   device string - The location where the volume was attached.
 //   attach_cleanup CleanupFunc
 type StepAttachVolume struct {
-	PollingConfig *awscommon.AWSPollingConfig
-	attached      bool
-	volumeId      string
+	attached bool
+	volumeId string
 }
 
 func (s *StepAttachVolume) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
@@ -52,7 +51,7 @@ func (s *StepAttachVolume) Run(ctx context.Context, state multistep.StateBag) mu
 	s.volumeId = volumeId
 
 	// Wait for the volume to become attached
-	err = s.PollingConfig.WaitUntilVolumeAttached(ctx, ec2conn, s.volumeId)
+	err = awscommon.WaitUntilVolumeAttached(ctx, ec2conn, s.volumeId)
 	if err != nil {
 		err := fmt.Errorf("Error waiting for volume: %s", err)
 		state.Put("error", err)
@@ -88,7 +87,7 @@ func (s *StepAttachVolume) CleanupFunc(state multistep.StateBag) error {
 	s.attached = false
 
 	// Wait for the volume to detach
-	err = s.PollingConfig.WaitUntilVolumeDetached(aws.BackgroundContext(), ec2conn, s.volumeId)
+	err = awscommon.WaitUntilVolumeDetached(aws.BackgroundContext(), ec2conn, s.volumeId)
 	if err != nil {
 		return fmt.Errorf("Error waiting for volume: %s", err)
 	}

builder/amazon/chroot/step_create_volume.go

@@ -20,7 +20,6 @@ import (
 // Produces:
 //   volume_id string - The ID of the created volume
 type StepCreateVolume struct {
-	PollingConfig  *awscommon.AWSPollingConfig
 	volumeId       string
 	RootVolumeSize int64
 	RootVolumeType string
@@ -111,7 +110,7 @@ func (s *StepCreateVolume) Run(ctx context.Context, state multistep.StateBag) mu
 	log.Printf("Volume ID: %s", s.volumeId)
 
 	// Wait for the volume to become ready
-	err = s.PollingConfig.WaitUntilVolumeAvailable(ctx, ec2conn, s.volumeId)
+	err = awscommon.WaitUntilVolumeAvailable(ctx, ec2conn, s.volumeId)
 	if err != nil {
 		err := fmt.Errorf("Error waiting for volume: %s", err)
 		state.Put("error", err)

builder/amazon/chroot/step_mount_device.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/builder"
 	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/hashicorp/packer/template/interpolate"
@@ -31,7 +31,7 @@ type StepMountDevice struct {
 	MountPartition string
 
 	mountPath     string
-	GeneratedData *packerbuilderdata.GeneratedData
+	GeneratedData *builder.GeneratedData
 }
 
 func (s *StepMountDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {

builder/amazon/chroot/step_prepare_device.go

@@ -6,14 +6,14 @@ import (
 	"log"
 	"os"
 
-	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/builder"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
 
 // StepPrepareDevice finds an available device and sets it.
 type StepPrepareDevice struct {
-	GeneratedData *packerbuilderdata.GeneratedData
+	GeneratedData *builder.GeneratedData
 }
 
 func (s *StepPrepareDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {

builder/amazon/chroot/step_register_ami.go

@@ -15,7 +15,6 @@ import (
 
 // StepRegisterAMI creates the AMI.
 type StepRegisterAMI struct {
-	PollingConfig            *awscommon.AWSPollingConfig
 	RootVolumeSize           int64
 	EnableAMIENASupport      confighelper.Trilean
 	EnableAMISriovNetSupport bool
@@ -82,7 +81,7 @@ func (s *StepRegisterAMI) Run(ctx context.Context, state multistep.StateBag) mul
 	state.Put("amis", amis)
 
 	ui.Say("Waiting for AMI to become ready...")
-	if err := s.PollingConfig.WaitUntilAMIAvailable(ctx, ec2conn, *registerResp.ImageId); err != nil {
+	if err := awscommon.WaitUntilAMIAvailable(ctx, ec2conn, *registerResp.ImageId); err != nil {
 		err := fmt.Errorf("Error waiting for AMI: %s", err)
 		state.Put("error", err)
 		ui.Error(err.Error())

builder/amazon/chroot/step_snapshot.go

@@ -16,8 +16,7 @@ import (
 // Produces:
 //   snapshot_id string - ID of the created snapshot
 type StepSnapshot struct {
-	PollingConfig *awscommon.AWSPollingConfig
-	snapshotId    string
+	snapshotId string
 }
 
 func (s *StepSnapshot) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
@@ -44,7 +43,7 @@ func (s *StepSnapshot) Run(ctx context.Context, state multistep.StateBag) multis
 	ui.Message(fmt.Sprintf("Snapshot ID: %s", s.snapshotId))
 
 	// Wait for the snapshot to be ready
-	err = s.PollingConfig.WaitUntilSnapshotDone(ctx, ec2conn, s.snapshotId)
+	err = awscommon.WaitUntilSnapshotDone(ctx, ec2conn, s.snapshotId)
 	if err != nil {
 		err := fmt.Errorf("Error waiting for snapshot: %s", err)
 		state.Put("error", err)

builder/amazon/common/access_config.go

@@ -1,5 +1,5 @@
 //go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type VaultAWSEngineOptions,AssumeRoleConfig
+//go:generate mapstructure-to-hcl2 -type VaultAWSEngineOptions
 
 package common
 
@@ -11,68 +11,15 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
-	awsCredentials "github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	awsbase "github.com/hashicorp/aws-sdk-go-base"
 	cleanhttp "github.com/hashicorp/go-cleanhttp"
-	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
 	"github.com/hashicorp/packer/template/interpolate"
 	vaultapi "github.com/hashicorp/vault/api"
 )
 
-// AssumeRoleConfig lets users set configuration options for assuming a special
-// role when executing Packer.
-//
-// Usage example:
-//
-// HCL config example:
-//
-// ```HCL
-// source "example" "amazon-ebs"{
-// 	assume_role {
-// 		role_arn     = "arn:aws:iam::ACCOUNT_ID:role/ROLE_NAME"
-// 		session_name = "SESSION_NAME"
-// 		external_id  = "EXTERNAL_ID"
-// 	}
-// }
-// ```
-//
-// JSON config example:
-//
-// ```json
-// builder{
-// 	"type": "amazon-ebs",
-// 	"assume_role": {
-// 		"role_arn"    :  "arn:aws:iam::ACCOUNT_ID:role/ROLE_NAME",
-// 		"session_name":  "SESSION_NAME",
-// 		"external_id" :  "EXTERNAL_ID"
-// 	}
-// }
-// ```
-type AssumeRoleConfig struct {
-	// Amazon Resource Name (ARN) of the IAM Role to assume.
-	AssumeRoleARN string `mapstructure:"role_arn" required:"false"`
-	// Number of seconds to restrict the assume role session duration.
-	AssumeRoleDurationSeconds int `mapstructure:"duration_seconds" required:"false"`
-	// The external ID to use when assuming the role. If omitted, no external
-	// ID is passed to the AssumeRole call.
-	AssumeRoleExternalID string `mapstructure:"external_id" required:"false"`
-	// IAM Policy JSON describing further restricting permissions for the IAM
-	// Role being assumed.
-	AssumeRolePolicy string `mapstructure:"policy" required:"false"`
-	// Set of Amazon Resource Names (ARNs) of IAM Policies describing further
-	// restricting permissions for the IAM Role being
-	AssumeRolePolicyARNs []string `mapstructure:"policy_arns" required:"false"`
-	// Session name to use when assuming the role.
-	AssumeRoleSessionName string `mapstructure:"session_name" required:"false"`
-	// Map of assume role session tags.
-	AssumeRoleTags map[string]string `mapstructure:"tags" required:"false"`
-	// Set of assume role session tag keys to pass to any subsequent sessions.
-	AssumeRoleTransitiveTagKeys []string `mapstructure:"transitive_tag_keys" required:"false"`
-}
-
 type VaultAWSEngineOptions struct {
 	Name    string `mapstructure:"name"`
 	RoleARN string `mapstructure:"role_arn"`
@@ -101,17 +48,10 @@ type AccessConfig struct {
 	// is not required if you are using `use_vault_aws_engine` for
 	// authentication instead.
 	AccessKey string `mapstructure:"access_key" required:"true"`
-	// If provided with a role ARN, Packer will attempt to assume this role
-	// using the supplied credentials. See
-	// [AssumeRoleConfig](#assume-role-configuration) below for more
-	// details on all of the options available, and for a usage example.
-	AssumeRole AssumeRoleConfig `mapstructure:"assume_role" required:"false"`
 	// This option is useful if you use a cloud
 	// provider whose API is compatible with aws EC2. Specify another endpoint
 	// like this https://ec2.custom.endpoint.com.
 	CustomEndpointEc2 string `mapstructure:"custom_endpoint_ec2" required:"false"`
-	// Path to a credentials file to load credentials from
-	CredsFilename string `mapstructure:"shared_credentials_file" required:"false"`
 	// Enable automatic decoding of any encoded authorization (error) messages
 	// using the `sts:DecodeAuthorizationMessage` API. Note: requires that the
 	// effective user/role have permissions to `sts:DecodeAuthorizationMessage`
@@ -146,8 +86,6 @@ type AccessConfig struct {
 	// validation of the ami_regions configuration option. Default false.
 	SkipValidation       bool `mapstructure:"skip_region_validation" required:"false"`
 	SkipMetadataApiCheck bool `mapstructure:"skip_metadata_api_check"`
-	// Set to true if you want to skip validating AWS credentials before runtime.
-	SkipCredsValidation bool `mapstructure:"skip_credential_validation"`
 	// The access token to use. This is different from the
 	// access key and secret key. If you're not sure what this is, then you
 	// probably don't need it. This will also be read from the AWS_SESSION_TOKEN
@@ -178,8 +116,6 @@ type AccessConfig struct {
 	//     credential types) and GetFederationToken (for federation\_token
 	//     credential types) for more details.
 	//
-	// JSON example:
-	//
 	// ```json
 	// {
 	//     "vault_aws_engine": {
@@ -189,20 +125,7 @@ type AccessConfig struct {
 	//     }
 	// }
 	// ```
-	//
-	// HCL2 example:
-	//
-	// ```hcl
-	//   vault_aws_engine {
-	//       name = "myrole"
-	//       role_arn = "myarn"
-	//       ttl = "3600s"
-	//   }
-	// ```
 	VaultAWSEngine VaultAWSEngineOptions `mapstructure:"vault_aws_engine" required:"false"`
-	// [Polling configuration](#polling-configuration) for the AWS waiter. Configures the waiter that checks
-	// resource state.
-	PollingConfig *AWSPollingConfig `mapstructure:"aws_polling" required:"false"`
 
 	getEC2Connection func() ec2iface.EC2API
 }
@@ -214,13 +137,16 @@ func (c *AccessConfig) Session() (*session.Session, error) {
 		return c.session, nil
 	}
 
-	// Create new AWS config
 	config := aws.NewConfig().WithCredentialsChainVerboseErrors(true)
 	if c.MaxRetries > 0 {
 		config = config.WithMaxRetries(c.MaxRetries)
 	}
 
-	// Set AWS config defaults.
+	staticCreds := credentials.NewStaticCredentials(c.AccessKey, c.SecretKey, c.Token)
+	if _, err := staticCreds.Get(); err != credentials.ErrStaticCredentialsEmpty {
+		config.WithCredentials(staticCreds)
+	}
+
 	if c.RawRegion != "" {
 		config = config.WithRegion(c.RawRegion)
 	}
@@ -238,16 +164,6 @@ func (c *AccessConfig) Session() (*session.Session, error) {
 	}
 	transport.Proxy = http.ProxyFromEnvironment
 
-	// Figure out which possible credential providers are valid; test that we
-	// can get credentials via the selected providers, and set the providers in
-	// the config.
-	creds, err := c.GetCredentials(config)
-	if err != nil {
-		return nil, err
-	}
-	config.WithCredentials(creds)
-
-	// Create session options based on our AWS config
 	opts := session.Options{
 		SharedConfigState: session.SharedConfigEnable,
 		Config:            *config,
@@ -272,8 +188,10 @@ func (c *AccessConfig) Session() (*session.Session, error) {
 
 	cp, err := c.session.Config.Credentials.Get()
 
-	if awserrors.Matches(err, "NoCredentialProviders", "") {
-		return nil, c.NewNoValidCredentialSourcesError(err)
+	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 " +
+			"for more information on providing credentials for the AWS Builder.")
 	}
 
 	if err != nil {
@@ -285,6 +203,7 @@ func (c *AccessConfig) Session() (*session.Session, error) {
 	if c.DecodeAuthZMessages {
 		DecodeAuthZMessages(c.session)
 	}
+	LogEnvOverrideWarnings()
 
 	return c.session, nil
 }
@@ -304,42 +223,6 @@ func (c *AccessConfig) IsChinaCloud() bool {
 	return strings.HasPrefix(c.SessionRegion(), "cn-")
 }
 
-// GetCredentials gets credentials from the environment, shared credentials,
-// the session (which may include a credential process), or ECS/EC2 metadata
-// endpoints. GetCredentials also validates the credentials and the ability to
-// assume a role or will return an error if unsuccessful.
-func (c *AccessConfig) GetCredentials(config *aws.Config) (*awsCredentials.Credentials, error) {
-	// Reload values into the config used by the Packer-Terraform shared SDK
-	awsbaseConfig := &awsbase.Config{
-		AccessKey:                   c.AccessKey,
-		AssumeRoleARN:               c.AssumeRole.AssumeRoleARN,
-		AssumeRoleDurationSeconds:   c.AssumeRole.AssumeRoleDurationSeconds,
-		AssumeRoleExternalID:        c.AssumeRole.AssumeRoleExternalID,
-		AssumeRolePolicy:            c.AssumeRole.AssumeRolePolicy,
-		AssumeRolePolicyARNs:        c.AssumeRole.AssumeRolePolicyARNs,
-		AssumeRoleSessionName:       c.AssumeRole.AssumeRoleSessionName,
-		AssumeRoleTags:              c.AssumeRole.AssumeRoleTags,
-		AssumeRoleTransitiveTagKeys: c.AssumeRole.AssumeRoleTransitiveTagKeys,
-		CredsFilename:               c.CredsFilename,
-		DebugLogging:                false,
-		// TODO: implement for Packer
-		// IamEndpoint:                 c.Endpoints["iam"],
-		Insecure:             c.InsecureSkipTLSVerify,
-		MaxRetries:           c.MaxRetries,
-		Profile:              c.ProfileName,
-		Region:               c.RawRegion,
-		SecretKey:            c.SecretKey,
-		SkipCredsValidation:  c.SkipCredsValidation,
-		SkipMetadataApiCheck: c.SkipMetadataApiCheck,
-		// TODO: implement for Packer
-		// SkipRequestingAccountId:     c.SkipRequestingAccountId,
-		// StsEndpoint:                 c.Endpoints["sts"],
-		Token: c.Token,
-	}
-
-	return awsbase.GetCredentials(awsbaseConfig)
-}
-
 func (c *AccessConfig) GetCredsFromVault() error {
 	// const EnvVaultAddress = "VAULT_ADDR"
 	// const EnvVaultToken = "VAULT_TOKEN"
@@ -401,21 +284,9 @@ func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
 			fmt.Errorf("`access_key` and `secret_key` must both be either set or not set."))
 	}
 
-	if c.PollingConfig == nil {
-		c.PollingConfig = new(AWSPollingConfig)
-	}
-	c.PollingConfig.LogEnvOverrideWarnings()
-
 	return errs
 }
 
-func (c *AccessConfig) NewNoValidCredentialSourcesError(err error) error {
-	return fmt.Errorf("No valid credential sources found for AWS Builder. "+
-		"Please see https://www.packer.io/docs/builders/amazon#authentication "+
-		"for more information on providing credentials for the AWS Builder. "+
-		"Error: %w", err)
-}
-
 func (c *AccessConfig) NewEC2Connection() (ec2iface.EC2API, error) {
 	if c.getEC2Connection != nil {
 		return c.getEC2Connection(), nil

builder/amazon/common/access_config.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type VaultAWSEngineOptions,AssumeRoleConfig"; DO NOT EDIT.
+// Code generated by "mapstructure-to-hcl2 -type VaultAWSEngineOptions"; DO NOT EDIT.
 package common
 
 import (
@@ -6,50 +6,13 @@ import (
 	"github.com/zclconf/go-cty/cty"
 )
 
-// FlatAssumeRoleConfig is an auto-generated flat version of AssumeRoleConfig.
-// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
-type FlatAssumeRoleConfig struct {
-	AssumeRoleARN               *string           `mapstructure:"role_arn" required:"false" cty:"role_arn" hcl:"role_arn"`
-	AssumeRoleDurationSeconds   *int              `mapstructure:"duration_seconds" required:"false" cty:"duration_seconds" hcl:"duration_seconds"`
-	AssumeRoleExternalID        *string           `mapstructure:"external_id" required:"false" cty:"external_id" hcl:"external_id"`
-	AssumeRolePolicy            *string           `mapstructure:"policy" required:"false" cty:"policy" hcl:"policy"`
-	AssumeRolePolicyARNs        []string          `mapstructure:"policy_arns" required:"false" cty:"policy_arns" hcl:"policy_arns"`
-	AssumeRoleSessionName       *string           `mapstructure:"session_name" required:"false" cty:"session_name" hcl:"session_name"`
-	AssumeRoleTags              map[string]string `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AssumeRoleTransitiveTagKeys []string          `mapstructure:"transitive_tag_keys" required:"false" cty:"transitive_tag_keys" hcl:"transitive_tag_keys"`
-}
-
-// FlatMapstructure returns a new FlatAssumeRoleConfig.
-// FlatAssumeRoleConfig is an auto-generated flat version of AssumeRoleConfig.
-// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
-func (*AssumeRoleConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
-	return new(FlatAssumeRoleConfig)
-}
-
-// HCL2Spec returns the hcl spec of a AssumeRoleConfig.
-// This spec is used by HCL to read the fields of AssumeRoleConfig.
-// The decoded values from this spec will then be applied to a FlatAssumeRoleConfig.
-func (*FlatAssumeRoleConfig) HCL2Spec() map[string]hcldec.Spec {
-	s := map[string]hcldec.Spec{
-		"role_arn":            &hcldec.AttrSpec{Name: "role_arn", Type: cty.String, Required: false},
-		"duration_seconds":    &hcldec.AttrSpec{Name: "duration_seconds", Type: cty.Number, Required: false},
-		"external_id":         &hcldec.AttrSpec{Name: "external_id", Type: cty.String, Required: false},
-		"policy":              &hcldec.AttrSpec{Name: "policy", Type: cty.String, Required: false},
-		"policy_arns":         &hcldec.AttrSpec{Name: "policy_arns", Type: cty.List(cty.String), Required: false},
-		"session_name":        &hcldec.AttrSpec{Name: "session_name", Type: cty.String, Required: false},
-		"tags":                &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"transitive_tag_keys": &hcldec.AttrSpec{Name: "transitive_tag_keys", Type: cty.List(cty.String), Required: false},
-	}
-	return s
-}
-
 // FlatVaultAWSEngineOptions is an auto-generated flat version of VaultAWSEngineOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatVaultAWSEngineOptions struct {
-	Name       *string `mapstructure:"name" cty:"name" hcl:"name"`
-	RoleARN    *string `mapstructure:"role_arn" cty:"role_arn" hcl:"role_arn"`
-	TTL        *string `mapstructure:"ttl" required:"false" cty:"ttl" hcl:"ttl"`
-	EngineName *string `mapstructure:"engine_name" cty:"engine_name" hcl:"engine_name"`
+	Name       *string `mapstructure:"name" cty:"name"`
+	RoleARN    *string `mapstructure:"role_arn" cty:"role_arn"`
+	TTL        *string `mapstructure:"ttl" required:"false" cty:"ttl"`
+	EngineName *string `mapstructure:"engine_name" cty:"engine_name"`
 }
 
 // FlatMapstructure returns a new FlatVaultAWSEngineOptions.

builder/amazon/common/access_config_test.go

@@ -13,7 +13,6 @@ func testAccessConfig() *AccessConfig {
 		getEC2Connection: func() ec2iface.EC2API {
 			return &mockEC2Client{}
 		},
-		PollingConfig: new(AWSPollingConfig),
 	}
 }
 

builder/amazon/common/ami_config.go

@@ -47,15 +47,15 @@ type AMIConfig struct {
 	// Set to true if you want to skip
 	// validation of the ami_regions configuration option. Default false.
 	AMISkipRegionValidation bool `mapstructure:"skip_region_validation" required:"false"`
-	// Key/value pair tags applied to the AMI. This is a [template
-	// engine](/docs/templates/engine), see [Build template
+	// Tags applied to the AMI. This is a
+	// [template engine](/docs/templates/engine), 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 `key` and a `value` field. In HCL2 mode the
+	// 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.KeyValues `mapstructure:"tag" required:"false"`
+	AMITag hcl2template.NameValues `mapstructure:"tag" required:"false"`
 	// Enable enhanced networking (ENA but not SriovNetSupport) on
 	// HVM-compatible AMIs. If set, add `ec2:ModifyInstanceAttribute` to your
 	// AWS IAM policy.
@@ -79,32 +79,18 @@ type AMIConfig struct {
 	// Default false.
 	AMIForceDeleteSnapshot bool `mapstructure:"force_delete_snapshot" required:"false"`
 	// Whether or not to encrypt the resulting AMI when
-	// copying a provisioned instance to an AMI. By default, Packer will keep
-	// the encryption setting to what it was in the source image. Setting false
-	// will result in an unencrypted image, and true will result in an encrypted
-	// one.
-	//
+	// copying a provisioned instance to an AMI. By default, Packer will keep the
+	// encryption setting to what it was in the source image. Setting false will
+	// result in an unencrypted image, and true will result in an encrypted one.
 	// If you have used the `launch_block_device_mappings` to set an encryption
 	// key and that key is the same as the one you want the image encrypted with
 	// at the end, then you don't need to set this field; leaving it empty will
 	// prevent an unnecessary extra copy step and save you some time.
 	AMIEncryptBootVolume config.Trilean `mapstructure:"encrypt_boot" required:"false"`
-	// ID, alias or ARN of the KMS key to use for AMI encryption. This
-	// only applies to the main `region` -- any regions the AMI gets copied to
-	// copied will be encrypted by the default EBS KMS key for that region,
-	// unless you set region-specific keys in AMIRegionKMSKeyIDs.
-	//
-	// Set this value if you select `encrypt_boot`, but don't want to use the
-	// region's default KMS key.
-	//
-	// If you have a custom kms key you'd like to apply to the launch volume,
-	// and are only building in one region, it is more efficient to leave this
-	// and `encrypt_boot` empty and to instead set the key id in the
-	// launch_block_device_mappings (you can find an example below). This saves
-	// potentially many minutes at the end of the build by preventing Packer
-	// from having to copy and re-encrypt the image at the end of the build.
-	//
-	// For valid formats see *KmsKeyId* in the [AWS API docs -
+	// ID, alias or ARN of the KMS key to use for boot volume encryption. This
+	// only applies to the main `region`, other regions where the AMI will be
+	// copied will be encrypted by the default EBS KMS key. For valid formats
+	// see *KmsKeyId* in the [AWS API docs -
 	// CopyImage](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CopyImage.html).
 	// This field is validated by Packer, when using an alias, you will have to
 	// prefix `kms_key_id` with `alias/`.
@@ -131,16 +117,16 @@ type AMIConfig struct {
 	// the intermediary AMI into any regions provided in `ami_regions`, then
 	// delete the intermediary AMI. Default `false`.
 	AMISkipBuildRegion bool `mapstructure:"skip_save_build_region"`
-	// Key/value pair 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
+	// 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
 	// 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 `key` and a `value` field. In HCL2 mode the
+	// 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.KeyValues `mapstructure:"snapshot_tag" required:"false"`
+	SnapshotTag hcl2template.NameValues `mapstructure:"snapshot_tag" 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

builder/amazon/common/awserrors/utils.go

@@ -1,18 +0,0 @@
-package awserrors
-
-import (
-	"strings"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-)
-
-// Returns true if the err matches all these conditions:
-//  * err is of type awserr.Error
-//  * Error.Code() matches code
-//  * Error.Message() contains message
-func Matches(err error, code string, message string) bool {
-	if err, ok := err.(awserr.Error); ok {
-		return err.Code() == code && strings.Contains(err.Message(), message)
-	}
-	return false
-}

builder/amazon/common/block_device.go

@@ -13,7 +13,7 @@ import (
 	"github.com/hashicorp/packer/template/interpolate"
 )
 
-// These will be attached when launching your instance. Your
+// These will be attached when booting a new instance from your AMI. Your
 // options here may vary depending on the type of VM you use.
 //
 // Example use case:
@@ -21,31 +21,14 @@ 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 example:
-//
 // ```json
-// launch_block_device_mappings: [
-//   {
-//      "device_name": "/dev/sda1",
-//      "encrypted": true,
-//      "kms_key_id": "1a2b3c4d-5e6f-1a2b-3c4d-5e6f1a2b3c4d"
-//   }
-// ]
+// [{
+//		"device_name": "/dev/sda1",
+//		"encrypted": true,
+//		"kms_key_id": "1a2b3c4d-5e6f-1a2b-3c4d-5e6f1a2b3c4d"
+// }]
 // ```
 //
-// HCL2 example:
-//
-// ```hcl
-// launch_block_device_mappings {
-//     device_name = "/dev/sda1"
-//     encrypted = true
-//     kms_key_id = "1a2b3c4d-5e6f-1a2b-3c4d-5e6f1a2b3c4d"
-// }
-// ```
-//
-// Please note that the kms_key_id option in this example exists for
-// launch_block_device_mappings but not ami_block_device_mappings.
-//
 // Documentation for Block Devices Mappings can be found here:
 // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html
 //
@@ -83,14 +66,12 @@ type BlockDevice struct {
 	// The size of the volume, in GiB. Required if not specifying a
 	// snapshot_id.
 	VolumeSize int64 `mapstructure:"volume_size" required:"false"`
-	// ID, alias or ARN of the KMS key to use for boot volume encryption.
-	// This option exists for launch_block_device_mappings but not
-	// ami_block_device_mappings. The kms key id defined here only applies to
-	// the original build region; if the AMI gets copied to other regions, the
-	// volume in those regions will be encrypted by the default EBS KMS key.
-	// For valid formats see KmsKeyId in the [AWS API docs -
+	// ID, alias or ARN of the KMS key to use for boot volume encryption. This
+	// only applies to the main region, other regions where the AMI will be
+	// copied will be encrypted by the default EBS KMS key. For valid formats
+	// see KmsKeyId in the [AWS API docs -
 	// CopyImage](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CopyImage.html)
-	// This field is validated by Packer. When using an alias, you will have to
+	// This field is validated by Packer, when using an alias, you will have to
 	// prefix kms_key_id with alias/.
 	KmsKeyId string `mapstructure:"kms_key_id" required:"false"`
 }
@@ -134,8 +115,8 @@ func (blockDevice BlockDevice) BuildEC2BlockDeviceMapping() *ec2.BlockDeviceMapp
 		ebsBlockDevice.VolumeSize = aws.Int64(blockDevice.VolumeSize)
 	}
 
-	// IOPS is only valid for io1 and io2 types
-	if blockDevice.VolumeType == "io1" || blockDevice.VolumeType == "io2" {
+	// IOPS is only valid for io1 type
+	if blockDevice.VolumeType == "io1" {
 		ebsBlockDevice.Iops = aws.Int64(blockDevice.IOPS)
 	}
 

builder/amazon/common/block_device.hcl2spec.go

@@ -9,16 +9,16 @@ import (
 // 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" hcl:"delete_on_termination"`
-	DeviceName          *string `mapstructure:"device_name" required:"false" cty:"device_name" hcl:"device_name"`
-	Encrypted           *bool   `mapstructure:"encrypted" required:"false" cty:"encrypted" hcl:"encrypted"`
-	IOPS                *int64  `mapstructure:"iops" required:"false" cty:"iops" hcl:"iops"`
-	NoDevice            *bool   `mapstructure:"no_device" required:"false" cty:"no_device" hcl:"no_device"`
-	SnapshotId          *string `mapstructure:"snapshot_id" required:"false" cty:"snapshot_id" hcl:"snapshot_id"`
-	VirtualName         *string `mapstructure:"virtual_name" required:"false" cty:"virtual_name" hcl:"virtual_name"`
-	VolumeType          *string `mapstructure:"volume_type" required:"false" cty:"volume_type" hcl:"volume_type"`
-	VolumeSize          *int64  `mapstructure:"volume_size" required:"false" cty:"volume_size" hcl:"volume_size"`
-	KmsKeyId            *string `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"`
+	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"`
 }
 
 // FlatMapstructure returns a new FlatBlockDevice.

builder/amazon/common/block_device_test.go

@@ -66,25 +66,6 @@ func TestBlockDevice(t *testing.T) {
 				},
 			},
 		},
-		{
-			Config: &BlockDevice{
-				DeviceName:          "/dev/sdb",
-				VolumeType:          "io2",
-				VolumeSize:          8,
-				DeleteOnTermination: true,
-				IOPS:                1000,
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName: aws.String("/dev/sdb"),
-				Ebs: &ec2.EbsBlockDevice{
-					VolumeType:          aws.String("io2"),
-					VolumeSize:          aws.Int64(8),
-					DeleteOnTermination: aws.Bool(true),
-					Iops:                aws.Int64(1000),
-				},
-			},
-		},
 		{
 			Config: &BlockDevice{
 				DeviceName:          "/dev/sdb",

builder/amazon/common/helper_funcs.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
 	"github.com/hashicorp/packer/common/retry"
 )
 
@@ -30,7 +31,7 @@ func DestroyAMIs(imageids []*string, ec2conn *ec2.EC2) error {
 		err = retry.Config{
 			Tries: 11,
 			ShouldRetry: func(err error) bool {
-				return awserrors.Matches(err, "UnauthorizedOperation", "")
+				return isAWSErr(err, "UnauthorizedOperation", "")
 			},
 			RetryDelay: (&retry.Backoff{InitialBackoff: 200 * time.Millisecond, MaxBackoff: 30 * time.Second, Multiplier: 2}).Linear,
 		}.Run(ctx, func(ctx context.Context) error {
@@ -53,7 +54,7 @@ func DestroyAMIs(imageids []*string, ec2conn *ec2.EC2) error {
 				err = retry.Config{
 					Tries: 11,
 					ShouldRetry: func(err error) bool {
-						return awserrors.Matches(err, "UnauthorizedOperation", "")
+						return isAWSErr(err, "UnauthorizedOperation", "")
 					},
 					RetryDelay: (&retry.Backoff{InitialBackoff: 200 * time.Millisecond, MaxBackoff: 30 * time.Second, Multiplier: 2}).Linear,
 				}.Run(ctx, func(ctx context.Context) error {
@@ -73,3 +74,14 @@ func DestroyAMIs(imageids []*string, ec2conn *ec2.EC2) error {
 	}
 	return nil
 }
+
+// Returns true if the error matches all these conditions:
+//  * err is of type awserr.Error
+//  * Error.Code() matches code
+//  * Error.Message() contains message
+func isAWSErr(err error, code string, message string) bool {
+	if err, ok := err.(awserr.Error); ok {
+		return err.Code() == code && strings.Contains(err.Message(), message)
+	}
+	return false
+}

builder/amazon/common/interpolate_build_info.go

@@ -3,21 +3,20 @@ package common
 import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/builder"
 	"github.com/hashicorp/packer/helper/multistep"
 )
 
 type BuildInfoTemplate struct {
-	BuildRegion           string
-	SourceAMI             string
-	SourceAMICreationDate string
-	SourceAMIName         string
-	SourceAMIOwner        string
-	SourceAMIOwnerName    string
-	SourceAMITags         map[string]string
+	BuildRegion        string
+	SourceAMI          string
+	SourceAMIName      string
+	SourceAMIOwner     string
+	SourceAMIOwnerName string
+	SourceAMITags      map[string]string
 }
 
-func extractBuildInfo(region string, state multistep.StateBag, generatedData *packerbuilderdata.GeneratedData) *BuildInfoTemplate {
+func extractBuildInfo(region string, state multistep.StateBag, generatedData *builder.GeneratedData) *BuildInfoTemplate {
 	rawSourceAMI, hasSourceAMI := state.GetOk("source_image")
 	if !hasSourceAMI {
 		return &BuildInfoTemplate{
@@ -32,32 +31,13 @@ func extractBuildInfo(region string, state multistep.StateBag, generatedData *pa
 	}
 
 	buildInfoTemplate := &BuildInfoTemplate{
-		BuildRegion:           region,
-		SourceAMI:             aws.StringValue(sourceAMI.ImageId),
-		SourceAMICreationDate: aws.StringValue(sourceAMI.CreationDate),
-		SourceAMIName:         aws.StringValue(sourceAMI.Name),
-		SourceAMIOwner:        aws.StringValue(sourceAMI.OwnerId),
-		SourceAMIOwnerName:    aws.StringValue(sourceAMI.ImageOwnerAlias),
-		SourceAMITags:         sourceAMITags,
+		BuildRegion:        region,
+		SourceAMI:          aws.StringValue(sourceAMI.ImageId),
+		SourceAMIName:      aws.StringValue(sourceAMI.Name),
+		SourceAMIOwner:     aws.StringValue(sourceAMI.OwnerId),
+		SourceAMIOwnerName: aws.StringValue(sourceAMI.ImageOwnerAlias),
+		SourceAMITags:      sourceAMITags,
 	}
-
-	generatedData.Put("BuildRegion", buildInfoTemplate.BuildRegion)
-	generatedData.Put("SourceAMI", buildInfoTemplate.SourceAMI)
-	generatedData.Put("SourceAMICreationDate", buildInfoTemplate.SourceAMICreationDate)
 	generatedData.Put("SourceAMIName", buildInfoTemplate.SourceAMIName)
-	generatedData.Put("SourceAMIOwner", buildInfoTemplate.SourceAMIOwner)
-	generatedData.Put("SourceAMIOwnerName", buildInfoTemplate.SourceAMIOwnerName)
-
 	return buildInfoTemplate
 }
-
-func GetGeneratedDataList() []string {
-	return []string{
-		"SourceAMIName",
-		"BuildRegion",
-		"SourceAMI",
-		"SourceAMICreationDate",
-		"SourceAMIOwner",
-		"SourceAMIOwnerName",
-	}
-}

builder/amazon/common/interpolate_build_info_test.go

@@ -6,18 +6,16 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/builder"
 	"github.com/hashicorp/packer/helper/multistep"
 )
 
 func testImage() *ec2.Image {
 	return &ec2.Image{
 		ImageId:         aws.String("ami-abcd1234"),
-		CreationDate:    aws.String("ami_test_creation_date"),
 		Name:            aws.String("ami_test_name"),
 		OwnerId:         aws.String("ami_test_owner_id"),
 		ImageOwnerAlias: aws.String("ami_test_owner_alias"),
-		RootDeviceType:  aws.String("ebs"),
 		Tags: []*ec2.Tag{
 			{
 				Key:   aws.String("key-1"),
@@ -36,8 +34,8 @@ func testState() multistep.StateBag {
 	return state
 }
 
-func testGeneratedData(state multistep.StateBag) packerbuilderdata.GeneratedData {
-	generatedData := packerbuilderdata.GeneratedData{State: state}
+func testGeneratedData(state multistep.StateBag) builder.GeneratedData {
+	generatedData := builder.GeneratedData{State: state}
 	return generatedData
 }
 
@@ -61,12 +59,11 @@ func TestInterpolateBuildInfo_extractBuildInfo_withSourceImage(t *testing.T) {
 	buildInfo := extractBuildInfo("foo", state, &generatedData)
 
 	expected := BuildInfoTemplate{
-		BuildRegion:           "foo",
-		SourceAMI:             "ami-abcd1234",
-		SourceAMICreationDate: "ami_test_creation_date",
-		SourceAMIName:         "ami_test_name",
-		SourceAMIOwner:        "ami_test_owner_id",
-		SourceAMIOwnerName:    "ami_test_owner_alias",
+		BuildRegion:        "foo",
+		SourceAMI:          "ami-abcd1234",
+		SourceAMIName:      "ami_test_name",
+		SourceAMIOwner:     "ami_test_owner_id",
+		SourceAMIOwnerName: "ami_test_owner_alias",
 		SourceAMITags: map[string]string{
 			"key-1": "value-1",
 			"key-2": "value-2",

builder/amazon/common/run_config.go

@@ -20,9 +20,9 @@ import (
 var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")
 
 type AmiFilterOptions struct {
-	hcl2template.KeyValueFilter `mapstructure:",squash"`
-	Owners                      []string
-	MostRecent                  bool `mapstructure:"most_recent"`
+	hcl2template.KVFilter `mapstructure:",squash"`
+	Owners                []string
+	MostRecent            bool `mapstructure:"most_recent"`
 }
 
 func (d *AmiFilterOptions) GetOwners() []*string {
@@ -35,7 +35,7 @@ func (d *AmiFilterOptions) GetOwners() []*string {
 }
 
 func (d *AmiFilterOptions) Empty() bool {
-	return len(d.Owners) == 0 && d.KeyValueFilter.Empty()
+	return len(d.Owners) == 0 && d.KVFilter.Empty()
 }
 
 func (d *AmiFilterOptions) NoOwner() bool {
@@ -43,28 +43,28 @@ func (d *AmiFilterOptions) NoOwner() bool {
 }
 
 type SubnetFilterOptions struct {
-	hcl2template.NameValueFilter `mapstructure:",squash"`
-	MostFree                     bool `mapstructure:"most_free"`
-	Random                       bool `mapstructure:"random"`
+	hcl2template.KVFilter `mapstructure:",squash"`
+	MostFree              bool `mapstructure:"most_free"`
+	Random                bool `mapstructure:"random"`
 }
 
 type VpcFilterOptions struct {
-	hcl2template.NameValueFilter `mapstructure:",squash"`
+	hcl2template.KVFilter `mapstructure:",squash"`
 }
 
 type Statement struct {
-	Effect   string   `mapstructure:"Effect" required:"false"`
-	Action   []string `mapstructure:"Action" required:"false"`
-	Resource []string `mapstructure:"Resource" required:"false"`
+	Effect   string
+	Action   []string
+	Resource string
 }
 
 type PolicyDocument struct {
-	Version   string      `mapstructure:"Version" required:"false"`
-	Statement []Statement `mapstructure:"Statement" required:"false"`
+	Version   string
+	Statement []Statement
 }
 
 type SecurityGroupFilterOptions struct {
-	hcl2template.NameValueFilter `mapstructure:",squash"`
+	hcl2template.KVFilter `mapstructure:",squash"`
 }
 
 // RunConfig contains configuration for running an instance from a source
@@ -89,23 +89,19 @@ type RunConfig struct {
 	// which will stop the instance for you. If this is set to `true`, Packer
 	// *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). 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.
+	// [windows-shell
+	// provisioner](/docs/provisioners/windows-shell).
+	// 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:
 	//
-	// An example of a valid windows shutdown command in a `windows-shell`
-	// provisioner is :
-	// ```shell-session
-	//   ec2config.exe -sysprep
+	// ```json
+	// {
+	//   "type": "windows-shell",
+	//   "inline": ["\"c:\\Program Files\\Amazon\\Ec2ConfigService\\ec2config.exe\" -sysprep"]
+	// }
 	// ```
-	// or
-	// ```sell-session
-	//   "%programfiles%\amazon\ec2configservice\"ec2config.exe -sysprep""
-	// ```
-	// -> Note: The double quotation marks in the command are not required if
-	// your CMD shell is already in the
-	// `C:\Program Files\Amazon\EC2ConfigService\` directory.
 	DisableStopInstance bool `mapstructure:"disable_stop_instance" required:"false"`
 	// Mark instance as [EBS
 	// Optimized](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSOptimized.html).
@@ -166,7 +162,7 @@ type RunConfig struct {
 	// The EC2 instance type to use while building the
 	// AMI, such as t2.small.
 	InstanceType string `mapstructure:"instance_type" required:"true"`
-	// Filters used to populate the `security_group_ids` field. JSON Example:
+	// Filters used to populate the `security_group_ids` field. Example:
 	//
 	// ```json
 	// {
@@ -178,16 +174,6 @@ type RunConfig struct {
 	// }
 	// ```
 	//
-	// HCL2 Example:
-	//
-	// ```hcl
-	//   security_group_filter {
-	//     filters = {
-	//       "tag:Class": "packer"
-	//     }
-	//   }
-	// ```
-	//
 	// This selects the SG's with tag `Class` with the value `packer`.
 	//
 	// -   `filters` (map of strings) - filters used to select a
@@ -197,16 +183,15 @@ type RunConfig struct {
 	//
 	// `security_group_ids` take precedence over this.
 	SecurityGroupFilter SecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false"`
-	// Key/value pair tags to apply to the instance that is that is *launched*
-	// to create the EBS volumes. This is a [template
-	// engine](/docs/templates/engine), see [Build template
-	// data](#build-template-data) for more information.
+	// Tags to apply to the instance that is that is *launched* to create the
+	// EBS volumes. This is a [template engine](/docs/templates/engine),
+	// 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 `key` and a `value` field. In HCL2 mode the
+	// 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.KeyValues `mapstructure:"run_tag" required:"false"`
+	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.
@@ -223,39 +208,21 @@ type RunConfig struct {
 	// used when from_scratch is set to true.
 	SourceAmi string `mapstructure:"source_ami" required:"true"`
 	// Filters used to populate the `source_ami`
-	// field. JSON Example:
+	// field. Example:
 	//
-	// ```json
-	// "builders" [
+	//   ```json
 	//   {
-	//     "type": "amazon-ebs",
 	//     "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": {
+	//         "virtualization-type": "hvm",
+	//         "name": "ubuntu/images/\*ubuntu-xenial-16.04-amd64-server-\*",
+	//         "root-device-type": "ebs"
+	//       },
+	//       "owners": ["099720109477"],
+	//       "most_recent": true
 	//     }
 	//   }
-	// ]
-	// ```
-	// HCL2 example:
-	//
-	// ```hcl
-	// source "amazon-ebs" "basic-example" {
-	//   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,
@@ -313,22 +280,20 @@ type RunConfig struct {
 	// best spot price. This must be one of: Linux/UNIX, SUSE Linux,
 	// Windows, Linux/UNIX (Amazon VPC), SUSE Linux (Amazon VPC),
 	// Windows (Amazon VPC)
-	SpotPriceAutoProduct string `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true"`
-	// Requires spot_price to be set. Key/value pair tags to apply tags to the
+	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.
 	SpotTags map[string]string `mapstructure:"spot_tags" required:"false"`
 	// Same as [`spot_tags`](#spot_tags) but defined as a singular repeatable block
-	// containing a `key` and a `value` field. In HCL2 mode the
+	// 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.KeyValues `mapstructure:"spot_tag" required:"false"`
+	SpotTag hcl2template.NameValues `mapstructure:"spot_tag" required:"false"`
 	// Filters used to populate the `subnet_id` field.
-	// JSON Example:
+	// Example:
 	//
-	// ```json
-	// "builders" [
+	//   ```json
 	//   {
-	//     "type": "amazon-ebs",
 	//     "subnet_filter": {
 	//       "filters": {
 	//         "tag:Class": "build"
@@ -337,21 +302,7 @@ type RunConfig struct {
 	//       "random": false
 	//     }
 	//   }
-	// ]
-	// ```
-	// HCL2 example:
-	//
-	// ```hcl
-	// source "amazon-ebs" "basic-example" {
-	//   subnet_filter {
-	//     filters = {
-	//           "tag:Class": "build"
-	//     }
-	//     most_free = true
-	//     random = false
-	//   }
-	// }
-	// ```
+	//   ```
 	//
 	//   This selects the Subnet with tag `Class` with the value `build`, which has
 	//   the most free IP addresses. NOTE: This will fail unless *exactly* one
@@ -376,12 +327,6 @@ type RunConfig struct {
 	// subnet-12345def, where Packer will launch the EC2 instance. This field is
 	// required if you are using an non-default VPC.
 	SubnetId string `mapstructure:"subnet_id" required:"false"`
-	// [Tenancy](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-instance.html) used
-	// when Packer launches the EC2 instance, allowing it to be launched on dedicated hardware.
-	//
-	// The default is "default", meaning shared tenancy. Allowed values are "default",
-	// "dedicated" and "host".
-	Tenancy string `mapstructure:"tenancy" required:"false"`
 	// The name of the temporary key pair to
 	// generate. By default, Packer generates a name that looks like
 	// `packer_<UUID>`, where &lt;UUID&gt; is a 36 character unique identifier.
@@ -402,28 +347,12 @@ type RunConfig struct {
 	// data when launching the instance.
 	UserDataFile string `mapstructure:"user_data_file" required:"false"`
 	// Filters used to populate the `vpc_id` field.
-	// JSON Example:
+	// Example:
 	//
 	// ```json
-	// "builders" [
-	//   {
-	//     "type": "amazon-ebs",
-	//     "vpc_filter": {
-	//       "filters": {
-	//         "tag:Class": "build",
-	//         "isDefault": "false",
-	//         "cidr": "/24"
-	//       }
-	//     }
-	//   }
-	// ]
-	// ```
-	// HCL2 example:
-	//
-	// ```hcl
-	// source "amazon-ebs" "basic-example" {
-	//   vpc_filter {
-	//     filters = {
+	// {
+	//   "vpc_filter": {
+	//     "filters": {
 	//       "tag:Class": "build",
 	//       "isDefault": "false",
 	//       "cidr": "/24"
@@ -457,8 +386,8 @@ type RunConfig struct {
 	// Communicator settings
 	Comm communicator.Config `mapstructure:",squash"`
 
-	// One of `public_ip`, `private_ip`, `public_dns`, `private_dns` or `session_manager`.
-	//    If set, either the public IP address, private IP address, public DNS name
+	// One of `public_ip`, `private_ip`, `public_dns`, or `private_dns`. If
+	//    set, either the public IP address, private IP address, public DNS name
 	//    or private DNS name will be used as the host for SSH. The default behaviour
 	//    if inside a VPC is to use the public IP address if available, otherwise
 	//    the private IP address will be used. If not in a VPC the public DNS name
@@ -468,28 +397,7 @@ type RunConfig struct {
 	//    should be direct, `ssh_interface` must be set to `private_dns` and
 	//    `<region>.compute.internal` included in the `NO_PROXY` environment
 	//    variable.
-	//
-	//    When using `session_manager` the machine running Packer must have
-	//	  the AWS Session Manager Plugin installed and within the users' system path.
-	//    Connectivity via the `session_manager` interface establishes a secure tunnel
-	//    between the local host and the remote host on an available local port to the specified `ssh_port`.
-	//    See [Session Manager Connections](#session-manager-connections) for more information.
-	//    - Session manager connectivity is currently only implemented for the SSH communicator, not the WinRM communicator.
-	//    - Upon termination the secure tunnel will be terminated automatically, if however there is a failure in
-	//    terminating the tunnel it will automatically terminate itself after 20 minutes of inactivity.
 	SSHInterface string `mapstructure:"ssh_interface"`
-
-	// The time to wait before establishing the Session Manager session.
-	// The value of this should be a duration. Examples are
-	// `5s` and `1m30s` which will cause Packer to wait five seconds and one
-	// minute 30 seconds, respectively. If no set, defaults to 10 seconds.
-	// This option is useful when the remote port takes longer to become available.
-	PauseBeforeSSM time.Duration `mapstructure:"pause_before_ssm"`
-
-	// Which port to connect the local end of the session tunnel to. If
-	// left blank, Packer will choose a port for you from available ports.
-	// This option is only used when `ssh_interface` is set `session_manager`.
-	SessionManagerPort int `mapstructure:"session_manager_port"`
 }
 
 func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
@@ -532,24 +440,10 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 		c.SSHInterface != "private_ip" &&
 		c.SSHInterface != "public_dns" &&
 		c.SSHInterface != "private_dns" &&
-		c.SSHInterface != "session_manager" &&
 		c.SSHInterface != "" {
 		errs = append(errs, fmt.Errorf("Unknown interface type: %s", c.SSHInterface))
 	}
 
-	// Connectivity via Session Manager has a few requirements
-	if c.SSHInterface == "session_manager" {
-		if c.Comm.Type == "winrm" {
-			msg := fmt.Errorf(`session_manager connectivity is not supported with the "winrm" communicator; please use "ssh"`)
-			errs = append(errs, msg)
-		}
-
-		if c.IamInstanceProfile == "" && c.TemporaryIamInstanceProfilePolicyDocument == nil {
-			msg := fmt.Errorf(`no iam_instance_profile defined; session_manager connectivity requires a valid instance profile with AmazonSSMManagedInstanceCore permissions. Alternatively a temporary_iam_instance_profile_policy_document can be used.`)
-			errs = append(errs, msg)
-		}
-	}
-
 	if c.Comm.SSHKeyPairName != "" {
 		if c.Comm.Type == "winrm" && c.Comm.WinRMPassword == "" && c.Comm.SSHPrivateKeyFile == "" {
 			errs = append(errs, fmt.Errorf("ssh_private_key_file must be provided to retrieve the winrm password when using ssh_keypair_name."))
@@ -623,7 +517,7 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 
 	if c.EnableT2Unlimited {
 		if c.SpotPrice != "" {
-			errs = append(errs, fmt.Errorf("Error: T2 Unlimited cannot be used in conjunction with Spot Instances"))
+			errs = append(errs, fmt.Errorf("Error: T2 Unlimited cannot be used in conjuction with Spot Instances"))
 		}
 		firstDotIndex := strings.Index(c.InstanceType, ".")
 		if firstDotIndex == -1 {
@@ -633,21 +527,9 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 		}
 	}
 
-	if c.Tenancy != "" &&
-		c.Tenancy != "default" &&
-		c.Tenancy != "dedicated" &&
-		c.Tenancy != "host" {
-		errs = append(errs, fmt.Errorf("Error: Unknown tenancy type %s", c.Tenancy))
-	}
-
 	return errs
 }
 
 func (c *RunConfig) IsSpotInstance() bool {
 	return c.SpotPrice != "" && c.SpotPrice != "0"
 }
-
-func (c *RunConfig) SSMAgentEnabled() bool {
-	hasIamInstanceProfile := c.IamInstanceProfile != "" || c.TemporaryIamInstanceProfilePolicyDocument != nil
-	return c.SSHInterface == "session_manager" && hasIamInstanceProfile
-}

builder/amazon/common/run_config.hcl2spec.go

@@ -10,10 +10,10 @@ import (
 // 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" hcl:"filters"`
-	Filter     []hcl2template.FlatKeyValue `cty:"filter" hcl:"filter"`
-	Owners     []string                    `cty:"owners" hcl:"owners"`
-	MostRecent *bool                       `mapstructure:"most_recent" cty:"most_recent" hcl:"most_recent"`
+	Filters    map[string]string            `cty:"filters"`
+	Filter     []hcl2template.FlatNameValue `cty:"filter"`
+	Owners     []string                     `cty:"owners"`
+	MostRecent *bool                        `mapstructure:"most_recent" cty:"most_recent"`
 }
 
 // FlatMapstructure returns a new FlatAmiFilterOptions.
@@ -29,7 +29,7 @@ func (*AmiFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl
 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.FlatKeyValue)(nil).HCL2Spec())},
+		"filter":      &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"owners":      &hcldec.AttrSpec{Name: "owners", Type: cty.List(cty.String), Required: false},
 		"most_recent": &hcldec.AttrSpec{Name: "most_recent", Type: cty.Bool, Required: false},
 	}
@@ -39,8 +39,8 @@ func (*FlatAmiFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 // FlatPolicyDocument is an auto-generated flat version of PolicyDocument.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatPolicyDocument struct {
-	Version   *string         `mapstructure:"Version" required:"false" cty:"Version" hcl:"Version"`
-	Statement []FlatStatement `mapstructure:"Statement" required:"false" cty:"Statement" hcl:"Statement"`
+	Version   *string         `cty:"version"`
+	Statement []FlatStatement `cty:"statement"`
 }
 
 // FlatMapstructure returns a new FlatPolicyDocument.
@@ -55,8 +55,8 @@ func (*PolicyDocument) FlatMapstructure() interface{ HCL2Spec() map[string]hclde
 // The decoded values from this spec will then be applied to a FlatPolicyDocument.
 func (*FlatPolicyDocument) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"Version":   &hcldec.AttrSpec{Name: "Version", Type: cty.String, Required: false},
-		"Statement": &hcldec.BlockListSpec{TypeName: "Statement", Nested: hcldec.ObjectSpec((*FlatStatement)(nil).HCL2Spec())},
+		"version":   &hcldec.AttrSpec{Name: "version", Type: cty.String, Required: false},
+		"statement": &hcldec.BlockListSpec{TypeName: "statement", Nested: hcldec.ObjectSpec((*FlatStatement)(nil).HCL2Spec())},
 	}
 	return s
 }
@@ -64,8 +64,8 @@ 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" hcl:"filters"`
-	Filter  []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
+	Filters map[string]string            `cty:"filters"`
+	Filter  []hcl2template.FlatNameValue `cty:"filter"`
 }
 
 // FlatMapstructure returns a new FlatSecurityGroupFilterOptions.
@@ -89,9 +89,9 @@ func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 // FlatStatement is an auto-generated flat version of Statement.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatStatement struct {
-	Effect   *string  `mapstructure:"Effect" required:"false" cty:"Effect" hcl:"Effect"`
-	Action   []string `mapstructure:"Action" required:"false" cty:"Action" hcl:"Action"`
-	Resource []string `mapstructure:"Resource" required:"false" cty:"Resource" hcl:"Resource"`
+	Effect   *string  `cty:"effect"`
+	Action   []string `cty:"action"`
+	Resource *string  `cty:"resource"`
 }
 
 // FlatMapstructure returns a new FlatStatement.
@@ -106,9 +106,9 @@ func (*Statement) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spe
 // The decoded values from this spec will then be applied to a FlatStatement.
 func (*FlatStatement) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"Effect":   &hcldec.AttrSpec{Name: "Effect", Type: cty.String, Required: false},
-		"Action":   &hcldec.AttrSpec{Name: "Action", Type: cty.List(cty.String), Required: false},
-		"Resource": &hcldec.AttrSpec{Name: "Resource", Type: cty.List(cty.String), Required: false},
+		"effect":   &hcldec.AttrSpec{Name: "effect", Type: cty.String, Required: false},
+		"action":   &hcldec.AttrSpec{Name: "action", Type: cty.List(cty.String), Required: false},
+		"resource": &hcldec.AttrSpec{Name: "resource", Type: cty.String, Required: false},
 	}
 	return s
 }
@@ -116,10 +116,10 @@ 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" hcl:"filters"`
-	Filter   []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
-	MostFree *bool                        `mapstructure:"most_free" cty:"most_free" hcl:"most_free"`
-	Random   *bool                        `mapstructure:"random" cty:"random" hcl:"random"`
+	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"`
 }
 
 // FlatMapstructure returns a new FlatSubnetFilterOptions.
@@ -145,8 +145,8 @@ 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" hcl:"filters"`
-	Filter  []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
+	Filters map[string]string            `cty:"filters"`
+	Filter  []hcl2template.FlatNameValue `cty:"filter"`
 }
 
 // FlatMapstructure returns a new FlatVpcFilterOptions.

builder/amazon/common/run_config_test.go

@@ -87,7 +87,7 @@ func TestRunConfigPrepare_SourceAmiFilterGood(t *testing.T) {
 	filter_value := "foo"
 	goodFilter := AmiFilterOptions{
 		Owners: []string{owner},
-		KeyValueFilter: hcl2template.KeyValueFilter{
+		KVFilter: hcl2template.KVFilter{
 			Filters: map[string]string{filter_key: filter_value},
 		},
 	}
@@ -232,23 +232,3 @@ func TestRunConfigPrepare_TemporaryKeyPairName(t *testing.T) {
 		t.Fatal("keypair name does not match")
 	}
 }
-
-func TestRunConfigPrepare_TenancyBad(t *testing.T) {
-	c := testConfig()
-	c.Tenancy = "not_real"
-
-	if err := c.Prepare(nil); len(err) != 1 {
-		t.Fatal("Should error if tenancy is set to an invalid type")
-	}
-}
-
-func TestRunConfigPrepare_TenancyGood(t *testing.T) {
-	validTenancy := []string{"", "default", "dedicated", "host"}
-	for _, vt := range validTenancy {
-		c := testConfig()
-		c.Tenancy = vt
-		if err := c.Prepare(nil); len(err) != 0 {
-			t.Fatalf("Should not error if tenancy is set to %s", vt)
-		}
-	}
-}

builder/amazon/common/ssh.go

@@ -28,10 +28,6 @@ func SSHHost(e ec2Describer, sshInterface string, host string) func(multistep.St
 			return host, nil
 		}
 
-		if sshInterface == "session_manager" {
-			return "localhost", nil
-		}
-
 		const tries = 2
 		// <= with current structure to check result of describing `tries` times
 		for j := 0; j <= tries; j++ {
@@ -89,20 +85,3 @@ func SSHHost(e ec2Describer, sshInterface string, host string) func(multistep.St
 		return "", errors.New("couldn't determine address for instance")
 	}
 }
-
-// Port returns a function that can be given to the communicator
-// for determining the port to use when connecting to an instance.
-func Port(sshInterface string, port int) func(multistep.StateBag) (int, error) {
-	return func(state multistep.StateBag) (int, error) {
-		if sshInterface != "session_manager" {
-			return port, nil
-		}
-
-		port, ok := state.GetOk("sessionPort")
-		if !ok {
-			return 0, fmt.Errorf("no local port defined for session-manager")
-		}
-		return port.(int), nil
-
-	}
-}

builder/amazon/common/ssh_test.go

@@ -13,7 +13,6 @@ const (
 	publicIP        = "192.168.1.1"
 	privateDNS      = "private.dns.test"
 	publicDNS       = "public.dns.test"
-	localhost       = "localhost"
 	sshHostTemplate = "custom.host.value"
 )
 
@@ -33,13 +32,11 @@ func TestSSHHost(t *testing.T) {
 	}{
 		{1, "", "", true, publicDNS, ""},
 		{1, "", "private_ip", true, privateIP, ""},
-		{1, "", "session_manager", true, localhost, ""},
 		{1, "vpc-id", "", true, publicIP, ""},
 		{1, "vpc-id", "private_ip", true, privateIP, ""},
 		{1, "vpc-id", "private_dns", true, privateDNS, ""},
 		{1, "vpc-id", "public_dns", true, publicDNS, ""},
 		{1, "vpc-id", "public_ip", true, publicIP, ""},
-		{1, "vpc-id", "session_manager", true, localhost, ""},
 		{2, "", "", true, publicDNS, ""},
 		{2, "", "private_ip", true, privateIP, ""},
 		{2, "vpc-id", "", true, publicIP, ""},

builder/amazon/common/ssm/session.go

@@ -1,117 +0,0 @@
-package ssm
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"log"
-	"os/exec"
-	"strconv"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ssm"
-	"github.com/aws/aws-sdk-go/service/ssm/ssmiface"
-	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/common/shell-local/localexec"
-	"github.com/hashicorp/packer/packer"
-)
-
-type Session struct {
-	SvcClient             ssmiface.SSMAPI
-	Region                string
-	InstanceID            string
-	LocalPort, RemotePort int
-}
-
-func (s Session) buildTunnelInput() *ssm.StartSessionInput {
-	portNumber, localPortNumber := strconv.Itoa(s.RemotePort), strconv.Itoa(s.LocalPort)
-	params := map[string][]*string{
-		"portNumber":      []*string{aws.String(portNumber)},
-		"localPortNumber": []*string{aws.String(localPortNumber)},
-	}
-
-	return &ssm.StartSessionInput{
-		DocumentName: aws.String("AWS-StartPortForwardingSession"),
-		Parameters:   params,
-		Target:       aws.String(s.InstanceID),
-	}
-}
-
-// getCommand return a valid ordered set of arguments to pass to the driver command.
-func (s Session) getCommand(ctx context.Context) ([]string, string, error) {
-	input := s.buildTunnelInput()
-
-	var session *ssm.StartSessionOutput
-	err := retry.Config{
-		ShouldRetry: func(err error) bool { return awserrors.Matches(err, "TargetNotConnected", "") },
-		RetryDelay:  (&retry.Backoff{InitialBackoff: 200 * time.Millisecond, MaxBackoff: 60 * time.Second, Multiplier: 2}).Linear,
-	}.Run(ctx, func(ctx context.Context) (err error) {
-		session, err = s.SvcClient.StartSessionWithContext(ctx, input)
-		return err
-	})
-
-	if err != nil {
-		return nil, "", err
-	}
-
-	if session == nil {
-		return nil, "", fmt.Errorf("an active Amazon SSM Session is required before trying to open a session tunnel")
-	}
-
-	// AWS session-manager-plugin requires a valid session be passed in JSON.
-	sessionDetails, err := json.Marshal(session)
-	if err != nil {
-		return nil, *session.SessionId, fmt.Errorf("error encountered in reading session details %s", err)
-	}
-
-	// AWS session-manager-plugin requires the parameters used in the session to be passed in JSON as well.
-	sessionParameters, err := json.Marshal(input)
-	if err != nil {
-		return nil, "", fmt.Errorf("error encountered in reading session parameter details %s", err)
-	}
-
-	// Args must be in this order
-	args := []string{
-		string(sessionDetails),
-		s.Region,
-		"StartSession",
-		"", // ProfileName
-		string(sessionParameters),
-		*session.StreamUrl,
-	}
-	return args, *session.SessionId, nil
-}
-
-// Start an interactive Systems Manager session with a remote instance via the
-// AWS session-manager-plugin. To terminate the session you must cancell the
-// context. If you do not wish to terminate the session manually: calling
-// StopSession on a instance of this driver will terminate the active session
-// created from calling StartSession.
-func (s Session) Start(ctx context.Context, ui packer.Ui) error {
-	for ctx.Err() == nil {
-		log.Printf("ssm: Starting PortForwarding session to instance %s", s.InstanceID)
-		args, sessionID, err := s.getCommand(ctx)
-		if sessionID != "" {
-			defer func() {
-				_, err := s.SvcClient.TerminateSession(&ssm.TerminateSessionInput{SessionId: aws.String(sessionID)})
-				if err != nil {
-					ui.Error(fmt.Sprintf("Error terminating SSM Session %q. Please terminate the session manually: %s", sessionID, err))
-				}
-			}()
-		}
-		if err != nil {
-			return err
-		}
-
-		cmd := exec.CommandContext(ctx, "session-manager-plugin", args...)
-
-		ui.Message(fmt.Sprintf("Starting portForwarding session %q.", sessionID))
-		err = localexec.RunAndStream(cmd, ui, nil)
-		if err != nil {
-			ui.Error(err.Error())
-		}
-	}
-	return nil
-}

builder/amazon/common/state.go

@@ -1,5 +1,3 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type AWSPollingConfig
 package common
 
 import (
@@ -40,45 +38,12 @@ type StateChangeConf struct {
 // Following are wrapper functions that use Packer's environment-variables to
 // determine retry logic, then call the AWS SDK's built-in waiters.
 
-// Polling configuration for the AWS waiter. Configures the waiter for resources creation or actions like attaching
-// volumes or importing image.
-// Usage example:
-//
-// In JSON:
-// ```json
-// "aws_polling" : {
-// 	 "delay_seconds": 30,
-// 	 "max_attempts": 50
-// }
-// ```
-//
-// In HCL2:
-// ```hcl
-// aws_polling {
-//	 delay_seconds = 30
-//	 max_attempts = 50
-// }
-// ```
-//
-type AWSPollingConfig struct {
-	// Specifies the maximum number of attempts the waiter will check for resource state.
-	// This value can also be set via the AWS_MAX_ATTEMPTS.
-	// If both option and environment variable are set, the max_attempts will be considered over the AWS_MAX_ATTEMPTS.
-	// If none is set, defaults to AWS waiter default which is 40 max_attempts.
-	MaxAttempts int `mapstructure:"max_attempts" required:"false"`
-	// Specifies the delay in seconds between attempts to check the resource state.
-	// This value can also be set via the AWS_POLL_DELAY_SECONDS.
-	// If both option and environment variable are set, the delay_seconds will be considered over the AWS_POLL_DELAY_SECONDS.
-	// If none is set, defaults to AWS waiter default which is 15 seconds.
-	DelaySeconds int `mapstructure:"delay_seconds" required:"false"`
-}
-
-func (w *AWSPollingConfig) WaitUntilAMIAvailable(ctx aws.Context, conn ec2iface.EC2API, imageId string) error {
+func WaitUntilAMIAvailable(ctx aws.Context, conn ec2iface.EC2API, imageId string) error {
 	imageInput := ec2.DescribeImagesInput{
 		ImageIds: []*string{&imageId},
 	}
 
-	waitOpts := w.getWaiterOptions()
+	waitOpts := getWaiterOptions()
 	if len(waitOpts) == 0 {
 		// Bump this default to 30 minutes because the aws default
 		// of ten minutes doesn't work for some of our long-running copies.
@@ -101,7 +66,7 @@ func (w *AWSPollingConfig) WaitUntilAMIAvailable(ctx aws.Context, conn ec2iface.
 	return err
 }
 
-func (w *AWSPollingConfig) WaitUntilInstanceRunning(ctx aws.Context, conn *ec2.EC2, instanceId string) error {
+func WaitUntilInstanceRunning(ctx aws.Context, conn *ec2.EC2, instanceId string) error {
 
 	instanceInput := ec2.DescribeInstancesInput{
 		InstanceIds: []*string{&instanceId},
@@ -110,11 +75,12 @@ func (w *AWSPollingConfig) WaitUntilInstanceRunning(ctx aws.Context, conn *ec2.E
 	err := conn.WaitUntilInstanceRunningWithContext(
 		ctx,
 		&instanceInput,
-		w.getWaiterOptions()...)
+		getWaiterOptions()...)
 	return err
 }
 
-func (w *AWSPollingConfig) WaitUntilInstanceTerminated(ctx aws.Context, conn *ec2.EC2, instanceId string) error {
+func WaitUntilInstanceTerminated(ctx aws.Context, conn *ec2.EC2, instanceId string) error {
+
 	instanceInput := ec2.DescribeInstancesInput{
 		InstanceIds: []*string{&instanceId},
 	}
@@ -122,12 +88,12 @@ func (w *AWSPollingConfig) WaitUntilInstanceTerminated(ctx aws.Context, conn *ec
 	err := conn.WaitUntilInstanceTerminatedWithContext(
 		ctx,
 		&instanceInput,
-		w.getWaiterOptions()...)
+		getWaiterOptions()...)
 	return err
 }
 
 // This function works for both requesting and cancelling spot instances.
-func (w *AWSPollingConfig) WaitUntilSpotRequestFulfilled(ctx aws.Context, conn *ec2.EC2, spotRequestId string) error {
+func WaitUntilSpotRequestFulfilled(ctx aws.Context, conn *ec2.EC2, spotRequestId string) error {
 	spotRequestInput := ec2.DescribeSpotInstanceRequestsInput{
 		SpotInstanceRequestIds: []*string{&spotRequestId},
 	}
@@ -135,11 +101,11 @@ func (w *AWSPollingConfig) WaitUntilSpotRequestFulfilled(ctx aws.Context, conn *
 	err := conn.WaitUntilSpotInstanceRequestFulfilledWithContext(
 		ctx,
 		&spotRequestInput,
-		w.getWaiterOptions()...)
+		getWaiterOptions()...)
 	return err
 }
 
-func (w *AWSPollingConfig) WaitUntilVolumeAvailable(ctx aws.Context, conn *ec2.EC2, volumeId string) error {
+func WaitUntilVolumeAvailable(ctx aws.Context, conn *ec2.EC2, volumeId string) error {
 	volumeInput := ec2.DescribeVolumesInput{
 		VolumeIds: []*string{&volumeId},
 	}
@@ -147,11 +113,11 @@ func (w *AWSPollingConfig) WaitUntilVolumeAvailable(ctx aws.Context, conn *ec2.E
 	err := conn.WaitUntilVolumeAvailableWithContext(
 		ctx,
 		&volumeInput,
-		w.getWaiterOptions()...)
+		getWaiterOptions()...)
 	return err
 }
 
-func (w *AWSPollingConfig) WaitUntilSnapshotDone(ctx aws.Context, conn *ec2.EC2, snapshotID string) error {
+func WaitUntilSnapshotDone(ctx aws.Context, conn *ec2.EC2, snapshotID string) error {
 	snapInput := ec2.DescribeSnapshotsInput{
 		SnapshotIds: []*string{&snapshotID},
 	}
@@ -159,13 +125,13 @@ func (w *AWSPollingConfig) WaitUntilSnapshotDone(ctx aws.Context, conn *ec2.EC2,
 	err := conn.WaitUntilSnapshotCompletedWithContext(
 		ctx,
 		&snapInput,
-		w.getWaiterOptions()...)
+		getWaiterOptions()...)
 	return err
 }
 
 // Wrappers for our custom AWS waiters
 
-func (w *AWSPollingConfig) WaitUntilVolumeAttached(ctx aws.Context, conn *ec2.EC2, volumeId string) error {
+func WaitUntilVolumeAttached(ctx aws.Context, conn *ec2.EC2, volumeId string) error {
 	volumeInput := ec2.DescribeVolumesInput{
 		VolumeIds: []*string{&volumeId},
 	}
@@ -173,11 +139,11 @@ func (w *AWSPollingConfig) WaitUntilVolumeAttached(ctx aws.Context, conn *ec2.EC
 	err := WaitForVolumeToBeAttached(conn,
 		ctx,
 		&volumeInput,
-		w.getWaiterOptions()...)
+		getWaiterOptions()...)
 	return err
 }
 
-func (w *AWSPollingConfig) WaitUntilVolumeDetached(ctx aws.Context, conn *ec2.EC2, volumeId string) error {
+func WaitUntilVolumeDetached(ctx aws.Context, conn *ec2.EC2, volumeId string) error {
 	volumeInput := ec2.DescribeVolumesInput{
 		VolumeIds: []*string{&volumeId},
 	}
@@ -185,11 +151,11 @@ func (w *AWSPollingConfig) WaitUntilVolumeDetached(ctx aws.Context, conn *ec2.EC
 	err := WaitForVolumeToBeDetached(conn,
 		ctx,
 		&volumeInput,
-		w.getWaiterOptions()...)
+		getWaiterOptions()...)
 	return err
 }
 
-func (w *AWSPollingConfig) WaitUntilImageImported(ctx aws.Context, conn *ec2.EC2, taskID string) error {
+func WaitUntilImageImported(ctx aws.Context, conn *ec2.EC2, taskID string) error {
 	importInput := ec2.DescribeImportImageTasksInput{
 		ImportTaskIds: []*string{&taskID},
 	}
@@ -197,7 +163,7 @@ func (w *AWSPollingConfig) WaitUntilImageImported(ctx aws.Context, conn *ec2.EC2
 	err := WaitForImageToBeImported(conn,
 		ctx,
 		&importInput,
-		w.getWaiterOptions()...)
+		getWaiterOptions()...)
 	return err
 }
 
@@ -332,18 +298,8 @@ type overridableWaitVars struct {
 	awsTimeoutSeconds   envInfo
 }
 
-func (w *AWSPollingConfig) getWaiterOptions() []request.WaiterOption {
+func getWaiterOptions() []request.WaiterOption {
 	envOverrides := getEnvOverrides()
-
-	if w.MaxAttempts != 0 {
-		envOverrides.awsMaxAttempts.Val = w.MaxAttempts
-		envOverrides.awsMaxAttempts.overridden = true
-	}
-	if w.DelaySeconds != 0 {
-		envOverrides.awsPollDelaySeconds.Val = w.DelaySeconds
-		envOverrides.awsPollDelaySeconds.overridden = true
-	}
-
 	waitOpts := applyEnvOverrides(envOverrides)
 	return waitOpts
 }
@@ -377,38 +333,33 @@ func getEnvOverrides() overridableWaitVars {
 	return envValues
 }
 
-func (w *AWSPollingConfig) LogEnvOverrideWarnings() {
-	pollDelayEnv := os.Getenv("AWS_POLL_DELAY_SECONDS")
-	timeoutSecondsEnv := os.Getenv("AWS_TIMEOUT_SECONDS")
-	maxAttemptsEnv := os.Getenv("AWS_MAX_ATTEMPTS")
+func LogEnvOverrideWarnings() {
+	pollDelay := os.Getenv("AWS_POLL_DELAY_SECONDS")
+	timeoutSeconds := os.Getenv("AWS_TIMEOUT_SECONDS")
+	maxAttempts := os.Getenv("AWS_MAX_ATTEMPTS")
 
-	maxAttemptsIsSet := maxAttemptsEnv != "" || w.MaxAttempts != 0
-	timeoutSecondsIsSet := timeoutSecondsEnv != ""
-	pollDelayIsSet := pollDelayEnv != "" || w.DelaySeconds != 0
-
-	if maxAttemptsIsSet && timeoutSecondsIsSet {
+	if maxAttempts != "" && timeoutSeconds != "" {
 		warning := fmt.Sprintf("[WARNING] (aws): AWS_MAX_ATTEMPTS and " +
 			"AWS_TIMEOUT_SECONDS are both set. Packer will use " +
 			"AWS_MAX_ATTEMPTS and discard AWS_TIMEOUT_SECONDS.")
-		if !pollDelayIsSet {
+		if pollDelay == "" {
 			warning = fmt.Sprintf("%s  Since you have not set the poll delay, "+
 				"Packer will default to a 2-second delay.", warning)
 		}
 		log.Printf(warning)
-	} else if timeoutSecondsIsSet {
+	} else if timeoutSeconds != "" {
 		log.Printf("[WARNING] (aws): env var AWS_TIMEOUT_SECONDS is " +
-			"deprecated in favor of AWS_MAX_ATTEMPTS env or aws_polling_max_attempts config option. " +
-			"If you have not explicitly set AWS_POLL_DELAY_SECONDS env or aws_polling_delay_seconds config option, " +
-			"we are defaulting to a poll delay of 2 seconds, regardless of the AWS waiter's default.")
+			"deprecated in favor of AWS_MAX_ATTEMPTS. If you have not " +
+			"explicitly set AWS_POLL_DELAY_SECONDS, we are defaulting to a " +
+			"poll delay of 2 seconds, regardless of the AWS waiter's default.")
 	}
-	if !maxAttemptsIsSet && !timeoutSecondsIsSet && !pollDelayIsSet {
+	if maxAttempts == "" && timeoutSeconds == "" && pollDelay == "" {
 		log.Printf("[INFO] (aws): No AWS timeout and polling overrides have been set. " +
 			"Packer will default to waiter-specific delays and timeouts. If you would " +
 			"like to customize the length of time between retries and max " +
 			"number of retries you may do so by setting the environment " +
-			"variables AWS_POLL_DELAY_SECONDS and AWS_MAX_ATTEMPTS or the " +
-			"configuration options aws_polling_delay_seconds and aws_polling_max_attempts " +
-			"to your desired values.")
+			"variables AWS_POLL_DELAY_SECONDS and AWS_MAX_ATTEMPTS to your " +
+			"desired values.")
 	}
 }
 

builder/amazon/common/state.hcl2spec.go

@@ -1,32 +0,0 @@
-// Code generated by "mapstructure-to-hcl2 -type AWSPollingConfig"; DO NOT EDIT.
-package common
-
-import (
-	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/zclconf/go-cty/cty"
-)
-
-// FlatAWSPollingConfig is an auto-generated flat version of AWSPollingConfig.
-// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
-type FlatAWSPollingConfig struct {
-	MaxAttempts  *int `mapstructure:"max_attempts" required:"false" cty:"max_attempts" hcl:"max_attempts"`
-	DelaySeconds *int `mapstructure:"delay_seconds" required:"false" cty:"delay_seconds" hcl:"delay_seconds"`
-}
-
-// FlatMapstructure returns a new FlatAWSPollingConfig.
-// FlatAWSPollingConfig is an auto-generated flat version of AWSPollingConfig.
-// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
-func (*AWSPollingConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
-	return new(FlatAWSPollingConfig)
-}
-
-// HCL2Spec returns the hcl spec of a AWSPollingConfig.
-// This spec is used by HCL to read the fields of AWSPollingConfig.
-// The decoded values from this spec will then be applied to a FlatAWSPollingConfig.
-func (*FlatAWSPollingConfig) HCL2Spec() map[string]hcldec.Spec {
-	s := map[string]hcldec.Spec{
-		"max_attempts":  &hcldec.AttrSpec{Name: "max_attempts", Type: cty.Number, Required: false},
-		"delay_seconds": &hcldec.AttrSpec{Name: "delay_seconds", Type: cty.Number, Required: false},
-	}
-	return s
-}

builder/amazon/common/step_ami_region_copy.go

@@ -209,7 +209,7 @@ func (s *StepAMIRegionCopy) amiRegionCopy(ctx context.Context, state multistep.S
 	}
 
 	// Wait for the image to become ready
-	if err := s.AccessConfig.PollingConfig.WaitUntilAMIAvailable(ctx, regionconn, *resp.ImageId); err != nil {
+	if err := WaitUntilAMIAvailable(ctx, regionconn, *resp.ImageId); err != nil {
 		return "", snapshotIds, fmt.Errorf("Error waiting for AMI (%s) in region (%s): %s",
 			*resp.ImageId, target, err)
 	}

builder/amazon/common/step_create_ssm_tunnel.go

@@ -1,126 +0,0 @@
-package common
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/service/ssm"
-	pssm "github.com/hashicorp/packer/builder/amazon/common/ssm"
-	"github.com/hashicorp/packer/common/net"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
-)
-
-type StepCreateSSMTunnel struct {
-	AWSSession       *session.Session
-	Region           string
-	LocalPortNumber  int
-	RemotePortNumber int
-	SSMAgentEnabled  bool
-	PauseBeforeSSM   time.Duration
-	stopSSMCommand   func()
-}
-
-// Run executes the Packer build step that creates a session tunnel.
-func (s *StepCreateSSMTunnel) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ui := state.Get("ui").(packer.Ui)
-
-	if !s.SSMAgentEnabled {
-		return multistep.ActionContinue
-	}
-
-	// Wait for the remote port to become available
-	if s.PauseBeforeSSM > 0 {
-		ui.Say(fmt.Sprintf("Waiting %s before establishing the SSM session...", s.PauseBeforeSSM))
-		select {
-		case <-time.After(s.PauseBeforeSSM):
-			break
-		case <-ctx.Done():
-			return multistep.ActionHalt
-		}
-	}
-
-	// Configure local port number
-	if err := s.ConfigureLocalHostPort(ctx); err != nil {
-		err := fmt.Errorf("error finding an available port to initiate a session tunnel: %s", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-
-	// Get instance information
-	instance, ok := state.Get("instance").(*ec2.Instance)
-	if !ok {
-		err := fmt.Errorf("error encountered in obtaining target instance id for session tunnel")
-		ui.Error(err.Error())
-		state.Put("error", err)
-		return multistep.ActionHalt
-	}
-
-	state.Put("sessionPort", s.LocalPortNumber)
-
-	ssmCtx, ssmCancel := context.WithCancel(ctx)
-	s.stopSSMCommand = ssmCancel
-
-	go func() {
-		ssmconn := ssm.New(s.AWSSession)
-		err := pssm.Session{
-			SvcClient:  ssmconn,
-			InstanceID: aws.StringValue(instance.InstanceId),
-			RemotePort: s.RemotePortNumber,
-			LocalPort:  s.LocalPortNumber,
-			Region:     s.Region,
-		}.Start(ssmCtx, ui)
-
-		if err != nil {
-			ui.Error(fmt.Sprintf("ssm error: %s", err))
-		}
-	}()
-
-	return multistep.ActionContinue
-}
-
-// Cleanup terminates an active session on AWS, which in turn terminates the associated tunnel process running on the local machine.
-func (s *StepCreateSSMTunnel) Cleanup(state multistep.StateBag) {
-	if !s.SSMAgentEnabled {
-		return
-	}
-
-	if s.stopSSMCommand != nil {
-		s.stopSSMCommand()
-	}
-}
-
-// ConfigureLocalHostPort finds an available port on the localhost that can be used for the remote tunnel.
-// Defaults to using s.LocalPortNumber if it is set.
-func (s *StepCreateSSMTunnel) ConfigureLocalHostPort(ctx context.Context) error {
-	minPortNumber, maxPortNumber := 8000, 9000
-
-	if s.LocalPortNumber != 0 {
-		minPortNumber = s.LocalPortNumber
-		maxPortNumber = minPortNumber
-	}
-
-	// Find an available TCP port for our HTTP server
-	l, err := net.ListenRangeConfig{
-		Min:     minPortNumber,
-		Max:     maxPortNumber,
-		Addr:    "0.0.0.0",
-		Network: "tcp",
-	}.Listen(ctx)
-	if err != nil {
-		return err
-	}
-
-	s.LocalPortNumber = l.Port
-	// Stop listening on selected port so that the AWS session-manager-plugin can use it.
-	// The port is closed right before we start the session to avoid two Packer builds from getting the same port - fingers-crossed
-	l.Close()
-
-	return nil
-
-}

builder/amazon/common/step_create_tags.go

@@ -8,7 +8,6 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
 	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
@@ -92,7 +91,7 @@ func (s *StepCreateTags) Run(ctx context.Context, state multistep.StateBag) mult
 
 		// Retry creating tags for about 2.5 minutes
 		err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {
-			if awserrors.Matches(err, "InvalidAMIID.NotFound", "") || awserrors.Matches(err, "InvalidSnapshot.NotFound", "") {
+			if isAWSErr(err, "InvalidAMIID.NotFound", "") || isAWSErr(err, "InvalidSnapshot.NotFound", "") {
 				return true
 			}
 			return false

builder/amazon/common/step_modify_ami_attributes.go

@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/builder"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/hashicorp/packer/template/interpolate"
@@ -22,7 +22,7 @@ type StepModifyAMIAttributes struct {
 	Description    string
 	Ctx            interpolate.Context
 
-	GeneratedData *packerbuilderdata.GeneratedData
+	GeneratedData *builder.GeneratedData
 }
 
 func (s *StepModifyAMIAttributes) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {

builder/amazon/common/step_pre_validate.go

@@ -9,7 +9,6 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
 	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
@@ -40,7 +39,7 @@ func (s *StepPreValidate) Run(ctx context.Context, state multistep.StateBag) mul
 			err := retry.Config{
 				Tries: 11,
 				ShouldRetry: func(err error) bool {
-					if awserrors.Matches(err, "AuthFailure", "") {
+					if isAWSErr(err, "AuthFailure", "") {
 						log.Printf("Waiting for Vault-generated AWS credentials" +
 							" to pass authentication... trying again.")
 						return true
@@ -132,7 +131,7 @@ func (s *StepPreValidate) checkVpc(conn ec2iface.EC2API) error {
 	}
 
 	res, err := conn.DescribeVpcs(&ec2.DescribeVpcsInput{VpcIds: []*string{aws.String(s.VpcId)}})
-	if awserrors.Matches(err, "InvalidVpcID.NotFound", "") || err != nil {
+	if isAWSErr(err, "InvalidVpcID.NotFound", "") || err != nil {
 		return fmt.Errorf("Error retrieving VPC information for vpc_id %s: %s", s.VpcId, err)
 	}
 

builder/amazon/common/step_run_source_instance.go

@@ -11,7 +11,6 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 
-	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
 	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
@@ -20,7 +19,6 @@ import (
 )
 
 type StepRunSourceInstance struct {
-	PollingConfig                     *AWSPollingConfig
 	AssociatePublicIpAddress          bool
 	LaunchMappings                    EC2BlockDeviceMappingsBuilder
 	Comm                              *communicator.Config
@@ -34,7 +32,6 @@ type StepRunSourceInstance struct {
 	IsRestricted                      bool
 	SourceAMI                         string
 	Tags                              map[string]string
-	Tenancy                           string
 	UserData                          string
 	UserDataFile                      string
 	VolumeTags                        map[string]string
@@ -197,15 +194,11 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 		runOpts.InstanceInitiatedShutdownBehavior = &s.InstanceInitiatedShutdownBehavior
 	}
 
-	if s.Tenancy != "" {
-		runOpts.Placement.Tenancy = aws.String(s.Tenancy)
-	}
-
 	var runResp *ec2.Reservation
 	err = retry.Config{
 		Tries: 11,
 		ShouldRetry: func(err error) bool {
-			if awserrors.Matches(err, "InvalidParameterValue", "iamInstanceProfile") {
+			if isAWSErr(err, "InvalidParameterValue", "iamInstanceProfile") {
 				return true
 			}
 			return false
@@ -216,7 +209,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 		return err
 	})
 
-	if awserrors.Matches(err, "VPCIdNotSpecified", "No default VPC for this user") && subnetId == "" {
+	if isAWSErr(err, "VPCIdNotSpecified", "No default VPC for this user") && subnetId == "" {
 		err := fmt.Errorf("Error launching source instance: a valid Subnet Id was not specified")
 		state.Put("error", err)
 		ui.Error(err.Error())
@@ -241,7 +234,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 		InstanceIds: []*string{aws.String(instanceId)},
 	}
 
-	if err := s.PollingConfig.WaitUntilInstanceRunning(ctx, ec2conn, instanceId); err != nil {
+	if err := WaitUntilInstanceRunning(ctx, ec2conn, instanceId); err != nil {
 		err := fmt.Errorf("Error waiting for instance (%s) to become ready: %s", instanceId, err)
 		state.Put("error", err)
 		ui.Error(err.Error())
@@ -254,7 +247,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 
 	var r *ec2.DescribeInstancesOutput
 	err = retry.Config{Tries: 11, ShouldRetry: func(err error) bool {
-		if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {
+		if isAWSErr(err, "InvalidInstanceID.NotFound", "") {
 			return true
 		}
 		return false
@@ -299,7 +292,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 		ec2Tags.Report(ui)
 		// Retry creating tags for about 2.5 minutes
 		err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {
-			if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {
+			if isAWSErr(err, "InvalidInstanceID.NotFound", "") {
 				return true
 			}
 			return false
@@ -371,7 +364,7 @@ func (s *StepRunSourceInstance) Cleanup(state multistep.StateBag) {
 			return
 		}
 
-		if err := s.PollingConfig.WaitUntilInstanceTerminated(aws.BackgroundContext(), ec2conn, s.instanceId); err != nil {
+		if err := WaitUntilInstanceTerminated(aws.BackgroundContext(), ec2conn, s.instanceId); err != nil {
 			ui.Error(err.Error())
 		}
 	}

builder/amazon/common/step_run_spot_instance.go

@@ -6,13 +6,10 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
-	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
 	"github.com/hashicorp/packer/common/random"
 	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
@@ -26,7 +23,6 @@ type EC2BlockDeviceMappingsBuilder interface {
 }
 
 type StepRunSpotInstance struct {
-	PollingConfig                     *AWSPollingConfig
 	AssociatePublicIpAddress          bool
 	LaunchMappings                    EC2BlockDeviceMappingsBuilder
 	BlockDurationMinutes              int64
@@ -36,7 +32,6 @@ type StepRunSpotInstance struct {
 	ExpectedRootDevice                string
 	InstanceInitiatedShutdownBehavior string
 	InstanceType                      string
-	Region                            string
 	SourceAMI                         string
 	SpotPrice                         string
 	SpotTags                          map[string]string
@@ -160,7 +155,7 @@ func (s *StepRunSpotInstance) LoadUserData() (string, error) {
 }
 
 func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ec2conn := state.Get("ec2").(ec2iface.EC2API)
+	ec2conn := state.Get("ec2").(*ec2.EC2)
 	ui := state.Get("ui").(packer.Ui)
 
 	ui.Say("Launching a spot AWS instance...")
@@ -199,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, s.Region, state)
+	ec2Tags, err := TagMap(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)
@@ -223,14 +218,6 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 	}
 	marketOptions.SetMarketType(ec2.MarketTypeSpot)
 
-	spotTags, err := TagMap(s.SpotTags).EC2Tags(s.Ctx, s.Region, state)
-	if err != nil {
-		err := fmt.Errorf("Error generating tags for spot request: %s", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-
 	// Create a launch template for the instance
 	ui.Message("Loading User Data File...")
 
@@ -253,14 +240,6 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 		LaunchTemplateName: aws.String(launchTemplateName),
 		VersionDescription: aws.String("template generated by packer for launching spot instances"),
 	}
-	if len(spotTags) > 0 {
-		launchTemplate.TagSpecifications = []*ec2.TagSpecification{
-			{
-				ResourceType: aws.String("launch-template"),
-				Tags:         spotTags,
-			},
-		}
-	}
 
 	// Tell EC2 to create the template
 	_, err = ec2conn.CreateLaunchTemplate(launchTemplate)
@@ -298,53 +277,36 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 		Type: aws.String("instant"),
 	}
 
-	var createOutput *ec2.CreateFleetOutput
-	err = retry.Config{
-		Tries: 11,
-		ShouldRetry: func(err error) bool {
-			if strings.Contains(err.Error(), "Invalid IAM Instance Profile name") {
-				// eventual consistency of the profile. PutRolePolicy &
-				// AddRoleToInstanceProfile are eventually consistent and once
-				// we can wait on those operations, this can be removed.
-				return true
-			}
-			return false
-		},
-		RetryDelay: (&retry.Backoff{InitialBackoff: 500 * time.Millisecond, MaxBackoff: 30 * time.Second, Multiplier: 2}).Linear,
-	}.Run(ctx, func(ctx context.Context) error {
-		createOutput, err = ec2conn.CreateFleet(createFleetInput)
-		if err == nil && createOutput.Errors != nil {
-			err = fmt.Errorf("errors: %v", createOutput.Errors)
-		}
-		// We can end up with errors because one of the allowed availability
-		// zones doesn't have one of the allowed instance types; as long as
-		// an instance is launched, these errors aren't important.
-		if len(createOutput.Instances) > 0 {
-			if err != nil {
-				log.Printf("create request failed for some instances %v", err.Error())
-			}
-			return nil
-		}
-		if err != nil {
-			log.Printf("create request failed %v", err)
-		}
-		return err
-	})
-
+	// Create the request for the spot instance.
+	req, createOutput := ec2conn.CreateFleetRequest(createFleetInput)
+	ui.Message(fmt.Sprintf("Sending spot request (%s)...", req.RequestID))
+	// Actually send the spot connection request.
+	err = req.Send()
 	if err != nil {
 		if createOutput.FleetId != nil {
 			err = fmt.Errorf("Error waiting for fleet request (%s): %s", *createOutput.FleetId, err)
+		} else {
+			err = fmt.Errorf("Error waiting for fleet request: %s", err)
 		}
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	if len(createOutput.Instances) == 0 {
+		// We can end up with errors because one of the allowed availability
+		// zones doesn't have one of the allowed instance types; as long as
+		// an instance is launched, these errors aren't important.
 		if len(createOutput.Errors) > 0 {
 			errString := fmt.Sprintf("Error waiting for fleet request (%s) to become ready:", *createOutput.FleetId)
 			for _, outErr := range createOutput.Errors {
 				errString = errString + aws.StringValue(outErr.ErrorMessage)
 			}
 			err = fmt.Errorf(errString)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
 		}
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
 	}
 
 	instanceId = *createOutput.Instances[0].InstanceIds[0]
@@ -362,11 +324,6 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 		describeOutput, err = ec2conn.DescribeInstances(&ec2.DescribeInstancesInput{
 			InstanceIds: []*string{aws.String(instanceId)},
 		})
-		if len(describeOutput.Reservations) > 0 && len(describeOutput.Reservations[0].Instances) > 0 {
-			if len(s.LaunchMappings.BuildEC2BlockDeviceMappings()) > 0 && len(describeOutput.Reservations[0].Instances[0].BlockDeviceMappings) == 0 {
-				return fmt.Errorf("Instance has no block devices")
-			}
-		}
 		return err
 	})
 	if err != nil || len(describeOutput.Reservations) == 0 || len(describeOutput.Reservations[0].Instances) == 0 {
@@ -379,6 +336,14 @@ 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)
+	if err != nil {
+		err := fmt.Errorf("Error generating tags for spot request: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
 	if len(spotTags) > 0 && len(s.SpotTags) > 0 {
 		spotTags.Report(ui)
 		// Use the instance ID to find out the SIR, so that we can tag the spot
@@ -407,7 +372,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 
 	// Retry creating tags for about 2.5 minutes
 	err = retry.Config{Tries: 11, ShouldRetry: func(error) bool {
-		if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {
+		if isAWSErr(err, "InvalidInstanceID.NotFound", "") {
 			return true
 		}
 		return false
@@ -438,7 +403,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 	if len(volumeIds) > 0 && len(s.VolumeTags) > 0 {
 		ui.Say("Adding tags to source EBS Volumes")
 
-		volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, s.Region, state)
+		volumeTags, err := TagMap(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)
@@ -496,7 +461,7 @@ func (s *StepRunSpotInstance) Cleanup(state multistep.StateBag) {
 			return
 		}
 
-		if err := s.PollingConfig.WaitUntilInstanceTerminated(aws.BackgroundContext(), ec2conn, s.instanceId); err != nil {
+		if err := WaitUntilInstanceTerminated(aws.BackgroundContext(), ec2conn, s.instanceId); err != nil {
 			ui.Error(err.Error())
 		}
 	}

builder/amazon/common/step_run_spot_instance_test.go

@@ -2,13 +2,11 @@ package common
 
 import (
 	"bytes"
-	"context"
 	"fmt"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
@@ -31,7 +29,6 @@ func tStateSpot() multistep.StateBag {
 
 func getBasicStep() *StepRunSpotInstance {
 	stepRunSpotInstance := StepRunSpotInstance{
-		PollingConfig:            new(AWSPollingConfig),
 		AssociatePublicIpAddress: false,
 		LaunchMappings:           BlockDevices{},
 		BlockDurationMinutes:     0,
@@ -45,7 +42,6 @@ func getBasicStep() *StepRunSpotInstance {
 		ExpectedRootDevice:                "ebs",
 		InstanceInitiatedShutdownBehavior: "stop",
 		InstanceType:                      "t2.micro",
-		Region:                            "us-east-1",
 		SourceAMI:                         "",
 		SpotPrice:                         "auto",
 		SpotTags:                          nil,
@@ -137,226 +133,3 @@ func TestCreateTemplateData_NoEphemeral(t *testing.T) {
 	// 	t.Fatalf("Should have created 26 mappings to keep ephemeral drives from appearing.")
 	// }
 }
-
-type runSpotEC2ConnMock struct {
-	ec2iface.EC2API
-
-	CreateLaunchTemplateParams []*ec2.CreateLaunchTemplateInput
-	CreateLaunchTemplateFn     func(*ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error)
-
-	CreateFleetParams []*ec2.CreateFleetInput
-	CreateFleetFn     func(*ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error)
-
-	CreateTagsParams []*ec2.CreateTagsInput
-	CreateTagsFn     func(*ec2.CreateTagsInput) (*ec2.CreateTagsOutput, error)
-
-	DescribeInstancesParams []*ec2.DescribeInstancesInput
-	DescribeInstancesFn     func(input *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error)
-}
-
-func (m *runSpotEC2ConnMock) CreateLaunchTemplate(req *ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) {
-	m.CreateLaunchTemplateParams = append(m.CreateLaunchTemplateParams, req)
-	resp, err := m.CreateLaunchTemplateFn(req)
-	return resp, err
-}
-
-func (m *runSpotEC2ConnMock) CreateFleet(req *ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error) {
-	m.CreateFleetParams = append(m.CreateFleetParams, req)
-	if m.CreateFleetFn != nil {
-		resp, err := m.CreateFleetFn(req)
-		return resp, err
-	} else {
-		return nil, nil
-	}
-}
-
-func (m *runSpotEC2ConnMock) DescribeInstances(req *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) {
-	m.DescribeInstancesParams = append(m.DescribeInstancesParams, req)
-	if m.DescribeInstancesFn != nil {
-		resp, err := m.DescribeInstancesFn(req)
-		return resp, err
-	} else {
-		return nil, nil
-	}
-}
-
-func (m *runSpotEC2ConnMock) CreateTags(req *ec2.CreateTagsInput) (*ec2.CreateTagsOutput, error) {
-	m.CreateTagsParams = append(m.CreateTagsParams, req)
-	if m.CreateTagsFn != nil {
-		resp, err := m.CreateTagsFn(req)
-		return resp, err
-	} else {
-		return nil, nil
-	}
-}
-
-func defaultEc2Mock(instanceId, spotRequestId, volumeId *string) *runSpotEC2ConnMock {
-	instance := &ec2.Instance{
-		InstanceId:            instanceId,
-		SpotInstanceRequestId: spotRequestId,
-		BlockDeviceMappings: []*ec2.InstanceBlockDeviceMapping{
-			{
-				Ebs: &ec2.EbsInstanceBlockDevice{
-					VolumeId: volumeId,
-				},
-			},
-		},
-	}
-	return &runSpotEC2ConnMock{
-		CreateLaunchTemplateFn: func(in *ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) {
-			return &ec2.CreateLaunchTemplateOutput{
-				LaunchTemplate: nil,
-				Warning:        nil,
-			}, nil
-		},
-		CreateFleetFn: func(*ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error) {
-			return &ec2.CreateFleetOutput{
-				Errors:  nil,
-				FleetId: nil,
-				Instances: []*ec2.CreateFleetInstance{
-					{
-						InstanceIds: []*string{instanceId},
-					},
-				},
-			}, nil
-		},
-		DescribeInstancesFn: func(input *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) {
-			return &ec2.DescribeInstancesOutput{
-				NextToken: nil,
-				Reservations: []*ec2.Reservation{
-					{
-						Instances: []*ec2.Instance{instance},
-					},
-				},
-			}, nil
-		},
-	}
-}
-
-func TestRun(t *testing.T) {
-	instanceId := aws.String("test-instance-id")
-	spotRequestId := aws.String("spot-id")
-	volumeId := aws.String("volume-id")
-	ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId)
-
-	uiMock := packer.TestUi(t)
-
-	state := tStateSpot()
-	state.Put("ec2", ec2Mock)
-	state.Put("ui", uiMock)
-	state.Put("source_image", testImage())
-
-	stepRunSpotInstance := getBasicStep()
-	stepRunSpotInstance.Tags["Name"] = "Packer Builder"
-	stepRunSpotInstance.Tags["test-tag"] = "test-value"
-	stepRunSpotInstance.SpotTags = map[string]string{
-		"spot-tag": "spot-tag-value",
-	}
-	stepRunSpotInstance.VolumeTags = map[string]string{
-		"volume-tag": "volume-tag-value",
-	}
-
-	ctx := context.TODO()
-	action := stepRunSpotInstance.Run(ctx, state)
-
-	if err := state.Get("error"); err != nil {
-		t.Fatalf("should not error, but: %v", err)
-	}
-
-	if action != multistep.ActionContinue {
-		t.Fatalf("shoul continue, but: %v", action)
-	}
-
-	if len(ec2Mock.CreateLaunchTemplateParams) != 1 {
-		t.Fatalf("createLaunchTemplate should be invoked once, but invoked %v", len(ec2Mock.CreateLaunchTemplateParams))
-	}
-	launchTemplateName := ec2Mock.CreateLaunchTemplateParams[0].LaunchTemplateName
-
-	if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications) != 1 {
-		t.Fatalf("exactly one launch template tag specification expected")
-	}
-	if *ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].ResourceType != "launch-template" {
-		t.Fatalf("resource type 'launch-template' expected")
-	}
-	if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags) != 1 {
-		t.Fatalf("1 launch template tag expected")
-	}
-
-	nameTag := ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags[0]
-	if *nameTag.Key != "spot-tag" || *nameTag.Value != "spot-tag-value" {
-		t.Fatalf("expected spot-tag: spot-tag-value")
-	}
-
-	if len(ec2Mock.CreateFleetParams) != 1 {
-		t.Fatalf("createFleet should be invoked once, but invoked %v", len(ec2Mock.CreateLaunchTemplateParams))
-	}
-	if *ec2Mock.CreateFleetParams[0].TargetCapacitySpecification.DefaultTargetCapacityType != "spot" {
-		t.Fatalf("capacity type should be spot")
-	}
-	if *ec2Mock.CreateFleetParams[0].TargetCapacitySpecification.TotalTargetCapacity != 1 {
-		t.Fatalf("target capacity should be 1")
-	}
-	if len(ec2Mock.CreateFleetParams[0].LaunchTemplateConfigs) != 1 {
-		t.Fatalf("exactly one launch config template expected")
-	}
-	if *ec2Mock.CreateFleetParams[0].LaunchTemplateConfigs[0].LaunchTemplateSpecification.LaunchTemplateName != *launchTemplateName {
-		t.Fatalf("launchTemplateName should match in createLaunchTemplate and createFleet requests")
-	}
-
-	if len(ec2Mock.DescribeInstancesParams) != 1 {
-		t.Fatalf("describeInstancesParams should be invoked once, but invoked %v", len(ec2Mock.DescribeInstancesParams))
-	}
-	if *ec2Mock.DescribeInstancesParams[0].InstanceIds[0] != *instanceId {
-		t.Fatalf("instanceId should match from createFleet response")
-	}
-
-	uiMock.Say(fmt.Sprintf("%v", ec2Mock.CreateTagsParams))
-	if len(ec2Mock.CreateTagsParams) != 3 {
-		t.Fatalf("createTags should be invoked 3 times")
-	}
-	if len(ec2Mock.CreateTagsParams[0].Resources) != 1 || *ec2Mock.CreateTagsParams[0].Resources[0] != *spotRequestId {
-		t.Fatalf("should create tags for spot request")
-	}
-	if len(ec2Mock.CreateTagsParams[1].Resources) != 1 || *ec2Mock.CreateTagsParams[1].Resources[0] != *instanceId {
-		t.Fatalf("should create tags for instance")
-	}
-	if len(ec2Mock.CreateTagsParams[2].Resources) != 1 || ec2Mock.CreateTagsParams[2].Resources[0] != volumeId {
-		t.Fatalf("should create tags for volume")
-	}
-}
-
-func TestRun_NoSpotTags(t *testing.T) {
-	instanceId := aws.String("test-instance-id")
-	spotRequestId := aws.String("spot-id")
-	volumeId := aws.String("volume-id")
-	ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId)
-
-	uiMock := packer.TestUi(t)
-
-	state := tStateSpot()
-	state.Put("ec2", ec2Mock)
-	state.Put("ui", uiMock)
-	state.Put("source_image", testImage())
-
-	stepRunSpotInstance := getBasicStep()
-	stepRunSpotInstance.Tags["Name"] = "Packer Builder"
-	stepRunSpotInstance.Tags["test-tag"] = "test-value"
-	stepRunSpotInstance.VolumeTags = map[string]string{
-		"volume-tag": "volume-tag-value",
-	}
-
-	ctx := context.TODO()
-	action := stepRunSpotInstance.Run(ctx, state)
-
-	if err := state.Get("error"); err != nil {
-		t.Fatalf("should not error, but: %v", err)
-	}
-
-	if action != multistep.ActionContinue {
-		t.Fatalf("shoul continue, but: %v", action)
-	}
-
-	if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications) != 0 {
-		t.Fatalf("0 launch template tags expected")
-	}
-}

builder/amazon/common/step_security_group.go

@@ -21,7 +21,6 @@ type StepSecurityGroup struct {
 	SecurityGroupFilter    SecurityGroupFilterOptions
 	SecurityGroupIds       []string
 	TemporarySGSourceCidrs []string
-	SkipSSHRuleCreation    bool
 
 	createdGroupId string
 }
@@ -77,6 +76,13 @@ func (s *StepSecurityGroup) Run(ctx context.Context, state multistep.StateBag) m
 		return multistep.ActionContinue
 	}
 
+	port := s.CommConfig.Port()
+	if port == 0 {
+		if s.CommConfig.Type != "none" {
+			panic("port must be set to a non-zero value.")
+		}
+	}
+
 	// Create the group
 	groupName := fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID())
 	ui.Say(fmt.Sprintf("Creating temporary security group for this instance: %s", groupName))
@@ -104,15 +110,15 @@ func (s *StepSecurityGroup) Run(ctx context.Context, state multistep.StateBag) m
 			GroupIds: []*string{aws.String(s.createdGroupId)},
 		},
 	)
-	if err != nil {
+	if err == nil {
+		log.Printf("[DEBUG] Found security group %s", s.createdGroupId)
+	} else {
 		err := fmt.Errorf("Timed out waiting for security group %s: %s", s.createdGroupId, err)
 		log.Printf("[DEBUG] %s", err.Error())
 		state.Put("error", err)
 		return multistep.ActionHalt
 	}
 
-	log.Printf("[DEBUG] Found security group %s", s.createdGroupId)
-
 	// map the list of temporary security group CIDRs bundled with config to
 	// types expected by EC2.
 	groupIpRanges := []*ec2.IpRange{}
@@ -123,15 +129,7 @@ func (s *StepSecurityGroup) Run(ctx context.Context, state multistep.StateBag) m
 		groupIpRanges = append(groupIpRanges, &ipRange)
 	}
 
-	// Set some state data for use in future steps
-	state.Put("securityGroupIds", []string{s.createdGroupId})
-
-	if s.SkipSSHRuleCreation {
-		return multistep.ActionContinue
-	}
-
-	port := s.CommConfig.Port()
-	// Authorize access for the provided port within the security group
+	// Authorize the SSH access for the security group
 	groupRules := &ec2.AuthorizeSecurityGroupIngressInput{
 		GroupId: groupResp.GroupId,
 		IpPermissions: []*ec2.IpPermission{
@@ -156,6 +154,9 @@ func (s *StepSecurityGroup) Run(ctx context.Context, state multistep.StateBag) m
 		return multistep.ActionHalt
 	}
 
+	// Set some state data for use in future steps
+	state.Put("securityGroupIds", []string{s.createdGroupId})
+
 	return multistep.ActionContinue
 }
 

builder/amazon/common/step_set_generated_data.go

@@ -1,29 +0,0 @@
-package common
-
-import (
-	"context"
-
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
-	"github.com/hashicorp/packer/helper/multistep"
-)
-
-// &awscommon.StepSetGeneratedData{
-// 	GeneratedData: generatedData,
-// },
-
-type StepSetGeneratedData struct {
-	GeneratedData *packerbuilderdata.GeneratedData
-}
-
-func (s *StepSetGeneratedData) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ec2conn := state.Get("ec2").(*ec2.EC2)
-
-	extractBuildInfo(*ec2conn.Config.Region, state, s.GeneratedData)
-
-	return multistep.ActionContinue
-}
-
-func (s *StepSetGeneratedData) Cleanup(state multistep.StateBag) {
-	// No cleanup...
-}

builder/amazon/common/step_stop_ebs_instance.go

@@ -6,14 +6,12 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
 	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
 
 type StepStopEBSBackedInstance struct {
-	PollingConfig       *AWSPollingConfig
 	Skip                bool
 	DisableStopInstance bool
 }
@@ -43,7 +41,7 @@ func (s *StepStopEBSBackedInstance) Run(ctx context.Context, state multistep.Sta
 
 		// Work around this by retrying a few times, up to about 5 minutes.
 		err := retry.Config{Tries: 6, ShouldRetry: func(error) bool {
-			if awserrors.Matches(err, "InvalidInstanceID.NotFound", "") {
+			if isAWSErr(err, "InvalidInstanceID.NotFound", "") {
 				return true
 			}
 			return false
@@ -76,7 +74,7 @@ func (s *StepStopEBSBackedInstance) Run(ctx context.Context, state multistep.Sta
 		&ec2.DescribeInstancesInput{
 			InstanceIds: []*string{instance.InstanceId},
 		},
-		s.PollingConfig.getWaiterOptions()...)
+		getWaiterOptions()...)
 
 	if err != nil {
 		err := fmt.Errorf("Error waiting for instance to stop: %s", err)

builder/amazon/common/tags.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/builder"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/hashicorp/packer/template/interpolate"
@@ -23,7 +23,7 @@ func (t EC2Tags) Report(ui packer.Ui) {
 
 func (t TagMap) EC2Tags(ictx interpolate.Context, region string, state multistep.StateBag) (EC2Tags, error) {
 	var ec2Tags []*ec2.Tag
-	generatedData := packerbuilderdata.GeneratedData{State: state}
+	generatedData := builder.GeneratedData{State: state}
 	ictx.Data = extractBuildInfo(region, state, &generatedData)
 
 	for key, value := range t {

builder/amazon/ebs/builder.go

@@ -15,10 +15,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
+	"github.com/hashicorp/packer/builder"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
@@ -55,12 +54,7 @@ type Config struct {
 	// duplicated in `tags`. This is a [template
 	// engine](/docs/templates/engine), see [Build template
 	// data](#build-template-data) for more information.
-	VolumeRunTags map[string]string `mapstructure:"run_volume_tags"`
-	// Same as [`run_volume_tags`](#run_volume_tags) but defined as a singular
-	// block containing a `name` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](https://packer.io/docs/configuration/from-1.5/expressions.html#dynamic-blocks)
-	// will allow you to create those programatically.
-	VolumeRunTag hcl2template.NameValues `mapstructure:"run_volume_tag" required:"false"`
+	VolumeRunTags awscommon.TagMap `mapstructure:"run_volume_tags"`
 	// Relevant only to Windows guests: If you set this flag, we'll add clauses
 	// to the launch_block_device_mappings that make sure ephemeral drives
 	// don't show up in the EC2 console. If you launched from the EC2 console,
@@ -85,22 +79,16 @@ func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstruct
 func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	b.config.ctx.Funcs = awscommon.TemplateFuncs
 	err := config.Decode(&b.config, &config.DecodeOpts{
-		PluginType:         BuilderId,
 		Interpolate:        true,
 		InterpolateContext: &b.config.ctx,
 		InterpolateFilter: &interpolate.RenderFilter{
 			Exclude: []string{
 				"ami_description",
 				"run_tags",
-				"run_tag",
 				"run_volume_tags",
-				"run_volume_tag",
 				"spot_tags",
-				"spot_tag",
 				"snapshot_tags",
-				"snapshot_tag",
 				"tags",
-				"tag",
 			},
 		},
 	}, raws...)
@@ -116,8 +104,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	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.AMIConfig.Prepare(&b.config.AccessConfig, &b.config.ctx)...)
@@ -146,7 +132,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 
 	packer.LogSecretFilter.Set(b.config.AccessKey, b.config.SecretKey, b.config.Token)
 
-	generatedData := awscommon.GetGeneratedDataList()
+	generatedData := []string{"SourceAMIName"}
 	return generatedData, warns, nil
 }
 
@@ -169,13 +155,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("awsSession", session)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	generatedData := &packerbuilderdata.GeneratedData{State: state}
+	generatedData := &builder.GeneratedData{State: state}
 
 	var instanceStep multistep.Step
 
 	if b.config.IsSpotInstance() {
 		instanceStep = &awscommon.StepRunSpotInstance{
-			PollingConfig:                     b.config.PollingConfig,
 			AssociatePublicIpAddress:          b.config.AssociatePublicIpAddress,
 			LaunchMappings:                    b.config.LaunchMappings,
 			BlockDurationMinutes:              b.config.BlockDurationMinutes,
@@ -186,7 +171,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ExpectedRootDevice:                "ebs",
 			InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior,
 			InstanceType:                      b.config.InstanceType,
-			Region:                            *ec2conn.Config.Region,
 			SourceAMI:                         b.config.SourceAmi,
 			SpotPrice:                         b.config.SpotPrice,
 			SpotTags:                          b.config.SpotTags,
@@ -199,7 +183,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		}
 	} else {
 		instanceStep = &awscommon.StepRunSourceInstance{
-			PollingConfig:                     b.config.PollingConfig,
 			AssociatePublicIpAddress:          b.config.AssociatePublicIpAddress,
 			LaunchMappings:                    b.config.LaunchMappings,
 			Comm:                              &b.config.RunConfig.Comm,
@@ -213,7 +196,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			IsRestricted:                      b.config.IsChinaCloud() || b.config.IsGovCloud(),
 			SourceAMI:                         b.config.SourceAmi,
 			Tags:                              b.config.RunTags,
-			Tenancy:                           b.config.Tenancy,
 			UserData:                          b.config.UserData,
 			UserDataFile:                      b.config.UserDataFile,
 			VolumeTags:                        b.config.VolumeRunTags,
@@ -257,7 +239,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			SecurityGroupIds:       b.config.SecurityGroupIds,
 			CommConfig:             &b.config.RunConfig.Comm,
 			TemporarySGSourceCidrs: b.config.TemporarySGSourceCidrs,
-			SkipSSHRuleCreation:    b.config.SSMAgentEnabled(),
 		},
 		&awscommon.StepIamInstanceProfile{
 			IamInstanceProfile:                        b.config.IamInstanceProfile,
@@ -274,14 +255,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Timeout:   b.config.WindowsPasswordTimeout,
 			BuildName: b.config.PackerBuildName,
 		},
-		&awscommon.StepCreateSSMTunnel{
-			AWSSession:       session,
-			Region:           *ec2conn.Config.Region,
-			PauseBeforeSSM:   b.config.PauseBeforeSSM,
-			LocalPortNumber:  b.config.SessionManagerPort,
-			RemotePortNumber: b.config.Comm.Port(),
-			SSMAgentEnabled:  b.config.SSMAgentEnabled(),
-		},
 		&communicator.StepConnect{
 			Config: &b.config.RunConfig.Comm,
 			Host: awscommon.SSHHost(
@@ -289,21 +262,13 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				b.config.SSHInterface,
 				b.config.Comm.Host(),
 			),
-			SSHPort: awscommon.Port(
-				b.config.SSHInterface,
-				b.config.Comm.Port(),
-			),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&awscommon.StepSetGeneratedData{
-			GeneratedData: generatedData,
-		},
 		&common.StepProvision{},
 		&common.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&awscommon.StepStopEBSBackedInstance{
-			PollingConfig:       b.config.PollingConfig,
 			Skip:                b.config.IsSpotInstance(),
 			DisableStopInstance: b.config.DisableStopInstance,
 		},
@@ -320,7 +285,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 		&stepCreateAMI{
 			AMISkipBuildRegion: b.config.AMISkipBuildRegion,
-			PollingConfig:      b.config.PollingConfig,
 		},
 		&awscommon.StepAMIRegionCopy{
 			AccessConfig:       &b.config.AccessConfig,

builder/amazon/ebs/builder.hcl2spec.go

@@ -11,140 +11,124 @@ 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" hcl:"packer_build_name"`
-	PackerBuilderType                         *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug                               *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce                               *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError                             *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars                            map[string]string                      `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars                       []string                               `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	AccessKey                                 *string                                `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"`
-	AssumeRole                                *common.FlatAssumeRoleConfig           `mapstructure:"assume_role" required:"false" cty:"assume_role" hcl:"assume_role"`
-	CustomEndpointEc2                         *string                                `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2" hcl:"custom_endpoint_ec2"`
-	CredsFilename                             *string                                `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file" hcl:"shared_credentials_file"`
-	DecodeAuthZMessages                       *bool                                  `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages" hcl:"decode_authorization_messages"`
-	InsecureSkipTLSVerify                     *bool                                  `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"`
-	MaxRetries                                *int                                   `mapstructure:"max_retries" required:"false" cty:"max_retries" hcl:"max_retries"`
-	MFACode                                   *string                                `mapstructure:"mfa_code" required:"false" cty:"mfa_code" hcl:"mfa_code"`
-	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
-	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
-	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
-	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check" hcl:"skip_metadata_api_check"`
-	SkipCredsValidation                       *bool                                  `mapstructure:"skip_credential_validation" cty:"skip_credential_validation" hcl:"skip_credential_validation"`
-	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token" hcl:"token"`
-	VaultAWSEngine                            *common.FlatVaultAWSEngineOptions      `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine" hcl:"vault_aws_engine"`
-	PollingConfig                             *common.FlatAWSPollingConfig           `mapstructure:"aws_polling" required:"false" cty:"aws_polling" hcl:"aws_polling"`
-	AMIName                                   *string                                `mapstructure:"ami_name" required:"true" cty:"ami_name" hcl:"ami_name"`
-	AMIDescription                            *string                                `mapstructure:"ami_description" required:"false" cty:"ami_description" hcl:"ami_description"`
-	AMIVirtType                               *string                                `mapstructure:"ami_virtualization_type" required:"false" cty:"ami_virtualization_type" hcl:"ami_virtualization_type"`
-	AMIUsers                                  []string                               `mapstructure:"ami_users" required:"false" cty:"ami_users" hcl:"ami_users"`
-	AMIGroups                                 []string                               `mapstructure:"ami_groups" required:"false" cty:"ami_groups" hcl:"ami_groups"`
-	AMIProductCodes                           []string                               `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes" hcl:"ami_product_codes"`
-	AMIRegions                                []string                               `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"`
-	AMITags                                   map[string]string                      `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AMITag                                    []hcl2template.FlatKeyValue            `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
-	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"`
-	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"`
-	AMIForceDeregister                        *bool                                  `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"`
-	AMIForceDeleteSnapshot                    *bool                                  `mapstructure:"force_delete_snapshot" required:"false" cty:"force_delete_snapshot" hcl:"force_delete_snapshot"`
-	AMIEncryptBootVolume                      *bool                                  `mapstructure:"encrypt_boot" required:"false" cty:"encrypt_boot" hcl:"encrypt_boot"`
-	AMIKmsKeyId                               *string                                `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"`
-	AMIRegionKMSKeyIDs                        map[string]string                      `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"`
-	AMISkipBuildRegion                        *bool                                  `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"`
-	SnapshotTags                              map[string]string                      `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"`
-	SnapshotTag                               []hcl2template.FlatKeyValue            `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
-	SnapshotUsers                             []string                               `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"`
-	SnapshotGroups                            []string                               `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"`
-	AssociatePublicIpAddress                  *bool                                  `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
-	AvailabilityZone                          *string                                `mapstructure:"availability_zone" required:"false" cty:"availability_zone" hcl:"availability_zone"`
-	BlockDurationMinutes                      *int64                                 `mapstructure:"block_duration_minutes" required:"false" cty:"block_duration_minutes" hcl:"block_duration_minutes"`
-	DisableStopInstance                       *bool                                  `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance" hcl:"disable_stop_instance"`
-	EbsOptimized                              *bool                                  `mapstructure:"ebs_optimized" required:"false" cty:"ebs_optimized" hcl:"ebs_optimized"`
-	EnableT2Unlimited                         *bool                                  `mapstructure:"enable_t2_unlimited" required:"false" cty:"enable_t2_unlimited" hcl:"enable_t2_unlimited"`
-	IamInstanceProfile                        *string                                `mapstructure:"iam_instance_profile" required:"false" cty:"iam_instance_profile" hcl:"iam_instance_profile"`
-	SkipProfileValidation                     *bool                                  `mapstructure:"skip_profile_validation" required:"false" cty:"skip_profile_validation" hcl:"skip_profile_validation"`
-	TemporaryIamInstanceProfilePolicyDocument *common.FlatPolicyDocument             `mapstructure:"temporary_iam_instance_profile_policy_document" required:"false" cty:"temporary_iam_instance_profile_policy_document" hcl:"temporary_iam_instance_profile_policy_document"`
-	InstanceInitiatedShutdownBehavior         *string                                `mapstructure:"shutdown_behavior" required:"false" cty:"shutdown_behavior" hcl:"shutdown_behavior"`
-	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
-	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"`
-	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"`
-	RunTag                                    []hcl2template.FlatKeyValue            `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
-	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
-	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"`
-	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"`
-	SourceAmiFilter                           *common.FlatAmiFilterOptions           `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter" hcl:"source_ami_filter"`
-	SpotInstanceTypes                         []string                               `mapstructure:"spot_instance_types" required:"false" cty:"spot_instance_types" hcl:"spot_instance_types"`
-	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"`
-	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"`
-	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatKeyValue            `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
-	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"`
-	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"`
-	Tenancy                                   *string                                `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"`
-	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
-	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs" hcl:"temporary_security_group_source_cidrs"`
-	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
-	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
-	VpcFilter                                 *common.FlatVpcFilterOptions           `mapstructure:"vpc_filter" required:"false" cty:"vpc_filter" hcl:"vpc_filter"`
-	VpcId                                     *string                                `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"`
-	WindowsPasswordTimeout                    *string                                `mapstructure:"windows_password_timeout" required:"false" cty:"windows_password_timeout" hcl:"windows_password_timeout"`
-	Type                                      *string                                `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
-	PauseBeforeConnect                        *string                                `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
-	SSHHost                                   *string                                `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
-	SSHPort                                   *int                                   `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
-	SSHUsername                               *string                                `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
-	SSHPassword                               *string                                `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
-	SSHKeyPairName                            *string                                `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
-	SSHTemporaryKeyPairType                   *string                                `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
-	SSHTemporaryKeyPairBits                   *int                                   `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
-	SSHCiphers                                []string                               `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
-	SSHClearAuthorizedKeys                    *bool                                  `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
-	SSHKEXAlgos                               []string                               `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
-	SSHPrivateKeyFile                         *string                                `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
-	SSHCertificateFile                        *string                                `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
-	SSHPty                                    *bool                                  `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
-	SSHTimeout                                *string                                `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
-	SSHWaitTimeout                            *string                                `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
-	SSHAgentAuth                              *bool                                  `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
-	SSHDisableAgentForwarding                 *bool                                  `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts                      *int                                   `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
-	SSHBastionHost                            *string                                `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
-	SSHBastionPort                            *int                                   `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
-	SSHBastionAgentAuth                       *bool                                  `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
-	SSHBastionUsername                        *string                                `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
-	SSHBastionPassword                        *string                                `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
-	SSHBastionInteractive                     *bool                                  `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile                  *string                                `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
-	SSHBastionCertificateFile                 *string                                `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
-	SSHFileTransferMethod                     *string                                `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
-	SSHProxyHost                              *string                                `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
-	SSHProxyPort                              *int                                   `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
-	SSHProxyUsername                          *string                                `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
-	SSHProxyPassword                          *string                                `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
-	SSHKeepAliveInterval                      *string                                `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout                       *string                                `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
-	SSHRemoteTunnels                          []string                               `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
-	SSHLocalTunnels                           []string                               `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
-	SSHPublicKey                              []byte                                 `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
-	SSHPrivateKey                             []byte                                 `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
-	WinRMUser                                 *string                                `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
-	WinRMPassword                             *string                                `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
-	WinRMHost                                 *string                                `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
-	WinRMNoProxy                              *bool                                  `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
-	WinRMPort                                 *int                                   `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
-	WinRMTimeout                              *string                                `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
-	WinRMUseSSL                               *bool                                  `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
-	WinRMInsecure                             *bool                                  `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
-	WinRMUseNTLM                              *bool                                  `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
-	SSHInterface                              *string                                `mapstructure:"ssh_interface" cty:"ssh_interface" hcl:"ssh_interface"`
-	PauseBeforeSSM                            *string                                `mapstructure:"pause_before_ssm" cty:"pause_before_ssm" hcl:"pause_before_ssm"`
-	SessionManagerPort                        *int                                   `mapstructure:"session_manager_port" cty:"session_manager_port" hcl:"session_manager_port"`
-	AMIMappings                               []common.FlatBlockDevice               `mapstructure:"ami_block_device_mappings" required:"false" cty:"ami_block_device_mappings" hcl:"ami_block_device_mappings"`
-	LaunchMappings                            []common.FlatBlockDevice               `mapstructure:"launch_block_device_mappings" required:"false" cty:"launch_block_device_mappings" hcl:"launch_block_device_mappings"`
-	VolumeRunTags                             map[string]string                      `mapstructure:"run_volume_tags" cty:"run_volume_tags" hcl:"run_volume_tags"`
-	VolumeRunTag                              []hcl2template.FlatNameValue           `mapstructure:"run_volume_tag" required:"false" cty:"run_volume_tag" hcl:"run_volume_tag"`
-	NoEphemeral                               *bool                                  `mapstructure:"no_ephemeral" required:"false" cty:"no_ephemeral" hcl:"no_ephemeral"`
+	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"`
+	AccessKey                                 *string                                `mapstructure:"access_key" required:"true" cty:"access_key"`
+	CustomEndpointEc2                         *string                                `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2"`
+	DecodeAuthZMessages                       *bool                                  `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages"`
+	InsecureSkipTLSVerify                     *bool                                  `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify"`
+	MaxRetries                                *int                                   `mapstructure:"max_retries" required:"false" cty:"max_retries"`
+	MFACode                                   *string                                `mapstructure:"mfa_code" required:"false" cty:"mfa_code"`
+	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile"`
+	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region"`
+	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key"`
+	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
+	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check"`
+	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token"`
+	VaultAWSEngine                            *common.FlatVaultAWSEngineOptions      `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine"`
+	AMIName                                   *string                                `mapstructure:"ami_name" required:"true" cty:"ami_name"`
+	AMIDescription                            *string                                `mapstructure:"ami_description" required:"false" cty:"ami_description"`
+	AMIVirtType                               *string                                `mapstructure:"ami_virtualization_type" required:"false" cty:"ami_virtualization_type"`
+	AMIUsers                                  []string                               `mapstructure:"ami_users" required:"false" cty:"ami_users"`
+	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"`
+	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"`
+	AMIForceDeleteSnapshot                    *bool                                  `mapstructure:"force_delete_snapshot" required:"false" cty:"force_delete_snapshot"`
+	AMIEncryptBootVolume                      *bool                                  `mapstructure:"encrypt_boot" required:"false" cty:"encrypt_boot"`
+	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"`
+	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"`
+	AvailabilityZone                          *string                                `mapstructure:"availability_zone" required:"false" cty:"availability_zone"`
+	BlockDurationMinutes                      *int64                                 `mapstructure:"block_duration_minutes" required:"false" cty:"block_duration_minutes"`
+	DisableStopInstance                       *bool                                  `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance"`
+	EbsOptimized                              *bool                                  `mapstructure:"ebs_optimized" required:"false" cty:"ebs_optimized"`
+	EnableT2Unlimited                         *bool                                  `mapstructure:"enable_t2_unlimited" required:"false" cty:"enable_t2_unlimited"`
+	IamInstanceProfile                        *string                                `mapstructure:"iam_instance_profile" required:"false" cty:"iam_instance_profile"`
+	SkipProfileValidation                     *bool                                  `mapstructure:"skip_profile_validation" required:"false" cty:"skip_profile_validation"`
+	TemporaryIamInstanceProfilePolicyDocument *common.FlatPolicyDocument             `mapstructure:"temporary_iam_instance_profile_policy_document" required:"false" cty:"temporary_iam_instance_profile_policy_document"`
+	InstanceInitiatedShutdownBehavior         *string                                `mapstructure:"shutdown_behavior" required:"false" cty:"shutdown_behavior"`
+	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"`
+	SourceAmiFilter                           *common.FlatAmiFilterOptions           `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter"`
+	SpotInstanceTypes                         []string                               `mapstructure:"spot_instance_types" required:"false" cty:"spot_instance_types"`
+	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"`
+	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs"`
+	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data"`
+	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file"`
+	VpcFilter                                 *common.FlatVpcFilterOptions           `mapstructure:"vpc_filter" required:"false" cty:"vpc_filter"`
+	VpcId                                     *string                                `mapstructure:"vpc_id" required:"false" cty:"vpc_id"`
+	WindowsPasswordTimeout                    *string                                `mapstructure:"windows_password_timeout" required:"false" cty:"windows_password_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"`
+	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"`
+	SSHInterface                              *string                                `mapstructure:"ssh_interface" cty:"ssh_interface"`
+	AMIMappings                               []common.FlatBlockDevice               `mapstructure:"ami_block_device_mappings" required:"false" cty:"ami_block_device_mappings"`
+	LaunchMappings                            []common.FlatBlockDevice               `mapstructure:"launch_block_device_mappings" required:"false" cty:"launch_block_device_mappings"`
+	VolumeRunTags                             common.TagMap                          `mapstructure:"run_volume_tags" cty:"run_volume_tags"`
+	NoEphemeral                               *bool                                  `mapstructure:"no_ephemeral" required:"false" cty:"no_ephemeral"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -167,9 +151,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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},
 		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
-		"assume_role":                   &hcldec.BlockSpec{TypeName: "assume_role", Nested: hcldec.ObjectSpec((*common.FlatAssumeRoleConfig)(nil).HCL2Spec())},
 		"custom_endpoint_ec2":           &hcldec.AttrSpec{Name: "custom_endpoint_ec2", Type: cty.String, Required: false},
-		"shared_credentials_file":       &hcldec.AttrSpec{Name: "shared_credentials_file", Type: cty.String, Required: false},
 		"decode_authorization_messages": &hcldec.AttrSpec{Name: "decode_authorization_messages", Type: cty.Bool, Required: false},
 		"insecure_skip_tls_verify":      &hcldec.AttrSpec{Name: "insecure_skip_tls_verify", Type: cty.Bool, Required: false},
 		"max_retries":                   &hcldec.AttrSpec{Name: "max_retries", Type: cty.Number, Required: false},
@@ -179,10 +161,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
 		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
-		"skip_credential_validation":    &hcldec.AttrSpec{Name: "skip_credential_validation", Type: cty.Bool, Required: false},
 		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
 		"vault_aws_engine":              &hcldec.BlockSpec{TypeName: "vault_aws_engine", Nested: hcldec.ObjectSpec((*common.FlatVaultAWSEngineOptions)(nil).HCL2Spec())},
-		"aws_polling":                   &hcldec.BlockSpec{TypeName: "aws_polling", Nested: hcldec.ObjectSpec((*common.FlatAWSPollingConfig)(nil).HCL2Spec())},
 		"ami_name":                      &hcldec.AttrSpec{Name: "ami_name", Type: cty.String, Required: false},
 		"ami_description":               &hcldec.AttrSpec{Name: "ami_description", Type: cty.String, Required: false},
 		"ami_virtualization_type":       &hcldec.AttrSpec{Name: "ami_virtualization_type", Type: cty.String, Required: false},
@@ -191,7 +171,7 @@ 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},
 		"tags":                          &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -201,7 +181,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"region_kms_key_ids":            &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(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.FlatKeyValue)(nil).HCL2Spec())},
+		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -217,7 +197,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -226,10 +206,9 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
-		"tenancy":                               &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false},
 		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_security_group_source_cidrs": &hcldec.AttrSpec{Name: "temporary_security_group_source_cidrs", Type: cty.List(cty.String), Required: false},
 		"user_data":                             &hcldec.AttrSpec{Name: "user_data", Type: cty.String, Required: false},
@@ -244,16 +223,10 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_username":                          &hcldec.AttrSpec{Name: "ssh_username", Type: cty.String, Required: false},
 		"ssh_password":                          &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
 		"ssh_keypair_name":                      &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
-		"temporary_key_pair_type":               &hcldec.AttrSpec{Name: "temporary_key_pair_type", Type: cty.String, Required: false},
-		"temporary_key_pair_bits":               &hcldec.AttrSpec{Name: "temporary_key_pair_bits", Type: cty.Number, Required: false},
-		"ssh_ciphers":                           &hcldec.AttrSpec{Name: "ssh_ciphers", Type: cty.List(cty.String), Required: false},
 		"ssh_clear_authorized_keys":             &hcldec.AttrSpec{Name: "ssh_clear_authorized_keys", Type: cty.Bool, Required: false},
-		"ssh_key_exchange_algorithms":           &hcldec.AttrSpec{Name: "ssh_key_exchange_algorithms", Type: cty.List(cty.String), Required: false},
 		"ssh_private_key_file":                  &hcldec.AttrSpec{Name: "ssh_private_key_file", Type: cty.String, Required: false},
-		"ssh_certificate_file":                  &hcldec.AttrSpec{Name: "ssh_certificate_file", Type: cty.String, Required: false},
 		"ssh_pty":                               &hcldec.AttrSpec{Name: "ssh_pty", Type: cty.Bool, Required: false},
 		"ssh_timeout":                           &hcldec.AttrSpec{Name: "ssh_timeout", Type: cty.String, Required: false},
-		"ssh_wait_timeout":                      &hcldec.AttrSpec{Name: "ssh_wait_timeout", Type: cty.String, Required: false},
 		"ssh_agent_auth":                        &hcldec.AttrSpec{Name: "ssh_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_disable_agent_forwarding":          &hcldec.AttrSpec{Name: "ssh_disable_agent_forwarding", Type: cty.Bool, Required: false},
 		"ssh_handshake_attempts":                &hcldec.AttrSpec{Name: "ssh_handshake_attempts", Type: cty.Number, Required: false},
@@ -264,7 +237,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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_bastion_certificate_file":          &hcldec.AttrSpec{Name: "ssh_bastion_certificate_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},
 		"ssh_proxy_port":                        &hcldec.AttrSpec{Name: "ssh_proxy_port", Type: cty.Number, Required: false},
@@ -279,19 +251,15 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"winrm_username":                        &hcldec.AttrSpec{Name: "winrm_username", Type: cty.String, Required: false},
 		"winrm_password":                        &hcldec.AttrSpec{Name: "winrm_password", Type: cty.String, Required: false},
 		"winrm_host":                            &hcldec.AttrSpec{Name: "winrm_host", Type: cty.String, Required: false},
-		"winrm_no_proxy":                        &hcldec.AttrSpec{Name: "winrm_no_proxy", Type: cty.Bool, Required: false},
 		"winrm_port":                            &hcldec.AttrSpec{Name: "winrm_port", Type: cty.Number, Required: false},
 		"winrm_timeout":                         &hcldec.AttrSpec{Name: "winrm_timeout", Type: cty.String, Required: false},
 		"winrm_use_ssl":                         &hcldec.AttrSpec{Name: "winrm_use_ssl", Type: cty.Bool, Required: false},
 		"winrm_insecure":                        &hcldec.AttrSpec{Name: "winrm_insecure", Type: cty.Bool, Required: false},
 		"winrm_use_ntlm":                        &hcldec.AttrSpec{Name: "winrm_use_ntlm", Type: cty.Bool, Required: false},
 		"ssh_interface":                         &hcldec.AttrSpec{Name: "ssh_interface", Type: cty.String, Required: false},
-		"pause_before_ssm":                      &hcldec.AttrSpec{Name: "pause_before_ssm", Type: cty.String, Required: false},
-		"session_manager_port":                  &hcldec.AttrSpec{Name: "session_manager_port", Type: cty.Number, 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_tag":                        &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"no_ephemeral":                          &hcldec.AttrSpec{Name: "no_ephemeral", Type: cty.Bool, Required: false},
 	}
 	return s

builder/amazon/ebs/builder_acc_test.go

@@ -6,7 +6,6 @@ package ebs
 
 import (
 	"fmt"
-	"os"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -105,10 +104,10 @@ func checkSnapshotsDeleted(snapshotIds []*string) builderT.TestCheckFunc {
 
 func TestBuilderAcc_amiSharing(t *testing.T) {
 	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccSharingPreCheck(t) },
+		PreCheck: func() { testAccPreCheck(t) },
 		Builder:  &Builder{},
-		Template: buildSharingConfig(os.Getenv("TESTACC_AWS_ACCOUNT_ID")),
-		Check:    checkAMISharing(2, os.Getenv("TESTACC_AWS_ACCOUNT_ID"), "all"),
+		Template: testBuilderAccSharing,
+		Check:    checkAMISharing(2, "932021504756", "all"),
 	})
 }
 
@@ -246,23 +245,9 @@ func checkBootEncrypted() builderT.TestCheckFunc {
 	}
 }
 
-func TestBuilderAcc_SessionManagerInterface(t *testing.T) {
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: testBuilderAccSessionManagerInterface,
-	})
-}
-
 func testAccPreCheck(t *testing.T) {
 }
 
-func testAccSharingPreCheck(t *testing.T) {
-	if v := os.Getenv("TESTACC_AWS_ACCOUNT_ID"); v == "" {
-		t.Fatal(fmt.Sprintf("TESTACC_AWS_ACCOUNT_ID must be set for acceptance tests"))
-	}
-}
-
 func testEC2Conn() (*ec2.EC2, error) {
 	access := &common.AccessConfig{RawRegion: "us-east-1"}
 	session, err := access.Session()
@@ -329,6 +314,7 @@ const testBuilderAccForceDeleteSnapshot = `
 }
 `
 
+// share with catsby
 const testBuilderAccSharing = `
 {
 	"builders": [{
@@ -338,7 +324,7 @@ const testBuilderAccSharing = `
 		"source_ami": "ami-76b2a71e",
 		"ssh_username": "ubuntu",
 		"ami_name": "packer-test {{timestamp}}",
-		"ami_users":["%s"],
+		"ami_users":["932021504756"],
 		"ami_groups":["all"]
 	}]
 }
@@ -358,31 +344,6 @@ const testBuilderAccEncrypted = `
 }
 `
 
-const testBuilderAccSessionManagerInterface = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "us-east-1",
-		"instance_type": "m3.medium",
-		"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
-		},
-		"ssh_username": "ubuntu",
-		"ssh_interface": "session_manager",
-		"iam_instance_profile": "SSMInstanceProfile",
-		"ami_name": "packer-ssm-test-{{timestamp}}"
-	}]
-}
-`
-
 func buildForceDeregisterConfig(val, name string) string {
 	return fmt.Sprintf(testBuilderAccForceDeregister, val, name)
 }
@@ -390,7 +351,3 @@ func buildForceDeregisterConfig(val, name string) string {
 func buildForceDeleteSnapshotConfig(val, name string) string {
 	return fmt.Sprintf(testBuilderAccForceDeleteSnapshot, val, val, name)
 }
-
-func buildSharingConfig(val string) string {
-	return fmt.Sprintf(testBuilderAccSharing, val)
-}

builder/amazon/ebs/builder_test.go

@@ -144,25 +144,7 @@ func TestBuilderPrepare_ReturnGeneratedData(t *testing.T) {
 	if len(generatedData) == 0 {
 		t.Fatalf("Generated data should not be empty")
 	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
 	if generatedData[0] != "SourceAMIName" {
 		t.Fatalf("Generated data should contain SourceAMIName")
 	}
-	if generatedData[1] != "BuildRegion" {
-		t.Fatalf("Generated data should contain BuildRegion")
-	}
-	if generatedData[2] != "SourceAMI" {
-		t.Fatalf("Generated data should contain SourceAMI")
-	}
-	if generatedData[3] != "SourceAMICreationDate" {
-		t.Fatalf("Generated data should contain SourceAMICreationDate")
-	}
-	if generatedData[4] != "SourceAMIOwner" {
-		t.Fatalf("Generated data should contain SourceAMIOwner")
-	}
-	if generatedData[5] != "SourceAMIOwnerName" {
-		t.Fatalf("Generated data should contain SourceAMIOwnerName")
-	}
 }

builder/amazon/ebs/step_create_ami.go

@@ -4,20 +4,16 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"time"
 
 	"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/builder/amazon/common/awserrors"
 	"github.com/hashicorp/packer/common/random"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
 
 type stepCreateAMI struct {
-	PollingConfig      *awscommon.AWSPollingConfig
 	image              *ec2.Image
 	AMISkipBuildRegion bool
 }
@@ -52,26 +48,7 @@ func (s *stepCreateAMI) Run(ctx context.Context, state multistep.StateBag) multi
 		BlockDeviceMappings: config.AMIMappings.BuildEC2BlockDeviceMappings(),
 	}
 
-	var createResp *ec2.CreateImageOutput
-	var err error
-
-	// Create a timeout for the CreateImage call.
-	timeoutCtx, cancel := context.WithTimeout(ctx, time.Minute*15)
-	defer cancel()
-
-	err = retry.Config{
-		Tries: 0,
-		ShouldRetry: func(err error) bool {
-			if awserrors.Matches(err, "InvalidParameterValue", "Instance is not in state") {
-				return true
-			}
-			return false
-		},
-		RetryDelay: (&retry.Backoff{InitialBackoff: 200 * time.Millisecond, MaxBackoff: 30 * time.Second, Multiplier: 2}).Linear,
-	}.Run(timeoutCtx, func(ctx context.Context) error {
-		createResp, err = ec2conn.CreateImage(createOpts)
-		return err
-	})
+	createResp, err := ec2conn.CreateImage(createOpts)
 	if err != nil {
 		err := fmt.Errorf("Error creating AMI: %s", err)
 		state.Put("error", err)
@@ -87,23 +64,18 @@ func (s *stepCreateAMI) Run(ctx context.Context, state multistep.StateBag) multi
 
 	// Wait for the image to become ready
 	ui.Say("Waiting for AMI to become ready...")
-	if waitErr := s.PollingConfig.WaitUntilAMIAvailable(ctx, ec2conn, *createResp.ImageId); waitErr != nil {
-		// waitErr should get bubbled up if the issue is a wait timeout
-		err := fmt.Errorf("Error waiting for AMI: %s", waitErr)
+	if err := awscommon.WaitUntilAMIAvailable(ctx, ec2conn, *createResp.ImageId); err != nil {
+		log.Printf("Error waiting for AMI: %s", err)
 		imResp, imerr := ec2conn.DescribeImages(&ec2.DescribeImagesInput{ImageIds: []*string{createResp.ImageId}})
 		if imerr != nil {
-			// If there's a failure describing images, bubble that error up too, but don't erase the waitErr.
-			log.Printf("DescribeImages call was unable to determine reason waiting for AMI failed: %s", imerr)
-			err = fmt.Errorf("Unknown error waiting for AMI; %s. DescribeImages returned an error: %s", waitErr, imerr)
+			log.Printf("Unable to determine reason waiting for AMI failed: %s", err)
+			err = fmt.Errorf("Unknown error waiting for AMI; %s", err)
 		}
 		if imResp != nil && len(imResp.Images) > 0 {
-			// Finally, if there's a stateReason, store that with the wait err
 			image := imResp.Images[0]
 			if image != nil {
 				stateReason := image.StateReason
-				if stateReason != nil {
-					err = fmt.Errorf("Error waiting for AMI: %s. DescribeImages returned the state reason: %s", waitErr, stateReason)
-				}
+				err = fmt.Errorf("Error waiting for AMI. Reason: %s", stateReason)
 			}
 		}
 		state.Put("error", err)

builder/amazon/ebssurrogate/block_device.go

@@ -3,6 +3,9 @@
 package ebssurrogate
 
 import (
+	"strings"
+
+	"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/template/interpolate"
@@ -38,6 +41,50 @@ func (bds BlockDevices) BuildEC2BlockDeviceMappings() []*ec2.BlockDeviceMapping
 	return blockDevices
 }
 
+func (blockDevice BlockDevice) BuildEC2BlockDeviceMapping() *ec2.BlockDeviceMapping {
+
+	mapping := &ec2.BlockDeviceMapping{
+		DeviceName: aws.String(blockDevice.DeviceName),
+	}
+
+	if blockDevice.NoDevice {
+		mapping.NoDevice = aws.String("")
+		return mapping
+	} else if blockDevice.VirtualName != "" {
+		if strings.HasPrefix(blockDevice.VirtualName, "ephemeral") {
+			mapping.VirtualName = aws.String(blockDevice.VirtualName)
+		}
+		return mapping
+	}
+
+	ebsBlockDevice := &ec2.EbsBlockDevice{
+		DeleteOnTermination: aws.Bool(blockDevice.DeleteOnTermination),
+	}
+
+	if blockDevice.VolumeType != "" {
+		ebsBlockDevice.VolumeType = aws.String(blockDevice.VolumeType)
+	}
+
+	if blockDevice.VolumeSize > 0 {
+		ebsBlockDevice.VolumeSize = aws.Int64(blockDevice.VolumeSize)
+	}
+
+	// IOPS is only valid for io1 type
+	if blockDevice.VolumeType == "io1" {
+		ebsBlockDevice.Iops = aws.Int64(blockDevice.IOPS)
+	}
+
+	// You cannot specify Encrypted if you specify a Snapshot ID
+	if blockDevice.SnapshotId != "" {
+		ebsBlockDevice.SnapshotId = aws.String(blockDevice.SnapshotId)
+	}
+	ebsBlockDevice.Encrypted = blockDevice.Encrypted.ToBoolPointer()
+
+	mapping.Ebs = ebsBlockDevice
+
+	return mapping
+}
+
 func (bds BlockDevices) Prepare(ctx *interpolate.Context) (errs []error) {
 	for _, block := range bds {
 		if err := block.Prepare(ctx); err != nil {

builder/amazon/ebssurrogate/builder.go

@@ -13,10 +13,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
+	"github.com/hashicorp/packer/builder"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
@@ -61,12 +60,7 @@ type Config struct {
 	// duplicated in `tags`. This is a [template
 	// engine](/docs/templates/engine), see [Build template
 	// data](#build-template-data) for more information.
-	VolumeRunTags map[string]string `mapstructure:"run_volume_tags"`
-	// Same as [`run_volume_tags`](#run_volume_tags) but defined as a singular
-	// block containing a `name` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](https://packer.io/docs/configuration/from-1.5/expressions.html#dynamic-blocks)
-	// will allow you to create those programatically.
-	VolumeRunTag hcl2template.NameValues `mapstructure:"run_volume_tag" required:"false"`
+	VolumeRunTags awscommon.TagMap `mapstructure:"run_volume_tags"`
 	// 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"`
@@ -84,22 +78,16 @@ func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstruct
 func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	b.config.ctx.Funcs = awscommon.TemplateFuncs
 	err := config.Decode(&b.config, &config.DecodeOpts{
-		PluginType:         BuilderId,
 		Interpolate:        true,
 		InterpolateContext: &b.config.ctx,
 		InterpolateFilter: &interpolate.RenderFilter{
 			Exclude: []string{
 				"ami_description",
 				"run_tags",
-				"run_tag",
 				"run_volume_tags",
-				"run_volume_tag",
 				"snapshot_tags",
-				"snapshot_tag",
 				"spot_tags",
-				"spot_tag",
 				"tags",
-				"tag",
 			},
 		},
 	}, raws...)
@@ -114,8 +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,
@@ -169,7 +155,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 
 	packer.LogSecretFilter.Set(b.config.AccessKey, b.config.SecretKey, b.config.Token)
 
-	generatedData := awscommon.GetGeneratedDataList()
+	generatedData := []string{"SourceAMIName"}
 	return generatedData, warns, nil
 }
 
@@ -192,13 +178,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("awsSession", session)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	generatedData := &packerbuilderdata.GeneratedData{State: state}
+	generatedData := &builder.GeneratedData{State: state}
 
 	var instanceStep multistep.Step
 
 	if b.config.IsSpotInstance() {
 		instanceStep = &awscommon.StepRunSpotInstance{
-			PollingConfig:                     b.config.PollingConfig,
 			AssociatePublicIpAddress:          b.config.AssociatePublicIpAddress,
 			LaunchMappings:                    b.config.LaunchMappings,
 			BlockDurationMinutes:              b.config.BlockDurationMinutes,
@@ -209,7 +194,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ExpectedRootDevice:                "ebs",
 			InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior,
 			InstanceType:                      b.config.InstanceType,
-			Region:                            *ec2conn.Config.Region,
 			SourceAMI:                         b.config.SourceAmi,
 			SpotPrice:                         b.config.SpotPrice,
 			SpotInstanceTypes:                 b.config.SpotInstanceTypes,
@@ -221,7 +205,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		}
 	} else {
 		instanceStep = &awscommon.StepRunSourceInstance{
-			PollingConfig:                     b.config.PollingConfig,
 			AssociatePublicIpAddress:          b.config.AssociatePublicIpAddress,
 			LaunchMappings:                    b.config.LaunchMappings,
 			Comm:                              &b.config.RunConfig.Comm,
@@ -235,7 +218,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			IsRestricted:                      b.config.IsChinaCloud() || b.config.IsGovCloud(),
 			SourceAMI:                         b.config.SourceAmi,
 			Tags:                              b.config.RunTags,
-			Tenancy:                           b.config.Tenancy,
 			UserData:                          b.config.UserData,
 			UserDataFile:                      b.config.UserDataFile,
 			VolumeTags:                        b.config.VolumeRunTags,
@@ -248,12 +230,11 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	// Build the steps
 	steps := []multistep.Step{
 		&awscommon.StepPreValidate{
-			DestAmiName:        b.config.AMIName,
-			ForceDeregister:    b.config.AMIForceDeregister,
-			AMISkipBuildRegion: b.config.AMISkipBuildRegion,
-			VpcId:              b.config.VpcId,
-			SubnetId:           b.config.SubnetId,
-			HasSubnetFilter:    !b.config.SubnetFilter.Empty(),
+			DestAmiName:     b.config.AMIName,
+			ForceDeregister: b.config.AMIForceDeregister,
+			VpcId:           b.config.VpcId,
+			SubnetId:        b.config.SubnetId,
+			HasSubnetFilter: !b.config.SubnetFilter.Empty(),
 		},
 		&awscommon.StepSourceAMIInfo{
 			SourceAmi:                b.config.SourceAmi,
@@ -281,7 +262,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			SecurityGroupIds:       b.config.SecurityGroupIds,
 			CommConfig:             &b.config.RunConfig.Comm,
 			TemporarySGSourceCidrs: b.config.TemporarySGSourceCidrs,
-			SkipSSHRuleCreation:    b.config.SSMAgentEnabled(),
 		},
 		&awscommon.StepIamInstanceProfile{
 			IamInstanceProfile:                        b.config.IamInstanceProfile,
@@ -298,14 +278,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Timeout:   b.config.WindowsPasswordTimeout,
 			BuildName: b.config.PackerBuildName,
 		},
-		&awscommon.StepCreateSSMTunnel{
-			AWSSession:       session,
-			Region:           *ec2conn.Config.Region,
-			PauseBeforeSSM:   b.config.PauseBeforeSSM,
-			LocalPortNumber:  b.config.SessionManagerPort,
-			RemotePortNumber: b.config.Comm.Port(),
-			SSMAgentEnabled:  b.config.SSMAgentEnabled(),
-		},
 		&communicator.StepConnect{
 			Config: &b.config.RunConfig.Comm,
 			Host: awscommon.SSHHost(
@@ -313,21 +285,13 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				b.config.SSHInterface,
 				b.config.Comm.Host(),
 			),
-			SSHPort: awscommon.Port(
-				b.config.SSHInterface,
-				b.config.Comm.Port(),
-			),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&awscommon.StepSetGeneratedData{
-			GeneratedData: generatedData,
-		},
 		&common.StepProvision{},
 		&common.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&awscommon.StepStopEBSBackedInstance{
-			PollingConfig:       b.config.PollingConfig,
 			Skip:                b.config.IsSpotInstance(),
 			DisableStopInstance: b.config.DisableStopInstance,
 		},
@@ -337,11 +301,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			EnableAMIENASupport:      b.config.AMIENASupport,
 		},
 		&StepSnapshotVolumes{
-			PollingConfig:   b.config.PollingConfig,
 			LaunchDevices:   launchDevices,
 			SnapshotOmitMap: b.config.LaunchMappings.GetOmissions(),
-			SnapshotTags:    b.config.SnapshotTags,
-			Ctx:             b.config.ctx,
 		},
 		&awscommon.StepDeregisterAMI{
 			AccessConfig:        &b.config.AccessConfig,
@@ -359,17 +320,15 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Architecture:             b.config.Architecture,
 			LaunchOmitMap:            b.config.LaunchMappings.GetOmissions(),
 			AMISkipBuildRegion:       b.config.AMISkipBuildRegion,
-			PollingConfig:            b.config.PollingConfig,
 		},
 		&awscommon.StepAMIRegionCopy{
-			AccessConfig:       &b.config.AccessConfig,
-			Regions:            b.config.AMIRegions,
-			AMIKmsKeyId:        b.config.AMIKmsKeyId,
-			RegionKeyIds:       b.config.AMIRegionKMSKeyIDs,
-			EncryptBootVolume:  b.config.AMIEncryptBootVolume,
-			Name:               b.config.AMIName,
-			OriginalRegion:     *ec2conn.Config.Region,
-			AMISkipBuildRegion: b.config.AMISkipBuildRegion,
+			AccessConfig:      &b.config.AccessConfig,
+			Regions:           b.config.AMIRegions,
+			AMIKmsKeyId:       b.config.AMIKmsKeyId,
+			RegionKeyIds:      b.config.AMIRegionKMSKeyIDs,
+			EncryptBootVolume: b.config.AMIEncryptBootVolume,
+			Name:              b.config.AMIName,
+			OriginalRegion:    *ec2conn.Config.Region,
 		},
 		&awscommon.StepModifyAMIAttributes{
 			Description:    b.config.AMIDescription,

builder/amazon/ebssurrogate/builder.hcl2spec.go

@@ -11,17 +11,17 @@ import (
 // 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" hcl:"delete_on_termination"`
-	DeviceName          *string `mapstructure:"device_name" required:"false" cty:"device_name" hcl:"device_name"`
-	Encrypted           *bool   `mapstructure:"encrypted" required:"false" cty:"encrypted" hcl:"encrypted"`
-	IOPS                *int64  `mapstructure:"iops" required:"false" cty:"iops" hcl:"iops"`
-	NoDevice            *bool   `mapstructure:"no_device" required:"false" cty:"no_device" hcl:"no_device"`
-	SnapshotId          *string `mapstructure:"snapshot_id" required:"false" cty:"snapshot_id" hcl:"snapshot_id"`
-	VirtualName         *string `mapstructure:"virtual_name" required:"false" cty:"virtual_name" hcl:"virtual_name"`
-	VolumeType          *string `mapstructure:"volume_type" required:"false" cty:"volume_type" hcl:"volume_type"`
-	VolumeSize          *int64  `mapstructure:"volume_size" required:"false" cty:"volume_size" hcl:"volume_size"`
-	KmsKeyId            *string `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"`
-	OmitFromArtifact    *bool   `mapstructure:"omit_from_artifact" cty:"omit_from_artifact" hcl:"omit_from_artifact"`
+	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"`
+	OmitFromArtifact    *bool   `mapstructure:"omit_from_artifact" cty:"omit_from_artifact"`
 }
 
 // FlatMapstructure returns a new FlatBlockDevice.
@@ -54,141 +54,125 @@ func (*FlatBlockDevice) 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" hcl:"packer_build_name"`
-	PackerBuilderType                         *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug                               *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce                               *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError                             *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars                            map[string]string                      `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars                       []string                               `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	AccessKey                                 *string                                `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"`
-	AssumeRole                                *common.FlatAssumeRoleConfig           `mapstructure:"assume_role" required:"false" cty:"assume_role" hcl:"assume_role"`
-	CustomEndpointEc2                         *string                                `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2" hcl:"custom_endpoint_ec2"`
-	CredsFilename                             *string                                `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file" hcl:"shared_credentials_file"`
-	DecodeAuthZMessages                       *bool                                  `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages" hcl:"decode_authorization_messages"`
-	InsecureSkipTLSVerify                     *bool                                  `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"`
-	MaxRetries                                *int                                   `mapstructure:"max_retries" required:"false" cty:"max_retries" hcl:"max_retries"`
-	MFACode                                   *string                                `mapstructure:"mfa_code" required:"false" cty:"mfa_code" hcl:"mfa_code"`
-	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
-	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
-	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
-	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check" hcl:"skip_metadata_api_check"`
-	SkipCredsValidation                       *bool                                  `mapstructure:"skip_credential_validation" cty:"skip_credential_validation" hcl:"skip_credential_validation"`
-	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token" hcl:"token"`
-	VaultAWSEngine                            *common.FlatVaultAWSEngineOptions      `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine" hcl:"vault_aws_engine"`
-	PollingConfig                             *common.FlatAWSPollingConfig           `mapstructure:"aws_polling" required:"false" cty:"aws_polling" hcl:"aws_polling"`
-	AssociatePublicIpAddress                  *bool                                  `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
-	AvailabilityZone                          *string                                `mapstructure:"availability_zone" required:"false" cty:"availability_zone" hcl:"availability_zone"`
-	BlockDurationMinutes                      *int64                                 `mapstructure:"block_duration_minutes" required:"false" cty:"block_duration_minutes" hcl:"block_duration_minutes"`
-	DisableStopInstance                       *bool                                  `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance" hcl:"disable_stop_instance"`
-	EbsOptimized                              *bool                                  `mapstructure:"ebs_optimized" required:"false" cty:"ebs_optimized" hcl:"ebs_optimized"`
-	EnableT2Unlimited                         *bool                                  `mapstructure:"enable_t2_unlimited" required:"false" cty:"enable_t2_unlimited" hcl:"enable_t2_unlimited"`
-	IamInstanceProfile                        *string                                `mapstructure:"iam_instance_profile" required:"false" cty:"iam_instance_profile" hcl:"iam_instance_profile"`
-	SkipProfileValidation                     *bool                                  `mapstructure:"skip_profile_validation" required:"false" cty:"skip_profile_validation" hcl:"skip_profile_validation"`
-	TemporaryIamInstanceProfilePolicyDocument *common.FlatPolicyDocument             `mapstructure:"temporary_iam_instance_profile_policy_document" required:"false" cty:"temporary_iam_instance_profile_policy_document" hcl:"temporary_iam_instance_profile_policy_document"`
-	InstanceInitiatedShutdownBehavior         *string                                `mapstructure:"shutdown_behavior" required:"false" cty:"shutdown_behavior" hcl:"shutdown_behavior"`
-	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
-	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"`
-	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"`
-	RunTag                                    []hcl2template.FlatKeyValue            `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
-	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
-	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"`
-	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"`
-	SourceAmiFilter                           *common.FlatAmiFilterOptions           `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter" hcl:"source_ami_filter"`
-	SpotInstanceTypes                         []string                               `mapstructure:"spot_instance_types" required:"false" cty:"spot_instance_types" hcl:"spot_instance_types"`
-	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"`
-	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"`
-	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatKeyValue            `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
-	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"`
-	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"`
-	Tenancy                                   *string                                `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"`
-	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
-	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs" hcl:"temporary_security_group_source_cidrs"`
-	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
-	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
-	VpcFilter                                 *common.FlatVpcFilterOptions           `mapstructure:"vpc_filter" required:"false" cty:"vpc_filter" hcl:"vpc_filter"`
-	VpcId                                     *string                                `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"`
-	WindowsPasswordTimeout                    *string                                `mapstructure:"windows_password_timeout" required:"false" cty:"windows_password_timeout" hcl:"windows_password_timeout"`
-	Type                                      *string                                `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
-	PauseBeforeConnect                        *string                                `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
-	SSHHost                                   *string                                `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
-	SSHPort                                   *int                                   `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
-	SSHUsername                               *string                                `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
-	SSHPassword                               *string                                `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
-	SSHKeyPairName                            *string                                `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
-	SSHTemporaryKeyPairType                   *string                                `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
-	SSHTemporaryKeyPairBits                   *int                                   `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
-	SSHCiphers                                []string                               `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
-	SSHClearAuthorizedKeys                    *bool                                  `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
-	SSHKEXAlgos                               []string                               `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
-	SSHPrivateKeyFile                         *string                                `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
-	SSHCertificateFile                        *string                                `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
-	SSHPty                                    *bool                                  `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
-	SSHTimeout                                *string                                `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
-	SSHWaitTimeout                            *string                                `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
-	SSHAgentAuth                              *bool                                  `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
-	SSHDisableAgentForwarding                 *bool                                  `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts                      *int                                   `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
-	SSHBastionHost                            *string                                `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
-	SSHBastionPort                            *int                                   `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
-	SSHBastionAgentAuth                       *bool                                  `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
-	SSHBastionUsername                        *string                                `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
-	SSHBastionPassword                        *string                                `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
-	SSHBastionInteractive                     *bool                                  `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile                  *string                                `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
-	SSHBastionCertificateFile                 *string                                `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
-	SSHFileTransferMethod                     *string                                `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
-	SSHProxyHost                              *string                                `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
-	SSHProxyPort                              *int                                   `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
-	SSHProxyUsername                          *string                                `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
-	SSHProxyPassword                          *string                                `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
-	SSHKeepAliveInterval                      *string                                `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout                       *string                                `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
-	SSHRemoteTunnels                          []string                               `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
-	SSHLocalTunnels                           []string                               `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
-	SSHPublicKey                              []byte                                 `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
-	SSHPrivateKey                             []byte                                 `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
-	WinRMUser                                 *string                                `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
-	WinRMPassword                             *string                                `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
-	WinRMHost                                 *string                                `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
-	WinRMNoProxy                              *bool                                  `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
-	WinRMPort                                 *int                                   `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
-	WinRMTimeout                              *string                                `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
-	WinRMUseSSL                               *bool                                  `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
-	WinRMInsecure                             *bool                                  `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
-	WinRMUseNTLM                              *bool                                  `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
-	SSHInterface                              *string                                `mapstructure:"ssh_interface" cty:"ssh_interface" hcl:"ssh_interface"`
-	PauseBeforeSSM                            *string                                `mapstructure:"pause_before_ssm" cty:"pause_before_ssm" hcl:"pause_before_ssm"`
-	SessionManagerPort                        *int                                   `mapstructure:"session_manager_port" cty:"session_manager_port" hcl:"session_manager_port"`
-	AMIName                                   *string                                `mapstructure:"ami_name" required:"true" cty:"ami_name" hcl:"ami_name"`
-	AMIDescription                            *string                                `mapstructure:"ami_description" required:"false" cty:"ami_description" hcl:"ami_description"`
-	AMIVirtType                               *string                                `mapstructure:"ami_virtualization_type" required:"false" cty:"ami_virtualization_type" hcl:"ami_virtualization_type"`
-	AMIUsers                                  []string                               `mapstructure:"ami_users" required:"false" cty:"ami_users" hcl:"ami_users"`
-	AMIGroups                                 []string                               `mapstructure:"ami_groups" required:"false" cty:"ami_groups" hcl:"ami_groups"`
-	AMIProductCodes                           []string                               `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes" hcl:"ami_product_codes"`
-	AMIRegions                                []string                               `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"`
-	AMITags                                   map[string]string                      `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AMITag                                    []hcl2template.FlatKeyValue            `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
-	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"`
-	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"`
-	AMIForceDeregister                        *bool                                  `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"`
-	AMIForceDeleteSnapshot                    *bool                                  `mapstructure:"force_delete_snapshot" required:"false" cty:"force_delete_snapshot" hcl:"force_delete_snapshot"`
-	AMIEncryptBootVolume                      *bool                                  `mapstructure:"encrypt_boot" required:"false" cty:"encrypt_boot" hcl:"encrypt_boot"`
-	AMIKmsKeyId                               *string                                `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"`
-	AMIRegionKMSKeyIDs                        map[string]string                      `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"`
-	AMISkipBuildRegion                        *bool                                  `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"`
-	SnapshotTags                              map[string]string                      `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"`
-	SnapshotTag                               []hcl2template.FlatKeyValue            `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
-	SnapshotUsers                             []string                               `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"`
-	SnapshotGroups                            []string                               `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"`
-	AMIMappings                               []common.FlatBlockDevice               `mapstructure:"ami_block_device_mappings" required:"false" cty:"ami_block_device_mappings" hcl:"ami_block_device_mappings"`
-	LaunchMappings                            []FlatBlockDevice                      `mapstructure:"launch_block_device_mappings" required:"false" cty:"launch_block_device_mappings" hcl:"launch_block_device_mappings"`
-	RootDevice                                *FlatRootBlockDevice                   `mapstructure:"ami_root_device" required:"true" cty:"ami_root_device" hcl:"ami_root_device"`
-	VolumeRunTags                             map[string]string                      `mapstructure:"run_volume_tags" cty:"run_volume_tags" hcl:"run_volume_tags"`
-	VolumeRunTag                              []hcl2template.FlatNameValue           `mapstructure:"run_volume_tag" required:"false" cty:"run_volume_tag" hcl:"run_volume_tag"`
-	Architecture                              *string                                `mapstructure:"ami_architecture" required:"false" cty:"ami_architecture" hcl:"ami_architecture"`
+	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"`
+	AccessKey                                 *string                                `mapstructure:"access_key" required:"true" cty:"access_key"`
+	CustomEndpointEc2                         *string                                `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2"`
+	DecodeAuthZMessages                       *bool                                  `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages"`
+	InsecureSkipTLSVerify                     *bool                                  `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify"`
+	MaxRetries                                *int                                   `mapstructure:"max_retries" required:"false" cty:"max_retries"`
+	MFACode                                   *string                                `mapstructure:"mfa_code" required:"false" cty:"mfa_code"`
+	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile"`
+	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region"`
+	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key"`
+	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
+	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check"`
+	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token"`
+	VaultAWSEngine                            *common.FlatVaultAWSEngineOptions      `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine"`
+	AssociatePublicIpAddress                  *bool                                  `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address"`
+	AvailabilityZone                          *string                                `mapstructure:"availability_zone" required:"false" cty:"availability_zone"`
+	BlockDurationMinutes                      *int64                                 `mapstructure:"block_duration_minutes" required:"false" cty:"block_duration_minutes"`
+	DisableStopInstance                       *bool                                  `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance"`
+	EbsOptimized                              *bool                                  `mapstructure:"ebs_optimized" required:"false" cty:"ebs_optimized"`
+	EnableT2Unlimited                         *bool                                  `mapstructure:"enable_t2_unlimited" required:"false" cty:"enable_t2_unlimited"`
+	IamInstanceProfile                        *string                                `mapstructure:"iam_instance_profile" required:"false" cty:"iam_instance_profile"`
+	SkipProfileValidation                     *bool                                  `mapstructure:"skip_profile_validation" required:"false" cty:"skip_profile_validation"`
+	TemporaryIamInstanceProfilePolicyDocument *common.FlatPolicyDocument             `mapstructure:"temporary_iam_instance_profile_policy_document" required:"false" cty:"temporary_iam_instance_profile_policy_document"`
+	InstanceInitiatedShutdownBehavior         *string                                `mapstructure:"shutdown_behavior" required:"false" cty:"shutdown_behavior"`
+	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"`
+	SourceAmiFilter                           *common.FlatAmiFilterOptions           `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter"`
+	SpotInstanceTypes                         []string                               `mapstructure:"spot_instance_types" required:"false" cty:"spot_instance_types"`
+	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"`
+	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs"`
+	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data"`
+	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file"`
+	VpcFilter                                 *common.FlatVpcFilterOptions           `mapstructure:"vpc_filter" required:"false" cty:"vpc_filter"`
+	VpcId                                     *string                                `mapstructure:"vpc_id" required:"false" cty:"vpc_id"`
+	WindowsPasswordTimeout                    *string                                `mapstructure:"windows_password_timeout" required:"false" cty:"windows_password_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"`
+	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"`
+	SSHInterface                              *string                                `mapstructure:"ssh_interface" cty:"ssh_interface"`
+	AMIName                                   *string                                `mapstructure:"ami_name" required:"true" cty:"ami_name"`
+	AMIDescription                            *string                                `mapstructure:"ami_description" required:"false" cty:"ami_description"`
+	AMIVirtType                               *string                                `mapstructure:"ami_virtualization_type" required:"false" cty:"ami_virtualization_type"`
+	AMIUsers                                  []string                               `mapstructure:"ami_users" required:"false" cty:"ami_users"`
+	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"`
+	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"`
+	AMIForceDeleteSnapshot                    *bool                                  `mapstructure:"force_delete_snapshot" required:"false" cty:"force_delete_snapshot"`
+	AMIEncryptBootVolume                      *bool                                  `mapstructure:"encrypt_boot" required:"false" cty:"encrypt_boot"`
+	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"`
+	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"`
+	LaunchMappings                            []FlatBlockDevice                      `mapstructure:"launch_block_device_mappings" required:"false" cty:"launch_block_device_mappings"`
+	RootDevice                                *FlatRootBlockDevice                   `mapstructure:"ami_root_device" required:"true" cty:"ami_root_device"`
+	VolumeRunTags                             common.TagMap                          `mapstructure:"run_volume_tags" cty:"run_volume_tags"`
+	Architecture                              *string                                `mapstructure:"ami_architecture" required:"false" cty:"ami_architecture"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -211,9 +195,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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},
 		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
-		"assume_role":                   &hcldec.BlockSpec{TypeName: "assume_role", Nested: hcldec.ObjectSpec((*common.FlatAssumeRoleConfig)(nil).HCL2Spec())},
 		"custom_endpoint_ec2":           &hcldec.AttrSpec{Name: "custom_endpoint_ec2", Type: cty.String, Required: false},
-		"shared_credentials_file":       &hcldec.AttrSpec{Name: "shared_credentials_file", Type: cty.String, Required: false},
 		"decode_authorization_messages": &hcldec.AttrSpec{Name: "decode_authorization_messages", Type: cty.Bool, Required: false},
 		"insecure_skip_tls_verify":      &hcldec.AttrSpec{Name: "insecure_skip_tls_verify", Type: cty.Bool, Required: false},
 		"max_retries":                   &hcldec.AttrSpec{Name: "max_retries", Type: cty.Number, Required: false},
@@ -223,10 +205,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
 		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
-		"skip_credential_validation":    &hcldec.AttrSpec{Name: "skip_credential_validation", Type: cty.Bool, Required: false},
 		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
 		"vault_aws_engine":              &hcldec.BlockSpec{TypeName: "vault_aws_engine", Nested: hcldec.ObjectSpec((*common.FlatVaultAWSEngineOptions)(nil).HCL2Spec())},
-		"aws_polling":                   &hcldec.BlockSpec{TypeName: "aws_polling", Nested: hcldec.ObjectSpec((*common.FlatAWSPollingConfig)(nil).HCL2Spec())},
 		"associate_public_ip_address":   &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
 		"availability_zone":             &hcldec.AttrSpec{Name: "availability_zone", Type: cty.String, Required: false},
 		"block_duration_minutes":        &hcldec.AttrSpec{Name: "block_duration_minutes", Type: cty.Number, Required: false},
@@ -240,7 +220,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -249,10 +229,9 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
-		"tenancy":                               &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false},
 		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_security_group_source_cidrs": &hcldec.AttrSpec{Name: "temporary_security_group_source_cidrs", Type: cty.List(cty.String), Required: false},
 		"user_data":                             &hcldec.AttrSpec{Name: "user_data", Type: cty.String, Required: false},
@@ -267,16 +246,10 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_username":                          &hcldec.AttrSpec{Name: "ssh_username", Type: cty.String, Required: false},
 		"ssh_password":                          &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
 		"ssh_keypair_name":                      &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
-		"temporary_key_pair_type":               &hcldec.AttrSpec{Name: "temporary_key_pair_type", Type: cty.String, Required: false},
-		"temporary_key_pair_bits":               &hcldec.AttrSpec{Name: "temporary_key_pair_bits", Type: cty.Number, Required: false},
-		"ssh_ciphers":                           &hcldec.AttrSpec{Name: "ssh_ciphers", Type: cty.List(cty.String), Required: false},
 		"ssh_clear_authorized_keys":             &hcldec.AttrSpec{Name: "ssh_clear_authorized_keys", Type: cty.Bool, Required: false},
-		"ssh_key_exchange_algorithms":           &hcldec.AttrSpec{Name: "ssh_key_exchange_algorithms", Type: cty.List(cty.String), Required: false},
 		"ssh_private_key_file":                  &hcldec.AttrSpec{Name: "ssh_private_key_file", Type: cty.String, Required: false},
-		"ssh_certificate_file":                  &hcldec.AttrSpec{Name: "ssh_certificate_file", Type: cty.String, Required: false},
 		"ssh_pty":                               &hcldec.AttrSpec{Name: "ssh_pty", Type: cty.Bool, Required: false},
 		"ssh_timeout":                           &hcldec.AttrSpec{Name: "ssh_timeout", Type: cty.String, Required: false},
-		"ssh_wait_timeout":                      &hcldec.AttrSpec{Name: "ssh_wait_timeout", Type: cty.String, Required: false},
 		"ssh_agent_auth":                        &hcldec.AttrSpec{Name: "ssh_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_disable_agent_forwarding":          &hcldec.AttrSpec{Name: "ssh_disable_agent_forwarding", Type: cty.Bool, Required: false},
 		"ssh_handshake_attempts":                &hcldec.AttrSpec{Name: "ssh_handshake_attempts", Type: cty.Number, Required: false},
@@ -287,7 +260,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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_bastion_certificate_file":          &hcldec.AttrSpec{Name: "ssh_bastion_certificate_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},
 		"ssh_proxy_port":                        &hcldec.AttrSpec{Name: "ssh_proxy_port", Type: cty.Number, Required: false},
@@ -302,15 +274,12 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"winrm_username":                        &hcldec.AttrSpec{Name: "winrm_username", Type: cty.String, Required: false},
 		"winrm_password":                        &hcldec.AttrSpec{Name: "winrm_password", Type: cty.String, Required: false},
 		"winrm_host":                            &hcldec.AttrSpec{Name: "winrm_host", Type: cty.String, Required: false},
-		"winrm_no_proxy":                        &hcldec.AttrSpec{Name: "winrm_no_proxy", Type: cty.Bool, Required: false},
 		"winrm_port":                            &hcldec.AttrSpec{Name: "winrm_port", Type: cty.Number, Required: false},
 		"winrm_timeout":                         &hcldec.AttrSpec{Name: "winrm_timeout", Type: cty.String, Required: false},
 		"winrm_use_ssl":                         &hcldec.AttrSpec{Name: "winrm_use_ssl", Type: cty.Bool, Required: false},
 		"winrm_insecure":                        &hcldec.AttrSpec{Name: "winrm_insecure", Type: cty.Bool, Required: false},
 		"winrm_use_ntlm":                        &hcldec.AttrSpec{Name: "winrm_use_ntlm", Type: cty.Bool, Required: false},
 		"ssh_interface":                         &hcldec.AttrSpec{Name: "ssh_interface", Type: cty.String, Required: false},
-		"pause_before_ssm":                      &hcldec.AttrSpec{Name: "pause_before_ssm", Type: cty.String, Required: false},
-		"session_manager_port":                  &hcldec.AttrSpec{Name: "session_manager_port", Type: cty.Number, 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},
 		"ami_virtualization_type":               &hcldec.AttrSpec{Name: "ami_virtualization_type", Type: cty.String, Required: false},
@@ -319,7 +288,7 @@ 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},
 		"tags":                                  &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                                   &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                                   &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -329,14 +298,13 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"region_kms_key_ids":                    &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(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.FlatKeyValue)(nil).HCL2Spec())},
+		"snapshot_tag":                          &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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_tag":                        &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"ami_architecture":                      &hcldec.AttrSpec{Name: "ami_architecture", Type: cty.String, Required: false},
 	}
 	return s
@@ -345,12 +313,12 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 // FlatRootBlockDevice is an auto-generated flat version of RootBlockDevice.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatRootBlockDevice struct {
-	SourceDeviceName    *string `mapstructure:"source_device_name" cty:"source_device_name" hcl:"source_device_name"`
-	DeviceName          *string `mapstructure:"device_name" required:"false" cty:"device_name" hcl:"device_name"`
-	DeleteOnTermination *bool   `mapstructure:"delete_on_termination" required:"false" cty:"delete_on_termination" hcl:"delete_on_termination"`
-	IOPS                *int64  `mapstructure:"iops" required:"false" cty:"iops" hcl:"iops"`
-	VolumeType          *string `mapstructure:"volume_type" required:"false" cty:"volume_type" hcl:"volume_type"`
-	VolumeSize          *int64  `mapstructure:"volume_size" required:"false" cty:"volume_size" hcl:"volume_size"`
+	SourceDeviceName    *string `mapstructure:"source_device_name" cty:"source_device_name"`
+	DeviceName          *string `mapstructure:"device_name" required:"false" cty:"device_name"`
+	DeleteOnTermination *bool   `mapstructure:"delete_on_termination" required:"false" cty:"delete_on_termination"`
+	IOPS                *int64  `mapstructure:"iops" required:"false" cty:"iops"`
+	VolumeType          *string `mapstructure:"volume_type" required:"false" cty:"volume_type"`
+	VolumeSize          *int64  `mapstructure:"volume_size" required:"false" cty:"volume_size"`
 }
 
 // FlatMapstructure returns a new FlatRootBlockDevice.

builder/amazon/ebssurrogate/builder_test.go

@@ -86,25 +86,7 @@ func TestBuilderPrepare_ReturnGeneratedData(t *testing.T) {
 	if len(generatedData) == 0 {
 		t.Fatalf("Generated data should not be empty")
 	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
 	if generatedData[0] != "SourceAMIName" {
 		t.Fatalf("Generated data should contain SourceAMIName")
 	}
-	if generatedData[1] != "BuildRegion" {
-		t.Fatalf("Generated data should contain BuildRegion")
-	}
-	if generatedData[2] != "SourceAMI" {
-		t.Fatalf("Generated data should contain SourceAMI")
-	}
-	if generatedData[3] != "SourceAMICreationDate" {
-		t.Fatalf("Generated data should contain SourceAMICreationDate")
-	}
-	if generatedData[4] != "SourceAMIOwner" {
-		t.Fatalf("Generated data should contain SourceAMIOwner")
-	}
-	if generatedData[5] != "SourceAMIOwnerName" {
-		t.Fatalf("Generated data should contain SourceAMIOwnerName")
-	}
 }

builder/amazon/ebssurrogate/step_register_ami.go

@@ -15,7 +15,6 @@ import (
 
 // StepRegisterAMI creates the AMI.
 type StepRegisterAMI struct {
-	PollingConfig            *awscommon.AWSPollingConfig
 	RootDevice               RootBlockDevice
 	AMIDevices               []*ec2.BlockDeviceMapping
 	LaunchDevices            []*ec2.BlockDeviceMapping
@@ -87,7 +86,7 @@ func (s *StepRegisterAMI) Run(ctx context.Context, state multistep.StateBag) mul
 
 	// Wait for the image to become ready
 	ui.Say("Waiting for AMI to become ready...")
-	if err := s.PollingConfig.WaitUntilAMIAvailable(ctx, ec2conn, *registerResp.ImageId); err != nil {
+	if err := awscommon.WaitUntilAMIAvailable(ctx, ec2conn, *registerResp.ImageId); err != nil {
 		err := fmt.Errorf("Error waiting for AMI: %s", err)
 		state.Put("error", err)
 		ui.Error(err.Error())

builder/amazon/ebssurrogate/step_register_ami_test.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder/amazon/common"
 )
 
 const sourceDeviceName = "/dev/xvdf"
@@ -24,7 +23,6 @@ func newStepRegisterAMI(amiDevices, launchDevices []*ec2.BlockDeviceMapping) *St
 		},
 		AMIDevices:    amiDevices,
 		LaunchDevices: launchDevices,
-		PollingConfig: new(common.AWSPollingConfig),
 	}
 }
 

builder/amazon/ebssurrogate/step_snapshot_volumes.go

@@ -6,13 +6,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	multierror "github.com/hashicorp/go-multierror"
 	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"
 )
 
 // StepSnapshotVolumes creates snapshots of the created volumes.
@@ -20,13 +18,10 @@ import (
 // Produces:
 //   snapshot_ids map[string]string - IDs of the created snapshots
 type StepSnapshotVolumes struct {
-	PollingConfig   *awscommon.AWSPollingConfig
 	LaunchDevices   []*ec2.BlockDeviceMapping
 	snapshotIds     map[string]string
 	snapshotMutex   sync.Mutex
 	SnapshotOmitMap map[string]bool
-	SnapshotTags    map[string]string
-	Ctx             interpolate.Context
 }
 
 func (s *StepSnapshotVolumes) snapshotVolume(ctx context.Context, deviceName string, state multistep.StateBag) error {
@@ -44,34 +39,12 @@ func (s *StepSnapshotVolumes) snapshotVolume(ctx context.Context, deviceName str
 		return fmt.Errorf("Volume ID for device %s not found", deviceName)
 	}
 
-	ui.Say("Creating snapshot tags")
-	snapshotTags, err := awscommon.TagMap(s.SnapshotTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
-	if err != nil {
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return err
-	}
-	snapshotTags.Report(ui)
-
 	ui.Say(fmt.Sprintf("Creating snapshot of EBS Volume %s...", volumeId))
 	description := fmt.Sprintf("Packer: %s", time.Now().String())
 
-	// Collect tags for tagging on resource creation
-	var tagSpecs []*ec2.TagSpecification
-
-	if len(snapshotTags) > 0 {
-		snapTags := &ec2.TagSpecification{
-			ResourceType: aws.String("snapshot"),
-			Tags:         snapshotTags,
-		}
-
-		tagSpecs = append(tagSpecs, snapTags)
-	}
-
 	createSnapResp, err := ec2conn.CreateSnapshot(&ec2.CreateSnapshotInput{
-		VolumeId:          &volumeId,
-		Description:       &description,
-		TagSpecifications: tagSpecs,
+		VolumeId:    &volumeId,
+		Description: &description,
 	})
 	if err != nil {
 		return err
@@ -83,7 +56,7 @@ func (s *StepSnapshotVolumes) snapshotVolume(ctx context.Context, deviceName str
 	s.snapshotMutex.Unlock()
 
 	// Wait for snapshot to be created
-	err = s.PollingConfig.WaitUntilSnapshotDone(ctx, ec2conn, *createSnapResp.SnapshotId)
+	err = awscommon.WaitUntilSnapshotDone(ctx, ec2conn, *createSnapResp.SnapshotId)
 	return err
 }
 

builder/amazon/ebsvolume/block_device.go

@@ -11,15 +11,15 @@ import (
 
 type BlockDevice struct {
 	awscommon.BlockDevice `mapstructure:",squash"`
-	// Key/value pair tags to apply to the volume. These are retained after the builder
+	// Tags to apply to the volume. These are retained after the builder
 	// completes. This is a [template engine](/docs/templates/engine), 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 `key` and a `value` field. In HCL2 mode the
+	// 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.KeyValues `mapstructure:"tag" required:"false"`
+	Tag hcl2template.NameValues `mapstructure:"tag" required:"false"`
 }
 
 type BlockDevices []BlockDevice

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/common/packerbuilderdata"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
@@ -54,10 +53,10 @@ type Config struct {
 	// source instance. See the [BlockDevices](#block-devices-configuration)
 	// documentation for fields.
 	VolumeMappings BlockDevices `mapstructure:"ebs_volumes" required:"false"`
-	// Key/value pair tags to apply to the volumes of the instance that is
-	// *launched* to 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
+	// Tags to apply to the volumes of the instance that is *launched* to
+	// 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
 	// data](#build-template-data) for more information.
 	//
@@ -68,11 +67,11 @@ type Config struct {
 	// 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 `key` and a `value` field. In HCL2 mode
+	// 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.KeyValues `mapstructure:"run_volume_tag"`
+	VolumeRunTag hcl2template.NameValues `mapstructure:"run_volume_tag"`
 
 	launchBlockDevices BlockDevices
 
@@ -100,21 +99,8 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 		SourceAMI:   `{{ .SourceAMI }} `,
 	}
 	err := config.Decode(&b.config, &config.DecodeOpts{
-		PluginType:         BuilderId,
 		Interpolate:        true,
 		InterpolateContext: &b.config.ctx,
-		InterpolateFilter: &interpolate.RenderFilter{
-			Exclude: []string{
-				"run_tags",
-				"run_tag",
-				"run_volume_tags",
-				"run_volume_tag",
-				"spot_tags",
-				"spot_tag",
-				"tags",
-				"tag",
-			},
-		},
 	}, raws...)
 	if err != nil {
 		return nil, nil, err
@@ -160,7 +146,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 
 	packer.LogSecretFilter.Set(b.config.AccessKey, b.config.SecretKey, b.config.Token)
 
-	generatedData := awscommon.GetGeneratedDataList()
+	generatedData := []string{"SourceAMIName"}
 	return generatedData, warns, nil
 }
 
@@ -180,13 +166,11 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("iam", iam)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	generatedData := &packerbuilderdata.GeneratedData{State: state}
 
 	var instanceStep multistep.Step
 
 	if b.config.IsSpotInstance() {
 		instanceStep = &awscommon.StepRunSpotInstance{
-			PollingConfig:                     b.config.PollingConfig,
 			AssociatePublicIpAddress:          b.config.AssociatePublicIpAddress,
 			LaunchMappings:                    b.config.launchBlockDevices,
 			BlockDurationMinutes:              b.config.BlockDurationMinutes,
@@ -197,7 +181,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ExpectedRootDevice:                "ebs",
 			InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior,
 			InstanceType:                      b.config.InstanceType,
-			Region:                            *ec2conn.Config.Region,
 			SourceAMI:                         b.config.SourceAmi,
 			SpotInstanceTypes:                 b.config.SpotInstanceTypes,
 			SpotPrice:                         b.config.SpotPrice,
@@ -209,7 +192,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		}
 	} else {
 		instanceStep = &awscommon.StepRunSourceInstance{
-			PollingConfig:                     b.config.PollingConfig,
 			AssociatePublicIpAddress:          b.config.AssociatePublicIpAddress,
 			LaunchMappings:                    b.config.launchBlockDevices,
 			Comm:                              &b.config.RunConfig.Comm,
@@ -223,7 +205,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			IsRestricted:                      b.config.IsChinaCloud() || b.config.IsGovCloud(),
 			SourceAMI:                         b.config.SourceAmi,
 			Tags:                              b.config.RunTags,
-			Tenancy:                           b.config.Tenancy,
 			UserData:                          b.config.UserData,
 			UserDataFile:                      b.config.UserDataFile,
 			VolumeTags:                        b.config.VolumeRunTags,
@@ -257,7 +238,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			SecurityGroupIds:       b.config.SecurityGroupIds,
 			CommConfig:             &b.config.RunConfig.Comm,
 			TemporarySGSourceCidrs: b.config.TemporarySGSourceCidrs,
-			SkipSSHRuleCreation:    b.config.SSMAgentEnabled(),
 		},
 		&awscommon.StepIamInstanceProfile{
 			IamInstanceProfile:                        b.config.IamInstanceProfile,
@@ -275,14 +255,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Timeout:   b.config.WindowsPasswordTimeout,
 			BuildName: b.config.PackerBuildName,
 		},
-		&awscommon.StepCreateSSMTunnel{
-			AWSSession:       session,
-			Region:           *ec2conn.Config.Region,
-			PauseBeforeSSM:   b.config.PauseBeforeSSM,
-			LocalPortNumber:  b.config.SessionManagerPort,
-			RemotePortNumber: b.config.Comm.Port(),
-			SSMAgentEnabled:  b.config.SSMAgentEnabled(),
-		},
 		&communicator.StepConnect{
 			Config: &b.config.RunConfig.Comm,
 			Host: awscommon.SSHHost(
@@ -290,21 +262,13 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				b.config.SSHInterface,
 				b.config.Comm.Host(),
 			),
-			SSHPort: awscommon.Port(
-				b.config.SSHInterface,
-				b.config.Comm.Port(),
-			),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&awscommon.StepSetGeneratedData{
-			GeneratedData: generatedData,
-		},
 		&common.StepProvision{},
 		&common.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&awscommon.StepStopEBSBackedInstance{
-			PollingConfig:       b.config.PollingConfig,
 			Skip:                b.config.IsSpotInstance(),
 			DisableStopInstance: b.config.DisableStopInstance,
 		},

builder/amazon/ebsvolume/builder.hcl2spec.go

@@ -11,18 +11,18 @@ import (
 // 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" hcl:"delete_on_termination"`
-	DeviceName          *string                     `mapstructure:"device_name" required:"false" cty:"device_name" hcl:"device_name"`
-	Encrypted           *bool                       `mapstructure:"encrypted" required:"false" cty:"encrypted" hcl:"encrypted"`
-	IOPS                *int64                      `mapstructure:"iops" required:"false" cty:"iops" hcl:"iops"`
-	NoDevice            *bool                       `mapstructure:"no_device" required:"false" cty:"no_device" hcl:"no_device"`
-	SnapshotId          *string                     `mapstructure:"snapshot_id" required:"false" cty:"snapshot_id" hcl:"snapshot_id"`
-	VirtualName         *string                     `mapstructure:"virtual_name" required:"false" cty:"virtual_name" hcl:"virtual_name"`
-	VolumeType          *string                     `mapstructure:"volume_type" required:"false" cty:"volume_type" hcl:"volume_type"`
-	VolumeSize          *int64                      `mapstructure:"volume_size" required:"false" cty:"volume_size" hcl:"volume_size"`
-	KmsKeyId            *string                     `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"`
-	Tags                map[string]string           `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	Tag                 []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"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                map[string]string            `mapstructure:"tags" required:"false" cty:"tags"`
+	Tag                 []hcl2template.FlatNameValue `mapstructure:"tag" required:"false" cty:"tag"`
 }
 
 // FlatMapstructure returns a new FlatBlockDevice.
@@ -48,7 +48,7 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                   &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 	}
 	return s
 }
@@ -56,119 +56,104 @@ func (*FlatBlockDevice) 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" hcl:"packer_build_name"`
-	PackerBuilderType                         *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug                               *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce                               *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError                             *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars                            map[string]string                      `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars                       []string                               `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	AccessKey                                 *string                                `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"`
-	AssumeRole                                *common.FlatAssumeRoleConfig           `mapstructure:"assume_role" required:"false" cty:"assume_role" hcl:"assume_role"`
-	CustomEndpointEc2                         *string                                `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2" hcl:"custom_endpoint_ec2"`
-	CredsFilename                             *string                                `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file" hcl:"shared_credentials_file"`
-	DecodeAuthZMessages                       *bool                                  `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages" hcl:"decode_authorization_messages"`
-	InsecureSkipTLSVerify                     *bool                                  `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"`
-	MaxRetries                                *int                                   `mapstructure:"max_retries" required:"false" cty:"max_retries" hcl:"max_retries"`
-	MFACode                                   *string                                `mapstructure:"mfa_code" required:"false" cty:"mfa_code" hcl:"mfa_code"`
-	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
-	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
-	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
-	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check" hcl:"skip_metadata_api_check"`
-	SkipCredsValidation                       *bool                                  `mapstructure:"skip_credential_validation" cty:"skip_credential_validation" hcl:"skip_credential_validation"`
-	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token" hcl:"token"`
-	VaultAWSEngine                            *common.FlatVaultAWSEngineOptions      `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine" hcl:"vault_aws_engine"`
-	PollingConfig                             *common.FlatAWSPollingConfig           `mapstructure:"aws_polling" required:"false" cty:"aws_polling" hcl:"aws_polling"`
-	AssociatePublicIpAddress                  *bool                                  `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
-	AvailabilityZone                          *string                                `mapstructure:"availability_zone" required:"false" cty:"availability_zone" hcl:"availability_zone"`
-	BlockDurationMinutes                      *int64                                 `mapstructure:"block_duration_minutes" required:"false" cty:"block_duration_minutes" hcl:"block_duration_minutes"`
-	DisableStopInstance                       *bool                                  `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance" hcl:"disable_stop_instance"`
-	EbsOptimized                              *bool                                  `mapstructure:"ebs_optimized" required:"false" cty:"ebs_optimized" hcl:"ebs_optimized"`
-	EnableT2Unlimited                         *bool                                  `mapstructure:"enable_t2_unlimited" required:"false" cty:"enable_t2_unlimited" hcl:"enable_t2_unlimited"`
-	IamInstanceProfile                        *string                                `mapstructure:"iam_instance_profile" required:"false" cty:"iam_instance_profile" hcl:"iam_instance_profile"`
-	SkipProfileValidation                     *bool                                  `mapstructure:"skip_profile_validation" required:"false" cty:"skip_profile_validation" hcl:"skip_profile_validation"`
-	TemporaryIamInstanceProfilePolicyDocument *common.FlatPolicyDocument             `mapstructure:"temporary_iam_instance_profile_policy_document" required:"false" cty:"temporary_iam_instance_profile_policy_document" hcl:"temporary_iam_instance_profile_policy_document"`
-	InstanceInitiatedShutdownBehavior         *string                                `mapstructure:"shutdown_behavior" required:"false" cty:"shutdown_behavior" hcl:"shutdown_behavior"`
-	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
-	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"`
-	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"`
-	RunTag                                    []hcl2template.FlatKeyValue            `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
-	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
-	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"`
-	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"`
-	SourceAmiFilter                           *common.FlatAmiFilterOptions           `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter" hcl:"source_ami_filter"`
-	SpotInstanceTypes                         []string                               `mapstructure:"spot_instance_types" required:"false" cty:"spot_instance_types" hcl:"spot_instance_types"`
-	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"`
-	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"`
-	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatKeyValue            `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
-	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"`
-	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"`
-	Tenancy                                   *string                                `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"`
-	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
-	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs" hcl:"temporary_security_group_source_cidrs"`
-	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
-	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
-	VpcFilter                                 *common.FlatVpcFilterOptions           `mapstructure:"vpc_filter" required:"false" cty:"vpc_filter" hcl:"vpc_filter"`
-	VpcId                                     *string                                `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"`
-	WindowsPasswordTimeout                    *string                                `mapstructure:"windows_password_timeout" required:"false" cty:"windows_password_timeout" hcl:"windows_password_timeout"`
-	Type                                      *string                                `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
-	PauseBeforeConnect                        *string                                `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
-	SSHHost                                   *string                                `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
-	SSHPort                                   *int                                   `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
-	SSHUsername                               *string                                `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
-	SSHPassword                               *string                                `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
-	SSHKeyPairName                            *string                                `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
-	SSHTemporaryKeyPairType                   *string                                `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
-	SSHTemporaryKeyPairBits                   *int                                   `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
-	SSHCiphers                                []string                               `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
-	SSHClearAuthorizedKeys                    *bool                                  `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
-	SSHKEXAlgos                               []string                               `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
-	SSHPrivateKeyFile                         *string                                `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
-	SSHCertificateFile                        *string                                `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
-	SSHPty                                    *bool                                  `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
-	SSHTimeout                                *string                                `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
-	SSHWaitTimeout                            *string                                `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
-	SSHAgentAuth                              *bool                                  `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
-	SSHDisableAgentForwarding                 *bool                                  `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts                      *int                                   `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
-	SSHBastionHost                            *string                                `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
-	SSHBastionPort                            *int                                   `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
-	SSHBastionAgentAuth                       *bool                                  `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
-	SSHBastionUsername                        *string                                `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
-	SSHBastionPassword                        *string                                `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
-	SSHBastionInteractive                     *bool                                  `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile                  *string                                `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
-	SSHBastionCertificateFile                 *string                                `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
-	SSHFileTransferMethod                     *string                                `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
-	SSHProxyHost                              *string                                `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
-	SSHProxyPort                              *int                                   `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
-	SSHProxyUsername                          *string                                `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
-	SSHProxyPassword                          *string                                `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
-	SSHKeepAliveInterval                      *string                                `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout                       *string                                `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
-	SSHRemoteTunnels                          []string                               `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
-	SSHLocalTunnels                           []string                               `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
-	SSHPublicKey                              []byte                                 `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
-	SSHPrivateKey                             []byte                                 `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
-	WinRMUser                                 *string                                `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
-	WinRMPassword                             *string                                `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
-	WinRMHost                                 *string                                `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
-	WinRMNoProxy                              *bool                                  `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
-	WinRMPort                                 *int                                   `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
-	WinRMTimeout                              *string                                `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
-	WinRMUseSSL                               *bool                                  `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
-	WinRMInsecure                             *bool                                  `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
-	WinRMUseNTLM                              *bool                                  `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
-	SSHInterface                              *string                                `mapstructure:"ssh_interface" cty:"ssh_interface" hcl:"ssh_interface"`
-	PauseBeforeSSM                            *string                                `mapstructure:"pause_before_ssm" cty:"pause_before_ssm" hcl:"pause_before_ssm"`
-	SessionManagerPort                        *int                                   `mapstructure:"session_manager_port" cty:"session_manager_port" hcl:"session_manager_port"`
-	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"`
-	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"`
-	VolumeMappings                            []FlatBlockDevice                      `mapstructure:"ebs_volumes" required:"false" cty:"ebs_volumes" hcl:"ebs_volumes"`
-	VolumeRunTags                             map[string]string                      `mapstructure:"run_volume_tags" cty:"run_volume_tags" hcl:"run_volume_tags"`
-	VolumeRunTag                              []hcl2template.FlatKeyValue            `mapstructure:"run_volume_tag" cty:"run_volume_tag" hcl:"run_volume_tag"`
+	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"`
+	AccessKey                                 *string                                `mapstructure:"access_key" required:"true" cty:"access_key"`
+	CustomEndpointEc2                         *string                                `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2"`
+	DecodeAuthZMessages                       *bool                                  `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages"`
+	InsecureSkipTLSVerify                     *bool                                  `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify"`
+	MaxRetries                                *int                                   `mapstructure:"max_retries" required:"false" cty:"max_retries"`
+	MFACode                                   *string                                `mapstructure:"mfa_code" required:"false" cty:"mfa_code"`
+	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile"`
+	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region"`
+	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key"`
+	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
+	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check"`
+	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token"`
+	VaultAWSEngine                            *common.FlatVaultAWSEngineOptions      `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine"`
+	AssociatePublicIpAddress                  *bool                                  `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address"`
+	AvailabilityZone                          *string                                `mapstructure:"availability_zone" required:"false" cty:"availability_zone"`
+	BlockDurationMinutes                      *int64                                 `mapstructure:"block_duration_minutes" required:"false" cty:"block_duration_minutes"`
+	DisableStopInstance                       *bool                                  `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance"`
+	EbsOptimized                              *bool                                  `mapstructure:"ebs_optimized" required:"false" cty:"ebs_optimized"`
+	EnableT2Unlimited                         *bool                                  `mapstructure:"enable_t2_unlimited" required:"false" cty:"enable_t2_unlimited"`
+	IamInstanceProfile                        *string                                `mapstructure:"iam_instance_profile" required:"false" cty:"iam_instance_profile"`
+	SkipProfileValidation                     *bool                                  `mapstructure:"skip_profile_validation" required:"false" cty:"skip_profile_validation"`
+	TemporaryIamInstanceProfilePolicyDocument *common.FlatPolicyDocument             `mapstructure:"temporary_iam_instance_profile_policy_document" required:"false" cty:"temporary_iam_instance_profile_policy_document"`
+	InstanceInitiatedShutdownBehavior         *string                                `mapstructure:"shutdown_behavior" required:"false" cty:"shutdown_behavior"`
+	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"`
+	SourceAmiFilter                           *common.FlatAmiFilterOptions           `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter"`
+	SpotInstanceTypes                         []string                               `mapstructure:"spot_instance_types" required:"false" cty:"spot_instance_types"`
+	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"`
+	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs"`
+	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data"`
+	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file"`
+	VpcFilter                                 *common.FlatVpcFilterOptions           `mapstructure:"vpc_filter" required:"false" cty:"vpc_filter"`
+	VpcId                                     *string                                `mapstructure:"vpc_id" required:"false" cty:"vpc_id"`
+	WindowsPasswordTimeout                    *string                                `mapstructure:"windows_password_timeout" required:"false" cty:"windows_password_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"`
+	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"`
+	SSHInterface                              *string                                `mapstructure:"ssh_interface" cty:"ssh_interface"`
+	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"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -191,9 +176,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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},
 		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
-		"assume_role":                   &hcldec.BlockSpec{TypeName: "assume_role", Nested: hcldec.ObjectSpec((*common.FlatAssumeRoleConfig)(nil).HCL2Spec())},
 		"custom_endpoint_ec2":           &hcldec.AttrSpec{Name: "custom_endpoint_ec2", Type: cty.String, Required: false},
-		"shared_credentials_file":       &hcldec.AttrSpec{Name: "shared_credentials_file", Type: cty.String, Required: false},
 		"decode_authorization_messages": &hcldec.AttrSpec{Name: "decode_authorization_messages", Type: cty.Bool, Required: false},
 		"insecure_skip_tls_verify":      &hcldec.AttrSpec{Name: "insecure_skip_tls_verify", Type: cty.Bool, Required: false},
 		"max_retries":                   &hcldec.AttrSpec{Name: "max_retries", Type: cty.Number, Required: false},
@@ -203,10 +186,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
 		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
-		"skip_credential_validation":    &hcldec.AttrSpec{Name: "skip_credential_validation", Type: cty.Bool, Required: false},
 		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
 		"vault_aws_engine":              &hcldec.BlockSpec{TypeName: "vault_aws_engine", Nested: hcldec.ObjectSpec((*common.FlatVaultAWSEngineOptions)(nil).HCL2Spec())},
-		"aws_polling":                   &hcldec.BlockSpec{TypeName: "aws_polling", Nested: hcldec.ObjectSpec((*common.FlatAWSPollingConfig)(nil).HCL2Spec())},
 		"associate_public_ip_address":   &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
 		"availability_zone":             &hcldec.AttrSpec{Name: "availability_zone", Type: cty.String, Required: false},
 		"block_duration_minutes":        &hcldec.AttrSpec{Name: "block_duration_minutes", Type: cty.Number, Required: false},
@@ -220,7 +201,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -229,10 +210,9 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
-		"tenancy":                               &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false},
 		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_security_group_source_cidrs": &hcldec.AttrSpec{Name: "temporary_security_group_source_cidrs", Type: cty.List(cty.String), Required: false},
 		"user_data":                             &hcldec.AttrSpec{Name: "user_data", Type: cty.String, Required: false},
@@ -247,16 +227,10 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_username":                          &hcldec.AttrSpec{Name: "ssh_username", Type: cty.String, Required: false},
 		"ssh_password":                          &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
 		"ssh_keypair_name":                      &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
-		"temporary_key_pair_type":               &hcldec.AttrSpec{Name: "temporary_key_pair_type", Type: cty.String, Required: false},
-		"temporary_key_pair_bits":               &hcldec.AttrSpec{Name: "temporary_key_pair_bits", Type: cty.Number, Required: false},
-		"ssh_ciphers":                           &hcldec.AttrSpec{Name: "ssh_ciphers", Type: cty.List(cty.String), Required: false},
 		"ssh_clear_authorized_keys":             &hcldec.AttrSpec{Name: "ssh_clear_authorized_keys", Type: cty.Bool, Required: false},
-		"ssh_key_exchange_algorithms":           &hcldec.AttrSpec{Name: "ssh_key_exchange_algorithms", Type: cty.List(cty.String), Required: false},
 		"ssh_private_key_file":                  &hcldec.AttrSpec{Name: "ssh_private_key_file", Type: cty.String, Required: false},
-		"ssh_certificate_file":                  &hcldec.AttrSpec{Name: "ssh_certificate_file", Type: cty.String, Required: false},
 		"ssh_pty":                               &hcldec.AttrSpec{Name: "ssh_pty", Type: cty.Bool, Required: false},
 		"ssh_timeout":                           &hcldec.AttrSpec{Name: "ssh_timeout", Type: cty.String, Required: false},
-		"ssh_wait_timeout":                      &hcldec.AttrSpec{Name: "ssh_wait_timeout", Type: cty.String, Required: false},
 		"ssh_agent_auth":                        &hcldec.AttrSpec{Name: "ssh_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_disable_agent_forwarding":          &hcldec.AttrSpec{Name: "ssh_disable_agent_forwarding", Type: cty.Bool, Required: false},
 		"ssh_handshake_attempts":                &hcldec.AttrSpec{Name: "ssh_handshake_attempts", Type: cty.Number, Required: false},
@@ -267,7 +241,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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_bastion_certificate_file":          &hcldec.AttrSpec{Name: "ssh_bastion_certificate_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},
 		"ssh_proxy_port":                        &hcldec.AttrSpec{Name: "ssh_proxy_port", Type: cty.Number, Required: false},
@@ -282,20 +255,17 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"winrm_username":                        &hcldec.AttrSpec{Name: "winrm_username", Type: cty.String, Required: false},
 		"winrm_password":                        &hcldec.AttrSpec{Name: "winrm_password", Type: cty.String, Required: false},
 		"winrm_host":                            &hcldec.AttrSpec{Name: "winrm_host", Type: cty.String, Required: false},
-		"winrm_no_proxy":                        &hcldec.AttrSpec{Name: "winrm_no_proxy", Type: cty.Bool, Required: false},
 		"winrm_port":                            &hcldec.AttrSpec{Name: "winrm_port", Type: cty.Number, Required: false},
 		"winrm_timeout":                         &hcldec.AttrSpec{Name: "winrm_timeout", Type: cty.String, Required: false},
 		"winrm_use_ssl":                         &hcldec.AttrSpec{Name: "winrm_use_ssl", Type: cty.Bool, Required: false},
 		"winrm_insecure":                        &hcldec.AttrSpec{Name: "winrm_insecure", Type: cty.Bool, Required: false},
 		"winrm_use_ntlm":                        &hcldec.AttrSpec{Name: "winrm_use_ntlm", Type: cty.Bool, Required: false},
 		"ssh_interface":                         &hcldec.AttrSpec{Name: "ssh_interface", Type: cty.String, Required: false},
-		"pause_before_ssm":                      &hcldec.AttrSpec{Name: "pause_before_ssm", Type: cty.String, Required: false},
-		"session_manager_port":                  &hcldec.AttrSpec{Name: "session_manager_port", Type: cty.Number, 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},
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"run_volume_tag":                        &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 	}
 	return s
 }

builder/amazon/ebsvolume/builder_test.go

@@ -105,25 +105,7 @@ func TestBuilderPrepare_ReturnGeneratedData(t *testing.T) {
 	if len(generatedData) == 0 {
 		t.Fatalf("Generated data should not be empty")
 	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
 	if generatedData[0] != "SourceAMIName" {
 		t.Fatalf("Generated data should contain SourceAMIName")
 	}
-	if generatedData[1] != "BuildRegion" {
-		t.Fatalf("Generated data should contain BuildRegion")
-	}
-	if generatedData[2] != "SourceAMI" {
-		t.Fatalf("Generated data should contain SourceAMI")
-	}
-	if generatedData[3] != "SourceAMICreationDate" {
-		t.Fatalf("Generated data should contain SourceAMICreationDate")
-	}
-	if generatedData[4] != "SourceAMIOwner" {
-		t.Fatalf("Generated data should contain SourceAMIOwner")
-	}
-	if generatedData[5] != "SourceAMIOwnerName" {
-		t.Fatalf("Generated data should contain SourceAMIOwnerName")
-	}
 }

builder/amazon/examples/apache_server/README.Md

@@ -1 +0,0 @@
-command: packer build -var "accesskey=*" -var "secretkey=" -var "shellpath=packages.sh" .\apache.json

builder/amazon/examples/apache_server/apache.json

@@ -1,31 +0,0 @@
-{
-    "variables":
-        {
-            "accesskey": "",
-            "secretkey": "",
-            "shellpath": "packages.sh"
-        },
-    "builders":[
-        {
-            "type": "amazon-ebs",
-            "access_key": "{{user `accesskey`}}",
-            "secret_key": "{{user `secretkey`}}",
-            "region": "ap-south-1",
-            "source_ami": "ami-sa7608343426b",
-            "instance_type": "t2.micro",
-            "ssh_username": "ubuntu",
-            "ami_name": "apache",
-            "tags": {
-              "OS_Version": "Ubuntu",
-              "Release": "Latest"
-            }
-        }
-    ],
-   "provisioners":[
-       {
-       "type": "shell",
-       "script": "{{user `shellpath`}}"
-       }
-    ]
-
-}

builder/amazon/examples/apache_server/packages.sh

@@ -1,6 +0,0 @@
-echo "installing apache "
-sudo apt-get update
-sudo apt-get install apache2 -y
-sudo apt-get update
-sudo service apache2 restart
-sudo apache2 --version

builder/amazon/examples/nginx_server/README.Md

@@ -1 +0,0 @@
-command: packer build -var "accesskey=*" -var "secretkey=" -var "shellpath=packages.sh" .\nginx.json

builder/amazon/examples/nginx_server/nginx.json

@@ -1,31 +0,0 @@
-{   
-    "variables":
-        {
-            "accesskey": "",
-            "secretkey": "",
-            "shellpath": "packages.sh"
-        },
-    "builders":[
-        {
-            "type": "amazon-ebs",
-            "access_key": "{{user `accesskey`}}",
-            "secret_key": "{{user `secretkey`}}",
-            "region": "ap-south-1",
-            "source_ami": "ami-sa7608343426b",
-            "instance_type": "t2.micro",
-            "ssh_username": "ubuntu",
-            "ami_name": "nginx",
-            "tags": {
-              "OS_Version": "Ubuntu",
-              "Release": "Latest"
-            }
-        }   
-    ],
-   "provisioners":[
-       {
-       "type": "shell",
-       "script": "{{user `shellpath`}}"
-       }  
-    ]
-
-}

builder/amazon/examples/nginx_server/packages.sh

@@ -1,4 +0,0 @@
-echo "installing nginx "
-sudo apt-get update
-sudo apt-get install nginx -y
-sudo service nginx restart

builder/amazon/instance/builder.go

@@ -15,9 +15,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
+	"github.com/hashicorp/packer/builder"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/packerbuilderdata"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
@@ -107,7 +107,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 
 	b.config.ctx.Funcs = awscommon.TemplateFuncs
 	err := config.Decode(&b.config, &config.DecodeOpts{
-		PluginType:         BuilderId,
 		Interpolate:        true,
 		InterpolateContext: &b.config.ctx,
 		InterpolateFilter: &interpolate.RenderFilter{
@@ -228,7 +227,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	}
 	packer.LogSecretFilter.Set(b.config.AccessKey, b.config.SecretKey, b.config.Token)
 
-	generatedData := awscommon.GetGeneratedDataList()
+	generatedData := []string{"SourceAMIName"}
 	return generatedData, warns, nil
 }
 
@@ -250,13 +249,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("awsSession", session)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	generatedData := &packerbuilderdata.GeneratedData{State: state}
+	generatedData := &builder.GeneratedData{State: state}
 
 	var instanceStep multistep.Step
 
 	if b.config.IsSpotInstance() {
 		instanceStep = &awscommon.StepRunSpotInstance{
-			PollingConfig:            b.config.PollingConfig,
 			AssociatePublicIpAddress: b.config.AssociatePublicIpAddress,
 			LaunchMappings:           b.config.LaunchMappings,
 			BlockDurationMinutes:     b.config.BlockDurationMinutes,
@@ -265,7 +263,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Debug:                    b.config.PackerDebug,
 			EbsOptimized:             b.config.EbsOptimized,
 			InstanceType:             b.config.InstanceType,
-			Region:                   *ec2conn.Config.Region,
 			SourceAMI:                b.config.SourceAmi,
 			SpotPrice:                b.config.SpotPrice,
 			SpotInstanceTypes:        b.config.SpotInstanceTypes,
@@ -276,7 +273,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		}
 	} else {
 		instanceStep = &awscommon.StepRunSourceInstance{
-			PollingConfig:            b.config.PollingConfig,
 			AssociatePublicIpAddress: b.config.AssociatePublicIpAddress,
 			LaunchMappings:           b.config.LaunchMappings,
 			Comm:                     &b.config.RunConfig.Comm,
@@ -288,7 +284,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			IsRestricted:             b.config.IsChinaCloud() || b.config.IsGovCloud(),
 			SourceAMI:                b.config.SourceAmi,
 			Tags:                     b.config.RunTags,
-			Tenancy:                  b.config.Tenancy,
 			UserData:                 b.config.UserData,
 			UserDataFile:             b.config.UserDataFile,
 		}
@@ -329,7 +324,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			SecurityGroupFilter:    b.config.SecurityGroupFilter,
 			SecurityGroupIds:       b.config.SecurityGroupIds,
 			TemporarySGSourceCidrs: b.config.TemporarySGSourceCidrs,
-			SkipSSHRuleCreation:    b.config.SSMAgentEnabled(),
 		},
 		&awscommon.StepIamInstanceProfile{
 			IamInstanceProfile:                        b.config.IamInstanceProfile,
@@ -343,32 +337,15 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Timeout:   b.config.WindowsPasswordTimeout,
 			BuildName: b.config.PackerBuildName,
 		},
-		&awscommon.StepCreateSSMTunnel{
-			AWSSession:       session,
-			Region:           *ec2conn.Config.Region,
-			PauseBeforeSSM:   b.config.PauseBeforeSSM,
-			LocalPortNumber:  b.config.SessionManagerPort,
-			RemotePortNumber: b.config.Comm.Port(),
-			SSMAgentEnabled:  b.config.SSMAgentEnabled(),
-		},
 		&communicator.StepConnect{
-			// StepConnect is provided settings for WinRM and SSH, but
-			// the communicator will ultimately determine which port to use.
 			Config: &b.config.RunConfig.Comm,
 			Host: awscommon.SSHHost(
 				ec2conn,
 				b.config.SSHInterface,
 				b.config.Comm.Host(),
 			),
-			SSHPort: awscommon.Port(
-				b.config.SSHInterface,
-				b.config.Comm.Port(),
-			),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&awscommon.StepSetGeneratedData{
-			GeneratedData: generatedData,
-		},
 		&common.StepProvision{},
 		&common.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
@@ -391,7 +368,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			EnableAMISriovNetSupport: b.config.AMISriovNetSupport,
 			EnableAMIENASupport:      b.config.AMIENASupport,
 			AMISkipBuildRegion:       b.config.AMISkipBuildRegion,
-			PollingConfig:            b.config.PollingConfig,
 		},
 		&awscommon.StepAMIRegionCopy{
 			AccessConfig:      &b.config.AccessConfig,

builder/amazon/instance/builder.hcl2spec.go

@@ -11,146 +11,131 @@ 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" hcl:"packer_build_name"`
-	PackerBuilderType                         *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug                               *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce                               *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError                             *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars                            map[string]string                      `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars                       []string                               `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	AccessKey                                 *string                                `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"`
-	AssumeRole                                *common.FlatAssumeRoleConfig           `mapstructure:"assume_role" required:"false" cty:"assume_role" hcl:"assume_role"`
-	CustomEndpointEc2                         *string                                `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2" hcl:"custom_endpoint_ec2"`
-	CredsFilename                             *string                                `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file" hcl:"shared_credentials_file"`
-	DecodeAuthZMessages                       *bool                                  `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages" hcl:"decode_authorization_messages"`
-	InsecureSkipTLSVerify                     *bool                                  `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"`
-	MaxRetries                                *int                                   `mapstructure:"max_retries" required:"false" cty:"max_retries" hcl:"max_retries"`
-	MFACode                                   *string                                `mapstructure:"mfa_code" required:"false" cty:"mfa_code" hcl:"mfa_code"`
-	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
-	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
-	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
-	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check" hcl:"skip_metadata_api_check"`
-	SkipCredsValidation                       *bool                                  `mapstructure:"skip_credential_validation" cty:"skip_credential_validation" hcl:"skip_credential_validation"`
-	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token" hcl:"token"`
-	VaultAWSEngine                            *common.FlatVaultAWSEngineOptions      `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine" hcl:"vault_aws_engine"`
-	PollingConfig                             *common.FlatAWSPollingConfig           `mapstructure:"aws_polling" required:"false" cty:"aws_polling" hcl:"aws_polling"`
-	AMIName                                   *string                                `mapstructure:"ami_name" required:"true" cty:"ami_name" hcl:"ami_name"`
-	AMIDescription                            *string                                `mapstructure:"ami_description" required:"false" cty:"ami_description" hcl:"ami_description"`
-	AMIVirtType                               *string                                `mapstructure:"ami_virtualization_type" required:"false" cty:"ami_virtualization_type" hcl:"ami_virtualization_type"`
-	AMIUsers                                  []string                               `mapstructure:"ami_users" required:"false" cty:"ami_users" hcl:"ami_users"`
-	AMIGroups                                 []string                               `mapstructure:"ami_groups" required:"false" cty:"ami_groups" hcl:"ami_groups"`
-	AMIProductCodes                           []string                               `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes" hcl:"ami_product_codes"`
-	AMIRegions                                []string                               `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"`
-	AMITags                                   map[string]string                      `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AMITag                                    []hcl2template.FlatKeyValue            `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
-	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"`
-	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"`
-	AMIForceDeregister                        *bool                                  `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"`
-	AMIForceDeleteSnapshot                    *bool                                  `mapstructure:"force_delete_snapshot" required:"false" cty:"force_delete_snapshot" hcl:"force_delete_snapshot"`
-	AMIEncryptBootVolume                      *bool                                  `mapstructure:"encrypt_boot" required:"false" cty:"encrypt_boot" hcl:"encrypt_boot"`
-	AMIKmsKeyId                               *string                                `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"`
-	AMIRegionKMSKeyIDs                        map[string]string                      `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"`
-	AMISkipBuildRegion                        *bool                                  `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"`
-	SnapshotTags                              map[string]string                      `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"`
-	SnapshotTag                               []hcl2template.FlatKeyValue            `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
-	SnapshotUsers                             []string                               `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"`
-	SnapshotGroups                            []string                               `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"`
-	AssociatePublicIpAddress                  *bool                                  `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
-	AvailabilityZone                          *string                                `mapstructure:"availability_zone" required:"false" cty:"availability_zone" hcl:"availability_zone"`
-	BlockDurationMinutes                      *int64                                 `mapstructure:"block_duration_minutes" required:"false" cty:"block_duration_minutes" hcl:"block_duration_minutes"`
-	DisableStopInstance                       *bool                                  `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance" hcl:"disable_stop_instance"`
-	EbsOptimized                              *bool                                  `mapstructure:"ebs_optimized" required:"false" cty:"ebs_optimized" hcl:"ebs_optimized"`
-	EnableT2Unlimited                         *bool                                  `mapstructure:"enable_t2_unlimited" required:"false" cty:"enable_t2_unlimited" hcl:"enable_t2_unlimited"`
-	IamInstanceProfile                        *string                                `mapstructure:"iam_instance_profile" required:"false" cty:"iam_instance_profile" hcl:"iam_instance_profile"`
-	SkipProfileValidation                     *bool                                  `mapstructure:"skip_profile_validation" required:"false" cty:"skip_profile_validation" hcl:"skip_profile_validation"`
-	TemporaryIamInstanceProfilePolicyDocument *common.FlatPolicyDocument             `mapstructure:"temporary_iam_instance_profile_policy_document" required:"false" cty:"temporary_iam_instance_profile_policy_document" hcl:"temporary_iam_instance_profile_policy_document"`
-	InstanceInitiatedShutdownBehavior         *string                                `mapstructure:"shutdown_behavior" required:"false" cty:"shutdown_behavior" hcl:"shutdown_behavior"`
-	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
-	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"`
-	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"`
-	RunTag                                    []hcl2template.FlatKeyValue            `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
-	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
-	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"`
-	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"`
-	SourceAmiFilter                           *common.FlatAmiFilterOptions           `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter" hcl:"source_ami_filter"`
-	SpotInstanceTypes                         []string                               `mapstructure:"spot_instance_types" required:"false" cty:"spot_instance_types" hcl:"spot_instance_types"`
-	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"`
-	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"`
-	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatKeyValue            `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
-	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"`
-	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"`
-	Tenancy                                   *string                                `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"`
-	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
-	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs" hcl:"temporary_security_group_source_cidrs"`
-	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
-	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
-	VpcFilter                                 *common.FlatVpcFilterOptions           `mapstructure:"vpc_filter" required:"false" cty:"vpc_filter" hcl:"vpc_filter"`
-	VpcId                                     *string                                `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"`
-	WindowsPasswordTimeout                    *string                                `mapstructure:"windows_password_timeout" required:"false" cty:"windows_password_timeout" hcl:"windows_password_timeout"`
-	Type                                      *string                                `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
-	PauseBeforeConnect                        *string                                `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
-	SSHHost                                   *string                                `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
-	SSHPort                                   *int                                   `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
-	SSHUsername                               *string                                `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
-	SSHPassword                               *string                                `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
-	SSHKeyPairName                            *string                                `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
-	SSHTemporaryKeyPairType                   *string                                `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
-	SSHTemporaryKeyPairBits                   *int                                   `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
-	SSHCiphers                                []string                               `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
-	SSHClearAuthorizedKeys                    *bool                                  `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
-	SSHKEXAlgos                               []string                               `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
-	SSHPrivateKeyFile                         *string                                `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
-	SSHCertificateFile                        *string                                `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
-	SSHPty                                    *bool                                  `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
-	SSHTimeout                                *string                                `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
-	SSHWaitTimeout                            *string                                `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
-	SSHAgentAuth                              *bool                                  `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
-	SSHDisableAgentForwarding                 *bool                                  `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts                      *int                                   `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
-	SSHBastionHost                            *string                                `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
-	SSHBastionPort                            *int                                   `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
-	SSHBastionAgentAuth                       *bool                                  `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
-	SSHBastionUsername                        *string                                `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
-	SSHBastionPassword                        *string                                `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
-	SSHBastionInteractive                     *bool                                  `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile                  *string                                `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
-	SSHBastionCertificateFile                 *string                                `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
-	SSHFileTransferMethod                     *string                                `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
-	SSHProxyHost                              *string                                `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
-	SSHProxyPort                              *int                                   `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
-	SSHProxyUsername                          *string                                `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
-	SSHProxyPassword                          *string                                `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
-	SSHKeepAliveInterval                      *string                                `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout                       *string                                `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
-	SSHRemoteTunnels                          []string                               `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
-	SSHLocalTunnels                           []string                               `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
-	SSHPublicKey                              []byte                                 `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
-	SSHPrivateKey                             []byte                                 `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
-	WinRMUser                                 *string                                `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
-	WinRMPassword                             *string                                `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
-	WinRMHost                                 *string                                `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
-	WinRMNoProxy                              *bool                                  `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
-	WinRMPort                                 *int                                   `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
-	WinRMTimeout                              *string                                `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
-	WinRMUseSSL                               *bool                                  `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
-	WinRMInsecure                             *bool                                  `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
-	WinRMUseNTLM                              *bool                                  `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
-	SSHInterface                              *string                                `mapstructure:"ssh_interface" cty:"ssh_interface" hcl:"ssh_interface"`
-	PauseBeforeSSM                            *string                                `mapstructure:"pause_before_ssm" cty:"pause_before_ssm" hcl:"pause_before_ssm"`
-	SessionManagerPort                        *int                                   `mapstructure:"session_manager_port" cty:"session_manager_port" hcl:"session_manager_port"`
-	AMIMappings                               []common.FlatBlockDevice               `mapstructure:"ami_block_device_mappings" required:"false" cty:"ami_block_device_mappings" hcl:"ami_block_device_mappings"`
-	LaunchMappings                            []common.FlatBlockDevice               `mapstructure:"launch_block_device_mappings" required:"false" cty:"launch_block_device_mappings" hcl:"launch_block_device_mappings"`
-	AccountId                                 *string                                `mapstructure:"account_id" required:"true" cty:"account_id" hcl:"account_id"`
-	BundleDestination                         *string                                `mapstructure:"bundle_destination" required:"false" cty:"bundle_destination" hcl:"bundle_destination"`
-	BundlePrefix                              *string                                `mapstructure:"bundle_prefix" required:"false" cty:"bundle_prefix" hcl:"bundle_prefix"`
-	BundleUploadCommand                       *string                                `mapstructure:"bundle_upload_command" required:"false" cty:"bundle_upload_command" hcl:"bundle_upload_command"`
-	BundleVolCommand                          *string                                `mapstructure:"bundle_vol_command" required:"false" cty:"bundle_vol_command" hcl:"bundle_vol_command"`
-	S3Bucket                                  *string                                `mapstructure:"s3_bucket" required:"true" cty:"s3_bucket" hcl:"s3_bucket"`
-	X509CertPath                              *string                                `mapstructure:"x509_cert_path" required:"true" cty:"x509_cert_path" hcl:"x509_cert_path"`
-	X509KeyPath                               *string                                `mapstructure:"x509_key_path" required:"true" cty:"x509_key_path" hcl:"x509_key_path"`
-	X509UploadPath                            *string                                `mapstructure:"x509_upload_path" required:"false" cty:"x509_upload_path" hcl:"x509_upload_path"`
+	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"`
+	AccessKey                                 *string                                `mapstructure:"access_key" required:"true" cty:"access_key"`
+	CustomEndpointEc2                         *string                                `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2"`
+	DecodeAuthZMessages                       *bool                                  `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages"`
+	InsecureSkipTLSVerify                     *bool                                  `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify"`
+	MaxRetries                                *int                                   `mapstructure:"max_retries" required:"false" cty:"max_retries"`
+	MFACode                                   *string                                `mapstructure:"mfa_code" required:"false" cty:"mfa_code"`
+	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile"`
+	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region"`
+	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key"`
+	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
+	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check"`
+	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token"`
+	VaultAWSEngine                            *common.FlatVaultAWSEngineOptions      `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine"`
+	AMIName                                   *string                                `mapstructure:"ami_name" required:"true" cty:"ami_name"`
+	AMIDescription                            *string                                `mapstructure:"ami_description" required:"false" cty:"ami_description"`
+	AMIVirtType                               *string                                `mapstructure:"ami_virtualization_type" required:"false" cty:"ami_virtualization_type"`
+	AMIUsers                                  []string                               `mapstructure:"ami_users" required:"false" cty:"ami_users"`
+	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"`
+	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"`
+	AMIForceDeleteSnapshot                    *bool                                  `mapstructure:"force_delete_snapshot" required:"false" cty:"force_delete_snapshot"`
+	AMIEncryptBootVolume                      *bool                                  `mapstructure:"encrypt_boot" required:"false" cty:"encrypt_boot"`
+	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"`
+	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"`
+	AvailabilityZone                          *string                                `mapstructure:"availability_zone" required:"false" cty:"availability_zone"`
+	BlockDurationMinutes                      *int64                                 `mapstructure:"block_duration_minutes" required:"false" cty:"block_duration_minutes"`
+	DisableStopInstance                       *bool                                  `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance"`
+	EbsOptimized                              *bool                                  `mapstructure:"ebs_optimized" required:"false" cty:"ebs_optimized"`
+	EnableT2Unlimited                         *bool                                  `mapstructure:"enable_t2_unlimited" required:"false" cty:"enable_t2_unlimited"`
+	IamInstanceProfile                        *string                                `mapstructure:"iam_instance_profile" required:"false" cty:"iam_instance_profile"`
+	SkipProfileValidation                     *bool                                  `mapstructure:"skip_profile_validation" required:"false" cty:"skip_profile_validation"`
+	TemporaryIamInstanceProfilePolicyDocument *common.FlatPolicyDocument             `mapstructure:"temporary_iam_instance_profile_policy_document" required:"false" cty:"temporary_iam_instance_profile_policy_document"`
+	InstanceInitiatedShutdownBehavior         *string                                `mapstructure:"shutdown_behavior" required:"false" cty:"shutdown_behavior"`
+	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"`
+	SourceAmiFilter                           *common.FlatAmiFilterOptions           `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter"`
+	SpotInstanceTypes                         []string                               `mapstructure:"spot_instance_types" required:"false" cty:"spot_instance_types"`
+	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"`
+	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs"`
+	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data"`
+	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file"`
+	VpcFilter                                 *common.FlatVpcFilterOptions           `mapstructure:"vpc_filter" required:"false" cty:"vpc_filter"`
+	VpcId                                     *string                                `mapstructure:"vpc_id" required:"false" cty:"vpc_id"`
+	WindowsPasswordTimeout                    *string                                `mapstructure:"windows_password_timeout" required:"false" cty:"windows_password_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"`
+	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"`
+	SSHInterface                              *string                                `mapstructure:"ssh_interface" cty:"ssh_interface"`
+	AMIMappings                               []common.FlatBlockDevice               `mapstructure:"ami_block_device_mappings" required:"false" cty:"ami_block_device_mappings"`
+	LaunchMappings                            []common.FlatBlockDevice               `mapstructure:"launch_block_device_mappings" required:"false" cty:"launch_block_device_mappings"`
+	AccountId                                 *string                                `mapstructure:"account_id" required:"true" cty:"account_id"`
+	BundleDestination                         *string                                `mapstructure:"bundle_destination" required:"false" cty:"bundle_destination"`
+	BundlePrefix                              *string                                `mapstructure:"bundle_prefix" required:"false" cty:"bundle_prefix"`
+	BundleUploadCommand                       *string                                `mapstructure:"bundle_upload_command" required:"false" cty:"bundle_upload_command"`
+	BundleVolCommand                          *string                                `mapstructure:"bundle_vol_command" required:"false" cty:"bundle_vol_command"`
+	S3Bucket                                  *string                                `mapstructure:"s3_bucket" required:"true" cty:"s3_bucket"`
+	X509CertPath                              *string                                `mapstructure:"x509_cert_path" required:"true" cty:"x509_cert_path"`
+	X509KeyPath                               *string                                `mapstructure:"x509_key_path" required:"true" cty:"x509_key_path"`
+	X509UploadPath                            *string                                `mapstructure:"x509_upload_path" required:"false" cty:"x509_upload_path"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -173,9 +158,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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},
 		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
-		"assume_role":                   &hcldec.BlockSpec{TypeName: "assume_role", Nested: hcldec.ObjectSpec((*common.FlatAssumeRoleConfig)(nil).HCL2Spec())},
 		"custom_endpoint_ec2":           &hcldec.AttrSpec{Name: "custom_endpoint_ec2", Type: cty.String, Required: false},
-		"shared_credentials_file":       &hcldec.AttrSpec{Name: "shared_credentials_file", Type: cty.String, Required: false},
 		"decode_authorization_messages": &hcldec.AttrSpec{Name: "decode_authorization_messages", Type: cty.Bool, Required: false},
 		"insecure_skip_tls_verify":      &hcldec.AttrSpec{Name: "insecure_skip_tls_verify", Type: cty.Bool, Required: false},
 		"max_retries":                   &hcldec.AttrSpec{Name: "max_retries", Type: cty.Number, Required: false},
@@ -185,10 +168,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
 		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
-		"skip_credential_validation":    &hcldec.AttrSpec{Name: "skip_credential_validation", Type: cty.Bool, Required: false},
 		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
 		"vault_aws_engine":              &hcldec.BlockSpec{TypeName: "vault_aws_engine", Nested: hcldec.ObjectSpec((*common.FlatVaultAWSEngineOptions)(nil).HCL2Spec())},
-		"aws_polling":                   &hcldec.BlockSpec{TypeName: "aws_polling", Nested: hcldec.ObjectSpec((*common.FlatAWSPollingConfig)(nil).HCL2Spec())},
 		"ami_name":                      &hcldec.AttrSpec{Name: "ami_name", Type: cty.String, Required: false},
 		"ami_description":               &hcldec.AttrSpec{Name: "ami_description", Type: cty.String, Required: false},
 		"ami_virtualization_type":       &hcldec.AttrSpec{Name: "ami_virtualization_type", Type: cty.String, Required: false},
@@ -197,7 +178,7 @@ 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},
 		"tags":                          &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -207,7 +188,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"region_kms_key_ids":            &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(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.FlatKeyValue)(nil).HCL2Spec())},
+		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -223,7 +204,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
@@ -232,10 +213,9 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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.FlatKeyValue)(nil).HCL2Spec())},
+		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"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},
-		"tenancy":                               &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false},
 		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_security_group_source_cidrs": &hcldec.AttrSpec{Name: "temporary_security_group_source_cidrs", Type: cty.List(cty.String), Required: false},
 		"user_data":                             &hcldec.AttrSpec{Name: "user_data", Type: cty.String, Required: false},
@@ -250,16 +230,10 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_username":                          &hcldec.AttrSpec{Name: "ssh_username", Type: cty.String, Required: false},
 		"ssh_password":                          &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
 		"ssh_keypair_name":                      &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
-		"temporary_key_pair_type":               &hcldec.AttrSpec{Name: "temporary_key_pair_type", Type: cty.String, Required: false},
-		"temporary_key_pair_bits":               &hcldec.AttrSpec{Name: "temporary_key_pair_bits", Type: cty.Number, Required: false},
-		"ssh_ciphers":                           &hcldec.AttrSpec{Name: "ssh_ciphers", Type: cty.List(cty.String), Required: false},
 		"ssh_clear_authorized_keys":             &hcldec.AttrSpec{Name: "ssh_clear_authorized_keys", Type: cty.Bool, Required: false},
-		"ssh_key_exchange_algorithms":           &hcldec.AttrSpec{Name: "ssh_key_exchange_algorithms", Type: cty.List(cty.String), Required: false},
 		"ssh_private_key_file":                  &hcldec.AttrSpec{Name: "ssh_private_key_file", Type: cty.String, Required: false},
-		"ssh_certificate_file":                  &hcldec.AttrSpec{Name: "ssh_certificate_file", Type: cty.String, Required: false},
 		"ssh_pty":                               &hcldec.AttrSpec{Name: "ssh_pty", Type: cty.Bool, Required: false},
 		"ssh_timeout":                           &hcldec.AttrSpec{Name: "ssh_timeout", Type: cty.String, Required: false},
-		"ssh_wait_timeout":                      &hcldec.AttrSpec{Name: "ssh_wait_timeout", Type: cty.String, Required: false},
 		"ssh_agent_auth":                        &hcldec.AttrSpec{Name: "ssh_agent_auth", Type: cty.Bool, Required: false},
 		"ssh_disable_agent_forwarding":          &hcldec.AttrSpec{Name: "ssh_disable_agent_forwarding", Type: cty.Bool, Required: false},
 		"ssh_handshake_attempts":                &hcldec.AttrSpec{Name: "ssh_handshake_attempts", Type: cty.Number, Required: false},
@@ -270,7 +244,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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_bastion_certificate_file":          &hcldec.AttrSpec{Name: "ssh_bastion_certificate_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},
 		"ssh_proxy_port":                        &hcldec.AttrSpec{Name: "ssh_proxy_port", Type: cty.Number, Required: false},
@@ -285,15 +258,12 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"winrm_username":                        &hcldec.AttrSpec{Name: "winrm_username", Type: cty.String, Required: false},
 		"winrm_password":                        &hcldec.AttrSpec{Name: "winrm_password", Type: cty.String, Required: false},
 		"winrm_host":                            &hcldec.AttrSpec{Name: "winrm_host", Type: cty.String, Required: false},
-		"winrm_no_proxy":                        &hcldec.AttrSpec{Name: "winrm_no_proxy", Type: cty.Bool, Required: false},
 		"winrm_port":                            &hcldec.AttrSpec{Name: "winrm_port", Type: cty.Number, Required: false},
 		"winrm_timeout":                         &hcldec.AttrSpec{Name: "winrm_timeout", Type: cty.String, Required: false},
 		"winrm_use_ssl":                         &hcldec.AttrSpec{Name: "winrm_use_ssl", Type: cty.Bool, Required: false},
 		"winrm_insecure":                        &hcldec.AttrSpec{Name: "winrm_insecure", Type: cty.Bool, Required: false},
 		"winrm_use_ntlm":                        &hcldec.AttrSpec{Name: "winrm_use_ntlm", Type: cty.Bool, Required: false},
 		"ssh_interface":                         &hcldec.AttrSpec{Name: "ssh_interface", Type: cty.String, Required: false},
-		"pause_before_ssm":                      &hcldec.AttrSpec{Name: "pause_before_ssm", Type: cty.String, Required: false},
-		"session_manager_port":                  &hcldec.AttrSpec{Name: "session_manager_port", Type: cty.Number, 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())},
 		"account_id":                            &hcldec.AttrSpec{Name: "account_id", Type: cty.String, Required: false},

builder/amazon/instance/builder_test.go

@@ -319,25 +319,7 @@ func TestBuilderPrepare_ReturnGeneratedData(t *testing.T) {
 	if len(generatedData) == 0 {
 		t.Fatalf("Generated data should not be empty")
 	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
 	if generatedData[0] != "SourceAMIName" {
 		t.Fatalf("Generated data should contain SourceAMIName")
 	}
-	if generatedData[1] != "BuildRegion" {
-		t.Fatalf("Generated data should contain BuildRegion")
-	}
-	if generatedData[2] != "SourceAMI" {
-		t.Fatalf("Generated data should contain SourceAMI")
-	}
-	if generatedData[3] != "SourceAMICreationDate" {
-		t.Fatalf("Generated data should contain SourceAMICreationDate")
-	}
-	if generatedData[4] != "SourceAMIOwner" {
-		t.Fatalf("Generated data should contain SourceAMIOwner")
-	}
-	if generatedData[5] != "SourceAMIOwnerName" {
-		t.Fatalf("Generated data should contain SourceAMIOwnerName")
-	}
 }

builder/amazon/instance/step_register_ami.go

@@ -14,7 +14,6 @@ import (
 )
 
 type StepRegisterAMI struct {
-	PollingConfig            *awscommon.AWSPollingConfig
 	EnableAMIENASupport      confighelper.Trilean
 	EnableAMISriovNetSupport bool
 	AMISkipBuildRegion       bool
@@ -81,7 +80,7 @@ func (s *StepRegisterAMI) Run(ctx context.Context, state multistep.StateBag) mul
 
 	// Wait for the image to become ready
 	ui.Say("Waiting for AMI to become ready...")
-	if err := s.PollingConfig.WaitUntilAMIAvailable(ctx, ec2conn, *registerResp.ImageId); err != nil {
+	if err := awscommon.WaitUntilAMIAvailable(ctx, ec2conn, *registerResp.ImageId); err != nil {
 		err := fmt.Errorf("Error waiting for AMI: %s", err)
 		state.Put("error", err)
 		ui.Error(err.Error())

builder/azure/arm/azure_client.go

@@ -128,8 +128,8 @@ func byConcatDecorators(decorators ...autorest.RespondDecorator) autorest.Respon
 	}
 }
 
-func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storageAccountName string,
-	cloud *azure.Environment, sharedGalleryTimeout time.Duration, pollingDuration time.Duration,
+func NewAzureClient(subscriptionID, resourceGroupName, storageAccountName string,
+	cloud *azure.Environment, SharedGalleryTimeout time.Duration, PollingDuration time.Duration,
 	servicePrincipalToken, servicePrincipalTokenVault *adal.ServicePrincipalToken) (*AzureClient, error) {
 
 	var azureClient = &AzureClient{}
@@ -141,56 +141,56 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag
 	azureClient.DeploymentsClient.RequestInspector = withInspection(maxlen)
 	azureClient.DeploymentsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.DeploymentsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DeploymentsClient.UserAgent)
-	azureClient.DeploymentsClient.Client.PollingDuration = pollingDuration
+	azureClient.DeploymentsClient.Client.PollingDuration = PollingDuration
 
 	azureClient.DeploymentOperationsClient = resources.NewDeploymentOperationsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.DeploymentOperationsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.DeploymentOperationsClient.RequestInspector = withInspection(maxlen)
 	azureClient.DeploymentOperationsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.DeploymentOperationsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DeploymentOperationsClient.UserAgent)
-	azureClient.DeploymentOperationsClient.Client.PollingDuration = pollingDuration
+	azureClient.DeploymentOperationsClient.Client.PollingDuration = PollingDuration
 
 	azureClient.DisksClient = compute.NewDisksClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.DisksClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.DisksClient.RequestInspector = withInspection(maxlen)
 	azureClient.DisksClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.DisksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DisksClient.UserAgent)
-	azureClient.DisksClient.Client.PollingDuration = pollingDuration
+	azureClient.DisksClient.Client.PollingDuration = PollingDuration
 
 	azureClient.GroupsClient = resources.NewGroupsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.GroupsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.GroupsClient.RequestInspector = withInspection(maxlen)
 	azureClient.GroupsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.GroupsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GroupsClient.UserAgent)
-	azureClient.GroupsClient.Client.PollingDuration = pollingDuration
+	azureClient.GroupsClient.Client.PollingDuration = PollingDuration
 
 	azureClient.ImagesClient = compute.NewImagesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.ImagesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.ImagesClient.RequestInspector = withInspection(maxlen)
 	azureClient.ImagesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.ImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.ImagesClient.UserAgent)
-	azureClient.ImagesClient.Client.PollingDuration = pollingDuration
+	azureClient.ImagesClient.Client.PollingDuration = PollingDuration
 
 	azureClient.InterfacesClient = network.NewInterfacesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.InterfacesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.InterfacesClient.RequestInspector = withInspection(maxlen)
 	azureClient.InterfacesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.InterfacesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.InterfacesClient.UserAgent)
-	azureClient.InterfacesClient.Client.PollingDuration = pollingDuration
+	azureClient.InterfacesClient.Client.PollingDuration = PollingDuration
 
 	azureClient.SubnetsClient = network.NewSubnetsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.SubnetsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.SubnetsClient.RequestInspector = withInspection(maxlen)
 	azureClient.SubnetsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.SubnetsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.SubnetsClient.UserAgent)
-	azureClient.SubnetsClient.Client.PollingDuration = pollingDuration
+	azureClient.SubnetsClient.Client.PollingDuration = PollingDuration
 
 	azureClient.VirtualNetworksClient = network.NewVirtualNetworksClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.VirtualNetworksClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.VirtualNetworksClient.RequestInspector = withInspection(maxlen)
 	azureClient.VirtualNetworksClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.VirtualNetworksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VirtualNetworksClient.UserAgent)
-	azureClient.VirtualNetworksClient.Client.PollingDuration = pollingDuration
+	azureClient.VirtualNetworksClient.Client.PollingDuration = PollingDuration
 
 	azureClient.SecurityGroupsClient = network.NewSecurityGroupsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.SecurityGroupsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
@@ -203,44 +203,42 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag
 	azureClient.PublicIPAddressesClient.RequestInspector = withInspection(maxlen)
 	azureClient.PublicIPAddressesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.PublicIPAddressesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.PublicIPAddressesClient.UserAgent)
-	azureClient.PublicIPAddressesClient.Client.PollingDuration = pollingDuration
+	azureClient.PublicIPAddressesClient.Client.PollingDuration = PollingDuration
 
 	azureClient.VirtualMachinesClient = compute.NewVirtualMachinesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.VirtualMachinesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.VirtualMachinesClient.RequestInspector = withInspection(maxlen)
 	azureClient.VirtualMachinesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient))
 	azureClient.VirtualMachinesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VirtualMachinesClient.UserAgent)
-	azureClient.VirtualMachinesClient.Client.PollingDuration = pollingDuration
+	azureClient.VirtualMachinesClient.Client.PollingDuration = PollingDuration
 
 	azureClient.SnapshotsClient = compute.NewSnapshotsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.SnapshotsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.SnapshotsClient.RequestInspector = withInspection(maxlen)
 	azureClient.SnapshotsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.SnapshotsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.SnapshotsClient.UserAgent)
-	azureClient.SnapshotsClient.Client.PollingDuration = pollingDuration
+	azureClient.SnapshotsClient.Client.PollingDuration = PollingDuration
 
 	azureClient.AccountsClient = armStorage.NewAccountsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.AccountsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.AccountsClient.RequestInspector = withInspection(maxlen)
 	azureClient.AccountsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.AccountsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.AccountsClient.UserAgent)
-	azureClient.AccountsClient.Client.PollingDuration = pollingDuration
+	azureClient.AccountsClient.Client.PollingDuration = PollingDuration
 
 	azureClient.GalleryImageVersionsClient = newCompute.NewGalleryImageVersionsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.GalleryImageVersionsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.GalleryImageVersionsClient.RequestInspector = withInspection(maxlen)
 	azureClient.GalleryImageVersionsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.GalleryImageVersionsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GalleryImageVersionsClient.UserAgent)
-	azureClient.GalleryImageVersionsClient.Client.PollingDuration = sharedGalleryTimeout
-	azureClient.GalleryImageVersionsClient.SubscriptionID = sigSubscriptionID
+	azureClient.GalleryImageVersionsClient.Client.PollingDuration = SharedGalleryTimeout
 
 	azureClient.GalleryImagesClient = newCompute.NewGalleryImagesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.GalleryImagesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.GalleryImagesClient.RequestInspector = withInspection(maxlen)
 	azureClient.GalleryImagesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.GalleryImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GalleryImagesClient.UserAgent)
-	azureClient.GalleryImagesClient.Client.PollingDuration = pollingDuration
-	azureClient.GalleryImagesClient.SubscriptionID = sigSubscriptionID
+	azureClient.GalleryImagesClient.Client.PollingDuration = PollingDuration
 
 	keyVaultURL, err := url.Parse(cloud.KeyVaultEndpoint)
 	if err != nil {
@@ -252,7 +250,7 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag
 	azureClient.VaultClient.RequestInspector = withInspection(maxlen)
 	azureClient.VaultClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.VaultClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VaultClient.UserAgent)
-	azureClient.VaultClient.Client.PollingDuration = pollingDuration
+	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.
@@ -261,7 +259,7 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag
 	azureClient.VaultClientDelete.RequestInspector = withInspection(maxlen)
 	azureClient.VaultClientDelete.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.VaultClientDelete.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VaultClientDelete.UserAgent)
-	azureClient.VaultClientDelete.Client.PollingDuration = pollingDuration
+	azureClient.VaultClientDelete.Client.PollingDuration = PollingDuration
 
 	// If this is a managed disk build, this should be ignored.
 	if resourceGroupName != "" && storageAccountName != "" {

builder/azure/arm/azure_error_response_test.TestAzureErrorNestedShouldFormat.approved.txt

@@ -1,4 +1,4 @@
-ERROR: -> DeploymentFailed : At least one resource deployment operation failed. Please list deployment operations for details. Please see https://aka.ms/arm-debug for usage details.
-ERROR:   -> BadRequest
-ERROR:   -> InvalidRequestFormat : Cannot parse the request.
-ERROR:     -> InvalidJson : Error converting value "playground" to type 'Microsoft.WindowsAzure.Networking.Nrp.Frontend.Contract.Csm.Public.IpAllocationMethod'. Path 'properties.publicIPAllocationMethod', line 1, position 130.
+ERROR: -> DeploymentFailed : At least one resource deployment operation failed. Please list deployment operations for details. Please see https://aka.ms/arm-debug for usage details.
+ERROR:   -> BadRequest
+ERROR:   -> InvalidRequestFormat : Cannot parse the request.
+ERROR:     -> InvalidJson : Error converting value "playground" to type 'Microsoft.WindowsAzure.Networking.Nrp.Frontend.Contract.Csm.Public.IpAllocationMethod'. Path 'properties.publicIPAllocationMethod', line 1, position 130.

builder/azure/arm/azure_error_response_test.TestAzureErrorSimpleShouldFormat.approved.txt

@@ -1 +1 @@
-ERROR: -> ResourceNotFound : The Resource 'Microsoft.Compute/images/PackerUbuntuImage' under resource group 'packer-test00' was not found.
+ERROR: -> ResourceNotFound : The Resource 'Microsoft.Compute/images/PackerUbuntuImage' under resource group 'packer-test00' was not found.

builder/azure/arm/builder.go

@@ -84,7 +84,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	ui.Message("Creating Azure Resource Manager (ARM) client ...")
 	azureClient, err := NewAzureClient(
 		b.config.ClientConfig.SubscriptionID,
-		b.config.SharedGalleryDestination.SigDestinationSubscription,
 		b.config.ResourceGroupName,
 		b.config.StorageAccount,
 		b.config.ClientConfig.CloudEnvironment(),
@@ -135,7 +134,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		}
 	} else {
 		// User is not using Managed Images to build, warning message here that this path is being deprecated
-		ui.Error("Warning: You are using Azure Packer Builder to create VHDs which is being deprecated, consider using Managed Images. Learn more https://www.packer.io/docs/builders/azure/arm#azure-arm-builder-specific-options")
+		ui.Error("Warning: You are using Azure Packer Builder to create VHDs which is being deprecated, consider using Managed Images. Learn more http://aka.ms/packermanagedimage")
 	}
 
 	if b.config.BuildResourceGroupName != "" {
@@ -222,6 +221,9 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			NewStepSnapshotDataDisks(azureClient, ui, &b.config),
 			NewStepCaptureImage(azureClient, ui),
 			NewStepPublishToSharedImageGallery(azureClient, ui, &b.config),
+			NewStepDeleteResourceGroup(azureClient, ui),
+			NewStepDeleteOSDisk(azureClient, ui),
+			NewStepDeleteAdditionalDisks(azureClient, ui),
 		}
 	} else if b.config.OSType == constants.Target_Windows {
 		steps = []multistep.Step{
@@ -262,6 +264,9 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			NewStepSnapshotDataDisks(azureClient, ui, &b.config),
 			NewStepCaptureImage(azureClient, ui),
 			NewStepPublishToSharedImageGallery(azureClient, ui, &b.config),
+			NewStepDeleteResourceGroup(azureClient, ui),
+			NewStepDeleteOSDisk(azureClient, ui),
+			NewStepDeleteAdditionalDisks(azureClient, ui),
 		)
 	} else {
 		return nil, fmt.Errorf("Builder does not support the os_type '%s'", b.config.OSType)
@@ -388,7 +393,7 @@ func (b *Builder) getBlobAccount(ctx context.Context, client *AzureClient, resou
 func (b *Builder) configureStateBag(stateBag multistep.StateBag) {
 	stateBag.Put(constants.AuthorizedKey, b.config.sshAuthorizedKey)
 
-	stateBag.Put(constants.ArmTags, packerAzureCommon.MapToAzureTags(b.config.AzureTags))
+	stateBag.Put(constants.ArmTags, b.config.AzureTags)
 	stateBag.Put(constants.ArmComputeName, b.config.tmpComputeName)
 	stateBag.Put(constants.ArmDeploymentName, b.config.tmpDeploymentName)
 

builder/azure/arm/builder_acc_test.go

@@ -6,6 +6,7 @@ package arm
 // * ARM_CLIENT_ID
 // * ARM_CLIENT_SECRET
 // * ARM_SUBSCRIPTION_ID
+// * ARM_OBJECT_ID
 // * ARM_STORAGE_ACCOUNT
 //
 // The subscription in question should have a resource group
@@ -46,14 +47,6 @@ func TestBuilderAcc_ManagedDisk_Windows_Build_Resource_Group(t *testing.T) {
 	})
 }
 
-func TestBuilderAcc_ManagedDisk_Windows_Build_Resource_Group_Additional_Disk(t *testing.T) {
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: testBuilderAccManagedDiskWindowsBuildResourceGroupAdditionalDisk,
-	})
-}
-
 func TestBuilderAcc_ManagedDisk_Windows_DeviceLogin(t *testing.T) {
 	if os.Getenv(DeviceLoginAcceptanceTest) == "" {
 		t.Skip(fmt.Sprintf(
@@ -90,19 +83,6 @@ func TestBuilderAcc_ManagedDisk_Linux_DeviceLogin(t *testing.T) {
 	})
 }
 
-func TestBuilderAcc_ManagedDisk_Linux_AzureCLI(t *testing.T) {
-	if os.Getenv("AZURE_CLI_AUTH") == "" {
-		t.Skip("Azure CLI Acceptance tests skipped unless env 'AZURE_CLI_AUTH' is set, and an active `az login` session has been established")
-		return
-	}
-
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: testBuilderAccManagedDiskLinuxAzureCLI,
-	})
-}
-
 func TestBuilderAcc_Blob_Windows(t *testing.T) {
 	builderT.Test(t, builderT.TestCase{
 		PreCheck: func() { testAccPreCheck(t) },
@@ -171,7 +151,7 @@ const testBuilderAccManagedDiskWindowsBuildResourceGroup = `
 
 	  "build_resource_group_name" : "packer-acceptance-test",
 	  "managed_image_resource_group_name": "packer-acceptance-test",
-	  "managed_image_name": "testBuilderAccManagedDiskWindowsBuildResourceGroup-{{timestamp}}",
+	  "managed_image_name": "testBuilderAccManagedDiskWindows-{{timestamp}}",
 
 	  "os_type": "Windows",
 	  "image_publisher": "MicrosoftWindowsServer",
@@ -190,42 +170,6 @@ const testBuilderAccManagedDiskWindowsBuildResourceGroup = `
 }
 `
 
-const testBuilderAccManagedDiskWindowsBuildResourceGroupAdditionalDisk = `
-{
-	"variables": {
-	  "client_id": "{{env ` + "`ARM_CLIENT_ID`" + `}}",
-	  "client_secret": "{{env ` + "`ARM_CLIENT_SECRET`" + `}}",
-	  "subscription_id": "{{env ` + "`ARM_SUBSCRIPTION_ID`" + `}}"
-	},
-	"builders": [{
-	  "type": "test",
-
-	  "client_id": "{{user ` + "`client_id`" + `}}",
-	  "client_secret": "{{user ` + "`client_secret`" + `}}",
-	  "subscription_id": "{{user ` + "`subscription_id`" + `}}",
-
-	  "build_resource_group_name" : "packer-acceptance-test",
-	  "managed_image_resource_group_name": "packer-acceptance-test",
-	  "managed_image_name": "testBuilderAccManagedDiskWindowsBuildResourceGroupAdditionDisk-{{timestamp}}",
-
-	  "os_type": "Windows",
-	  "image_publisher": "MicrosoftWindowsServer",
-	  "image_offer": "WindowsServer",
-	  "image_sku": "2012-R2-Datacenter",
-
-	  "communicator": "winrm",
-	  "winrm_use_ssl": "true",
-	  "winrm_insecure": "true",
-	  "winrm_timeout": "3m",
-	  "winrm_username": "packer",
-	  "async_resourcegroup_delete": "true",
-
-	  "vm_size": "Standard_DS2_v2",
-	  "disk_additional_size": [10,15]
-	}]
-}
-`
-
 const testBuilderAccManagedDiskWindowsDeviceLogin = `
 {
 	"variables": {
@@ -279,11 +223,7 @@ const testBuilderAccManagedDiskLinux = `
 	  "image_sku": "16.04-LTS",
 
 	  "location": "South Central US",
-	  "vm_size": "Standard_DS2_v2",
-	  "azure_tags": {
-	    "env": "testing",
-	    "builder": "packer"
-	   }
+	  "vm_size": "Standard_DS2_v2"
 	}]
 }
 `
@@ -318,6 +258,7 @@ const testBuilderAccBlobWindows = `
 	  "client_id": "{{env ` + "`ARM_CLIENT_ID`" + `}}",
 	  "client_secret": "{{env ` + "`ARM_CLIENT_SECRET`" + `}}",
 	  "subscription_id": "{{env ` + "`ARM_SUBSCRIPTION_ID`" + `}}",
+	  "object_id": "{{env ` + "`ARM_OBJECT_ID`" + `}}",
 	  "storage_account": "{{env ` + "`ARM_STORAGE_ACCOUNT`" + `}}"
 	},
 	"builders": [{
@@ -326,6 +267,7 @@ const testBuilderAccBlobWindows = `
 	  "client_id": "{{user ` + "`client_id`" + `}}",
 	  "client_secret": "{{user ` + "`client_secret`" + `}}",
 	  "subscription_id": "{{user ` + "`subscription_id`" + `}}",
+	  "object_id": "{{user ` + "`object_id`" + `}}",
 
 	  "storage_account": "{{user ` + "`storage_account`" + `}}",
 	  "resource_group_name": "packer-acceptance-test",
@@ -379,27 +321,3 @@ const testBuilderAccBlobLinux = `
 	}]
 }
 `
-const testBuilderAccManagedDiskLinuxAzureCLI = `
-{
-	"builders": [{
-	  "type": "test",
-
-	  "use_azure_cli_auth": true,
-
-	  "managed_image_resource_group_name": "packer-acceptance-test",
-	  "managed_image_name": "testBuilderAccManagedDiskLinuxAzureCLI-{{timestamp}}",
-
-	  "os_type": "Linux",
-	  "image_publisher": "Canonical",
-	  "image_offer": "UbuntuServer",
-	  "image_sku": "16.04-LTS",
-
-	  "location": "South Central US",
-	  "vm_size": "Standard_DS2_v2",
-	  "azure_tags": {
-	    "env": "testing",
-	    "builder": "packer"
-	   }
-	}]
-}
-`

builder/azure/arm/builder_test.go

@@ -33,35 +33,3 @@ func TestStateBagShouldBePopulatedExpectedValues(t *testing.T) {
 		}
 	}
 }
-
-func TestStateBagShouldPoluateExpectedTags(t *testing.T) {
-	var testSubject Builder
-
-	expectedTags := map[string]string{
-		"env":     "test",
-		"builder": "packer",
-	}
-	armConfig := getArmBuilderConfiguration()
-	armConfig["azure_tags"] = expectedTags
-
-	_, _, err := testSubject.Prepare(armConfig, getPackerConfiguration())
-	if err != nil {
-		t.Fatalf("failed to prepare: %s", err)
-	}
-
-	tags, ok := testSubject.stateBag.Get(constants.ArmTags).(map[string]*string)
-	if !ok {
-		t.Errorf("Expected the builder's state bag to contain tags of type %T, but didn't.", testSubject.config.AzureTags)
-	}
-
-	if len(tags) != len(expectedTags) {
-		t.Errorf("expect tags from state to be the same length as tags from config")
-	}
-
-	for k, v := range tags {
-		if expectedTags[k] != *v {
-			t.Errorf("expect tag value of %s to be %s, but got %s", k, expectedTags[k], *v)
-		}
-	}
-
-}

builder/azure/arm/config.go

@@ -90,7 +90,6 @@ type SharedImageGallery struct {
 }
 
 type SharedImageGalleryDestination struct {
-	SigDestinationSubscription       string   `mapstructure:"subscription"`
 	SigDestinationResourceGroup      string   `mapstructure:"resource_group"`
 	SigDestinationGalleryName        string   `mapstructure:"gallery_name"`
 	SigDestinationImageName          string   `mapstructure:"image_name"`
@@ -104,79 +103,37 @@ type Config struct {
 	// Authentication via OAUTH
 	ClientConfig client.Config `mapstructure:",squash"`
 
-	// A list of one or more fully-qualified resource IDs of user assigned
-	// managed identities to be configured on the VM.
-	// See [documentation](https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/how-to-use-vm-token)
-	// for how to acquire tokens within the VM.
-	// To assign a user assigned managed identity to a VM, the provided account or service principal must have [Managed Identity Operator](https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#managed-identity-operator)
-	// and [Virtual Machine Contributor](https://docs.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#virtual-machine-contributor) role assignments.
-	UserAssignedManagedIdentities []string `mapstructure:"user_assigned_managed_identities" required:"false"`
-
-	// VHD prefix.
-	CaptureNamePrefix string `mapstructure:"capture_name_prefix"`
-	// Destination container name.
+	// Capture
+	CaptureNamePrefix    string `mapstructure:"capture_name_prefix"`
 	CaptureContainerName string `mapstructure:"capture_container_name"`
 	// Use a [Shared Gallery
 	// image](https://azure.microsoft.com/en-us/blog/announcing-the-public-preview-of-shared-image-gallery/)
 	// as the source for this build. *VHD targets are incompatible with this
-	// build type* - the target must be a *Managed Image*. When using shared_image_gallery as a source, image_publisher,
-	// image_offer, image_sku, image_version, and custom_managed_image_name should not be set.
+	// build type* - the target must be a *Managed Image*.
 	//
-	// In JSON
-	// ```json
-	// "shared_image_gallery": {
-	//     "subscription": "00000000-0000-0000-0000-00000000000",
-	//     "resource_group": "ResourceGroup",
-	//     "gallery_name": "GalleryName",
-	//     "image_name": "ImageName",
-	//     "image_version": "1.0.0"
-	// }
-	// "managed_image_name": "TargetImageName",
-	// "managed_image_resource_group_name": "TargetResourceGroup"
-	// ```
-	// In HCL2
-	// ```hcl
-	// shared_image_gallery {
-	//     subscription = "00000000-0000-0000-0000-00000000000"
-	//     resource_group = "ResourceGroup"
-	//     gallery_name = "GalleryName"
-	//     image_name = "ImageName"
-	//     image_version = "1.0.0"
-	// }
-	// managed_image_name = "TargetImageName"
-	// managed_image_resource_group_name = "TargetResourceGroup"
-	// ```
+	//     "shared_image_gallery": {
+	//         "subscription": "00000000-0000-0000-0000-00000000000",
+	//         "resource_group": "ResourceGroup",
+	//         "gallery_name": "GalleryName",
+	//         "image_name": "ImageName",
+	//         "image_version": "1.0.0"
+	//     }
+	//     "managed_image_name": "TargetImageName",
+	//     "managed_image_resource_group_name": "TargetResourceGroup"
 	SharedGallery SharedImageGallery `mapstructure:"shared_image_gallery" required:"false"`
 	// The name of the Shared Image Gallery under which the managed image will be published as Shared Gallery Image version.
 	//
 	// Following is an example.
 	//
-	// In JSON
-	// ```json
-	// "shared_image_gallery_destination": {
-	//     "subscription": "00000000-0000-0000-0000-00000000000",
-	//     "resource_group": "ResourceGroup",
-	//     "gallery_name": "GalleryName",
-	//     "image_name": "ImageName",
-	//     "image_version": "1.0.0",
-	//     "replication_regions": ["regionA", "regionB", "regionC"]
-	// }
-	// "managed_image_name": "TargetImageName",
-	// "managed_image_resource_group_name": "TargetResourceGroup"
-	// ```
-	// In HCL2
-	// ```hcl
-	// shared_image_gallery_destination {
-	//     subscription = "00000000-0000-0000-0000-00000000000"
-	//     resource_group = "ResourceGroup"
-	//     gallery_name = "GalleryName"
-	//     image_name = "ImageName"
-	//     image_version = "1.0.0"
-	//     replication_regions = ["regionA", "regionB", "regionC"]
-	// }
-	// managed_image_name = "TargetImageName"
-	// managed_image_resource_group_name = "TargetResourceGroup"
-	// ```
+	//     "shared_image_gallery_destination": {
+	//         "resource_group": "ResourceGroup",
+	//         "gallery_name": "GalleryName",
+	//         "image_name": "ImageName",
+	//         "image_version": "1.0.0",
+	//         "replication_regions": ["regionA", "regionB", "regionC"]
+	//     }
+	//     "managed_image_name": "TargetImageName",
+	//     "managed_image_resource_group_name": "TargetResourceGroup"
 	SharedGalleryDestination SharedImageGalleryDestination `mapstructure:"shared_image_gallery_destination"`
 	// How long to wait for an image to be published to the shared image
 	// gallery before timing out. If your Packer build is failing on the
@@ -225,27 +182,25 @@ type Config struct {
 	// CLI example
 	// `az vm image list --location westus --publisher Canonical --offer UbuntuServer --sku 16.04.0-LTS --all`
 	ImageVersion string `mapstructure:"image_version" required:"false"`
-	// URL to a custom VHD to use for your base image. If this value is set,
-	// image_publisher, image_offer, image_sku, or image_version should not be set.
+	// URL to a custom VHD to use for your base image. If this value is set, do
+	// not set image_publisher, image_offer, image_sku, or image_version.
 	ImageUrl string `mapstructure:"image_url" required:"true"`
 	// Name of a custom managed image to use for your base image. If this value is set, do
 	// not set image_publisher, image_offer, image_sku, or image_version.
-	// If this value is set, the option
+	// If this value is set, the value
 	// `custom_managed_image_resource_group_name` must also be set. See
 	// [documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview#images)
 	// to learn more about managed images.
 	CustomManagedImageName string `mapstructure:"custom_managed_image_name" required:"true"`
 
 	// Name of a custom managed image's resource group to use for your base image. If this
-	// value is set, image_publisher, image_offer, image_sku, or image_version should not be set.
-	// If this value is set, the option
+	// value is set, image_publisher, image_offer, image_sku, or image_version.
 	// `custom_managed_image_name` must also be set. See
 	// [documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview#images)
 	// to learn more about managed images.
 	CustomManagedImageResourceGroupName string `mapstructure:"custom_managed_image_resource_group_name" required:"true"`
 	customManagedImageID                string
 
-	// Azure datacenter in which your VM will build.
 	Location string `mapstructure:"location"`
 	// Size of the VM used for building. This can be changed when you deploy a
 	// VM from your VHD. See
@@ -284,11 +239,11 @@ type Config struct {
 	// region that supports [availability
 	// zones](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview).
 	ManagedImageZoneResilient bool `mapstructure:"managed_image_zone_resilient" required:"false"`
-	// Name/value pair tags to apply to every resource deployed i.e. Resource
-	// Group, VM, NIC, VNET, Public IP, KeyVault, etc. The user can define up
-	// to 15 tags. Tag names cannot exceed 512 characters, and tag values
-	// cannot exceed 256 characters.
-	AzureTags map[string]string `mapstructure:"azure_tags" required:"false"`
+	// the user can define up to 15
+	// tags. Tag names cannot exceed 512 characters, and tag values cannot exceed
+	// 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)
@@ -375,12 +330,10 @@ type Config struct {
 	// tags to the image to ensure this information is not lost. The following
 	// tags are added.
 	//
-	// ```text
 	// 1.  PlanName
 	// 2.  PlanProduct
 	// 3.  PlanPublisher
 	// 4.  PlanPromotionCode
-	// ```
 	//
 	PlanInfo PlanInformation `mapstructure:"plan_info" required:"false"`
 	// The default PollingDuration for azure is 15mins, this property will override
@@ -436,7 +389,7 @@ type Config struct {
 	// 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 characters
+	// 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"`
@@ -513,7 +466,7 @@ func (c *Config) toImageParameters() *compute.Image {
 			},
 		},
 		Location: to.StringPtr(c.Location),
-		Tags:     azcommon.MapToAzureTags(c.AzureTags),
+		Tags:     c.AzureTags,
 	}
 }
 
@@ -580,7 +533,6 @@ func (c *Config) createCertificate() (string, error) {
 func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	c.ctx.Funcs = azcommon.TemplateFuncs
 	err := config.Decode(c, &config.DecodeOpts{
-		PluginType:         BuilderId,
 		Interpolate:        true,
 		InterpolateContext: &c.ctx,
 	}, raws...)
@@ -597,7 +549,10 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	}
 
 	// copy singular blocks
-	c.AzureTag.CopyOn(&c.AzureTags)
+	for _, kv := range c.AzureTag {
+		v := kv.Value
+		c.AzureTags[kv.Name] = &v
+	}
 
 	err = c.ClientConfig.SetDefaultValues()
 	if err != nil {
@@ -708,7 +663,7 @@ func setRuntimeValues(c *Config) {
 	c.tmpNicName = tempName.NicName
 	c.tmpPublicIPAddressName = tempName.PublicIPAddressName
 	c.tmpOSDiskName = tempName.OSDiskName
-	c.tmpDataDiskName = tempName.DataDiskName
+	c.tmpDataDiskName = tempName.DataDiskname
 	c.tmpSubnetName = tempName.SubnetName
 	c.tmpVirtualNetworkName = tempName.VirtualNetworkName
 	c.tmpNsgName = tempName.NsgName
@@ -716,40 +671,27 @@ func setRuntimeValues(c *Config) {
 }
 
 func setUserNamePassword(c *Config) error {
-	// Set default credentials generated by the builder
-	c.UserName = DefaultUserName
-	c.Password = c.tmpAdminPassword
-
-	// Set communicator specific credentials and update defaults if different.
-	// Communicator specific credentials need to be updated as the standard Packer
-	// SSHConfigFunc and WinRMConfigFunc use communicator specific credentials, unless overwritten.
-
 	// SSH comm
 	if c.Comm.SSHUsername == "" {
-		c.Comm.SSHUsername = c.UserName
+		c.Comm.SSHUsername = DefaultUserName
 	}
 	c.UserName = c.Comm.SSHUsername
 
-	// if user has an explicit wish to use an SSH password, we'll set it
 	if c.Comm.SSHPassword != "" {
 		c.Password = c.Comm.SSHPassword
-	}
-
-	if c.Comm.Type == "ssh" {
 		return nil
 	}
 
 	// WinRM comm
 	if c.Comm.WinRMUser == "" {
-		c.Comm.WinRMUser = c.UserName
+		c.Comm.WinRMUser = DefaultUserName
 	}
 	c.UserName = c.Comm.WinRMUser
 
 	if c.Comm.WinRMPassword == "" {
 		// Configure password settings using Azure generated credentials
-		c.Comm.WinRMPassword = c.Password
+		c.Comm.WinRMPassword = c.tmpAdminPassword
 	}
-
 	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")
 	}
@@ -805,8 +747,8 @@ func assertTagProperties(c *Config, errs *packer.MultiError) {
 		if len(k) > 512 {
 			errs = packer.MultiErrorAppend(errs, fmt.Errorf("the tag name %q exceeds (%d) the 512 character limit", k, len(k)))
 		}
-		if len(v) > 256 {
-			errs = packer.MultiErrorAppend(errs, fmt.Errorf("the tag name %q exceeds (%d) the 256 character limit", v, len(v)))
+		if len(*v) > 256 {
+			errs = packer.MultiErrorAppend(errs, fmt.Errorf("the tag name %q exceeds (%d) the 256 character limit", *v, len(*v)))
 		}
 	}
 }
@@ -814,28 +756,6 @@ func assertTagProperties(c *Config, errs *packer.MultiError) {
 func assertRequiredParametersSet(c *Config, errs *packer.MultiError) {
 	c.ClientConfig.Validate(errs)
 
-	/////////////////////////////////////////////
-	// Identity
-	if len(c.UserAssignedManagedIdentities) != 0 {
-		for _, rid := range c.UserAssignedManagedIdentities {
-			r, err := client.ParseResourceID(rid)
-			if err != nil {
-				err := fmt.Errorf("Error parsing resource ID from `user_assigned_managed_identities`; please make sure"+
-					" that this value follows the full resource id format: "+
-					"/subscriptions/<SUBSCRIPTON_ID>/resourcegroups/<RESOURCE_GROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities/<USER_ASSIGNED_IDENTITY_NAME>.\n"+
-					" Original error: %s", err)
-				errs = packer.MultiErrorAppend(errs, err)
-			} else {
-				if !strings.EqualFold(r.Provider, "Microsoft.ManagedIdentity") {
-					errs = packer.MultiErrorAppend(errs, fmt.Errorf("A valid user assigned managed identity resource id must have a correct resource provider"))
-				}
-				if !strings.EqualFold(r.ResourceType.String(), "userAssignedIdentities") {
-					errs = packer.MultiErrorAppend(errs, fmt.Errorf("A valid user assigned managed identity resource id must have a correct resource type"))
-				}
-			}
-		}
-	}
-
 	/////////////////////////////////////////////
 	// Capture
 	if c.CaptureContainerName == "" && c.ManagedImageName == "" {
@@ -1010,9 +930,6 @@ func assertRequiredParametersSet(c *Config, errs *packer.MultiError) {
 		if len(c.SharedGalleryDestination.SigDestinationReplicationRegions) == 0 {
 			errs = packer.MultiErrorAppend(errs, fmt.Errorf("A list of replication_regions must be specified for shared_image_gallery_destination"))
 		}
-		if c.SharedGalleryDestination.SigDestinationSubscription == "" {
-			c.SharedGalleryDestination.SigDestinationSubscription = c.ClientConfig.SubscriptionID
-		}
 	}
 	if c.SharedGalleryTimeout == 0 {
 		// default to a one-hour timeout. In the sdk, the default is 15 m.
@@ -1061,13 +978,13 @@ func assertRequiredParametersSet(c *Config, errs *packer.MultiError) {
 			errs = packer.MultiErrorAppend(errs, fmt.Errorf("if either plan_name, plan_product, plan_publisher, or plan_promotion_code are defined then plan_name, plan_product, and plan_publisher must be defined"))
 		} else {
 			if c.AzureTags == nil {
-				c.AzureTags = make(map[string]string)
+				c.AzureTags = make(map[string]*string)
 			}
 
-			c.AzureTags["PlanInfo"] = c.PlanInfo.PlanName
-			c.AzureTags["PlanProduct"] = c.PlanInfo.PlanProduct
-			c.AzureTags["PlanPublisher"] = c.PlanInfo.PlanPublisher
-			c.AzureTags["PlanPromotionCode"] = c.PlanInfo.PlanPromotionCode
+			c.AzureTags["PlanInfo"] = &c.PlanInfo.PlanName
+			c.AzureTags["PlanProduct"] = &c.PlanInfo.PlanProduct
+			c.AzureTags["PlanPublisher"] = &c.PlanInfo.PlanPublisher
+			c.AzureTags["PlanPromotionCode"] = &c.PlanInfo.PlanPromotionCode
 		}
 	}
 

builder/azure/arm/config.hcl2spec.go

@@ -10,119 +10,109 @@ 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" hcl:"packer_build_name"`
-	PackerBuilderType                          *string                            `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug                                *bool                              `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce                                *bool                              `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError                              *string                            `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars                             map[string]string                  `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars                        []string                           `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	CloudEnvironmentName                       *string                            `mapstructure:"cloud_environment_name" required:"false" cty:"cloud_environment_name" hcl:"cloud_environment_name"`
-	ClientID                                   *string                            `mapstructure:"client_id" cty:"client_id" hcl:"client_id"`
-	ClientSecret                               *string                            `mapstructure:"client_secret" cty:"client_secret" hcl:"client_secret"`
-	ClientCertPath                             *string                            `mapstructure:"client_cert_path" cty:"client_cert_path" hcl:"client_cert_path"`
-	ClientJWT                                  *string                            `mapstructure:"client_jwt" cty:"client_jwt" hcl:"client_jwt"`
-	ObjectID                                   *string                            `mapstructure:"object_id" cty:"object_id" hcl:"object_id"`
-	TenantID                                   *string                            `mapstructure:"tenant_id" required:"false" cty:"tenant_id" hcl:"tenant_id"`
-	SubscriptionID                             *string                            `mapstructure:"subscription_id" cty:"subscription_id" hcl:"subscription_id"`
-	UseAzureCLIAuth                            *bool                              `mapstructure:"use_azure_cli_auth" required:"false" cty:"use_azure_cli_auth" hcl:"use_azure_cli_auth"`
-	UserAssignedManagedIdentities              []string                           `mapstructure:"user_assigned_managed_identities" required:"false" cty:"user_assigned_managed_identities" hcl:"user_assigned_managed_identities"`
-	CaptureNamePrefix                          *string                            `mapstructure:"capture_name_prefix" cty:"capture_name_prefix" hcl:"capture_name_prefix"`
-	CaptureContainerName                       *string                            `mapstructure:"capture_container_name" cty:"capture_container_name" hcl:"capture_container_name"`
-	SharedGallery                              *FlatSharedImageGallery            `mapstructure:"shared_image_gallery" required:"false" cty:"shared_image_gallery" hcl:"shared_image_gallery"`
-	SharedGalleryDestination                   *FlatSharedImageGalleryDestination `mapstructure:"shared_image_gallery_destination" cty:"shared_image_gallery_destination" hcl:"shared_image_gallery_destination"`
-	SharedGalleryTimeout                       *string                            `mapstructure:"shared_image_gallery_timeout" cty:"shared_image_gallery_timeout" hcl:"shared_image_gallery_timeout"`
-	SharedGalleryImageVersionEndOfLifeDate     *string                            `mapstructure:"shared_gallery_image_version_end_of_life_date" required:"false" cty:"shared_gallery_image_version_end_of_life_date" hcl:"shared_gallery_image_version_end_of_life_date"`
-	SharedGalleryImageVersionReplicaCount      *int32                             `mapstructure:"shared_image_gallery_replica_count" required:"false" cty:"shared_image_gallery_replica_count" hcl:"shared_image_gallery_replica_count"`
-	SharedGalleryImageVersionExcludeFromLatest *bool                              `mapstructure:"shared_gallery_image_version_exclude_from_latest" required:"false" cty:"shared_gallery_image_version_exclude_from_latest" hcl:"shared_gallery_image_version_exclude_from_latest"`
-	ImagePublisher                             *string                            `mapstructure:"image_publisher" required:"true" cty:"image_publisher" hcl:"image_publisher"`
-	ImageOffer                                 *string                            `mapstructure:"image_offer" required:"true" cty:"image_offer" hcl:"image_offer"`
-	ImageSku                                   *string                            `mapstructure:"image_sku" required:"true" cty:"image_sku" hcl:"image_sku"`
-	ImageVersion                               *string                            `mapstructure:"image_version" required:"false" cty:"image_version" hcl:"image_version"`
-	ImageUrl                                   *string                            `mapstructure:"image_url" required:"true" cty:"image_url" hcl:"image_url"`
-	CustomManagedImageName                     *string                            `mapstructure:"custom_managed_image_name" required:"true" cty:"custom_managed_image_name" hcl:"custom_managed_image_name"`
-	CustomManagedImageResourceGroupName        *string                            `mapstructure:"custom_managed_image_resource_group_name" required:"true" cty:"custom_managed_image_resource_group_name" hcl:"custom_managed_image_resource_group_name"`
-	Location                                   *string                            `mapstructure:"location" cty:"location" hcl:"location"`
-	VMSize                                     *string                            `mapstructure:"vm_size" required:"false" cty:"vm_size" hcl:"vm_size"`
-	ManagedImageResourceGroupName              *string                            `mapstructure:"managed_image_resource_group_name" cty:"managed_image_resource_group_name" hcl:"managed_image_resource_group_name"`
-	ManagedImageName                           *string                            `mapstructure:"managed_image_name" cty:"managed_image_name" hcl:"managed_image_name"`
-	ManagedImageStorageAccountType             *string                            `mapstructure:"managed_image_storage_account_type" required:"false" cty:"managed_image_storage_account_type" hcl:"managed_image_storage_account_type"`
-	ManagedImageOSDiskSnapshotName             *string                            `mapstructure:"managed_image_os_disk_snapshot_name" required:"false" cty:"managed_image_os_disk_snapshot_name" hcl:"managed_image_os_disk_snapshot_name"`
-	ManagedImageDataDiskSnapshotPrefix         *string                            `mapstructure:"managed_image_data_disk_snapshot_prefix" required:"false" cty:"managed_image_data_disk_snapshot_prefix" hcl:"managed_image_data_disk_snapshot_prefix"`
-	ManagedImageZoneResilient                  *bool                              `mapstructure:"managed_image_zone_resilient" required:"false" cty:"managed_image_zone_resilient" hcl:"managed_image_zone_resilient"`
-	AzureTags                                  map[string]string                  `mapstructure:"azure_tags" required:"false" cty:"azure_tags" hcl:"azure_tags"`
-	AzureTag                                   []hcl2template.FlatNameValue       `mapstructure:"azure_tag" required:"false" cty:"azure_tag" hcl:"azure_tag"`
-	ResourceGroupName                          *string                            `mapstructure:"resource_group_name" cty:"resource_group_name" hcl:"resource_group_name"`
-	StorageAccount                             *string                            `mapstructure:"storage_account" cty:"storage_account" hcl:"storage_account"`
-	TempComputeName                            *string                            `mapstructure:"temp_compute_name" required:"false" cty:"temp_compute_name" hcl:"temp_compute_name"`
-	TempResourceGroupName                      *string                            `mapstructure:"temp_resource_group_name" cty:"temp_resource_group_name" hcl:"temp_resource_group_name"`
-	BuildResourceGroupName                     *string                            `mapstructure:"build_resource_group_name" cty:"build_resource_group_name" hcl:"build_resource_group_name"`
-	BuildKeyVaultName                          *string                            `mapstructure:"build_key_vault_name" cty:"build_key_vault_name" hcl:"build_key_vault_name"`
-	BuildKeyVaultSKU                           *string                            `mapstructure:"build_key_vault_sku" cty:"build_key_vault_sku" hcl:"build_key_vault_sku"`
-	PrivateVirtualNetworkWithPublicIp          *bool                              `mapstructure:"private_virtual_network_with_public_ip" required:"false" cty:"private_virtual_network_with_public_ip" hcl:"private_virtual_network_with_public_ip"`
-	VirtualNetworkName                         *string                            `mapstructure:"virtual_network_name" required:"false" cty:"virtual_network_name" hcl:"virtual_network_name"`
-	VirtualNetworkSubnetName                   *string                            `mapstructure:"virtual_network_subnet_name" required:"false" cty:"virtual_network_subnet_name" hcl:"virtual_network_subnet_name"`
-	VirtualNetworkResourceGroupName            *string                            `mapstructure:"virtual_network_resource_group_name" required:"false" cty:"virtual_network_resource_group_name" hcl:"virtual_network_resource_group_name"`
-	CustomDataFile                             *string                            `mapstructure:"custom_data_file" required:"false" cty:"custom_data_file" hcl:"custom_data_file"`
-	PlanInfo                                   *FlatPlanInformation               `mapstructure:"plan_info" required:"false" cty:"plan_info" hcl:"plan_info"`
-	PollingDurationTimeout                     *string                            `mapstructure:"polling_duration_timeout" required:"false" cty:"polling_duration_timeout" hcl:"polling_duration_timeout"`
-	OSType                                     *string                            `mapstructure:"os_type" required:"false" cty:"os_type" hcl:"os_type"`
-	OSDiskSizeGB                               *int32                             `mapstructure:"os_disk_size_gb" required:"false" cty:"os_disk_size_gb" hcl:"os_disk_size_gb"`
-	AdditionalDiskSize                         []int32                            `mapstructure:"disk_additional_size" required:"false" cty:"disk_additional_size" hcl:"disk_additional_size"`
-	DiskCachingType                            *string                            `mapstructure:"disk_caching_type" required:"false" cty:"disk_caching_type" hcl:"disk_caching_type"`
-	AllowedInboundIpAddresses                  []string                           `mapstructure:"allowed_inbound_ip_addresses" cty:"allowed_inbound_ip_addresses" hcl:"allowed_inbound_ip_addresses"`
-	BootDiagSTGAccount                         *string                            `mapstructure:"boot_diag_storage_account" required:"false" cty:"boot_diag_storage_account" hcl:"boot_diag_storage_account"`
-	CustomResourcePrefix                       *string                            `mapstructure:"custom_resource_build_prefix" required:"false" cty:"custom_resource_build_prefix" hcl:"custom_resource_build_prefix"`
-	Type                                       *string                            `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
-	PauseBeforeConnect                         *string                            `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
-	SSHHost                                    *string                            `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
-	SSHPort                                    *int                               `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
-	SSHUsername                                *string                            `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
-	SSHPassword                                *string                            `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
-	SSHKeyPairName                             *string                            `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
-	SSHTemporaryKeyPairName                    *string                            `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
-	SSHTemporaryKeyPairType                    *string                            `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
-	SSHTemporaryKeyPairBits                    *int                               `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
-	SSHCiphers                                 []string                           `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
-	SSHClearAuthorizedKeys                     *bool                              `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
-	SSHKEXAlgos                                []string                           `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
-	SSHPrivateKeyFile                          *string                            `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
-	SSHCertificateFile                         *string                            `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
-	SSHPty                                     *bool                              `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
-	SSHTimeout                                 *string                            `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
-	SSHWaitTimeout                             *string                            `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
-	SSHAgentAuth                               *bool                              `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
-	SSHDisableAgentForwarding                  *bool                              `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts                       *int                               `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
-	SSHBastionHost                             *string                            `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
-	SSHBastionPort                             *int                               `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
-	SSHBastionAgentAuth                        *bool                              `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
-	SSHBastionUsername                         *string                            `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
-	SSHBastionPassword                         *string                            `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
-	SSHBastionInteractive                      *bool                              `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile                   *string                            `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
-	SSHBastionCertificateFile                  *string                            `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
-	SSHFileTransferMethod                      *string                            `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
-	SSHProxyHost                               *string                            `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
-	SSHProxyPort                               *int                               `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
-	SSHProxyUsername                           *string                            `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
-	SSHProxyPassword                           *string                            `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
-	SSHKeepAliveInterval                       *string                            `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout                        *string                            `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
-	SSHRemoteTunnels                           []string                           `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
-	SSHLocalTunnels                            []string                           `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
-	SSHPublicKey                               []byte                             `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
-	SSHPrivateKey                              []byte                             `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
-	WinRMUser                                  *string                            `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
-	WinRMPassword                              *string                            `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
-	WinRMHost                                  *string                            `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
-	WinRMNoProxy                               *bool                              `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
-	WinRMPort                                  *int                               `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
-	WinRMTimeout                               *string                            `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
-	WinRMUseSSL                                *bool                              `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
-	WinRMInsecure                              *bool                              `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
-	WinRMUseNTLM                               *bool                              `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
-	AsyncResourceGroupDelete                   *bool                              `mapstructure:"async_resourcegroup_delete" required:"false" cty:"async_resourcegroup_delete" hcl:"async_resourcegroup_delete"`
+	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"`
+	CaptureNamePrefix                          *string                            `mapstructure:"capture_name_prefix" cty:"capture_name_prefix"`
+	CaptureContainerName                       *string                            `mapstructure:"capture_container_name" cty:"capture_container_name"`
+	SharedGallery                              *FlatSharedImageGallery            `mapstructure:"shared_image_gallery" required:"false" cty:"shared_image_gallery"`
+	SharedGalleryDestination                   *FlatSharedImageGalleryDestination `mapstructure:"shared_image_gallery_destination" cty:"shared_image_gallery_destination"`
+	SharedGalleryTimeout                       *string                            `mapstructure:"shared_image_gallery_timeout" cty:"shared_image_gallery_timeout"`
+	SharedGalleryImageVersionEndOfLifeDate     *string                            `mapstructure:"shared_gallery_image_version_end_of_life_date" required:"false" cty:"shared_gallery_image_version_end_of_life_date"`
+	SharedGalleryImageVersionReplicaCount      *int32                             `mapstructure:"shared_image_gallery_replica_count" required:"false" cty:"shared_image_gallery_replica_count"`
+	SharedGalleryImageVersionExcludeFromLatest *bool                              `mapstructure:"shared_gallery_image_version_exclude_from_latest" required:"false" cty:"shared_gallery_image_version_exclude_from_latest"`
+	ImagePublisher                             *string                            `mapstructure:"image_publisher" required:"true" cty:"image_publisher"`
+	ImageOffer                                 *string                            `mapstructure:"image_offer" required:"true" cty:"image_offer"`
+	ImageSku                                   *string                            `mapstructure:"image_sku" required:"true" cty:"image_sku"`
+	ImageVersion                               *string                            `mapstructure:"image_version" required:"false" cty:"image_version"`
+	ImageUrl                                   *string                            `mapstructure:"image_url" required:"true" cty:"image_url"`
+	CustomManagedImageName                     *string                            `mapstructure:"custom_managed_image_name" required:"true" cty:"custom_managed_image_name"`
+	CustomManagedImageResourceGroupName        *string                            `mapstructure:"custom_managed_image_resource_group_name" required:"true" cty:"custom_managed_image_resource_group_name"`
+	Location                                   *string                            `mapstructure:"location" cty:"location"`
+	VMSize                                     *string                            `mapstructure:"vm_size" required:"false" cty:"vm_size"`
+	ManagedImageResourceGroupName              *string                            `mapstructure:"managed_image_resource_group_name" cty:"managed_image_resource_group_name"`
+	ManagedImageName                           *string                            `mapstructure:"managed_image_name" cty:"managed_image_name"`
+	ManagedImageStorageAccountType             *string                            `mapstructure:"managed_image_storage_account_type" required:"false" cty:"managed_image_storage_account_type"`
+	ManagedImageOSDiskSnapshotName             *string                            `mapstructure:"managed_image_os_disk_snapshot_name" required:"false" cty:"managed_image_os_disk_snapshot_name"`
+	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"`
+	VirtualNetworkResourceGroupName            *string                            `mapstructure:"virtual_network_resource_group_name" required:"false" cty:"virtual_network_resource_group_name"`
+	CustomDataFile                             *string                            `mapstructure:"custom_data_file" required:"false" cty:"custom_data_file"`
+	PlanInfo                                   *FlatPlanInformation               `mapstructure:"plan_info" required:"false" cty:"plan_info"`
+	PollingDurationTimeout                     *string                            `mapstructure:"polling_duration_timeout" required:"false" cty:"polling_duration_timeout"`
+	OSType                                     *string                            `mapstructure:"os_type" required:"false" cty:"os_type"`
+	OSDiskSizeGB                               *int32                             `mapstructure:"os_disk_size_gb" required:"false" cty:"os_disk_size_gb"`
+	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"`
+	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"`
+	AsyncResourceGroupDelete                   *bool                              `mapstructure:"async_resourcegroup_delete" required:"false" cty:"async_resourcegroup_delete"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -137,119 +127,109 @@ 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},
-		"use_azure_cli_auth":                               &hcldec.AttrSpec{Name: "use_azure_cli_auth", Type: cty.Bool, Required: false},
-		"user_assigned_managed_identities":                 &hcldec.AttrSpec{Name: "user_assigned_managed_identities", Type: cty.List(cty.String), Required: false},
-		"capture_name_prefix":                              &hcldec.AttrSpec{Name: "capture_name_prefix", Type: cty.String, Required: false},
-		"capture_container_name":                           &hcldec.AttrSpec{Name: "capture_container_name", Type: cty.String, Required: false},
-		"shared_image_gallery":                             &hcldec.BlockSpec{TypeName: "shared_image_gallery", Nested: hcldec.ObjectSpec((*FlatSharedImageGallery)(nil).HCL2Spec())},
-		"shared_image_gallery_destination":                 &hcldec.BlockSpec{TypeName: "shared_image_gallery_destination", Nested: hcldec.ObjectSpec((*FlatSharedImageGalleryDestination)(nil).HCL2Spec())},
-		"shared_image_gallery_timeout":                     &hcldec.AttrSpec{Name: "shared_image_gallery_timeout", Type: cty.String, Required: false},
+		"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},
+		"capture_name_prefix":              &hcldec.AttrSpec{Name: "capture_name_prefix", Type: cty.String, Required: false},
+		"capture_container_name":           &hcldec.AttrSpec{Name: "capture_container_name", Type: cty.String, Required: false},
+		"shared_image_gallery":             &hcldec.BlockSpec{TypeName: "shared_image_gallery", Nested: hcldec.ObjectSpec((*FlatSharedImageGallery)(nil).HCL2Spec())},
+		"shared_image_gallery_destination": &hcldec.BlockSpec{TypeName: "shared_image_gallery_destination", Nested: hcldec.ObjectSpec((*FlatSharedImageGalleryDestination)(nil).HCL2Spec())},
+		"shared_image_gallery_timeout":     &hcldec.AttrSpec{Name: "shared_image_gallery_timeout", Type: cty.String, Required: false},
 		"shared_gallery_image_version_end_of_life_date":    &hcldec.AttrSpec{Name: "shared_gallery_image_version_end_of_life_date", Type: cty.String, Required: false},
 		"shared_image_gallery_replica_count":               &hcldec.AttrSpec{Name: "shared_image_gallery_replica_count", Type: cty.Number, Required: false},
 		"shared_gallery_image_version_exclude_from_latest": &hcldec.AttrSpec{Name: "shared_gallery_image_version_exclude_from_latest", Type: cty.Bool, Required: false},
-		"image_publisher":                                  &hcldec.AttrSpec{Name: "image_publisher", Type: cty.String, Required: false},
-		"image_offer":                                      &hcldec.AttrSpec{Name: "image_offer", Type: cty.String, Required: false},
-		"image_sku":                                        &hcldec.AttrSpec{Name: "image_sku", Type: cty.String, Required: false},
-		"image_version":                                    &hcldec.AttrSpec{Name: "image_version", Type: cty.String, Required: false},
-		"image_url":                                        &hcldec.AttrSpec{Name: "image_url", Type: cty.String, Required: false},
-		"custom_managed_image_name":                        &hcldec.AttrSpec{Name: "custom_managed_image_name", Type: cty.String, Required: false},
-		"custom_managed_image_resource_group_name":         &hcldec.AttrSpec{Name: "custom_managed_image_resource_group_name", Type: cty.String, Required: false},
-		"location":                                         &hcldec.AttrSpec{Name: "location", Type: cty.String, Required: false},
-		"vm_size":                                          &hcldec.AttrSpec{Name: "vm_size", Type: cty.String, Required: false},
-		"managed_image_resource_group_name":                &hcldec.AttrSpec{Name: "managed_image_resource_group_name", Type: cty.String, Required: false},
-		"managed_image_name":                               &hcldec.AttrSpec{Name: "managed_image_name", Type: cty.String, Required: false},
-		"managed_image_storage_account_type":               &hcldec.AttrSpec{Name: "managed_image_storage_account_type", Type: cty.String, Required: false},
-		"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())},
-		"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},
-		"virtual_network_resource_group_name":              &hcldec.AttrSpec{Name: "virtual_network_resource_group_name", Type: cty.String, Required: false},
-		"custom_data_file":                                 &hcldec.AttrSpec{Name: "custom_data_file", Type: cty.String, Required: false},
-		"plan_info":                                        &hcldec.BlockSpec{TypeName: "plan_info", Nested: hcldec.ObjectSpec((*FlatPlanInformation)(nil).HCL2Spec())},
-		"polling_duration_timeout":                         &hcldec.AttrSpec{Name: "polling_duration_timeout", Type: cty.String, Required: false},
-		"os_type":                                          &hcldec.AttrSpec{Name: "os_type", Type: cty.String, Required: false},
-		"os_disk_size_gb":                                  &hcldec.AttrSpec{Name: "os_disk_size_gb", Type: cty.Number, Required: false},
-		"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},
-		"ssh_port":                                         &hcldec.AttrSpec{Name: "ssh_port", Type: cty.Number, Required: false},
-		"ssh_username":                                     &hcldec.AttrSpec{Name: "ssh_username", Type: cty.String, Required: false},
-		"ssh_password":                                     &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
-		"ssh_keypair_name":                                 &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
-		"temporary_key_pair_name":                          &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
-		"temporary_key_pair_type":                          &hcldec.AttrSpec{Name: "temporary_key_pair_type", Type: cty.String, Required: false},
-		"temporary_key_pair_bits":                          &hcldec.AttrSpec{Name: "temporary_key_pair_bits", Type: cty.Number, Required: false},
-		"ssh_ciphers":                                      &hcldec.AttrSpec{Name: "ssh_ciphers", Type: cty.List(cty.String), Required: false},
-		"ssh_clear_authorized_keys":                        &hcldec.AttrSpec{Name: "ssh_clear_authorized_keys", Type: cty.Bool, Required: false},
-		"ssh_key_exchange_algorithms":                      &hcldec.AttrSpec{Name: "ssh_key_exchange_algorithms", Type: cty.List(cty.String), Required: false},
-		"ssh_private_key_file":                             &hcldec.AttrSpec{Name: "ssh_private_key_file", Type: cty.String, Required: false},
-		"ssh_certificate_file":                             &hcldec.AttrSpec{Name: "ssh_certificate_file", Type: cty.String, Required: false},
-		"ssh_pty":                                          &hcldec.AttrSpec{Name: "ssh_pty", Type: cty.Bool, Required: false},
-		"ssh_timeout":                                      &hcldec.AttrSpec{Name: "ssh_timeout", Type: cty.String, Required: false},
-		"ssh_wait_timeout":                                 &hcldec.AttrSpec{Name: "ssh_wait_timeout", Type: cty.String, Required: false},
-		"ssh_agent_auth":                                   &hcldec.AttrSpec{Name: "ssh_agent_auth", Type: cty.Bool, Required: false},
-		"ssh_disable_agent_forwarding":                     &hcldec.AttrSpec{Name: "ssh_disable_agent_forwarding", Type: cty.Bool, Required: false},
-		"ssh_handshake_attempts":                           &hcldec.AttrSpec{Name: "ssh_handshake_attempts", Type: cty.Number, Required: false},
-		"ssh_bastion_host":                                 &hcldec.AttrSpec{Name: "ssh_bastion_host", Type: cty.String, Required: false},
-		"ssh_bastion_port":                                 &hcldec.AttrSpec{Name: "ssh_bastion_port", Type: cty.Number, Required: false},
-		"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_bastion_certificate_file":                     &hcldec.AttrSpec{Name: "ssh_bastion_certificate_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},
-		"ssh_proxy_port":                                   &hcldec.AttrSpec{Name: "ssh_proxy_port", Type: cty.Number, Required: false},
-		"ssh_proxy_username":                               &hcldec.AttrSpec{Name: "ssh_proxy_username", Type: cty.String, Required: false},
-		"ssh_proxy_password":                               &hcldec.AttrSpec{Name: "ssh_proxy_password", Type: cty.String, Required: false},
-		"ssh_keep_alive_interval":                          &hcldec.AttrSpec{Name: "ssh_keep_alive_interval", Type: cty.String, Required: false},
-		"ssh_read_write_timeout":                           &hcldec.AttrSpec{Name: "ssh_read_write_timeout", Type: cty.String, Required: false},
-		"ssh_remote_tunnels":                               &hcldec.AttrSpec{Name: "ssh_remote_tunnels", Type: cty.List(cty.String), Required: false},
-		"ssh_local_tunnels":                                &hcldec.AttrSpec{Name: "ssh_local_tunnels", Type: cty.List(cty.String), Required: false},
-		"ssh_public_key":                                   &hcldec.AttrSpec{Name: "ssh_public_key", Type: cty.List(cty.Number), Required: false},
-		"ssh_private_key":                                  &hcldec.AttrSpec{Name: "ssh_private_key", Type: cty.List(cty.Number), Required: false},
-		"winrm_username":                                   &hcldec.AttrSpec{Name: "winrm_username", Type: cty.String, Required: false},
-		"winrm_password":                                   &hcldec.AttrSpec{Name: "winrm_password", Type: cty.String, Required: false},
-		"winrm_host":                                       &hcldec.AttrSpec{Name: "winrm_host", Type: cty.String, Required: false},
-		"winrm_no_proxy":                                   &hcldec.AttrSpec{Name: "winrm_no_proxy", Type: cty.Bool, Required: false},
-		"winrm_port":                                       &hcldec.AttrSpec{Name: "winrm_port", Type: cty.Number, Required: false},
-		"winrm_timeout":                                    &hcldec.AttrSpec{Name: "winrm_timeout", Type: cty.String, Required: false},
-		"winrm_use_ssl":                                    &hcldec.AttrSpec{Name: "winrm_use_ssl", Type: cty.Bool, Required: false},
-		"winrm_insecure":                                   &hcldec.AttrSpec{Name: "winrm_insecure", Type: cty.Bool, Required: false},
-		"winrm_use_ntlm":                                   &hcldec.AttrSpec{Name: "winrm_use_ntlm", Type: cty.Bool, Required: false},
-		"async_resourcegroup_delete":                       &hcldec.AttrSpec{Name: "async_resourcegroup_delete", Type: cty.Bool, Required: false},
+		"image_publisher":           &hcldec.AttrSpec{Name: "image_publisher", Type: cty.String, Required: false},
+		"image_offer":               &hcldec.AttrSpec{Name: "image_offer", Type: cty.String, Required: false},
+		"image_sku":                 &hcldec.AttrSpec{Name: "image_sku", Type: cty.String, Required: false},
+		"image_version":             &hcldec.AttrSpec{Name: "image_version", Type: cty.String, Required: false},
+		"image_url":                 &hcldec.AttrSpec{Name: "image_url", Type: cty.String, Required: false},
+		"custom_managed_image_name": &hcldec.AttrSpec{Name: "custom_managed_image_name", Type: cty.String, Required: false},
+		"custom_managed_image_resource_group_name": &hcldec.AttrSpec{Name: "custom_managed_image_resource_group_name", Type: cty.String, Required: false},
+		"location":                                &hcldec.AttrSpec{Name: "location", Type: cty.String, Required: false},
+		"vm_size":                                 &hcldec.AttrSpec{Name: "vm_size", Type: cty.String, Required: false},
+		"managed_image_resource_group_name":       &hcldec.AttrSpec{Name: "managed_image_resource_group_name", Type: cty.String, Required: false},
+		"managed_image_name":                      &hcldec.AttrSpec{Name: "managed_image_name", Type: cty.String, Required: false},
+		"managed_image_storage_account_type":      &hcldec.AttrSpec{Name: "managed_image_storage_account_type", Type: cty.String, Required: false},
+		"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())},
+		"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},
+		"virtual_network_resource_group_name":     &hcldec.AttrSpec{Name: "virtual_network_resource_group_name", Type: cty.String, Required: false},
+		"custom_data_file":                        &hcldec.AttrSpec{Name: "custom_data_file", Type: cty.String, Required: false},
+		"plan_info":                               &hcldec.BlockSpec{TypeName: "plan_info", Nested: hcldec.ObjectSpec((*FlatPlanInformation)(nil).HCL2Spec())},
+		"polling_duration_timeout":                &hcldec.AttrSpec{Name: "polling_duration_timeout", Type: cty.String, Required: false},
+		"os_type":                                 &hcldec.AttrSpec{Name: "os_type", Type: cty.String, Required: false},
+		"os_disk_size_gb":                         &hcldec.AttrSpec{Name: "os_disk_size_gb", Type: cty.Number, Required: false},
+		"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},
+		"ssh_port":                                &hcldec.AttrSpec{Name: "ssh_port", Type: cty.Number, Required: false},
+		"ssh_username":                            &hcldec.AttrSpec{Name: "ssh_username", Type: cty.String, Required: false},
+		"ssh_password":                            &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
+		"ssh_keypair_name":                        &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
+		"temporary_key_pair_name":                 &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
+		"ssh_clear_authorized_keys":               &hcldec.AttrSpec{Name: "ssh_clear_authorized_keys", Type: cty.Bool, Required: false},
+		"ssh_private_key_file":                    &hcldec.AttrSpec{Name: "ssh_private_key_file", Type: cty.String, Required: false},
+		"ssh_pty":                                 &hcldec.AttrSpec{Name: "ssh_pty", Type: cty.Bool, Required: false},
+		"ssh_timeout":                             &hcldec.AttrSpec{Name: "ssh_timeout", Type: cty.String, Required: false},
+		"ssh_agent_auth":                          &hcldec.AttrSpec{Name: "ssh_agent_auth", Type: cty.Bool, Required: false},
+		"ssh_disable_agent_forwarding":            &hcldec.AttrSpec{Name: "ssh_disable_agent_forwarding", Type: cty.Bool, Required: false},
+		"ssh_handshake_attempts":                  &hcldec.AttrSpec{Name: "ssh_handshake_attempts", Type: cty.Number, Required: false},
+		"ssh_bastion_host":                        &hcldec.AttrSpec{Name: "ssh_bastion_host", Type: cty.String, Required: false},
+		"ssh_bastion_port":                        &hcldec.AttrSpec{Name: "ssh_bastion_port", Type: cty.Number, Required: false},
+		"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},
+		"ssh_proxy_port":                          &hcldec.AttrSpec{Name: "ssh_proxy_port", Type: cty.Number, Required: false},
+		"ssh_proxy_username":                      &hcldec.AttrSpec{Name: "ssh_proxy_username", Type: cty.String, Required: false},
+		"ssh_proxy_password":                      &hcldec.AttrSpec{Name: "ssh_proxy_password", Type: cty.String, Required: false},
+		"ssh_keep_alive_interval":                 &hcldec.AttrSpec{Name: "ssh_keep_alive_interval", Type: cty.String, Required: false},
+		"ssh_read_write_timeout":                  &hcldec.AttrSpec{Name: "ssh_read_write_timeout", Type: cty.String, Required: false},
+		"ssh_remote_tunnels":                      &hcldec.AttrSpec{Name: "ssh_remote_tunnels", Type: cty.List(cty.String), Required: false},
+		"ssh_local_tunnels":                       &hcldec.AttrSpec{Name: "ssh_local_tunnels", Type: cty.List(cty.String), Required: false},
+		"ssh_public_key":                          &hcldec.AttrSpec{Name: "ssh_public_key", Type: cty.List(cty.Number), Required: false},
+		"ssh_private_key":                         &hcldec.AttrSpec{Name: "ssh_private_key", Type: cty.List(cty.Number), Required: false},
+		"winrm_username":                          &hcldec.AttrSpec{Name: "winrm_username", Type: cty.String, Required: false},
+		"winrm_password":                          &hcldec.AttrSpec{Name: "winrm_password", Type: cty.String, Required: false},
+		"winrm_host":                              &hcldec.AttrSpec{Name: "winrm_host", Type: cty.String, Required: false},
+		"winrm_port":                              &hcldec.AttrSpec{Name: "winrm_port", Type: cty.Number, Required: false},
+		"winrm_timeout":                           &hcldec.AttrSpec{Name: "winrm_timeout", Type: cty.String, Required: false},
+		"winrm_use_ssl":                           &hcldec.AttrSpec{Name: "winrm_use_ssl", Type: cty.Bool, Required: false},
+		"winrm_insecure":                          &hcldec.AttrSpec{Name: "winrm_insecure", Type: cty.Bool, Required: false},
+		"winrm_use_ntlm":                          &hcldec.AttrSpec{Name: "winrm_use_ntlm", Type: cty.Bool, Required: false},
+		"async_resourcegroup_delete":              &hcldec.AttrSpec{Name: "async_resourcegroup_delete", Type: cty.Bool, Required: false},
 	}
 	return s
 }
@@ -257,10 +237,10 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 // FlatPlanInformation is an auto-generated flat version of PlanInformation.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatPlanInformation struct {
-	PlanName          *string `mapstructure:"plan_name" cty:"plan_name" hcl:"plan_name"`
-	PlanProduct       *string `mapstructure:"plan_product" cty:"plan_product" hcl:"plan_product"`
-	PlanPublisher     *string `mapstructure:"plan_publisher" cty:"plan_publisher" hcl:"plan_publisher"`
-	PlanPromotionCode *string `mapstructure:"plan_promotion_code" cty:"plan_promotion_code" hcl:"plan_promotion_code"`
+	PlanName          *string `mapstructure:"plan_name" cty:"plan_name"`
+	PlanProduct       *string `mapstructure:"plan_product" cty:"plan_product"`
+	PlanPublisher     *string `mapstructure:"plan_publisher" cty:"plan_publisher"`
+	PlanPromotionCode *string `mapstructure:"plan_promotion_code" cty:"plan_promotion_code"`
 }
 
 // FlatMapstructure returns a new FlatPlanInformation.
@@ -286,11 +266,11 @@ func (*FlatPlanInformation) HCL2Spec() map[string]hcldec.Spec {
 // FlatSharedImageGallery is an auto-generated flat version of SharedImageGallery.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatSharedImageGallery struct {
-	Subscription  *string `mapstructure:"subscription" cty:"subscription" hcl:"subscription"`
-	ResourceGroup *string `mapstructure:"resource_group" cty:"resource_group" hcl:"resource_group"`
-	GalleryName   *string `mapstructure:"gallery_name" cty:"gallery_name" hcl:"gallery_name"`
-	ImageName     *string `mapstructure:"image_name" cty:"image_name" hcl:"image_name"`
-	ImageVersion  *string `mapstructure:"image_version" required:"false" cty:"image_version" hcl:"image_version"`
+	Subscription  *string `mapstructure:"subscription" cty:"subscription"`
+	ResourceGroup *string `mapstructure:"resource_group" cty:"resource_group"`
+	GalleryName   *string `mapstructure:"gallery_name" cty:"gallery_name"`
+	ImageName     *string `mapstructure:"image_name" cty:"image_name"`
+	ImageVersion  *string `mapstructure:"image_version" required:"false" cty:"image_version"`
 }
 
 // FlatMapstructure returns a new FlatSharedImageGallery.
@@ -317,12 +297,11 @@ func (*FlatSharedImageGallery) HCL2Spec() map[string]hcldec.Spec {
 // 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 {
-	SigDestinationSubscription       *string  `mapstructure:"subscription" cty:"subscription" hcl:"subscription"`
-	SigDestinationResourceGroup      *string  `mapstructure:"resource_group" cty:"resource_group" hcl:"resource_group"`
-	SigDestinationGalleryName        *string  `mapstructure:"gallery_name" cty:"gallery_name" hcl:"gallery_name"`
-	SigDestinationImageName          *string  `mapstructure:"image_name" cty:"image_name" hcl:"image_name"`
-	SigDestinationImageVersion       *string  `mapstructure:"image_version" cty:"image_version" hcl:"image_version"`
-	SigDestinationReplicationRegions []string `mapstructure:"replication_regions" cty:"replication_regions" hcl:"replication_regions"`
+	SigDestinationResourceGroup      *string  `mapstructure:"resource_group" cty:"resource_group"`
+	SigDestinationGalleryName        *string  `mapstructure:"gallery_name" cty:"gallery_name"`
+	SigDestinationImageName          *string  `mapstructure:"image_name" cty:"image_name"`
+	SigDestinationImageVersion       *string  `mapstructure:"image_version" cty:"image_version"`
+	SigDestinationReplicationRegions []string `mapstructure:"replication_regions" cty:"replication_regions"`
 }
 
 // FlatMapstructure returns a new FlatSharedImageGalleryDestination.
@@ -337,7 +316,6 @@ func (*SharedImageGalleryDestination) FlatMapstructure() interface{ HCL2Spec() m
 // 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{
-		"subscription":        &hcldec.AttrSpec{Name: "subscription", Type: cty.String, Required: false},
 		"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},

builder/azure/arm/config_test.go

@@ -6,9 +6,7 @@ import (
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
-	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/hcl2template"
 )
 
 // List of configuration parameters that are required by the ARM builder.
@@ -57,54 +55,6 @@ func TestConfigShouldProvideReasonableDefaultValues(t *testing.T) {
 	}
 }
 
-func TestConfigUserNameOverride(t *testing.T) {
-	builderValues := getArmBuilderConfiguration()
-	builderValues["ssh_username"] = "override_username"
-	builderValues["communicator"] = "ssh"
-
-	var c Config
-	_, err := c.Prepare(builderValues, getPackerConfiguration())
-
-	if err != nil {
-		t.Fatalf("newConfig failed: %s", err)
-	}
-
-	// SSH comm
-	if c.Password != c.tmpAdminPassword {
-		t.Errorf("Expected 'Password' to be set to generated password, but found %q!", c.Password)
-	}
-	if c.Comm.SSHPassword != "" {
-		t.Errorf("Expected 'c.Comm.SSHPassword' to be empty, 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_username"] = "override_winrm_username"
-	_, err = c.Prepare(builderValues, getPackerConfiguration())
-	if err != nil {
-		t.Fatalf("newConfig failed: %s", err)
-	}
-	if c.Password != c.tmpAdminPassword {
-		t.Errorf("Expected 'Password' to be set to generated password, but found %q!", c.Password)
-	}
-	if c.Comm.WinRMPassword != c.tmpAdminPassword {
-		t.Errorf("Expected 'c.Comm.WinRMPassword' to be set to generated password, but found %q!", c.Comm.WinRMPassword)
-	}
-	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.WinRMUser)
-	}
-}
 func TestConfigShouldBeAbleToOverrideDefaultedValues(t *testing.T) {
 	builderValues := getArmBuilderConfiguration()
 	builderValues["ssh_password"] = "override_password"
@@ -161,13 +111,13 @@ func TestConfigShouldBeAbleToOverrideDefaultedValues(t *testing.T) {
 		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.WinRMPassword)
+		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.WinRMUser)
+		t.Errorf("Expected 'c.Comm.WinRMUser' to be set to 'override_winrm_username', but found %q!", c.Comm.SSHUsername)
 	}
 }
 
@@ -598,10 +548,6 @@ func TestSystemShouldDefineRuntimeValues(t *testing.T) {
 		t.Errorf("Expected tmpOSDiskName to not be empty, but it was '%s'!", c.tmpOSDiskName)
 	}
 
-	if c.tmpDataDiskName == "" {
-		t.Errorf("Expected tmpDataDiskName to not be empty, but it was '%s'!", c.tmpDataDiskName)
-	}
-
 	if c.tmpNsgName == "" {
 		t.Errorf("Expected tmpNsgName to not be empty, but it was '%s'!", c.tmpNsgName)
 	}
@@ -912,55 +858,32 @@ func TestConfigShouldAcceptTags(t *testing.T) {
 		},
 	}
 
-	c := Config{
-		AzureTag: hcl2template.NameValues{
-			{Name: "tag03", Value: "value03"},
-		},
-	}
+	var c Config
 	_, err := c.Prepare(config, getPackerConfiguration())
+
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	if diff := cmp.Diff(c.AzureTags, map[string]string{
-		"tag01": "value01",
-		"tag02": "value02",
-		"tag03": "value03",
-	}); diff != "" {
-		t.Fatalf("unexpected azure tags: %s", diff)
-	}
-}
-
-func TestConfigShouldAcceptTag(t *testing.T) {
-	config := map[string]interface{}{
-		"capture_name_prefix":    "ignore",
-		"capture_container_name": "ignore",
-		"image_offer":            "ignore",
-		"image_publisher":        "ignore",
-		"image_sku":              "ignore",
-		"location":               "ignore",
-		"storage_account":        "ignore",
-		"resource_group_name":    "ignore",
-		"subscription_id":        "ignore",
-		"communicator":           "none",
-		// Does not matter for this test case, just pick one.
-		"os_type": constants.Target_Linux,
+	if len(c.AzureTags) != 2 {
+		t.Fatalf("expected to find 2 tags, but got %d", len(c.AzureTags))
 	}
 
-	c := Config{
-		AzureTag: hcl2template.NameValues{
-			{Name: "tag03", Value: "value03"},
-		},
+	if _, ok := c.AzureTags["tag01"]; !ok {
+		t.Error("expected to find key=\"tag01\", but did not")
 	}
-	_, err := c.Prepare(config, getPackerConfiguration())
-	if err != nil {
-		t.Fatal(err)
+	if _, ok := c.AzureTags["tag02"]; !ok {
+		t.Error("expected to find key=\"tag02\", but did not")
 	}
 
-	if diff := cmp.Diff(c.AzureTags, map[string]string{
-		"tag03": "value03",
-	}); diff != "" {
-		t.Fatalf("unexpected azure tags: %s", diff)
+	value := c.AzureTags["tag01"]
+	if *value != "value01" {
+		t.Errorf("expected AzureTags[\"tag01\"] to have value \"value01\", but got %q", *value)
+	}
+
+	value = c.AzureTags["tag02"]
+	if *value != "value02" {
+		t.Errorf("expected AzureTags[\"tag02\"] to have value \"value02\", but got %q", *value)
 	}
 }
 
@@ -2072,8 +1995,8 @@ func TestConfig_PrepareProvidedWinRMPassword(t *testing.T) {
 	}
 }
 
-func getArmBuilderConfiguration() map[string]interface{} {
-	m := make(map[string]interface{})
+func getArmBuilderConfiguration() map[string]string {
+	m := make(map[string]string)
 	for _, v := range requiredConfigValues {
 		m[v] = "ignored00"
 	}
@@ -2117,49 +2040,3 @@ func getPackerCommunicatorConfiguration() map[string]string {
 
 	return config
 }
-
-func getPackerSSHPasswordCommunicatorConfiguration() map[string]string {
-	config := map[string]string{
-		"ssh_password": "superS3cret",
-	}
-
-	return config
-}
-
-func TestConfigShouldRejectMalformedUserAssignedManagedIdentities(t *testing.T) {
-	config := map[string]interface{}{
-		"capture_name_prefix":    "ignore",
-		"capture_container_name": "ignore",
-		"image_offer":            "ignore",
-		"image_publisher":        "ignore",
-		"image_sku":              "ignore",
-		"location":               "ignore",
-		"storage_account":        "ignore",
-		"resource_group_name":    "ignore",
-		"subscription_id":        "ignore",
-		"communicator":           "none",
-		// Does not matter for this test case, just pick one.
-		"os_type": constants.Target_Linux,
-	}
-
-	config["user_assigned_managed_identities"] = []string{"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id"}
-	var c Config
-	if _, err := c.Prepare(config, getPackerConfiguration()); err != nil {
-		t.Error("Expected test to pass, but it failed with the well-formed user_assigned_managed_identities.")
-	}
-
-	malformedUserAssignedManagedIdentityResourceIds := []string{
-		"not_a_resource_id",
-		"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/",
-		"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Compute/images/im",
-		"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentitie/id",
-	}
-
-	for _, x := range malformedUserAssignedManagedIdentityResourceIds {
-		config["user_assigned_managed_identities"] = x
-		var c Config
-		if _, err := c.Prepare(config, getPackerConfiguration()); err == nil {
-			t.Errorf("Expected test to fail, but it succeeded with the malformed user_assigned_managed_identities set to %q.", x)
-		}
-	}
-}

builder/azure/arm/step_create_resource_group.go

@@ -61,13 +61,7 @@ func (s *StepCreateResourceGroup) Run(ctx context.Context, state multistep.State
 
 	var resourceGroupName = state.Get(constants.ArmResourceGroupName).(string)
 	var location = state.Get(constants.ArmLocation).(string)
-	tags, ok := state.Get(constants.ArmTags).(map[string]*string)
-	if !ok {
-		err := fmt.Errorf("failed to extract tags from state bag")
-		state.Put(constants.Error, err)
-		s.error(err)
-		return multistep.ActionHalt
-	}
+	var tags = state.Get(constants.ArmTags).(map[string]*string)
 
 	exists, err := s.exists(ctx, resourceGroupName)
 	if err != nil {
@@ -117,30 +111,27 @@ func (s *StepCreateResourceGroup) Cleanup(state multistep.StateBag) {
 	if state.Get(constants.ArmIsExistingResourceGroup).(bool) {
 		ui.Say("\nThe resource group was not created by Packer, not deleting ...")
 		return
-	}
+	} else {
+		ui.Say("\nCleanup requested, deleting resource group ...")
 
-	ctx := context.TODO()
-	resourceGroupName := state.Get(constants.ArmResourceGroupName).(string)
-	if exists, err := s.exists(ctx, resourceGroupName); !exists || err != nil {
-		return
-	}
-
-	ui.Say("\nCleanup requested, deleting resource group ...")
-	f, err := s.client.GroupsClient.Delete(ctx, resourceGroupName)
-	if err == nil {
-		if state.Get(constants.ArmAsyncResourceGroupDelete).(bool) {
-			s.say(fmt.Sprintf("\n Not waiting for Resource Group delete as requested by user. Resource Group Name is %s", resourceGroupName))
-		} else {
-			err = f.WaitForCompletionRef(ctx, s.client.GroupsClient.Client)
+		var resourceGroupName = state.Get(constants.ArmResourceGroupName).(string)
+		ctx := context.TODO()
+		f, err := s.client.GroupsClient.Delete(ctx, resourceGroupName)
+		if err == nil {
+			if state.Get(constants.ArmAsyncResourceGroupDelete).(bool) {
+				s.say(fmt.Sprintf("\n Not waiting for Resource Group delete as requested by user. Resource Group Name is %s", resourceGroupName))
+			} else {
+				err = f.WaitForCompletionRef(ctx, s.client.GroupsClient.Client)
+			}
+		}
+		if err != nil {
+			ui.Error(fmt.Sprintf("Error deleting resource group.  Please delete it manually.\n\n"+
+				"Name: %s\n"+
+				"Error: %s", resourceGroupName, err))
+			return
+		}
+		if !state.Get(constants.ArmAsyncResourceGroupDelete).(bool) {
+			ui.Say("Resource group has been deleted.")
 		}
 	}
-	if err != nil {
-		ui.Error(fmt.Sprintf("Error deleting resource group.  Please delete it manually.\n\n"+
-			"Name: %s\n"+
-			"Error: %s", resourceGroupName, err))
-		return
-	}
-	if !state.Get(constants.ArmAsyncResourceGroupDelete).(bool) {
-		ui.Say("Resource group has been deleted.")
-	}
 }

builder/azure/arm/step_create_resource_group_test.go

@@ -220,32 +220,3 @@ func createTestExistingStateBagStepCreateResourceGroup() multistep.StateBag {
 	stateBag.Put(constants.ArmTags, tags)
 	return stateBag
 }
-
-func TestStepCreateResourceGroupShouldFailIfTagsFailCast(t *testing.T) {
-	stateBag := new(multistep.BasicStateBag)
-
-	stateBag.Put(constants.ArmLocation, "Unit Test: Location")
-	stateBag.Put(constants.ArmResourceGroupName, "Unit Test: ResourceGroupName")
-	stateBag.Put(constants.ArmIsExistingResourceGroup, true)
-
-	value := "Unit Test: Tags"
-	tags := map[string]string{
-		"tag01": value,
-	}
-
-	stateBag.Put(constants.ArmTags, tags)
-	var testSubject = &StepCreateResourceGroup{
-		create: func(context.Context, string, string, map[string]*string) error { return nil },
-		say:    func(message string) {},
-		error:  func(e error) {},
-		exists: func(context.Context, string) (bool, error) { return false, nil },
-	}
-	var result = testSubject.Run(context.Background(), stateBag)
-	if result != multistep.ActionHalt {
-		t.Fatalf("Expected the step to return 'ActionHalt', but got '%d'.", result)
-	}
-
-	if _, ok := stateBag.GetOk(constants.Error); ok == false {
-		t.Fatalf("Expected the step to set stateBag['%s'], but it was not.", constants.Error)
-	}
-}

builder/azure/arm/step_delete_additional_disks.go

@@ -35,13 +35,8 @@ func NewStepDeleteAdditionalDisks(client *AzureClient, ui packer.Ui) *StepDelete
 
 func (s *StepDeleteAdditionalDisk) deleteBlob(storageContainerName string, blobName string) error {
 	blob := s.client.BlobStorageClient.GetContainerReference(storageContainerName).GetBlobReference(blobName)
-	_, err := blob.BreakLease(nil)
-	if err != nil && !strings.Contains(err.Error(), "LeaseNotPresentWithLeaseOperation") {
-		s.say(s.client.LastError.Error())
-		return err
-	}
+	err := blob.Delete(nil)
 
-	err = blob.Delete(nil)
 	if err != nil {
 		s.say(s.client.LastError.Error())
 	}
@@ -61,11 +56,7 @@ func (s *StepDeleteAdditionalDisk) deleteManagedDisk(ctx context.Context, resour
 func (s *StepDeleteAdditionalDisk) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	s.say("Deleting the temporary Additional disk ...")
 
-	var dataDisks []string
-
-	if disks := state.Get(constants.ArmAdditionalDiskVhds); disks != nil {
-		dataDisks = disks.([]string)
-	}
+	var dataDisks = state.Get(constants.ArmAdditionalDiskVhds).([]string)
 	var isManagedDisk = state.Get(constants.ArmIsManagedImage).(bool)
 	var isExistingResourceGroup = state.Get(constants.ArmIsExistingResourceGroup).(bool)
 	var resourceGroupName = state.Get(constants.ArmResourceGroupName).(string)
@@ -89,26 +80,25 @@ func (s *StepDeleteAdditionalDisk) Run(ctx context.Context, state multistep.Stat
 				s.say("Failed to delete the managed Additional Disk!")
 				return processStepResult(err, s.error, state)
 			}
-			continue
-		}
-
-		u, err := url.Parse(additionaldisk)
-		if err != nil {
-			s.say("Failed to parse the Additional Disk's VHD URI!")
-			return processStepResult(err, s.error, state)
-		}
-
-		xs := strings.Split(u.Path, "/")
-		if len(xs) < 3 {
-			err = errors.New("Failed to parse Additional Disk's VHD URI!")
 		} else {
-			var storageAccountName = xs[1]
-			var blobName = strings.Join(xs[2:], "/")
+			u, err := url.Parse(additionaldisk)
+			if err != nil {
+				s.say("Failed to parse the Additional Disk's VHD URI!")
+				return processStepResult(err, s.error, state)
+			}
 
-			err = s.delete(storageAccountName, blobName)
-		}
-		if err != nil {
-			return processStepResult(err, s.error, state)
+			xs := strings.Split(u.Path, "/")
+			if len(xs) < 3 {
+				err = errors.New("Failed to parse Additional Disk's VHD URI!")
+			} else {
+				var storageAccountName = xs[1]
+				var blobName = strings.Join(xs[2:], "/")
+
+				err = s.delete(storageAccountName, blobName)
+			}
+			if err != nil {
+				return processStepResult(err, s.error, state)
+			}
 		}
 	}
 	return multistep.ActionContinue

builder/azure/arm/step_delete_os_disk.go

@@ -0,0 +1,99 @@
+package arm
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/url"
+	"strings"
+
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+type StepDeleteOSDisk struct {
+	client        *AzureClient
+	delete        func(string, string) error
+	deleteManaged func(context.Context, string, string) error
+	say           func(message string)
+	error         func(e error)
+}
+
+func NewStepDeleteOSDisk(client *AzureClient, ui packer.Ui) *StepDeleteOSDisk {
+	var step = &StepDeleteOSDisk{
+		client: client,
+		say:    func(message string) { ui.Say(message) },
+		error:  func(e error) { ui.Error(e.Error()) },
+	}
+
+	step.delete = step.deleteBlob
+	step.deleteManaged = step.deleteManagedDisk
+	return step
+}
+
+func (s *StepDeleteOSDisk) deleteBlob(storageContainerName string, blobName string) error {
+	blob := s.client.BlobStorageClient.GetContainerReference(storageContainerName).GetBlobReference(blobName)
+	err := blob.Delete(nil)
+
+	if err != nil {
+		s.say(s.client.LastError.Error())
+	}
+	return err
+}
+
+func (s *StepDeleteOSDisk) deleteManagedDisk(ctx context.Context, resourceGroupName string, imageName string) error {
+	xs := strings.Split(imageName, "/")
+	diskName := xs[len(xs)-1]
+	f, err := s.client.DisksClient.Delete(ctx, resourceGroupName, diskName)
+	if err == nil {
+		err = f.WaitForCompletionRef(ctx, s.client.DisksClient.Client)
+	}
+	return err
+}
+
+func (s *StepDeleteOSDisk) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+	s.say("Deleting the temporary OS disk ...")
+
+	var osDisk = state.Get(constants.ArmOSDiskVhd).(string)
+	var isManagedDisk = state.Get(constants.ArmIsManagedImage).(bool)
+	var isExistingResourceGroup = state.Get(constants.ArmIsExistingResourceGroup).(bool)
+	var resourceGroupName = state.Get(constants.ArmResourceGroupName).(string)
+
+	if isManagedDisk && !isExistingResourceGroup {
+		s.say(fmt.Sprintf(" -> OS Disk : skipping, managed disk was used..."))
+		return multistep.ActionContinue
+	}
+
+	s.say(fmt.Sprintf(" -> OS Disk : '%s'", osDisk))
+
+	var err error
+	if isManagedDisk {
+		err = s.deleteManaged(ctx, resourceGroupName, osDisk)
+		if err != nil {
+			s.say("Failed to delete the managed OS Disk!")
+			return processStepResult(err, s.error, state)
+		}
+		return multistep.ActionContinue
+	}
+	u, err := url.Parse(osDisk)
+	if err != nil {
+		s.say("Failed to parse the OS Disk's VHD URI!")
+		return processStepResult(err, s.error, state)
+	}
+
+	xs := strings.Split(u.Path, "/")
+	if len(xs) < 3 {
+		err = errors.New("Failed to parse OS Disk's VHD URI!")
+	} else {
+		var storageAccountName = xs[1]
+		var blobName = strings.Join(xs[2:], "/")
+
+		err = s.delete(storageAccountName, blobName)
+	}
+	return processStepResult(err, s.error, state)
+}
+
+func (*StepDeleteOSDisk) Cleanup(multistep.StateBag) {
+}

builder/azure/arm/step_delete_os_disk_test.go

@@ -0,0 +1,227 @@
+package arm
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/helper/multistep"
+)
+
+func TestStepDeleteOSDiskShouldFailIfGetFails(t *testing.T) {
+	var testSubject = &StepDeleteOSDisk{
+		delete:        func(string, string) error { return fmt.Errorf("!! Unit Test FAIL !!") },
+		deleteManaged: func(context.Context, string, string) error { return nil },
+		say:           func(message string) {},
+		error:         func(e error) {},
+	}
+
+	stateBag := DeleteTestStateBagStepDeleteOSDisk("http://storage.blob.core.windows.net/images/pkrvm_os.vhd")
+
+	var result = testSubject.Run(context.Background(), stateBag)
+	if result != multistep.ActionHalt {
+		t.Fatalf("Expected the step to return 'ActionHalt', but got '%d'.", result)
+	}
+
+	if _, ok := stateBag.GetOk(constants.Error); ok == false {
+		t.Fatalf("Expected the step to set stateBag['%s'], but it was not.", constants.Error)
+	}
+}
+
+func TestStepDeleteOSDiskShouldPassIfGetPasses(t *testing.T) {
+	var testSubject = &StepDeleteOSDisk{
+		delete: func(string, string) error { return nil },
+		say:    func(message string) {},
+		error:  func(e error) {},
+	}
+
+	stateBag := DeleteTestStateBagStepDeleteOSDisk("http://storage.blob.core.windows.net/images/pkrvm_os.vhd")
+
+	var result = testSubject.Run(context.Background(), stateBag)
+	if result != multistep.ActionContinue {
+		t.Fatalf("Expected the step to return 'ActionContinue', but got '%d'.", result)
+	}
+
+	if _, ok := stateBag.GetOk(constants.Error); ok == true {
+		t.Fatalf("Expected the step to not set stateBag['%s'], but it was.", constants.Error)
+	}
+}
+
+func TestStepDeleteOSDiskShouldTakeStepArgumentsFromStateBag(t *testing.T) {
+	var actualStorageContainerName string
+	var actualBlobName string
+
+	var testSubject = &StepDeleteOSDisk{
+		delete: func(storageContainerName string, blobName string) error {
+			actualStorageContainerName = storageContainerName
+			actualBlobName = blobName
+			return nil
+		},
+		say:   func(message string) {},
+		error: func(e error) {},
+	}
+
+	stateBag := DeleteTestStateBagStepDeleteOSDisk("http://storage.blob.core.windows.net/images/pkrvm_os.vhd")
+	var result = testSubject.Run(context.Background(), stateBag)
+
+	if result != multistep.ActionContinue {
+		t.Fatalf("Expected the step to return 'ActionContinue', but got '%d'.", result)
+	}
+
+	if actualStorageContainerName != "images" {
+		t.Fatalf("Expected the storage container name to be 'images', but found '%s'.", actualStorageContainerName)
+	}
+
+	if actualBlobName != "pkrvm_os.vhd" {
+		t.Fatalf("Expected the blob name to be 'pkrvm_os.vhd', but found '%s'.", actualBlobName)
+	}
+}
+
+func TestStepDeleteOSDiskShouldHandleComplexStorageContainerNames(t *testing.T) {
+	var actualStorageContainerName string
+	var actualBlobName string
+
+	var testSubject = &StepDeleteOSDisk{
+		delete: func(storageContainerName string, blobName string) error {
+			actualStorageContainerName = storageContainerName
+			actualBlobName = blobName
+			return nil
+		},
+		say:   func(message string) {},
+		error: func(e error) {},
+	}
+
+	stateBag := DeleteTestStateBagStepDeleteOSDisk("http://storage.blob.core.windows.net/abc/def/pkrvm_os.vhd")
+	testSubject.Run(context.Background(), stateBag)
+
+	if actualStorageContainerName != "abc" {
+		t.Fatalf("Expected the storage container name to be 'abc/def', but found '%s'.", actualStorageContainerName)
+	}
+
+	if actualBlobName != "def/pkrvm_os.vhd" {
+		t.Fatalf("Expected the blob name to be 'pkrvm_os.vhd', but found '%s'.", actualBlobName)
+	}
+}
+
+func TestStepDeleteOSDiskShouldFailIfVHDNameCannotBeURLParsed(t *testing.T) {
+	var testSubject = &StepDeleteOSDisk{
+		delete:        func(string, string) error { return nil },
+		say:           func(message string) {},
+		error:         func(e error) {},
+		deleteManaged: func(context.Context, string, string) error { return nil },
+	}
+
+	// Invalid URL per https://golang.org/src/net/url/url_test.go
+	stateBag := DeleteTestStateBagStepDeleteOSDisk("http://[fe80::1%en0]/")
+
+	var result = testSubject.Run(context.Background(), stateBag)
+	if result != multistep.ActionHalt {
+		t.Fatalf("Expected the step to return 'ActionHalt', but got '%v'.", result)
+	}
+
+	if _, ok := stateBag.GetOk(constants.Error); ok == false {
+		t.Fatalf("Expected the step to not stateBag['%s'], but it was.", constants.Error)
+	}
+}
+func TestStepDeleteOSDiskShouldFailIfVHDNameIsTooShort(t *testing.T) {
+	var testSubject = &StepDeleteOSDisk{
+		delete:        func(string, string) error { return nil },
+		say:           func(message string) {},
+		error:         func(e error) {},
+		deleteManaged: func(context.Context, string, string) error { return nil },
+	}
+
+	stateBag := DeleteTestStateBagStepDeleteOSDisk("storage.blob.core.windows.net/abc")
+
+	var result = testSubject.Run(context.Background(), stateBag)
+	if result != multistep.ActionHalt {
+		t.Fatalf("Expected the step to return 'ActionHalt', but got '%d'.", result)
+	}
+
+	if _, ok := stateBag.GetOk(constants.Error); ok == false {
+		t.Fatalf("Expected the step to not stateBag['%s'], but it was.", constants.Error)
+	}
+}
+
+func TestStepDeleteOSDiskShouldPassIfManagedDiskInTempResourceGroup(t *testing.T) {
+	var testSubject = &StepDeleteOSDisk{
+		delete: func(string, string) error { return nil },
+		say:    func(message string) {},
+		error:  func(e error) {},
+	}
+
+	stateBag := new(multistep.BasicStateBag)
+	stateBag.Put(constants.ArmOSDiskVhd, "subscriptions/123-456-789/resourceGroups/existingresourcegroup/providers/Microsoft.Compute/disks/osdisk")
+	stateBag.Put(constants.ArmIsManagedImage, true)
+	stateBag.Put(constants.ArmIsExistingResourceGroup, false)
+	stateBag.Put(constants.ArmResourceGroupName, "testgroup")
+
+	var result = testSubject.Run(context.Background(), stateBag)
+	if result != multistep.ActionContinue {
+		t.Fatalf("Expected the step to return 'ActionContinue', but got '%d'.", result)
+	}
+
+	if _, ok := stateBag.GetOk(constants.Error); ok == true {
+		t.Fatalf("Expected the step to not set stateBag['%s'], but it was.", constants.Error)
+	}
+}
+
+func TestStepDeleteOSDiskShouldFailIfManagedDiskInExistingResourceGroupFailsToDelete(t *testing.T) {
+	var testSubject = &StepDeleteOSDisk{
+		delete:        func(string, string) error { return nil },
+		say:           func(message string) {},
+		error:         func(e error) {},
+		deleteManaged: func(context.Context, string, string) error { return errors.New("UNIT TEST FAIL!") },
+	}
+
+	stateBag := new(multistep.BasicStateBag)
+	stateBag.Put(constants.ArmOSDiskVhd, "subscriptions/123-456-789/resourceGroups/existingresourcegroup/providers/Microsoft.Compute/disks/osdisk")
+	stateBag.Put(constants.ArmIsManagedImage, true)
+	stateBag.Put(constants.ArmIsExistingResourceGroup, true)
+	stateBag.Put(constants.ArmResourceGroupName, "testgroup")
+
+	var result = testSubject.Run(context.Background(), stateBag)
+	if result != multistep.ActionHalt {
+		t.Fatalf("Expected the step to return 'ActionHalt', but got '%d'.", result)
+	}
+
+	if _, ok := stateBag.GetOk(constants.Error); ok == false {
+		t.Fatalf("Expected the step to not stateBag['%s'], but it was.", constants.Error)
+	}
+}
+
+func TestStepDeleteOSDiskShouldFailIfManagedDiskInExistingResourceGroupIsDeleted(t *testing.T) {
+	var testSubject = &StepDeleteOSDisk{
+		delete:        func(string, string) error { return nil },
+		say:           func(message string) {},
+		error:         func(e error) {},
+		deleteManaged: func(context.Context, string, string) error { return nil },
+	}
+
+	stateBag := new(multistep.BasicStateBag)
+	stateBag.Put(constants.ArmOSDiskVhd, "subscriptions/123-456-789/resourceGroups/existingresourcegroup/providers/Microsoft.Compute/disks/osdisk")
+	stateBag.Put(constants.ArmIsManagedImage, true)
+	stateBag.Put(constants.ArmIsExistingResourceGroup, true)
+	stateBag.Put(constants.ArmResourceGroupName, "testgroup")
+
+	var result = testSubject.Run(context.Background(), stateBag)
+	if result != multistep.ActionContinue {
+		t.Fatalf("Expected the step to return 'ActionContinue', but got '%d'.", result)
+	}
+
+	if _, ok := stateBag.GetOk(constants.Error); ok == true {
+		t.Fatalf("Expected the step to not set stateBag['%s'], but it was.", constants.Error)
+	}
+}
+
+func DeleteTestStateBagStepDeleteOSDisk(osDiskVhd string) multistep.StateBag {
+	stateBag := new(multistep.BasicStateBag)
+	stateBag.Put(constants.ArmOSDiskVhd, osDiskVhd)
+	stateBag.Put(constants.ArmIsManagedImage, false)
+	stateBag.Put(constants.ArmIsExistingResourceGroup, false)
+	stateBag.Put(constants.ArmResourceGroupName, "testgroup")
+
+	return stateBag
+}

builder/azure/arm/step_delete_resource_group.go

@@ -0,0 +1,153 @@
+package arm
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+const (
+	maxResourcesToDelete = 50
+)
+
+type StepDeleteResourceGroup struct {
+	client *AzureClient
+	delete func(ctx context.Context, state multistep.StateBag, resourceGroupName string) error
+	say    func(message string)
+	error  func(e error)
+}
+
+func NewStepDeleteResourceGroup(client *AzureClient, ui packer.Ui) *StepDeleteResourceGroup {
+	var step = &StepDeleteResourceGroup{
+		client: client,
+		say:    func(message string) { ui.Say(message) },
+		error:  func(e error) { ui.Error(e.Error()) },
+	}
+
+	step.delete = step.deleteResourceGroup
+	return step
+}
+
+func (s *StepDeleteResourceGroup) deleteResourceGroup(ctx context.Context, state multistep.StateBag, resourceGroupName string) error {
+	var err error
+	if state.Get(constants.ArmIsExistingResourceGroup).(bool) {
+		s.say("\nThe resource group was not created by Packer, only deleting individual resources ...")
+		var deploymentName = state.Get(constants.ArmDeploymentName).(string)
+		err = s.deleteDeploymentResources(ctx, deploymentName, resourceGroupName)
+		if err != nil {
+			return err
+		}
+
+		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...")
+				err = s.deleteDeploymentResources(ctx, keyVaultDeploymentName.(string), resourceGroupName)
+				if err != nil {
+					return err
+				}
+			}
+		}
+
+		return nil
+	} else {
+		s.say("\nThe resource group was created by Packer, deleting ...")
+		f, err := s.client.GroupsClient.Delete(ctx, resourceGroupName)
+		if err == nil {
+			if state.Get(constants.ArmAsyncResourceGroupDelete).(bool) {
+				// No need to wait for the completion for delete if request is Accepted
+				s.say(fmt.Sprintf("\nResource Group is being deleted, not waiting for deletion due to config. Resource Group Name '%s'", resourceGroupName))
+			} else {
+				f.WaitForCompletionRef(ctx, s.client.GroupsClient.Client)
+			}
+
+		}
+
+		if err != nil {
+			s.say(s.client.LastError.Error())
+		}
+		return err
+	}
+}
+
+func (s *StepDeleteResourceGroup) deleteDeploymentResources(ctx context.Context, deploymentName, resourceGroupName string) error {
+	maxResources := int32(maxResourcesToDelete)
+
+	deploymentOperations, err := s.client.DeploymentOperationsClient.ListComplete(ctx, resourceGroupName, deploymentName, &maxResources)
+	if err != nil {
+		s.reportIfError(err, resourceGroupName)
+		return err
+	}
+
+	for deploymentOperations.NotDone() {
+		deploymentOperation := deploymentOperations.Value()
+		// Sometimes an empty operation is added to the list by Azure
+		if deploymentOperation.Properties.TargetResource == nil {
+			deploymentOperations.Next()
+			continue
+		}
+
+		resourceName := *deploymentOperation.Properties.TargetResource.ResourceName
+		resourceType := *deploymentOperation.Properties.TargetResource.ResourceType
+
+		s.say(fmt.Sprintf(" -> %s : '%s'",
+			resourceType,
+			resourceName))
+
+		retry.Config{
+			Tries:      10,
+			RetryDelay: (&retry.Backoff{InitialBackoff: 10 * time.Second, MaxBackoff: 600 * time.Second, Multiplier: 2}).Linear,
+		}.Run(ctx, func(ctx context.Context) error {
+			err := deleteResource(ctx, s.client,
+				resourceType,
+				resourceName,
+				resourceGroupName)
+			if err != nil {
+				s.reportIfError(err, resourceName)
+			}
+			return nil
+		})
+
+		if err = deploymentOperations.Next(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (s *StepDeleteResourceGroup) reportIfError(err error, resourceName string) {
+	if err != nil {
+		s.say(fmt.Sprintf("Error deleting resource. Please delete manually.\n\n"+
+			"Name: %s\n"+
+			"Error: %s", resourceName, err.Error()))
+		s.error(err)
+	}
+}
+
+func (s *StepDeleteResourceGroup) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+	s.say("Deleting resource group ...")
+
+	var resourceGroupName = state.Get(constants.ArmResourceGroupName).(string)
+	s.say(fmt.Sprintf(" -> ResourceGroupName : '%s'", resourceGroupName))
+
+	err := s.delete(ctx, state, resourceGroupName)
+	if err != nil {
+		state.Put(constants.Error, err)
+		s.error(err)
+
+		return multistep.ActionHalt
+	}
+
+	state.Put(constants.ArmIsResourceGroupCreated, false)
+
+	return multistep.ActionContinue
+}
+
+func (*StepDeleteResourceGroup) Cleanup(multistep.StateBag) {
+}

builder/azure/arm/step_delete_resource_group_test.go

@@ -0,0 +1,78 @@
+package arm
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/packer/builder/azure/common/constants"
+	"github.com/hashicorp/packer/helper/multistep"
+)
+
+func TestStepDeleteResourceGroupShouldFailIfDeleteFails(t *testing.T) {
+	var testSubject = &StepDeleteResourceGroup{
+		delete: func(context.Context, multistep.StateBag, string) error { return fmt.Errorf("!! Unit Test FAIL !!") },
+		say:    func(message string) {},
+		error:  func(e error) {},
+	}
+
+	stateBag := DeleteTestStateBagStepDeleteResourceGroup()
+
+	var result = testSubject.Run(context.Background(), stateBag)
+	if result != multistep.ActionHalt {
+		t.Fatalf("Expected the step to return 'ActionHalt', but got '%d'.", result)
+	}
+
+	if _, ok := stateBag.GetOk(constants.Error); ok == false {
+		t.Fatalf("Expected the step to set stateBag['%s'], but it was not.", constants.Error)
+	}
+}
+
+func TestStepDeleteResourceGroupShouldPassIfDeletePasses(t *testing.T) {
+	var testSubject = &StepDeleteResourceGroup{
+		delete: func(context.Context, multistep.StateBag, string) error { return nil },
+		say:    func(message string) {},
+		error:  func(e error) {},
+	}
+
+	stateBag := DeleteTestStateBagStepDeleteResourceGroup()
+
+	var result = testSubject.Run(context.Background(), stateBag)
+	if result != multistep.ActionContinue {
+		t.Fatalf("Expected the step to return 'ActionContinue', but got '%d'.", result)
+	}
+
+	if _, ok := stateBag.GetOk(constants.Error); ok == true {
+		t.Fatalf("Expected the step to not set stateBag['%s'], but it was.", constants.Error)
+	}
+}
+
+func TestStepDeleteResourceGroupShouldDeleteStateBagArmResourceGroupCreated(t *testing.T) {
+	var testSubject = &StepDeleteResourceGroup{
+		delete: func(context.Context, multistep.StateBag, string) error {
+			return nil
+		},
+		say:   func(message string) {},
+		error: func(e error) {},
+	}
+
+	stateBag := DeleteTestStateBagStepDeleteResourceGroup()
+	testSubject.Run(context.Background(), stateBag)
+
+	value, ok := stateBag.GetOk(constants.ArmIsResourceGroupCreated)
+	if !ok {
+		t.Fatal("Expected the resource bag value arm.IsResourceGroupCreated to exist")
+	}
+
+	if value.(bool) {
+		t.Fatalf("Expected arm.IsResourceGroupCreated to be false, but got %q", value)
+	}
+}
+
+func DeleteTestStateBagStepDeleteResourceGroup() multistep.StateBag {
+	stateBag := new(multistep.BasicStateBag)
+	stateBag.Put(constants.ArmResourceGroupName, "Unit Test: ResourceGroupName")
+	stateBag.Put(constants.ArmIsResourceGroupCreated, "Unit Test: IsResourceGroupCreated")
+
+	return stateBag
+}

builder/azure/arm/step_deploy_template.go

@@ -6,10 +6,8 @@ import (
 	"fmt"
 	"net/url"
 	"strings"
-	"time"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -17,7 +15,7 @@ import (
 type StepDeployTemplate struct {
 	client     *AzureClient
 	deploy     func(ctx context.Context, resourceGroupName string, deploymentName string) error
-	delete     func(ctx context.Context, deploymentName, resourceGroupName string) error
+	delete     func(ctx context.Context, client *AzureClient, resourceType string, resourceName string, resourceGroupName string) error
 	disk       func(ctx context.Context, resourceGroupName string, computeName string) (string, string, error)
 	deleteDisk func(ctx context.Context, imageType string, imageName string, resourceGroupName string) error
 	say        func(message string)
@@ -38,54 +36,12 @@ func NewStepDeployTemplate(client *AzureClient, ui packer.Ui, config *Config, de
 	}
 
 	step.deploy = step.deployTemplate
-	step.delete = step.deleteDeploymentResources
+	step.delete = deleteResource
 	step.disk = step.getImageDetails
 	step.deleteDisk = step.deleteImage
 	return step
 }
 
-func (s *StepDeployTemplate) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	s.say("Deploying deployment template ...")
-
-	var resourceGroupName = state.Get(constants.ArmResourceGroupName).(string)
-	s.say(fmt.Sprintf(" -> ResourceGroupName : '%s'", resourceGroupName))
-	s.say(fmt.Sprintf(" -> DeploymentName    : '%s'", s.name))
-
-	return processStepResult(
-		s.deploy(ctx, resourceGroupName, s.name),
-		s.error, state)
-}
-
-func (s *StepDeployTemplate) Cleanup(state multistep.StateBag) {
-	defer func() {
-		err := s.deleteTemplate(context.Background(), state)
-		if err != nil {
-			s.say(s.client.LastError.Error())
-		}
-	}()
-
-	// Only clean up if this is an existing resource group that has been verified to exist.
-	// ArmIsResourceGroupCreated is set in step_create_resource_group to true, when Packer has verified that the resource group exists.
-	// ArmIsExistingResourceGroup is set to true when build_resource_group is set in the Packer configuration.
-	existingResourceGroup := state.Get(constants.ArmIsExistingResourceGroup).(bool)
-	resourceGroupCreated := state.Get(constants.ArmIsResourceGroupCreated).(bool)
-	if !existingResourceGroup || !resourceGroupCreated {
-		return
-	}
-
-	ui := state.Get("ui").(packer.Ui)
-	ui.Say("\nThe resource group was not created by Packer, deleting individual resources ...")
-
-	deploymentName := s.name
-	resourceGroupName := state.Get(constants.ArmResourceGroupName).(string)
-	err := s.deleteDeploymentResources(context.TODO(), deploymentName, resourceGroupName)
-	if err != nil {
-		s.reportIfError(err, resourceGroupName)
-	}
-
-	NewStepDeleteAdditionalDisks(s.client, ui).Run(context.TODO(), state)
-}
-
 func (s *StepDeployTemplate) deployTemplate(ctx context.Context, resourceGroupName string, deploymentName string) error {
 	deployment, err := s.factory(s.config)
 	if err != nil {
@@ -93,50 +49,61 @@ func (s *StepDeployTemplate) deployTemplate(ctx context.Context, resourceGroupNa
 	}
 
 	f, err := s.client.DeploymentsClient.CreateOrUpdate(ctx, resourceGroupName, deploymentName, *deployment)
+	if err == nil {
+		err = f.WaitForCompletionRef(ctx, s.client.DeploymentsClient.Client)
+	}
 	if err != nil {
 		s.say(s.client.LastError.Error())
-		return err
 	}
+	return err
+}
 
-	err = f.WaitForCompletionRef(ctx, s.client.DeploymentsClient.Client)
+func (s *StepDeployTemplate) deleteTemplate(ctx context.Context, state multistep.StateBag) error {
+	var resourceGroupName = state.Get(constants.ArmResourceGroupName).(string)
+	var deploymentName = s.name
+	ui := state.Get("ui").(packer.Ui)
+	ui.Say(fmt.Sprintf("Removing the created Deployment object: '%s'", deploymentName))
+
+	f, err := s.client.DeploymentsClient.Delete(ctx, resourceGroupName, deploymentName)
 	if err == nil {
+		err = f.WaitForCompletionRef(ctx, s.client.DeploymentsClient.Client)
+	}
+	if err != nil {
 		s.say(s.client.LastError.Error())
 	}
 
 	return err
 }
 
-func (s *StepDeployTemplate) deleteTemplate(ctx context.Context, state multistep.StateBag) error {
-	deploymentName := s.name
-	resourceGroupName := state.Get(constants.ArmResourceGroupName).(string)
-	ui := state.Get("ui").(packer.Ui)
+func (s *StepDeployTemplate) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+	s.say("Deploying deployment template ...")
 
-	ui.Say(fmt.Sprintf("Removing the created Deployment object: '%s'", deploymentName))
-	f, err := s.client.DeploymentsClient.Delete(ctx, resourceGroupName, deploymentName)
-	if err != nil {
-		return err
-	}
+	var resourceGroupName = state.Get(constants.ArmResourceGroupName).(string)
 
-	return f.WaitForCompletionRef(ctx, s.client.DeploymentsClient.Client)
+	s.say(fmt.Sprintf(" -> ResourceGroupName : '%s'", resourceGroupName))
+	s.say(fmt.Sprintf(" -> DeploymentName    : '%s'", s.name))
+
+	return processStepResult(
+		s.deploy(ctx, resourceGroupName, s.name),
+		s.error, state)
 }
 
 func (s *StepDeployTemplate) getImageDetails(ctx context.Context, resourceGroupName string, computeName string) (string, string, error) {
 	//We can't depend on constants.ArmOSDiskVhd being set
-	var imageName, imageType string
+	var imageName string
+	var imageType string
 	vm, err := s.client.VirtualMachinesClient.Get(ctx, resourceGroupName, computeName, "")
 	if err != nil {
 		return imageName, imageType, err
+	} else {
+		if vm.StorageProfile.OsDisk.Vhd != nil {
+			imageType = "image"
+			imageName = *vm.StorageProfile.OsDisk.Vhd.URI
+		} else {
+			imageType = "Microsoft.Compute/disks"
+			imageName = *vm.StorageProfile.OsDisk.ManagedDisk.ID
+		}
 	}
-
-	if vm.StorageProfile.OsDisk.Vhd != nil {
-		imageType = "image"
-		imageName = *vm.StorageProfile.OsDisk.Vhd.URI
-		return imageType, imageName, nil
-	}
-
-	imageType = "Microsoft.Compute/disks"
-	imageName = *vm.StorageProfile.OsDisk.ManagedDisk.ID
-
 	return imageType, imageName, nil
 }
 
@@ -191,7 +158,6 @@ func (s *StepDeployTemplate) deleteImage(ctx context.Context, imageType string,
 		}
 		return err
 	}
-
 	// VHD image
 	u, err := url.Parse(imageName)
 	if err != nil {
@@ -205,66 +171,75 @@ func (s *StepDeployTemplate) deleteImage(ctx context.Context, imageType string,
 	var blobName = strings.Join(xs[2:], "/")
 
 	blob := s.client.BlobStorageClient.GetContainerReference(storageAccountName).GetBlobReference(blobName)
-	_, err = blob.BreakLease(nil)
-	if err != nil && !strings.Contains(err.Error(), "LeaseNotPresentWithLeaseOperation") {
-		s.say(s.client.LastError.Error())
-		return err
-	}
-
-	return blob.Delete(nil)
+	err = blob.Delete(nil)
+	return err
 }
 
-func (s *StepDeployTemplate) deleteDeploymentResources(ctx context.Context, deploymentName, resourceGroupName string) error {
-	var maxResources int32 = 50
-	deploymentOperations, err := s.client.DeploymentOperationsClient.ListComplete(ctx, resourceGroupName, deploymentName, &maxResources)
+func (s *StepDeployTemplate) Cleanup(state multistep.StateBag) {
+	defer s.deleteTemplate(context.Background(), state)
+
+	//Only clean up if this was an existing resource group and the resource group
+	//is marked as created
+	var existingResourceGroup = state.Get(constants.ArmIsExistingResourceGroup).(bool)
+	var resourceGroupCreated = state.Get(constants.ArmIsResourceGroupCreated).(bool)
+	if !existingResourceGroup || !resourceGroupCreated {
+		return
+	}
+	ui := state.Get("ui").(packer.Ui)
+	ui.Say("\nThe resource group was not created by Packer, deleting individual resources ...")
+
+	var resourceGroupName = state.Get(constants.ArmResourceGroupName).(string)
+	var computeName = state.Get(constants.ArmComputeName).(string)
+	var deploymentName = s.name
+	imageType, imageName, err := s.disk(context.TODO(), resourceGroupName, computeName)
 	if err != nil {
-		s.reportIfError(err, resourceGroupName)
-		return err
+		ui.Error("Could not retrieve OS Image details")
 	}
 
-	for deploymentOperations.NotDone() {
-		deploymentOperation := deploymentOperations.Value()
-		// Sometimes an empty operation is added to the list by Azure
-		if deploymentOperation.Properties.TargetResource == nil {
-			_ = deploymentOperations.Next()
-			continue
+	ui.Say(" -> Deployment Resources within: " + deploymentName)
+	if deploymentName != "" {
+		maxResources := int32(50)
+		deploymentOperations, err := s.client.DeploymentOperationsClient.ListComplete(context.TODO(), resourceGroupName, deploymentName, &maxResources)
+		if err != nil {
+			ui.Error(fmt.Sprintf("Error deleting resources.  Please delete them manually.\n\n"+
+				"Name: %s\n"+
+				"Error: %s", resourceGroupName, err))
 		}
-
-		resourceName := *deploymentOperation.Properties.TargetResource.ResourceName
-		resourceType := *deploymentOperation.Properties.TargetResource.ResourceType
-
-		s.say(fmt.Sprintf(" -> %s : '%s'", resourceType, resourceName))
-
-		err = retry.Config{
-			Tries:      10,
-			RetryDelay: (&retry.Backoff{InitialBackoff: 10 * time.Second, MaxBackoff: 600 * time.Second, Multiplier: 2}).Linear,
-		}.Run(ctx, func(ctx context.Context) error {
-			err := deleteResource(ctx, s.client,
-				resourceType,
-				resourceName,
+		for deploymentOperations.NotDone() {
+			deploymentOperation := deploymentOperations.Value()
+			// Sometimes an empty operation is added to the list by Azure
+			if deploymentOperation.Properties.TargetResource == nil {
+				deploymentOperations.Next()
+				continue
+			}
+			ui.Say(fmt.Sprintf(" -> %s : '%s'",
+				*deploymentOperation.Properties.TargetResource.ResourceType,
+				*deploymentOperation.Properties.TargetResource.ResourceName))
+			err = s.delete(context.TODO(), s.client,
+				*deploymentOperation.Properties.TargetResource.ResourceType,
+				*deploymentOperation.Properties.TargetResource.ResourceName,
 				resourceGroupName)
 			if err != nil {
-				s.reportIfError(err, resourceName)
+				ui.Error(fmt.Sprintf("Error deleting resource.  Please delete manually.\n\n"+
+					"Name: %s\n"+
+					"Error: %s", *deploymentOperation.Properties.TargetResource.ResourceName, err))
 			}
-			return nil
-		})
+			if err = deploymentOperations.Next(); err != nil {
+				ui.Error(fmt.Sprintf("Error deleting resources.  Please delete them manually.\n\n"+
+					"Name: %s\n"+
+					"Error: %s", resourceGroupName, err))
+				break
+			}
+		}
+
+		// The disk is not defined as an operation in the template so has to be
+		// deleted separately
+		ui.Say(fmt.Sprintf(" -> %s : '%s'", imageType, imageName))
+		err = s.deleteDisk(context.TODO(), imageType, imageName, resourceGroupName)
 		if err != nil {
-			s.reportIfError(err, resourceName)
-		}
-
-		if err = deploymentOperations.Next(); err != nil {
-			return err
+			ui.Error(fmt.Sprintf("Error deleting resource.  Please delete manually.\n\n"+
+				"Name: %s\n"+
+				"Error: %s", imageName, err))
 		}
 	}
-
-	return nil
-}
-
-func (s *StepDeployTemplate) reportIfError(err error, resourceName string) {
-	if err != nil {
-		s.say(fmt.Sprintf("Error deleting resource. Please delete manually.\n\n"+
-			"Name: %s\n"+
-			"Error: %s", resourceName, err.Error()))
-		s.error(err)
-	}
 }