Document plugin requirement block usage

.circleci/config.yml

@@ -7,7 +7,7 @@ version: 2.1
 executors:
   golang:
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.16
+      - image: docker.mirror.hashicorp.services/circleci/golang:1.15
     resource_class: medium+
   darwin:
     macos:
@@ -37,19 +37,15 @@ commands:
     parameters:
       GOOS:
         type: string
-      GOARCH:
-        default: "amd64"
-        type: string
     steps:
       - checkout
-      - run: GOOS=<< parameters.GOOS >> GOARCH=<<parameters.GOARCH>> go build -ldflags="-s -w -X github.com/hashicorp/packer/version.GitCommit=${CIRCLE_SHA1}" -o ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >> .
-      - run: zip ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >>.zip ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >>
-      - run: rm ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >>
+      - run: GOOS=<< parameters.GOOS >> go build -ldflags="-s -w -X github.com/hashicorp/packer/version.GitCommit=${CIRCLE_SHA1}" -o ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH) .
+      - run: zip ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH).zip ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH)
+      - run: rm ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH)
       - persist_to_workspace:
           root: .
           paths:
             - ./pkg/
-
 # Golang CircleCI 2.0 configuration file
 #
 # Check https://circleci.com/docs/2.0/language-go/ for more details
@@ -65,11 +61,13 @@ jobs:
           file: coverage.txt
   test-darwin:
     executor: darwin
-    working_directory: ~/go/github.com/hashicorp/packer
+    working_directory: ~/go/src/github.com/hashicorp/packer
+    environment:
+      GO111MODULE: "off"
     steps:
       - install-go-run-tests-unix:
           GOOS: darwin
-          GOVERSION: "1.16"
+          GOVERSION: "1.15"
       - codecov/upload:
           file: coverage.txt
   test-windows:
@@ -78,7 +76,7 @@ jobs:
       shell: bash.exe
     steps:
       - install-go-run-tests-windows:
-          GOVERSION: "1.16"
+          GOVERSION: "1.15"
       - codecov/upload:
           file: coverage.txt
   check-lint:
@@ -127,13 +125,6 @@ jobs:
     steps:
       - build-and-persist-packer-binary:
           GOOS: darwin
-  build_darwin_arm64:
-    executor: golang
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - build-and-persist-packer-binary:
-          GOOS: darwin
-          GOARCH: arm64
   build_freebsd:
     executor: golang
     working_directory: /go/src/github.com/hashicorp/packer
@@ -214,7 +205,6 @@ workflows:
     jobs:
       - build_linux
       - build_darwin
-      - build_darwin_arm64
       - build_windows
       - build_freebsd
       - build_openbsd
@@ -223,7 +213,6 @@ workflows:
           requires:
             - build_linux
             - build_darwin
-            - build_darwin_arm64
             - build_windows
             - build_freebsd
             - build_openbsd

.gitattributes

@@ -6,7 +6,6 @@
 *.mdx text eol=lf
 *.ps1 text eol=lf
 *.hcl text eol=lf
-*.tmpl text eol=lf
 *.txt text eol=lf
 go.mod text eol=lf
 go.sum text eol=lf

.github/CONTRIBUTING.md

@@ -11,12 +11,6 @@ contribute to the project, read on. This document will cover what we're looking
 for. By addressing all the points we're looking for, it raises the chances we
 can quickly merge or address your contributions.
 
-When contributing in any way to the Packer project (new issue, PR, etc), please 
-be aware that our team identifies with many gender pronouns. Please remember to 
-use nonbinary pronouns (they/them) and gender neutral language ("Hello folks") 
-when addressing our team. For more reading on our code of conduct, please see the 
-[HashiCorp community guidelines](https://www.hashicorp.com/community-guidelines).
-
 ## Issues
 
 ### Reporting an Issue
@@ -25,7 +19,7 @@ when addressing our team. For more reading on our code of conduct, please see th
   already fixed the bug you're experiencing.
 
 - Run the command with debug output with the environment variable `PACKER_LOG`.
-  For example: `PACKER_LOG=1 packer build template.pkr.hcl`. Take the _entire_
+  For example: `PACKER_LOG=1 packer build template.json`. Take the _entire_
   output and create a [gist](https://gist.github.com) for linking to in your
   issue. Packer should strip sensitive keys from the output, but take a look
   through just in case.
@@ -70,9 +64,7 @@ when addressing our team. For more reading on our code of conduct, please see th
 If you have never worked with Go before, you will have to install its
 runtime in order to build packer.
 
-1. This project always releases from the latest version of golang.
-[Install go](https://golang.org/doc/install#install) To properly build from
-source, you need to have golang >= v1.16
+1. This project always releases from the latest version of golang. [Install go](https://golang.org/doc/install#install)
 
 ## Setting up Packer for dev
 
@@ -80,6 +72,7 @@ If/when you have go installed you can already `go get` packer and `make` in
 order to compile and test Packer. These instructions target
 POSIX-like environments (macOS, Linux, Cygwin, etc.) so you may need to
 adjust them for Windows or other shells.
+The instructions below are for go 1.7. or later.
 
 1. Download the Packer source (and its dependencies) by running
    `go get github.com/hashicorp/packer`. This will download the Packer source to
@@ -98,7 +91,7 @@ adjust them for Windows or other shells.
 4. After running building Packer successfully, use
    `$GOPATH/src/github.com/hashicorp/packer/bin/packer` to build a machine and
    verify your changes work. For instance:
-   `$GOPATH/src/github.com/hashicorp/packer/bin/packer build template.pkr.hcl`.
+   `$GOPATH/src/github.com/hashicorp/packer/bin/packer build template.json`.
 
 5. If everything works well and the tests pass, run `go fmt` on your code before
    submitting a pull-request.
@@ -266,7 +259,7 @@ does not attempt to track the latest version for each dependency.
 #### Code generation
 
 Packer relies on `go generate` to generate a [peg parser for boot
-commands](https://github.com/hashicorp/packer/blob/master/packer-plugin-sdk/bootcommand/boot_command.go),
+commands](https://github.com/hashicorp/packer/blob/master/common/bootcommand/boot_command.go),
 [docs](https://github.com/hashicorp/packer/blob/master/website/pages/partials/builder/amazon/chroot/_Config-not-required.mdx)
 and HCL2's bridging code. Packer's testing suite will run `make check-generate`
 to check that all the generated files Packer needs are what they should be.
@@ -308,15 +301,15 @@ You can run tests for individual packages using commands like this:
 make test TEST=./builder/amazon/...
 ```
 
-#### Running Builder Acceptance Tests
+#### Running Acceptance Tests
 
 Packer has [acceptance tests](https://en.wikipedia.org/wiki/Acceptance_testing)
 for various builders. These typically require an API key (AWS, GCE), or
 additional software to be installed on your computer (VirtualBox, VMware).
 
 If you're working on a new builder or builder feature and want to verify it is
-functioning (and also hasn't broken anything else), we recommend creating or
-running the acceptance tests.
+functioning (and also hasn't broken anything else), we recommend running the
+acceptance tests.
 
 **Warning:** The acceptance tests create/destroy/modify _real resources_, which
 may incur costs for real money. In the presence of a bug, it is possible that
@@ -347,7 +340,7 @@ Acceptance tests typically require other environment variables to be set for
 things such as API tokens and keys. Each test should error and tell you which
 credentials are missing, so those are not documented here.
 
-#### Running Provisioner Acceptance Tests
+#### Running Provisioners Acceptance Tests
 
 **Warning:** The acceptance tests create/destroy/modify _real resources_, which
 may incur costs for real money. In the presence of a bug, it is possible that
@@ -358,164 +351,124 @@ 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 the
-**ACC_TEST_BUILDERS** environment variable to tell the tests which builder the
-test should be run against.
+To run the Provisioners Acceptance Tests you should use both **ACC_TEST_BUILDERS** and **ACC_TEST_PROVISIONERS** variables to
+tell which provisioner and builder the test should be run against.
 
 Examples of usage:
 
 - Run the Shell provisioner acceptance tests against the Amazon EBS builder.
     ```
-    ACC_TEST_BUILDERS=amazon-ebs go test ./provisioner/shell/... -v -timeout=1h
+    ACC_TEST_BUILDERS=amazon-ebs ACC_TEST_PROVISIONERS=shell go test ./provisioner/shell/... -v -timeout=1h
     ```
 - Do the same but using the Makefile
     ```
-    ACC_TEST_BUILDERS=amazon-ebs make provisioners-acctest TEST=./provisioner/shell
+    ACC_TEST_BUILDERS=amazon-ebs ACC_TEST_PROVISIONERS=shell make provisioners-acctest
     ```
-- Run all provisioner acceptance tests against the Amazon EBS builder.
+- Run the all Shell and Powershell provisioners acceptance tests against the Amazon EBS builder.
     ```
-    ACC_TEST_BUILDERS=amazon-ebs make provisioners-acctest  TEST=./...
+    ACC_TEST_BUILDERS=amazon-ebs ACC_TEST_PROVISIONERS=shell,powershell make provisioners-acctest
     ```
-- Run all provisioner acceptance tests against all builders whenever they are compatible.
+- Run the all provisioners acceptance tests against the Amazon EBS builder.
     ```
-    ACC_TEST_BUILDERS=all make provisioners-acctest  TEST=./...
+    ACC_TEST_BUILDERS=amazon-ebs ACC_TEST_PROVISIONERS=all make provisioners-acctest
+    ```
+- Run the all provisioners acceptance tests against all builders whenever they are compatible.
+    ```
+    ACC_TEST_BUILDERS=all ACC_TEST_PROVISIONERS=all make provisioners-acctest
     ```
 
-The **ACC_TEST_BUILDERS** env variable accepts a list of builders separated by
-commas. (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 implemented a `ProvisionerTestCase` structure to help write
-provisioner acceptance tests.
+Packer has an already implemented structure that will run the provisioner against builders and you can find it in `helper/tests/acc/provisioners.go`.
+All provisioners should use this structure in their acceptance tests.
+
+To start writing a new provisioner acceptance test, you should add a test file named as `provisioner_acc_test.go` in the provisioner folder
+and the package should be `<provisioner>_test`. This file should have a struct that will implement the ProvisionerAcceptance interface.
 
 ```go
-type ProvisionerTestCase struct {
-  // Check is called after this step is executed in order to test that
-  // the step executed successfully. If this is not set, then the next
-  // step will be called
-  Check func(*exec.Cmd, string) error
-  // IsCompatible checks whether a provisioner is able to run against a
-  // given builder type and guest operating system, and returns a boolean.
-  // if it returns true, the test combination is okay to run. If false, the
-  // test combination is not okay to run.
-  IsCompatible func(builderType string, BuilderGuestOS string) bool
-  // Name is the name of the test case. Be simple but unique and descriptive.
-  Name string
-  // Setup, if non-nil, will be called once before the test case
-  // runs. This can be used for some setup like setting environment
-  // variables, or for validation prior to the
-  // test running. For example, you can use this to make sure certain
-  // binaries are installed, or text fixtures are in place.
-  Setup func() error
-  // Teardown will be called before the test case is over regardless
-  // of if the test succeeded or failed. This should return an error
-  // in the case that the test can't guarantee all resources were
-  // properly cleaned up.
-  Teardown builderT.TestTeardownFunc
-  // Template is the provisioner template to use.
-  // The provisioner template fragment must be a json-formatted string
-  // containing the provisioner definition but no other portions of a packer
-  // template. For
-  // example:
-  //
-  // ```json
-  // {
-  //  "type": "shell-local",
-  //  "inline", ["echo hello world"]
-  // }
-  //```
-  //
-  // is a valid entry for "template" here, but the complete Packer template:
-  //
-  // ```json
-  // {
-  //  "provisioners": [
-  //    {
-  //      "type": "shell-local",
-  //      "inline", ["echo hello world"]
-  //    }
-  //  ]
-  // }
-  // ```
-  //
-  // is invalid as input.
-  //
-  // You may provide multiple provisioners in the same template. For example:
-  // ```json
-  // {
-  //  "type": "shell-local",
-  //  "inline", ["echo hello world"]
-  // },
-  // {
-  //  "type": "shell-local",
-  //  "inline", ["echo hello world 2"]
-  // }
-  // ```
-  Template string
-  // Type is the type of provisioner.
-  Type string
+type ProvisionerAcceptance interface {
+	GetName() string
+	GetConfig() (string, error)
+	GetProvisionerStore() packer.MapOfProvisioner
+	IsCompatible(builder string, vmOS string) bool
+	RunTest(c *command.BuildCommand, args []string) error
 }
-
 ```
 
-To start writing a new provisioner acceptance test, you should add a test file
-named `provisioner_acc_test.go` in the same folder as your provisioner is
-defined. Create a test case by implementing the above struct, and run it
-by calling `provisioneracc.TestProvisionersAgainstBuilders(testCase, t)`
+- **GetName()** should return the provisioner type. For example for the Shell provisioner the method returns "shell".
 
-The following example has been adapted from a shell-local provisioner test:
+- **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:
 
-```
-import (
-  "github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc"
-  "github.com/hashicorp/packer-plugin-sdk/acctest/testutils"
-)
-
-// ...
-
-func TestAccShellProvisioner_basic(t *testing.T) {
-  // Create a json template fragment containing just the provisioners you want
-  // to run.
-  templateString := `{
-    "type": "shell-local",
-    "script": "test-fixtures/script.sh",
-    "max_retries" : 5
-}`
-
-  // instantiate a test case.
-  testCase := &provisioneracc.ProvisionerTestCase{
-    IsCompatible: func() bool {return true},
-    Name:         "shell-local-provisioner-basic",
-    Teardown: func() error {
-      testutils.CleanupFiles("test-fixtures/file.txt")
-      return nil
+    ```
+    {
+      "type": "shell",
+      "inline": [
+        "echo {{ build `ID`}} > provisioner.{{ build `PackerRunUUID`}}.txt"
+      ]
     },
-    Template: templateString,
-    Type:     "shell-local",
-    Check: func(buildcommand *exec.Cmd, logfile string) error {
-      if buildcommand.ProcessState != nil {
-        if buildcommand.ProcessState.ExitCode() != 0 {
-          return fmt.Errorf("Bad exit code. Logfile: %s", logfile)
-        }
-      }
-      filecontents, err := loadFile("file.txt")
-      if err != nil {
-        return err
-      }
-      if !strings.Contains(filecontents, "hello") {
-        return fmt.Errorf("file contents were wrong: %s", filecontents)
-      }
-      return nil
-    },
-  }
+    {
+        "type": "file",
+        "source": "provisioner.{{ build `PackerRunUUID`}}.txt",
+        "destination": "provisioner.shell.{{ build `PackerRunUUID`}}.txt",
+        "direction": "download"
+    }
+    ```
+  The file should be placed under the `test-fixtures` folder.
+  In this case, it's necessary to use the File provisioner to validate if the Shell provisioner test is successful or not.
+  This config should be returned as string that will be later merged with the builder config into a full template.
 
-  provisioneracc.TestProvisionersAgainstBuilders(testCase, t)
-}
+- **GetProvisionerStore()** this returns the provisioner store where we declare the available provisioners for running the build.
+For the Shell provisioners this is:
+    ```go
+      func (s *ShellProvisionerAccTest) GetProvisionerStore() packer.MapOfProvisioner {
+      	return packer.MapOfProvisioner{
+      		"shell": func() (packer.Provisioner, error) { return &shell.Provisioner{}, nil },
+      		"file":  func() (packer.Provisioner, error) { return &file.Provisioner{}, nil },
+      	}
+      }
+    ```
 
-```
+- **IsCompatible(builder string, vmOS string)** returns true or false whether the provisioner should run against a
+specific builder or/and specific OS.
 
+- **RunTest(c \*command.BuildCommand, args []string)** it will actually run the build and return any error if it fails the validations.
+For the Shell provisioner this is:
+    ```go
+      func (s *ShellProvisionerAccTest) RunTest(c *command.BuildCommand, args []string) error {
+      	// Provisioner specific setup
+      	UUID := os.Getenv("PACKER_RUN_UUID")
+      	if UUID == "" {
+      		UUID, _ = uuid.GenerateUUID()
+      		os.Setenv("PACKER_RUN_UUID", UUID)
+      	}
+      	file := "provisioner.shell." + UUID + ".txt"
+      	defer testshelper.CleanupFiles(file)
+
+      	// Run build
+    	// All provisioner acc tests should contain this code and validation
+      	if code := c.Run(args); code != 0 {
+      		ui := c.Meta.Ui.(*packer.BasicUi)
+      		out := ui.Writer.(*bytes.Buffer)
+      		err := ui.ErrorWriter.(*bytes.Buffer)
+      		return fmt.Errorf(
+      			"Bad exit code.\n\nStdout:\n\n%s\n\nStderr:\n\n%s",
+      			out.String(),
+      			err.String())
+      	}
+
+      	// Any other extra specific validation
+      	if !testshelper.FileExists(file) {
+      		return fmt.Errorf("Expected to find %s", file)
+      	}
+      	return nil
+      }
+
+    ```
 
 After writing the struct and implementing the interface, now is time to write the test that will run all
 of this code you wrote. Your test should be like:
@@ -527,101 +480,64 @@ func TestShellProvisioner(t *testing.T) {
 }
 ```
 
-The method `TestProvisionersAgainstBuilders` will run the provisioner against
-all available and compatible builders. If there are not builders compatible with
-the test you want to run, you can add a builder using the following steps:
+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.
 
-Create a subdirectory in provisioneracc/test-fixtures for the type of builder
-you are adding. In this subdirectory, add one json file containing a single
-builder fragment. For example, one of our amazon-ebs builders is defined in
-provisioneracc/test-fixtures/amazon-ebs/amazon-ebs.txt and contains:
-
-```json
-{
-  "type": "amazon-ebs",
-  "ami_name": "packer-acc-test",
-  "instance_type": "t2.micro",
-  "region": "us-east-1",
-  "ssh_username": "ubuntu",
-  "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
-  },
-  "force_deregister" : true,
-  "tags": {
-    "packer-test": "true"
-  }
-}
-```
-
-note that this fragment does not contain anything other than a single builder
-definition. The testing framework will combine this with the provisioner
-fragment to create a working json template.
-
-In order to tell the testing framework how to use this builder fragment, you
-need to implement a `BuilderFixture` struct:
+The method `TestProvisionersAgainstBuilders` will run the provisioner against all available and compatible builders. An available builder
+is the one that has the necessary code for running this type of test. In case the builder you want to run against is not available for testing, you can write it following the next steps.
 
+To add a new builder to the available builders for provisioners acc testing, you'll need to create a new folder under the builder folder
+called `acceptance` and inside you create the `builder_acceptance.go` file and the package should be `<builder>_acc`. Like the provisioners, you'll need to create a struct that will
+implement the BuilderAcceptance interface.
 ```go
-type BuilderFixture struct {
-  // Name is the name of the builder fixture.
-  // Be simple and descriptive.
-  Name string
-  // Setup creates necessary extra test fixtures, and renders their values
-  // into the BuilderFixture.Template.
-  Setup func()
-  // Template is the path to a builder template fragment.
-  // The builder template fragment must be a json-formatted file containing
-  // the builder definition but no other portions of a packer template. For
-  // example:
-  //
-  // ```json
-  // {
-  //  "type": "null",
-  //  "communicator", "none"
-  // }
-  //```
-  //
-  // is a valid entry for "template" here, but the complete Packer template:
-  //
-  // ```json
-  // {
-  //  "builders": [
-  //    "type": "null",
-  //    "communicator": "none"
-  //  ]
-  // }
-  // ```
-  //
-  // is invalid as input.
-  //
-  // Only provide one builder template fragment per file.
-  TemplatePath string
-
-  // GuestOS says what guest os type the builder template fragment creates.
-  // Valid values are "windows", "linux" or "darwin" guests.
-  GuestOS string
-
-  // HostOS says what host os type the builder is capable of running on.
-  // Valid values are "any", windows", or "posix". If you set "posix", then
-  // this builder can run on a "linux" or "darwin" platform. If you set
-  // "any", then this builder can be used on any platform.
-  HostOS string
-
-  Teardown builderT.TestTeardownFunc
+type BuilderAcceptance interface {
+	GetConfigs() (map[string]string, error)
+	GetBuilderStore() packer.MapOfBuilder
+	CleanUp() error
 }
 ```
-Implement this struct to the file "provisioneracc/builders.go", then add
-the new implementation to the `BuildersAccTest` map in
-`provisioneracc/provisioners.go`
+- **GetConfigs()** should read a text file with the json configuration block for the builder and return a map of configs by OS type.
+For the Amazon EBS builder the file contains:
+    ```
+      {
+        "type": "amazon-ebs",
+        "ami_name": "packer-acc-test",
+        "instance_type": "m1.small",
+        "region": "us-east-1",
+        "ssh_username": "ubuntu",
+        "source_ami": "ami-0568456c",
+        "force_deregister" : true,
+        "tags": {
+          "packer-test": "true"
+        }
+      }
+    ```
+    The file should be placed under the `test-fixtures` folder.
+    In case you need to make references to another file, you'll need to add the relative path to provisioners folder like:
+    `../../builder/amazon/ebs/acceptance/test-fixtures/file.txt`.
 
-Once you finish these steps, you should be ready to run your new provisioner
-acceptance test by setting the name used in the BuildersAccTest map as your
-`ACC_TEST_BUILDERS` environment variable.
+- **GetBuilderStore()** this returns the builder store where we declare the available builders for running the build.
+For the Amazon EBS builder this is:
+    ```go
+    func (s *AmazonEBSAccTest) GetBuilderStore() packer.MapOfBuilder {
+        return packer.MapOfBuilder{
+            "amazon-ebs": func() (packer.Builder, error) { return &amazonebsbuilder.Builder{}, nil },
+        }
+    }
+    ```
+
+- **CleanUp()** cleans any resource created by the builder whether local or remote.
+
+Once you created the builder necessary code, the last step is adding it to the `BuildersAccTest` map in `helper/tests/acc/provisioners.go`.
+```go
+var BuildersAccTest = map[string]BuilderAcceptance{
+	...
+	"amazon-ebs":     new(amazonEBS.AmazonEBSAccTest),
+	...
+}
+```
+
+Once you finish the steps, you should be ready to run your new provisioner acceptance test.
 
 #### Debugging Plugins
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,7 +10,7 @@ Describe the change you are making here!
 
 Please include tests. Check out these examples:
 
-- https://github.com/hashicorp/packer/blob/master/builder/parallels/common/ssh_config_test.go#L34
+- https://github.com/hashicorp/packer/blob/master/builder/virtualbox/common/ssh_config_test.go#L19-L37
 - https://github.com/hashicorp/packer/blob/master/post-processor/compress/post-processor_test.go#L153-L182
 
 If your PR resolves any open issue(s), please indicate them like this so they will be closed when your PR is merged:

.github/workflows/check-plugin-docs.js

@@ -1,77 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-const fetchPluginDocs = require("../../website/components/remote-plugin-docs/utils/fetch-plugin-docs");
-
-const COLOR_RESET = "\x1b[0m";
-const COLOR_GREEN = "\x1b[32m";
-const COLOR_BLUE = "\x1b[34m";
-const COLOR_RED = "\x1b[31m";
-
-async function checkPluginDocs() {
-  const failureMessages = [];
-  const pluginsPath = "website/data/docs-remote-plugins.json";
-  const pluginsFile = fs.readFileSync(path.join(process.cwd(), pluginsPath));
-  const pluginEntries = JSON.parse(pluginsFile);
-  const entriesCount = pluginEntries.length;
-  console.log(`\nResolving plugin docs from ${entriesCount} repositories …`);
-  for (var i = 0; i < entriesCount; i++) {
-    const pluginEntry = pluginEntries[i];
-    const { title, repo, version } = pluginEntry;
-    console.log(`\n${COLOR_BLUE}${repo}${COLOR_RESET} | ${title}`);
-    console.log(`Fetching docs from release "${version}" …`);
-    try {
-      const undefinedProps = ["title", "repo", "version", "path"].filter(
-        (key) => typeof pluginEntry[key] == "undefined"
-      );
-      if (undefinedProps.length > 0) {
-        throw new Error(
-          `Failed to validate plugin docs config. Undefined configuration properties ${JSON.stringify(
-            undefinedProps
-          )} found for "${
-            title || pluginEntry.path || repo
-          }". In "website/data/docs-remote-plugins.json", please ensure the missing properties ${JSON.stringify(
-            undefinedProps
-          )} are defined. Additional information on this configuration can be found in "website/README.md".`
-        );
-      }
-      const docsMdxFiles = await fetchPluginDocs({ repo, tag: version });
-      const mdxFilesByComponent = docsMdxFiles.reduce((acc, mdxFile) => {
-        const componentType = mdxFile.filePath.split("/")[1];
-        if (!acc[componentType]) acc[componentType] = [];
-        acc[componentType].push(mdxFile);
-        return acc;
-      }, {});
-      console.log(`${COLOR_GREEN}Found valid docs:${COLOR_RESET}`);
-      Object.keys(mdxFilesByComponent).forEach((component) => {
-        const componentFiles = mdxFilesByComponent[component];
-        console.log(`  ${component}`);
-        componentFiles.forEach(({ filePath }) => {
-          const pathFromComponent = filePath.split("/").slice(2).join("/");
-          console.log(`  ├── ${pathFromComponent}`);
-        });
-      });
-    } catch (err) {
-      console.log(`${COLOR_RED}${err}${COLOR_RESET}`);
-      failureMessages.push(`\n${COLOR_RED}× ${repo}: ${COLOR_RESET}${err}`);
-    }
-  }
-
-  if (failureMessages.length === 0) {
-    console.log(
-      `\n---\n\n${COLOR_GREEN}Summary: Successfully resolved all plugin docs.`
-    );
-    pluginEntries.forEach((e) =>
-      console.log(`${COLOR_GREEN}✓ ${e.repo}${COLOR_RESET}`)
-    );
-    console.log("");
-  } else {
-    console.log(
-      `\n---\n\n${COLOR_RED}Summary: Failed to fetch docs for ${failureMessages.length} plugin(s):`
-    );
-    failureMessages.forEach((err) => console.log(err));
-    console.log("");
-    process.exit(1);
-  }
-}
-
-checkPluginDocs();

.github/workflows/check-plugin-docs.yml

@@ -1,29 +0,0 @@
-#
-# This GitHub action checks plugin repositories for valid docs.
-#
-# This provides a quick assessment on PRs of whether
-# there might be issues with docs in plugin repositories.
-#
-# This is intended to help debug Vercel build issues, which
-# may or may not be related to docs in plugin repositories.
-
-name: "website: Check plugin docs"
-on:
-  pull_request:
-    paths:
-      - "website/**"
-  schedule:
-    - cron: "45 0 * * *"
-
-jobs:
-  check-plugin-docs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup Node
-        uses: actions/setup-node@v1
-      - name: Install Dependencies
-        run: npm i isomorphic-unfetch adm-zip gray-matter
-      - name: Fetch and validate plugin docs
-        run: node .github/workflows/check-plugin-docs.js

.github/workflows/linkchecker.yml

@@ -1,37 +0,0 @@
-on:
-  pull_request:
-    paths:
-      - 'website/**'
-
-name: Check markdown links on modified website files
-jobs:
-  vercel-deployment-poll:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5 #cancel job if no deployment is found within x minutes
-    outputs:
-      url: ${{ steps.waitForVercelPreviewDeployment.outputs.url }}
-    steps:
-    - name: Wait for Vercel preview deployment to be ready
-      uses: nywilken/wait-for-vercel-preview@master
-      id: waitForVercelPreviewDeployment
-      with:
-       token: ${{ secrets.GITHUB_TOKEN }}
-       max_timeout: 600 # in seconds, set really high to leverage job timeout-minutes values
-       allow_inactive: true # needed to ensure we get a URL for a previously released deployment
-  markdown-link-check:
-    needs: vercel-deployment-poll
-    if: ${{ needs.vercel-deployment-poll.outputs.url != '' }}
-    runs-on: ubuntu-latest
-    steps:
-    - name: Get Deployment URL
-      run:
-        echo "DEPLOYMENT_URL=${{ needs.vercel-deployment-poll.outputs.url }}" >> $GITHUB_ENV
-    - name: Checkout source branch
-      uses: actions/checkout@master
-    - name: Check links
-      uses: gaurav-nelson/github-action-markdown-link-check@v1
-      with:
-        use-quiet-mode: 'yes'
-        file-extension: 'mdx'
-        check-modified-files-only: 'yes'
-        folder-path: 'website/content'

.github/workflows/scheduled-link-checker.yml

@@ -1,17 +0,0 @@
-on:
-  schedule:
-  - cron: "45 0 * * *"
-name: Check Markdown links on main branch
-jobs:
-  markdown-link-check:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Set deployment URL env
-      run:
-        echo "DEPLOYMENT_URL=https://packer-git-master.hashicorp.vercel.app" >> $GITHUB_ENV
-    - uses: actions/checkout@master
-    - uses: gaurav-nelson/github-action-markdown-link-check@v1
-      with:
-        use-quiet-mode: 'yes'
-        file-extension: 'mdx'
-        folder-path: 'website/content'

.hashibot.hcl

@@ -22,21 +22,3 @@ poll "closed_issue_locker" "locker" {
     If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
   EOF
 }
-
-poll "label_issue_migrater" "remote_plugin_migrater" {
-  schedule                = "0 20 * * * *"
-  new_owner               = "hashicorp"
-  repo_prefix             = "packer-plugin-"
-  label_prefix            = "remote-plugin/"
-  excluded_label_prefixes  = ["communicator/"]
-  excluded_labels         = ["build", "core", "new-plugin-contribution", "website"]
-
-  issue_header     = <<-EOF
-    _This issue was originally opened by @${var.user} as ${var.repository}#${var.issue_number}. It was migrated here as a result of the [Packer plugin split](https://github.com/hashicorp/packer/issues/8610#issuecomment-770034737). The original body of the issue is below._
-
-    <hr>
-
-    EOF
-  migrated_comment = "This issue has been automatically migrated to ${var.repository}#${var.issue_number} because it looks like an issue with that plugin. If you believe this is _not_ an issue with the plugin, please reply to ${var.repository}#${var.issue_number}."
-}
-

CHANGELOG.md

@@ -1,302 +1,30 @@
-## 1.7.2 (Upcoming)
+## 1.6.6 (Upcoming)
 
-## 1.7.1 (March 31, 2021)
-
-### NOTES:
-
-* builder/amazon: Has been vendored in this release and will no longer be
-    updated with Packer core. In Packer v1.8.0 the plugin will be removed
-    entirely. The `amazon` components will continue to work as expected until
-    then, but for the latest offerings of the Amazon plugin, users are
-    encourage to use the `packer init` command to install the latest release
-    version. For more details see [Installing Packer
-    Plugins](https://www.packer.io/docs/plugins#installing-plugins)
-* builder/docker: Has been vendored in this release and will no longer be
-    updated with Packer core. In Packer v1.8.0 the plugin will be removed
-    entirely. The `docker` builder will continue to work as expected until
-    then, but for the latest offerings of the Docker plugin, users are
-    encourage to use the `packer init` command to install the latest release
-    version. For more details see [Installing Packer
-    Plugins](https://www.packer.io/docs/plugins#installing-plugins)
-* darwin/arm64: Packer now includes the darwin/arm64 binary to its releases to
-    supports the new OSX M1. [GH-10804]
-* post-processor/docker-\*: Have been vendored in this release and will no
-    longer be updated with Packer core. In Packer v1.8.0 the plugin will be
-    removed entirely. The `docker` builder will continue to work as expected
-    until then, but for the latest offerings of the Docker plugin, users are
-    encourage to use the `packer init` command to install the latest release
-    version. For more details see [Installing Packer
-    Plugins](https://www.packer.io/docs/plugins#installing-plugins)
-* post-processor/exoscale-import: Has been vendored in this release and will no
-    longer be updated with Packer core. In Packer v1.8.0 the plugin will be
-    removed entirely. The `exoscale-import` post-processor will continue to
-    work as expected until then, but for the latest offerings of the Exoscale
-    plugin, users are encourage to use the `packer init` command to install the
-    latest release version. For more details see [Exoscale Plugin
-    Repostiroy](https://github.com/exoscale/packer-plugin-exoscale). [GH-10709]
-
-### IMPROVEMENTS
-* builder/amazon: allow creation of ebs snapshots without volumes. [GH-9591]
-* builder/amazon: Fix issue for multi-region AMI build that fail when
-    encrypting with KMS and sharing across accounts. [GH-10754]
-* builder/azure: Add client_cert_token_timeout option. [GH-10528]
-* builder/google: Make Windows password timeout configurable. [GH-10727]
-* builder/google: Update public GCP image project as gce-uefi-images are
-    deprecated. [GH-10724]
-* builder/oracle-oci: Update Oracle Go SDK to add support for OCI flexible
-    shapes.  [GH-10833]
-* builder/proxmox: Allow using API tokens for Proxmox authentication.
-    [GH-10797]
-* builder/qemu: Added firmware option. [GH-10683]
-* builder/scaleway: add support for timeout in shutdown step. [GH-10503]
-* builder/vagrant: Fix logging to be clearer when Vagrant builder overrides
-    values retrieved from vagrant's ssh_config call. [GH-10743]
-* builder/virtualbox:  Added ISO builder option to create additional disks.
-    [GH-10674]
-* builder/virtualbox: Add options for nested virtualisation and RTC time base.
-    [GH-10736]
-* builder/virtualbox: Add template options for chipset, firmware, nic, graphics
-    controller, and audio controller. [GH-10671]
-* builder/virtualbox: Support for "virtio" storage and ISO drive. [GH-10632]
-* builder/vmware: Added "attach_snapshot" parameter to vmware vmx builder.
-    [GH-10651]
-* command/fmt: Adding recursive flag to formatter to format subdirectories.
-    [GH-10457]
-* core/hcl2: Add legacy_isotime function. [GH-10780]
-* core/hcl2: Add support for generating `dynamic` blocks within a `build`
-    block. [GH-10825]
-* core/hcl2: Add templatefile function. [GH-10776]
-* core/hcl2_upgrade: hcl2_upgrade command can now upgrade json var-files.
-    [GH-10676]
-* core/init: Add implicit required_plugin blocks feature. [GH-10732]
-* core: Add http_content option to serve variables from HTTP at preseed.
-    [GH-10801]
-* core: Change template parsing error to include warning about file extensions.
-    [GH-10652]
-* core: Update to gopsutil v3.21.1 to allow builds to work for darwin arm64.
-    [GH-10697]
-* provisioner/inspec: Allow non-zero exit codes for inspec provisioner.
-    [GH-10723]
-
-### BUG FIXES
-* buider/azure: Update builder to ensure a proper clean up Azure temporary
-    managed Os disks. [GH-10713]
-* builder/amazon: Update amazon SDK to fix an SSO login issue. [GH-10668]
-* builder/azure: Don't overwrite subscription id if unset. [GH-10659]
-* builder/azure: Set default for the parameter client_cert_token_timeout
-    [GH-10783]
-* builder/google: Add new configuration field `windows_password_timeout` to
-    allow user to set configurable timeouts. [GH-10727]
-* builder/hyperv: Make Packer respect winrm_host flag in winrm connect func.
-    [GH-10748]
-* builder/openstack: Make Packer respect winrm_host flag in winrm connect func.
-    [GH-10748]
-* builder/oracle-oci: Update Oracle Go SDK to fix issue with reading key file.
-    [GH-10560] [GH-10774]
-* builder/outscale: Fix omi_description that was ignored in Osc builder
-    [GH-10792]
-* builder/parallels: Make Packer respect winrm_host flag in winrm connect func.
-    [GH-10748]
-* builder/proxmox: Fixes issue when using `additional_iso_files` in HCL enabled
-    templates. [GH-10772]
-* builder/qemu: Make Packer respect winrm_host flag in winrm connect func.
-    [GH-10748]
-* builder/virtualbox: Make Packer respect winrm_host flag in winrm connect
-    func. [GH-10748]
-* builder/vmware: Added a fallback file check when trying to determine the
-    network-mapping configuration. [GH-10543]
-* builder/vsphere: Fix invalid device configuration issue when creating a
-    vm with multiple disk on the same controller. [GH-10844]
-* builder/vsphere: Fix issue where boot command would fail the build do to a
-    key typing error. This change will now retry to type the key on error
-    before giving up. [GH-10541]
-* core/hcl2_upgrade: Check for nil config map when provisioner/post-processor
-    doesn't have config. [GH-10730]
-* core/hcl2_upgrade: Fix escaped quotes in template functions [GH-10794]
-* core/hcl2_upgrade: Make hcl2_upgrade command correctly translate
-    pause_before. [GH-10654]
-* core/hcl2_upgrade: Make json variables using template engines get stored as
-    locals so they can be properly interpolated. [GH-10685]
-* core/init: Fixes issue where `packer init` was failing to install valid
-    plugins containing a 'v' within its name. [GH-10760]
-* core: Packer will now show a proper error message when failing to load the
-    contents of PACKER_CONFIG. [GH-10766]
-* core: Pin Packer to Golang 1.16 to fix code generation issues. [GH-10702]
-* core: Templates previously could not interpolate the environment variable
-    PACKER_LOG_PATH. [GH-10660]
-* post-processor/vagrant-cloud: Override direct upload based on box size
-    [GH-10820]
-* provisioner/chef-solo: HCL2 templates can support the json_string option.
-    [GH-10655]
-* provisioner/inspec: Add new configuration field `valid_exit_codes` to allow
-    for non-zero exit codes. [GH-10723]
-* provisioner/salt-masterless: Update urls for the bootstrap scripts used by
-    salt-masterless provide. [GH-10755]
-
-## 1.7.0 (February 17, 2021)
-
-### FEATURES
-* **New Command** (HCL only) `packer init` command will download plugins defined
-    in a new `required_plugins` block [GH-10304] [GH-10633].
-* **New Plugin Type** Data sources can be implemented (blog post forthcoming).
-    [GH-10440]
-* **New Plugin** Aws Secrets Manager data source [GH-10505] [GH-10467]
-
-### BACKWARDS INCOMPATIBILITIES
-* core: The API that the Packer core uses to communicate with community plugins
-    has changed; maintainers of community plugins will need to upgrade their
-    plugins in order to make them compatible with v1.7.0. An upgrade guide will
-    be available on our guides page https://www.packer.io/guides.
-
-### IMPROVEMENTS
-* builder/amazon: Add `skip_create_ami` option for testing and situations where
-    artifact is not the ami. [GH-10531]
-* builder/amazon: Add IMDSv2 support for AWS EBS builder. [GH-10546]
-* builder/amazon: Add resource tags in the launch template used to request spot
-    instances. [GH-10456]
-* builder/openstack:  Add `skip_create_image` option for testing and situations
-    where artifact is not the image. [GH-10496]
-* builder/oracle-oci: Add retry strategies to oci calls [GH-10591]
-* core/fmt: The `packer fmt` can now read from stdin. [GH-10500]
-* core/hcl: Add regex and regexall hcl2 template functions. [GH-10601]
-* core/hcl: Templates now support "sensitive" locals. [GH-10509]
-* core/hcl: Templates now support error-cleanup-provisioner. [GH-10604]
-* hcl2_upgrade: Command now comes with a flag so you can control whether output
-    templates are annotated with helpful comments. [GH-10619]
-* hcl2_upgrade: Command now gracefully handles options with template engine
-    interpolations. [GH-10625]
-* hcl2_upgrade: Command will convert amazon filters to use the ami data source.
-    [GH-10491]
-
-### BUG FIXES
-* amazon/ebssurrogate: Apply snapshot tags at same time as when taking
-    snapshot. [GH-10150]
-* builder/amazon: Fix bug where validation fails if optional iops value is
-    unset. [GH-10518]
-* builder/amazon: Wrap API call to get filtered image in a retry. [GH-10610]
-* builder/bsusurrogate: override bsu when omi root device is set. [GH-10490]
-* builder/google: Fix bug where Packer would fail when run by users who do not
-    have permission to access the metadata, even though the metadata is not
-    necessary to the run. [GH-10458]
-* builder/profitbricks: Profitbricks builder could not connect using SSH
-    communicator. [GH-10549]
-* builder/proxmox: Ensure ISOs in additional_iso_files are mounted during VM
-    creation. [GH-10586]
-* builder/proxmox: Improve cloud init error logging for proxmox builder.
-    [GH-10499]
-* builder/qemu: Fix bug where vnc_min_port set to value greater then 5900 could
-    prevent Packer from connecting to QEMU. [GH-10450] [GH-10451]
-* builder/qemu: Fix regression with cd indexing when disk_interface is `ide`.
-    [GH-10519]
-* builder/vmware-esx: Skip credential validation, which requires ovftool to be
-    installed, if we are not exporting an image. [GH-10520]
-* builder/yandex: Fix cloud-init config for ubuntu 20.04. [GH-10522]
-* builder/yandex: Fix incorrect access to `instance_id`. [GH-10522]
-* core/hcl: Fix bug where []uint8 types could not be passed to plugins.
-* core/hcl: fix bug where HCL core could not handle passing []uint8 to plugins.
-    [GH-10516]
-* core/hcl: Fix force flag for hcl2 provisioners and post-processors.
-    [GH-10571]
-* post-processor/vsphere: Fix regression where Packer would not check the exit
-    status after streaming UI from the ovftool command. [GH-10468]
-* post-processor/yandex-export: Changed dhclient command and supported
-    configuring disk for exportupdate-dump-method. Also added support for
-    `file` builder. [GH-10488]
-
-## 1.6.6 (December 16, 2020)
-
-### FEATURES
+### 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]
-    [GH-10377]
 * **New function** `env` allows users to set the default value of a variable to
     the value of an environment variable. Please see [env function
-    docs](https://www.packer.io/docs/templates/hcl_templates/functions/contextual/env) for
+    docs](https://www.packer.io/docs/from-1.5/functions/contextual/env") for
     more details. [GH-10240]
-* **Future Scaffolding** This release contains a large number of no-op
-    refactoring changes. The Packer team at HashiCorp is preparing to split the
-    plugins and core to make it easier for our third party maintainers and
-    community members to release and maintain plugins, just like HashiCorp did
-    with the Terraform Core-Provider split. The Packer team is committed to
-    making sure that this split is seamless for our users and for our community
-    maintainers -- if you are a community maintainer, you may want to follow
-    along with some of the work by looking at the
-    [core-plugin-split github tag.](https://github.com/hashicorp/packer/pulls?q=is%3Apr+label%3Acore-plugin-split)
-    No one needs to do anything, yet, but we felt it was worth calling out all
-    the work that isn't making it into the changelog. We will be following up
-    with lots of documentation and communication in early 2021 with more
-    information.
+* 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/amazon: Add support for Amazon EBS gp3 volumes. [Gh-10338]
-* builder/amazon: Increase default max_retries to lessen throttling issues.
-    [GH-10290]
-* builder/amazon: Support AWS gp3 volumes [GH-10338]
-* builder/amazon: Support root volume encryption for amazon-chroot. [GH-10243]
-* builder/amazon: Validate IOPS ratio. [GH-10199]
 * builder/azure-arm: Add Azure CLI authentication support to builder.
     [GH-10157]
-* builder/azure-arm: Create keyvaults with SoftDelete enabled. [GH-10210]
-* builder/digitalocean: New option to provision with private ip. [GH-10093]
-* builder/google: Add `wait_to_add_ssh_keys` option to delay the addition of
-    SSH configuration that may be disrupted during an instance boot sequence.
-    [GH-10320]
-* builder/google: Add support for creating shielded VMs. [GH-10172]
-* builder/googlecompute-export: Add logging.write to service account scopes.
-    [GH-10316]
-* builder/oracle-oci: Support image launch mode. [GH-10212]
-* builder/outscale: Add outscale.hk endpoint support [GH-10207]
-* builder/outscale: Add x509 certificate support. [GH-10161]
-* builder/proxmox: New config option for boot-order. [GH-10260]
-* builder/scaleway: Use the SDK functions to load profile from file and env.
-    [GH-10181]
-* builder/virtualbox: Allow attaching guest additions with "none" communicator.
-    [GH-10306]
-* builder/vmware: Make compatible with MacOS BigSur by using Apple DHCP leases
-    instead of VMWare leases [GH-10384]
-* builder/vsphere: New option to add additional storage to a cloned vm.
-    [GH-10287]
-* builder/yandex: More resilient image mounting and initialization. [GH-10335]
-* builder/yandex: Update user-data to not use cloud-config fields to prevent
-    possible user data collisions. [GH-10385]
-* core/hcl: Update to `hcl2_upgrade` command to support complex variable values
-    and packer version blocks. [GH-10221]
-* hcl2upgrade: Update command to fix `env` call upgrade. [GH-10244]
+* 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]
-* post-processor/yandex-export: Add retries and wait after disk attach
-    operation. [GH-10303]
-* post-processor/yandex-export: Show progress on export. [GH-10368]
-* post-processor/yandex-export: Use ssh communicator in export. [GH-10352]
-* post-processor/yandex-export: Verify the access to a specific bucket.
-    [GH-10188]
-* provisioner/salt-masterless: Call winrepo.update_git_repos and
-    pkg.refresh_db. [GH-10201]
 
 ### BUG FIXES
-* builder/amazon: Fix retry logic in AWS spot instance tagging. [GH-10394]
 * builder/amazon: Fix single `tag` interpolation to allow for templating engine
     usage. [GH-10224]
-* builder/google: Fix crash when using the `-on-error` build flag. [GH-10247]
-* builder/google: Fix issue with service account detection when running Packer
-    on a compute instance with `use_os_login` enabled. [GH-10360]
-* builder/qemu: Fix duplication of main disk when setting "disk_image: true".
-    [GH-10337]
-* builder/qemu: Fix nil pointer dereference when loading values from state.
-    [GH-10249]
-* builder/qemu: Fix panic when disk_image=true and source image has no file
-    extension. [GH-10226]
-* builder/vagrant: Return error if ssh-config command fails. [GH-10213]
-* builder/vsphere: WaitForIP should not return an error if an IP is not found
-    [GH-10321]
-* builder/yandex: Change disk creation method to manual. [GH-10250]
-* builder/yandex: Fix issue with UserAgent string. [GH-10361]
-* builder/yandex: Fixed using cloud config when using IPv6. [GH-10297]
-* core/hcl: Ensure the `reverse` function does not break when given a value of
-    type list. [GH-10380]
-* post-processor/yandex-export: Check service account id. [GH-10305]
 
 ## 1.6.5 (October 30, 2020)
 

CODEOWNERS

@@ -37,8 +37,8 @@
 /builder/oracle/                      @prydie @owainlewis
 /website/pages/docs/builders/oracle* @prydie @owainlewis
 
-/builder/profitbricks/                      @LiviusP @mflorin
-/website/pages/docs/builders/profitbricks* @LiviusP @mflorin
+/builder/profitbricks/                      @jasmingacic
+/website/pages/docs/builders/profitbricks* @jasmingacic
 
 /builder/triton/                      @sean-
 /website/pages/docs/builders/triton* @sean-
@@ -87,6 +87,7 @@
 
 /post-processor/alicloud-import/        dongxiao.zzh@alibaba-inc.com
 /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

Makefile

@@ -1,7 +1,6 @@
 TEST?=$(shell go list ./...)
 COUNT?=1
 VET?=$(shell go list ./...)
-
 ACC_TEST_BUILDERS?=all
 ACC_TEST_PROVISIONERS?=all
 # Get the current full sha from git
@@ -49,7 +48,7 @@ package:
 	@sh -c "$(CURDIR)/scripts/dist.sh $(VERSION)"
 
 install-build-deps: ## Install dependencies for bin build
-	@go install github.com/mitchellh/gox@v1.0.1
+	@go get github.com/mitchellh/gox
 
 install-gen-deps: ## Install dependencies for code generation
 	# to avoid having to tidy our go deps, we `go get` our binaries from a temp
@@ -57,6 +56,7 @@ install-gen-deps: ## Install dependencies for code generation
 	# out code dependencies; so a go mod tidy will remove them again. `go
 	# install` seems to install the last tagged version and we want to install
 	# master.
+	@(cd $(TEMPDIR) && GO111MODULE=on go get github.com/mna/pigeon@master)
 	@(cd $(TEMPDIR) && GO111MODULE=on go get github.com/alvaroloes/enumer@master)
 	@go install ./cmd/struct-markdown
 	@go install ./cmd/mapstructure-to-hcl2
@@ -120,11 +120,13 @@ fmt-examples:
 # generate runs `go generate` to build the dynamically generated
 # source files.
 generate: install-gen-deps ## Generate dynamically generated code
-	@echo "==> removing autogenerated markdown..." # but don't remove partials generated in the SDK and copied over.
-	@find website/pages -path website/pages/partials/packer-plugin-sdk -prune -o -type f | xargs grep -l '^<!-- Code generated' | xargs rm -f
+	@echo "==> removing autogenerated markdown..."
+	@find website/pages/ -type f | xargs grep -l '^<!-- Code generated' | xargs rm -f
 	@echo "==> removing autogenerated code..."
-	@find post-processor helper builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm -f
-	PROJECT_ROOT="$(shell pwd)" go generate $(shell go list ./... | grep -v packer-plugin-sdk)
+	@find post-processor common helper template builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm -f
+	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..."
@@ -138,11 +140,11 @@ test: mode-check vet ## Run unit tests
 	@go test -count $(COUNT) $(TEST) $(TESTARGS) -timeout=3m
 
 # acctest runs provisioners acceptance tests
-provisioners-acctest: #install-build-deps generate
-	ACC_TEST_BUILDERS=$(ACC_TEST_BUILDERS) go test $(TEST) $(TESTARGS) -timeout=1h
+provisioners-acctest: install-build-deps generate
+	ACC_TEST_BUILDERS=$(ACC_TEST_BUILDERS) ACC_TEST_PROVISIONERS=$(ACC_TEST_PROVISIONERS) go test ./provisioner/... -timeout=1h
 
 # testacc runs acceptance tests
-testacc: # install-build-deps generate ## Run acceptance tests
+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
 

README.md

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

builder/alicloud/ecs/access_config.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	"github.com/hashicorp/packer/builder/alicloud/version"
+	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/version"
 	"github.com/mitchellh/go-homedir"
 )
 
@@ -78,7 +78,7 @@ func (c *AlicloudAccessConfig) Client() (*ClientWrapper, error) {
 		return nil, err
 	}
 
-	client.AppendUserAgent(Packer, version.AlicloudPluginVersion.FormattedVersion())
+	client.AppendUserAgent(Packer, version.FormattedVersion())
 	client.SetReadTimeout(DefaultRequestReadTimeout)
 	c.client = &ClientWrapper{client}
 

builder/alicloud/ecs/artifact.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Artifact struct {
@@ -136,7 +136,7 @@ func (a *Artifact) Destroy() error {
 		if len(errors) == 1 {
 			return errors[0]
 		} else {
-			return &packersdk.MultiError{Errors: errors}
+			return &packer.MultiError{Errors: errors}
 		}
 	}
 

builder/alicloud/ecs/artifact_test.go

@@ -4,11 +4,11 @@ import (
 	"reflect"
 	"testing"
 
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 func TestArtifact_Impl(t *testing.T) {
-	var _ packersdk.Artifact = new(Artifact)
+	var _ packer.Artifact = new(Artifact)
 }
 
 func TestArtifactId(t *testing.T) {

builder/alicloud/ecs/builder.go

@@ -1,6 +1,6 @@
 //go:generate mapstructure-to-hcl2 -type Config,AlicloudDiskDevice
 
-// The alicloud  contains a packersdk.Builder implementation that
+// The alicloud  contains a packer.Builder implementation that
 // builds ecs images for alicloud.
 package ecs
 
@@ -9,13 +9,12 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer-plugin-sdk/common"
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -67,20 +66,20 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	}
 
 	// Accumulate any errors
-	var errs *packersdk.MultiError
-	errs = packersdk.MultiErrorAppend(errs, b.config.AlicloudAccessConfig.Prepare(&b.config.ctx)...)
-	errs = packersdk.MultiErrorAppend(errs, b.config.AlicloudImageConfig.Prepare(&b.config.ctx)...)
-	errs = packersdk.MultiErrorAppend(errs, b.config.RunConfig.Prepare(&b.config.ctx)...)
+	var errs *packer.MultiError
+	errs = packer.MultiErrorAppend(errs, b.config.AlicloudAccessConfig.Prepare(&b.config.ctx)...)
+	errs = packer.MultiErrorAppend(errs, b.config.AlicloudImageConfig.Prepare(&b.config.ctx)...)
+	errs = packer.MultiErrorAppend(errs, b.config.RunConfig.Prepare(&b.config.ctx)...)
 
 	if errs != nil && len(errs.Errors) > 0 {
 		return nil, nil, errs
 	}
 
-	packersdk.LogSecretFilter.Set(b.config.AlicloudAccessKey, b.config.AlicloudSecretKey)
+	packer.LogSecretFilter.Set(b.config.AlicloudAccessKey, b.config.AlicloudSecretKey)
 	return nil, nil, nil
 }
 
-func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook) (packersdk.Artifact, error) {
+func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
 
 	client, err := b.config.Client()
 	if err != nil {
@@ -165,8 +164,8 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 				b.config.SSHPrivateIp),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&commonsteps.StepProvision{},
-		&commonsteps.StepCleanupTempKeys{
+		&common.StepProvision{},
+		&common.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&stepStopAlicloudInstance{
@@ -207,7 +206,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 		})
 
 	// Run!
-	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that

builder/alicloud/ecs/builder.hcl2spec.go

@@ -1,10 +1,9 @@
 // Code generated by "mapstructure-to-hcl2 -type Config,AlicloudDiskDevice"; DO NOT EDIT.
-
 package ecs
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -48,109 +47,108 @@ 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"`
-	PackerCoreVersion                 *string                  `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
-	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                  []config.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" 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"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -167,7 +165,6 @@ 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_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", 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},
@@ -194,7 +191,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((*config.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                          &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(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},

builder/alicloud/ecs/builder_acc_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	builderT "github.com/hashicorp/packer-plugin-sdk/acctest"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	builderT "github.com/hashicorp/packer/helper/builder/testing"
+	"github.com/hashicorp/packer/packer"
 )
 
 const defaultTestRegion = "cn-beijing"
@@ -104,7 +104,7 @@ const testBuilderAccWithDiskSettings = `
 }`
 
 func checkImageDisksSettings() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+	return func(artifacts []packer.Artifact) error {
 		if len(artifacts) > 1 {
 			return fmt.Errorf("more than 1 artifact")
 		}
@@ -215,7 +215,7 @@ const testBuilderAccIgnoreDataDisks = `
 }`
 
 func checkIgnoreDataDisks() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+	return func(artifacts []packer.Artifact) error {
 		if len(artifacts) > 1 {
 			return fmt.Errorf("more than 1 artifact")
 		}
@@ -308,7 +308,7 @@ const testBuilderAccRegionCopy = `
 `
 
 func checkRegionCopy(regions []string) builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+	return func(artifacts []packer.Artifact) error {
 		if len(artifacts) > 1 {
 			return fmt.Errorf("more than 1 artifact")
 		}
@@ -438,7 +438,7 @@ const testBuilderAccSharing = `
 `
 
 func checkECSImageSharing(uid string) builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+	return func(artifacts []packer.Artifact) error {
 		if len(artifacts) > 1 {
 			return fmt.Errorf("more than 1 artifact")
 		}
@@ -534,7 +534,7 @@ const testBuilderAccForceDeleteSnapshot = `
 `
 
 func checkSnapshotsDeleted(snapshotIds []string) builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+	return func(artifacts []packer.Artifact) error {
 		// Verify the snapshots are gone
 		client, _ := testAliyunClient()
 		data, err := json.Marshal(snapshotIds)
@@ -587,7 +587,7 @@ const testBuilderAccImageTags = `
 }`
 
 func checkImageTags() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+	return func(artifacts []packer.Artifact) error {
 		if len(artifacts) > 1 {
 			return fmt.Errorf("more than 1 artifact")
 		}
@@ -716,7 +716,7 @@ const testBuilderAccDataDiskEncrypted = `
 }`
 
 func checkDataDiskEncrypted() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+	return func(artifacts []packer.Artifact) error {
 		if len(artifacts) > 1 {
 			return fmt.Errorf("more than 1 artifact")
 		}
@@ -815,7 +815,7 @@ const testBuilderAccSystemDiskEncrypted = `
 }`
 
 func checkSystemDiskEncrypted() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+	return func(artifacts []packer.Artifact) error {
 		if len(artifacts) > 1 {
 			return fmt.Errorf("more than 1 artifact")
 		}

builder/alicloud/ecs/builder_test.go

@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	helperconfig "github.com/hashicorp/packer-plugin-sdk/template/config"
+	helperconfig "github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testBuilderConfig() map[string]interface{} {
@@ -24,7 +24,7 @@ func testBuilderConfig() map[string]interface{} {
 func TestBuilder_ImplementsBuilder(t *testing.T) {
 	var raw interface{}
 	raw = &Builder{}
-	if _, ok := raw.(packersdk.Builder); !ok {
+	if _, ok := raw.(packer.Builder); !ok {
 		t.Fatalf("Builder should be a builder")
 	}
 }

builder/alicloud/ecs/image_config.go

@@ -7,8 +7,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // The "AlicloudDiskDevice" object us used for the `ECSSystemDiskMapping` and
@@ -153,9 +154,9 @@ type AlicloudImageConfig struct {
 	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
-	// [`dynamic_block`](/docs/templates/hcl_templates/expressions#dynamic-blocks)
+	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	AlicloudImageTag    config.KeyValues `mapstructure:"tag" required:"false"`
+	AlicloudImageTag    hcl2template.KeyValues `mapstructure:"tag" required:"false"`
 	AlicloudDiskDevices `mapstructure:",squash"`
 }
 

builder/alicloud/ecs/packer_helper.go

@@ -4,15 +4,15 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 func cleanUpMessage(state multistep.StateBag, module string) {
 	_, cancelled := state.GetOk(multistep.StateCancelled)
 	_, halted := state.GetOk(multistep.StateHalted)
 
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	if cancelled || halted {
 		ui.Say(fmt.Sprintf("Deleting %s because of cancellation or error...", module))
@@ -22,7 +22,7 @@ func cleanUpMessage(state multistep.StateBag, module string) {
 }
 
 func halt(state multistep.StateBag, err error, prefix string) multistep.StepAction {
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	if prefix != "" {
 		err = fmt.Errorf("%s: %s", prefix, err)

builder/alicloud/ecs/run_config.go

@@ -8,10 +8,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	"github.com/hashicorp/packer-plugin-sdk/uuid"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type RunConfig struct {

builder/alicloud/ecs/run_config_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func testConfig() *RunConfig {

builder/alicloud/ecs/ssh_helper.go

@@ -3,7 +3,7 @@ package ecs
 import (
 	"time"
 
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 var (

builder/alicloud/ecs/step_attach_keypair.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepAttachKeyPair struct {
@@ -21,7 +21,7 @@ var attachKeyPairNotRetryErrors = []string{
 }
 
 func (s *stepAttachKeyPair) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	client := state.Get("client").(*ClientWrapper)
 	config := state.Get("config").(*Config)
 	instance := state.Get("instance").(*ecs.Instance)
@@ -52,7 +52,7 @@ func (s *stepAttachKeyPair) Run(ctx context.Context, state multistep.StateBag) m
 func (s *stepAttachKeyPair) Cleanup(state multistep.StateBag) {
 	client := state.Get("client").(*ClientWrapper)
 	config := state.Get("config").(*Config)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	instance := state.Get("instance").(*ecs.Instance)
 	keyPairName := config.Comm.SSHKeyPairName
 	if keyPairName == "" {

builder/alicloud/ecs/step_check_source_image.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCheckAlicloudSourceImage struct {
@@ -16,7 +16,7 @@ type stepCheckAlicloudSourceImage struct {
 func (s *stepCheckAlicloudSourceImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	client := state.Get("client").(*ClientWrapper)
 	config := state.Get("config").(*Config)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	describeImagesRequest := ecs.CreateDescribeImagesRequest()
 	describeImagesRequest.RegionId = config.AlicloudRegion

builder/alicloud/ecs/step_config_eip.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
-	"github.com/hashicorp/packer-plugin-sdk/uuid"
+	"github.com/hashicorp/packer/common/uuid"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepConfigAlicloudEIP struct {
@@ -28,7 +28,7 @@ var allocateEipAddressRetryErrors = []string{
 
 func (s *stepConfigAlicloudEIP) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	instance := state.Get("instance").(*ecs.Instance)
 
 	if s.SSHPrivateIp {
@@ -96,7 +96,7 @@ func (s *stepConfigAlicloudEIP) Cleanup(state multistep.StateBag) {
 
 	client := state.Get("client").(*ClientWrapper)
 	instance := state.Get("instance").(*ecs.Instance)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	unassociateEipAddressRequest := ecs.CreateUnassociateEipAddressRequest()
 	unassociateEipAddressRequest.AllocationId = s.allocatedId

builder/alicloud/ecs/step_config_key_pair.go

@@ -7,9 +7,9 @@ import (
 	"runtime"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepConfigAlicloudKeyPair struct {
@@ -22,7 +22,7 @@ type stepConfigAlicloudKeyPair struct {
 }
 
 func (s *stepConfigAlicloudKeyPair) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	if s.Comm.SSHPrivateKeyFile != "" {
 		ui.Say("Using existing SSH private key")
@@ -108,7 +108,7 @@ func (s *stepConfigAlicloudKeyPair) Cleanup(state multistep.StateBag) {
 	}
 
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	// Remove the keypair
 	ui.Say("Deleting temporary keypair...")

builder/alicloud/ecs/step_config_public_ip.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepConfigAlicloudPublicIP struct {
@@ -17,7 +17,7 @@ type stepConfigAlicloudPublicIP struct {
 
 func (s *stepConfigAlicloudPublicIP) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	instance := state.Get("instance").(*ecs.Instance)
 
 	if s.SSHPrivateIp {

builder/alicloud/ecs/step_config_security_group.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/uuid"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepConfigAlicloudSecurityGroup struct {
@@ -30,7 +30,7 @@ var deleteSecurityGroupRetryErrors = []string{
 
 func (s *stepConfigAlicloudSecurityGroup) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	networkType := state.Get("networktype").(InstanceNetWork)
 
 	if len(s.SecurityGroupId) != 0 {
@@ -117,7 +117,7 @@ func (s *stepConfigAlicloudSecurityGroup) Cleanup(state multistep.StateBag) {
 	cleanUpMessage(state, "security group")
 
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	_, err := client.WaitForExpected(&WaitForExpectArgs{
 		RequestFunc: func() (responses.AcsResponse, error) {

builder/alicloud/ecs/step_config_vpc.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/uuid"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepConfigAlicloudVPC struct {
@@ -35,7 +35,7 @@ var deleteVpcRetryErrors = []string{
 func (s *stepConfigAlicloudVPC) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	if len(s.VpcId) != 0 {
 		describeVpcsRequest := ecs.CreateDescribeVpcsRequest()
@@ -118,7 +118,7 @@ func (s *stepConfigAlicloudVPC) Cleanup(state multistep.StateBag) {
 	cleanUpMessage(state, "VPC")
 
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	_, err := client.WaitForExpected(&WaitForExpectArgs{
 		RequestFunc: func() (responses.AcsResponse, error) {

builder/alicloud/ecs/step_config_vswitch.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/uuid"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepConfigAlicloudVSwitch struct {
@@ -33,7 +33,7 @@ var deleteVSwitchRetryErrors = []string{
 
 func (s *stepConfigAlicloudVSwitch) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	vpcId := state.Get("vpcid").(string)
 	config := state.Get("config").(*Config)
 
@@ -176,7 +176,7 @@ func (s *stepConfigAlicloudVSwitch) Cleanup(state multistep.StateBag) {
 	cleanUpMessage(state, "vSwitch")
 
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	_, err := client.WaitForExpected(&WaitForExpectArgs{
 		RequestFunc: func() (responses.AcsResponse, error) {

builder/alicloud/ecs/step_create_image.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer-plugin-sdk/random"
+	"github.com/hashicorp/packer/common/random"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/uuid"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCreateAlicloudImage struct {
@@ -27,7 +27,7 @@ var createImageRetryErrors = []string{
 func (s *stepCreateAlicloudImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	tempImageName := config.AlicloudImageName
 	if config.ImageEncrypted.True() {
@@ -95,7 +95,7 @@ func (s *stepCreateAlicloudImage) Cleanup(state multistep.StateBag) {
 	}
 
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	if !cancelled && !halted && encryptedSet {
 		ui.Say(fmt.Sprintf("Deleting temporary image %s(%s) and related snapshots after finishing encryption...", s.image.ImageId, s.image.ImageName))

builder/alicloud/ecs/step_create_instance.go

@@ -7,14 +7,14 @@ import (
 	"io/ioutil"
 	"strconv"
 
-	"github.com/hashicorp/packer-plugin-sdk/uuid"
+	"github.com/hashicorp/packer/common/uuid"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	confighelper "github.com/hashicorp/packer-plugin-sdk/template/config"
+	confighelper "github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCreateAlicloudInstance struct {
@@ -41,7 +41,7 @@ var deleteInstanceRetryErrors = []string{
 
 func (s *stepCreateAlicloudInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	ui.Say("Creating instance...")
 	createInstanceRequest, err := s.buildCreateInstanceRequest(state)
@@ -91,7 +91,7 @@ func (s *stepCreateAlicloudInstance) Cleanup(state multistep.StateBag) {
 	cleanUpMessage(state, "instance")
 
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	_, err := client.WaitForExpected(&WaitForExpectArgs{
 		RequestFunc: func() (responses.AcsResponse, error) {

builder/alicloud/ecs/step_create_snapshot.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCreateAlicloudSnapshot struct {
@@ -19,7 +19,7 @@ type stepCreateAlicloudSnapshot struct {
 func (s *stepCreateAlicloudSnapshot) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	instance := state.Get("instance").(*ecs.Instance)
 
 	describeDisksRequest := ecs.CreateDescribeDisksRequest()
@@ -77,7 +77,7 @@ func (s *stepCreateAlicloudSnapshot) Cleanup(state multistep.StateBag) {
 	}
 
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	ui.Say("Deleting the snapshot because of cancellation or error...")
 

builder/alicloud/ecs/step_create_tags.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCreateTags struct {
@@ -16,7 +16,7 @@ type stepCreateTags struct {
 func (s *stepCreateTags) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	imageId := state.Get("alicloudimage").(string)
 	snapshotIds := state.Get("alicloudsnapshots").([]string)
 

builder/alicloud/ecs/step_delete_images_snapshots.go

@@ -6,8 +6,8 @@ import (
 	"log"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepDeleteAlicloudImageSnapshots struct {
@@ -54,7 +54,7 @@ func (s *stepDeleteAlicloudImageSnapshots) Run(ctx context.Context, state multis
 
 func (s *stepDeleteAlicloudImageSnapshots) deleteImageAndSnapshots(state multistep.StateBag, imageName string, region string) error {
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	describeImagesRequest := ecs.CreateDescribeImagesRequest()
 	describeImagesRequest.RegionId = region

builder/alicloud/ecs/step_pre_validate.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepPreValidate struct {
@@ -27,7 +27,7 @@ func (s *stepPreValidate) Run(ctx context.Context, state multistep.StateBag) mul
 }
 
 func (s *stepPreValidate) validateRegions(state multistep.StateBag) error {
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	config := state.Get("config").(*Config)
 
 	if config.AlicloudSkipValidation {
@@ -37,13 +37,13 @@ func (s *stepPreValidate) validateRegions(state multistep.StateBag) error {
 
 	ui.Say("Prevalidating source region and copied regions...")
 
-	var errs *packersdk.MultiError
+	var errs *packer.MultiError
 	if err := config.ValidateRegion(config.AlicloudRegion); err != nil {
-		errs = packersdk.MultiErrorAppend(errs, err)
+		errs = packer.MultiErrorAppend(errs, err)
 	}
 	for _, region := range config.AlicloudImageDestinationRegions {
 		if err := config.ValidateRegion(region); err != nil {
-			errs = packersdk.MultiErrorAppend(errs, err)
+			errs = packer.MultiErrorAppend(errs, err)
 		}
 	}
 
@@ -55,7 +55,7 @@ func (s *stepPreValidate) validateRegions(state multistep.StateBag) error {
 }
 
 func (s *stepPreValidate) validateDestImageName(state multistep.StateBag) error {
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	client := state.Get("client").(*ClientWrapper)
 	config := state.Get("config").(*Config)
 

builder/alicloud/ecs/step_region_copy_image.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	confighelper "github.com/hashicorp/packer-plugin-sdk/template/config"
+	confighelper "github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepRegionCopyAlicloudImage struct {
@@ -31,7 +31,7 @@ func (s *stepRegionCopyAlicloudImage) Run(ctx context.Context, state multistep.S
 	}
 
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	srcImageId := state.Get("alicloudimage").(string)
 	alicloudImages := state.Get("alicloudimages").(map[string]string)
@@ -83,7 +83,7 @@ func (s *stepRegionCopyAlicloudImage) Cleanup(state multistep.StateBag) {
 		return
 	}
 
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	ui.Say(fmt.Sprintf("Stopping copy image because cancellation or error..."))
 
 	client := state.Get("client").(*ClientWrapper)

builder/alicloud/ecs/step_run_instance.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepRunAlicloudInstance struct {
@@ -15,7 +15,7 @@ type stepRunAlicloudInstance struct {
 
 func (s *stepRunAlicloudInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	instance := state.Get("instance").(*ecs.Instance)
 
 	startInstanceRequest := ecs.CreateStartInstanceRequest()
@@ -42,7 +42,7 @@ func (s *stepRunAlicloudInstance) Cleanup(state multistep.StateBag) {
 		return
 	}
 
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	client := state.Get("client").(*ClientWrapper)
 	instance := state.Get("instance").(*ecs.Instance)
 

builder/alicloud/ecs/step_share_image.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepShareAlicloudImage struct {
@@ -41,7 +41,7 @@ func (s *stepShareAlicloudImage) Cleanup(state multistep.StateBag) {
 		return
 	}
 
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	client := state.Get("client").(*ClientWrapper)
 	alicloudImages := state.Get("alicloudimages").(map[string]string)
 

builder/alicloud/ecs/step_stop_instance.go

@@ -8,8 +8,8 @@ import (
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepStopAlicloudInstance struct {
@@ -20,7 +20,7 @@ type stepStopAlicloudInstance struct {
 func (s *stepStopAlicloudInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	client := state.Get("client").(*ClientWrapper)
 	instance := state.Get("instance").(*ecs.Instance)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	if !s.DisableStop {
 		ui.Say(fmt.Sprintf("Stopping instance: %s", instance.InstanceId))

builder/alicloud/version/version.go

@@ -1,13 +0,0 @@
-package version
-
-import (
-	"github.com/hashicorp/packer-plugin-sdk/version"
-	packerVersion "github.com/hashicorp/packer/version"
-)
-
-var AlicloudPluginVersion *version.PluginVersion
-
-func init() {
-	AlicloudPluginVersion = version.InitializePluginVersion(
-		packerVersion.Version, packerVersion.VersionPrerelease)
-}

builder/amazon/chroot/builder.go

@@ -10,20 +10,19 @@ package chroot
 import (
 	"context"
 	"errors"
-	"fmt"
 	"runtime"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	awscommon "github.com/hashicorp/packer-plugin-amazon/builder/common"
-	"github.com/hashicorp/packer-plugin-sdk/chroot"
-	"github.com/hashicorp/packer-plugin-sdk/common"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/packerbuilderdata"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	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"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -162,34 +161,14 @@ type Config struct {
 	//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/legacy_json_templates/engine), see [Build template
+	// 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
-	// [`dynamic_block`](/docs/templates/hcl_templates/expressions#dynamic-blocks)
+	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	RootVolumeTag config.KeyValues `mapstructure:"root_volume_tag" required:"false"`
-	// Whether or not to encrypt the volumes that are *launched*. By default, Packer will keep
-	// the encryption setting to what it was in the source image when set to `false`. Setting true will
-	// always result in an encrypted one.
-	RootVolumeEncryptBoot config.Trilean `mapstructure:"root_volume_encrypt_boot" required:"false"`
-	// ID, alias or ARN of the KMS key to use for *launched* volumes encryption.
-	//
-	// Set this value if you select `root_volume_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 set this
-	// and `root_volume_encrypt_boot` to `true` and not use `encrypt_boot` and `kms_key_id`. 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 -
-	// 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/`.
-	RootVolumeKmsKeyId string `mapstructure:"root_volume_kms_key_id" required:"false"`
+	RootVolumeTag hcl2template.KeyValues `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"`
@@ -281,17 +260,19 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	}
 
 	// Accumulate any errors or warnings
-	var errs *packersdk.MultiError
+	var errs *packer.MultiError
 	var warns []string
 
-	errs = packersdk.MultiErrorAppend(errs, b.config.RootVolumeTag.CopyOn(&b.config.RootVolumeTags)...)
-	errs = packersdk.MultiErrorAppend(errs, b.config.AccessConfig.Prepare()...)
-	errs = packersdk.MultiErrorAppend(errs,
+	errs = packer.MultiErrorAppend(errs, b.config.RootVolumeTag.CopyOn(&b.config.RootVolumeTags)...)
+	errs = packer.MultiErrorAppend(errs, b.config.SourceAmiFilter.Prepare()...)
+
+	errs = packer.MultiErrorAppend(errs, b.config.AccessConfig.Prepare(&b.config.ctx)...)
+	errs = packer.MultiErrorAppend(errs,
 		b.config.AMIConfig.Prepare(&b.config.AccessConfig, &b.config.ctx)...)
 
 	for _, mounts := range b.config.ChrootMounts {
 		if len(mounts) != 3 {
-			errs = packersdk.MultiErrorAppend(
+			errs = packer.MultiErrorAppend(
 				errs, errors.New("Each chroot_mounts entry should be three elements."))
 			break
 		}
@@ -302,56 +283,45 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 			warns = append(warns, "source_ami and source_ami_filter are unused when from_scratch is true")
 		}
 		if b.config.RootVolumeSize == 0 {
-			errs = packersdk.MultiErrorAppend(
+			errs = packer.MultiErrorAppend(
 				errs, errors.New("root_volume_size is required with from_scratch."))
 		}
 		if len(b.config.PreMountCommands) == 0 {
-			errs = packersdk.MultiErrorAppend(
+			errs = packer.MultiErrorAppend(
 				errs, errors.New("pre_mount_commands is required with from_scratch."))
 		}
 		if b.config.AMIVirtType == "" {
-			errs = packersdk.MultiErrorAppend(
+			errs = packer.MultiErrorAppend(
 				errs, errors.New("ami_virtualization_type is required with from_scratch."))
 		}
 		if b.config.RootDeviceName == "" {
-			errs = packersdk.MultiErrorAppend(
+			errs = packer.MultiErrorAppend(
 				errs, errors.New("root_device_name is required with from_scratch."))
 		}
 		if len(b.config.AMIMappings) == 0 {
-			errs = packersdk.MultiErrorAppend(
+			errs = packer.MultiErrorAppend(
 				errs, errors.New("ami_block_device_mappings is required with from_scratch."))
 		}
 	} else {
 		if b.config.SourceAmi == "" && b.config.SourceAmiFilter.Empty() {
-			errs = packersdk.MultiErrorAppend(
+			errs = packer.MultiErrorAppend(
 				errs, errors.New("source_ami or source_ami_filter is required."))
 		}
 		if len(b.config.AMIMappings) > 0 && b.config.RootDeviceName != "" {
 			if b.config.RootVolumeSize == 0 {
 				// Although, they can specify the device size in the block
 				// device mapping, it's easier to be specific here.
-				errs = packersdk.MultiErrorAppend(
+				errs = packer.MultiErrorAppend(
 					errs, errors.New("root_volume_size is required if ami_block_device_mappings is specified"))
 			}
 			warns = append(warns, "ami_block_device_mappings from source image will be completely overwritten")
 		} else if len(b.config.AMIMappings) > 0 {
-			errs = packersdk.MultiErrorAppend(
+			errs = packer.MultiErrorAppend(
 				errs, errors.New("If ami_block_device_mappings is specified, root_device_name must be specified"))
 		} else if b.config.RootDeviceName != "" {
-			errs = packersdk.MultiErrorAppend(
+			errs = packer.MultiErrorAppend(
 				errs, errors.New("If root_device_name is specified, ami_block_device_mappings must be specified"))
 		}
-
-		if b.config.RootVolumeKmsKeyId != "" {
-			if b.config.RootVolumeEncryptBoot.False() {
-				errs = packersdk.MultiErrorAppend(
-					errs, errors.New("If you have set root_volume_kms_key_id, root_volume_encrypt_boot must also be true."))
-			} else if b.config.RootVolumeEncryptBoot.True() && !awscommon.ValidateKmsKey(b.config.RootVolumeKmsKeyId) {
-				errs = packersdk.MultiErrorAppend(
-					errs, fmt.Errorf("%q is not a valid KMS Key Id.", b.config.RootVolumeKmsKeyId))
-			}
-		}
-
 	}
 	valid := false
 	for _, validArch := range []string{"x86_64", "arm64"} {
@@ -361,21 +331,21 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 		}
 	}
 	if !valid {
-		errs = packersdk.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "x86_64" and "arm64"`))
+		errs = packer.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "x86_64" and "arm64"`))
 	}
 
 	if errs != nil && len(errs.Errors) > 0 {
 		return nil, warns, errs
 	}
 
-	packersdk.LogSecretFilter.Set(b.config.AccessKey, b.config.SecretKey, b.config.Token)
+	packer.LogSecretFilter.Set(b.config.AccessKey, b.config.SecretKey, b.config.Token)
 	generatedData := awscommon.GetGeneratedDataList()
 	generatedData = append(generatedData, "Device", "MountPath")
 
 	return generatedData, warns, nil
 }
 
-func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook) (packersdk.Artifact, error) {
+func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
 	if runtime.GOOS != "linux" {
 		return nil, errors.New("The amazon-chroot builder only works on Linux environments.")
 	}
@@ -432,13 +402,11 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 			GeneratedData: generatedData,
 		},
 		&StepCreateVolume{
-			PollingConfig:         b.config.PollingConfig,
-			RootVolumeType:        b.config.RootVolumeType,
-			RootVolumeSize:        b.config.RootVolumeSize,
-			RootVolumeTags:        b.config.RootVolumeTags,
-			RootVolumeEncryptBoot: b.config.RootVolumeEncryptBoot,
-			RootVolumeKmsKeyId:    b.config.RootVolumeKmsKeyId,
-			Ctx:                   b.config.ctx,
+			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,
@@ -510,7 +478,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 	)
 
 	// Run!
-	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that

builder/amazon/chroot/builder.hcl2spec.go

@@ -1,11 +1,10 @@
 // Code generated by "mapstructure-to-hcl2 -type Config,BlockDevices,BlockDevice"; DO NOT EDIT.
-
 package chroot
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer-plugin-amazon/builder/common"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -14,7 +13,6 @@ import (
 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"`
-	PackerCoreVersion       *string                           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	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"`
@@ -29,7 +27,7 @@ type FlatConfig struct {
 	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                  []config.FlatKeyValue             `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
+	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"`
@@ -39,7 +37,7 @@ type FlatConfig struct {
 	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             []config.FlatKeyValue             `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
+	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"`
@@ -76,9 +74,7 @@ type FlatConfig struct {
 	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           []config.FlatKeyValue             `mapstructure:"root_volume_tag" required:"false" cty:"root_volume_tag" hcl:"root_volume_tag"`
-	RootVolumeEncryptBoot   *bool                             `mapstructure:"root_volume_encrypt_boot" required:"false" cty:"root_volume_encrypt_boot" hcl:"root_volume_encrypt_boot"`
-	RootVolumeKmsKeyId      *string                           `mapstructure:"root_volume_kms_key_id" required:"false" cty:"root_volume_kms_key_id" hcl:"root_volume_kms_key_id"`
+	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"`
 }
 
@@ -96,7 +92,6 @@ 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_core_version":           &hcldec.AttrSpec{Name: "packer_core_version", 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},
@@ -111,7 +106,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((*config.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(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},
@@ -121,7 +116,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((*config.FlatKeyValue)(nil).HCL2Spec())},
+		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(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},
@@ -158,9 +153,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((*config.FlatKeyValue)(nil).HCL2Spec())},
-		"root_volume_encrypt_boot":      &hcldec.AttrSpec{Name: "root_volume_encrypt_boot", Type: cty.Bool, Required: false},
-		"root_volume_kms_key_id":        &hcldec.AttrSpec{Name: "root_volume_kms_key_id", Type: cty.String, Required: false},
+		"root_volume_tag":               &hcldec.BlockListSpec{TypeName: "root_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
 		"ami_architecture":              &hcldec.AttrSpec{Name: "ami_architecture", Type: cty.String, Required: false},
 	}
 	return s

builder/amazon/chroot/builder_test.go

@@ -0,0 +1,251 @@
+package chroot
+
+import (
+	"testing"
+
+	"github.com/hashicorp/packer/packer"
+)
+
+func testConfig() map[string]interface{} {
+	return map[string]interface{}{
+		"ami_name":   "foo",
+		"source_ami": "foo",
+		"region":     "us-east-1",
+		// region validation logic is checked in ami_config_test
+		"skip_region_validation": true,
+	}
+}
+
+func TestBuilder_ImplementsBuilder(t *testing.T) {
+	var raw interface{}
+	raw = &Builder{}
+	if _, ok := raw.(packer.Builder); !ok {
+		t.Fatalf("Builder should be a builder")
+	}
+}
+
+func TestBuilderPrepare_AMIName(t *testing.T) {
+	var b Builder
+	config := testConfig()
+
+	// Test good
+	config["ami_name"] = "foo"
+	config["skip_region_validation"] = true
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Fatalf("should not have error: %s", err)
+	}
+
+	// Test bad
+	config["ami_name"] = "foo {{"
+	b = Builder{}
+	_, warnings, err = b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatal("should have error")
+	}
+
+	// Test bad
+	delete(config, "ami_name")
+	b = Builder{}
+	_, warnings, err = b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatal("should have error")
+	}
+}
+
+func TestBuilderPrepare_ChrootMounts(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	config["chroot_mounts"] = nil
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Errorf("err: %s", err)
+	}
+}
+
+func TestBuilderPrepare_ChrootMountsBadDefaults(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	config["chroot_mounts"] = [][]string{
+		{"bad"},
+	}
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatal("should have error")
+	}
+}
+func TestBuilderPrepare_SourceAmi(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	config["source_ami"] = ""
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatal("should have error")
+	}
+
+	config["source_ami"] = "foo"
+	_, warnings, err = b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Errorf("err: %s", err)
+	}
+}
+
+func TestBuilderPrepare_CommandWrapper(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	config["command_wrapper"] = "echo hi; {{.Command}}"
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Errorf("err: %s", err)
+	}
+}
+
+func TestBuilderPrepare_CopyFiles(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Errorf("err: %s", err)
+	}
+
+	if len(b.config.CopyFiles) != 1 && b.config.CopyFiles[0] != "/etc/resolv.conf" {
+		t.Errorf("Was expecting default value for copy_files.")
+	}
+}
+
+func TestBuilderPrepare_CopyFilesNoDefault(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	config["copy_files"] = []string{}
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Errorf("err: %s", err)
+	}
+
+	if len(b.config.CopyFiles) > 0 {
+		t.Errorf("Was expecting no default value for copy_files. Found %v",
+			b.config.CopyFiles)
+	}
+}
+
+func TestBuilderPrepare_RootDeviceNameAndAMIMappings(t *testing.T) {
+	var b Builder
+	config := testConfig()
+
+	config["root_device_name"] = "/dev/sda"
+	config["ami_block_device_mappings"] = []interface{}{map[string]string{}}
+	config["root_volume_size"] = 15
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) == 0 {
+		t.Fatal("Missing warning, stating block device mappings will be overwritten")
+	} else if len(warnings) > 1 {
+		t.Fatalf("excessive warnings: %#v", warnings)
+	}
+	if err != nil {
+		t.Fatalf("should not have error: %s", err)
+	}
+}
+
+func TestBuilderPrepare_AMIMappingsNoRootDeviceName(t *testing.T) {
+	var b Builder
+	config := testConfig()
+
+	config["ami_block_device_mappings"] = []interface{}{map[string]string{}}
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatalf("should have error")
+	}
+}
+
+func TestBuilderPrepare_RootDeviceNameNoAMIMappings(t *testing.T) {
+	var b Builder
+	config := testConfig()
+
+	config["root_device_name"] = "/dev/sda"
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatalf("should have error")
+	}
+}
+
+func TestBuilderPrepare_ReturnGeneratedData(t *testing.T) {
+	var b Builder
+	config := testConfig()
+
+	generatedData, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Fatalf("should not have error: %s", err)
+	}
+	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")
+	}
+	if generatedData[6] != "Device" {
+		t.Fatalf("Generated data should contain Device")
+	}
+	if generatedData[7] != "MountPath" {
+		t.Fatalf("Generated data should contain MountPath")
+	}
+}

builder/amazon/chroot/copy_files_test.go

@@ -0,0 +1,51 @@
+package chroot
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"runtime"
+	"testing"
+
+	"github.com/hashicorp/packer/common"
+)
+
+func TestCopyFile(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		return
+	}
+
+	first, err := ioutil.TempFile("", "copy_files_test")
+	if err != nil {
+		t.Fatalf("couldn't create temp file.")
+	}
+	defer os.Remove(first.Name())
+	newName := first.Name() + "-new"
+
+	payload := "copy_files_test.go payload"
+	if _, err = first.WriteString(payload); err != nil {
+		t.Fatalf("Couldn't write payload to first file.")
+	}
+	first.Sync()
+
+	cmd := common.ShellCommand(fmt.Sprintf("cp %s %s", first.Name(), newName))
+	if err := cmd.Run(); err != nil {
+		t.Fatalf("Couldn't copy file")
+	}
+	defer os.Remove(newName)
+
+	second, err := os.Open(newName)
+	if err != nil {
+		t.Fatalf("Couldn't open copied file.")
+	}
+	defer second.Close()
+
+	var copiedPayload = make([]byte, len(payload))
+	if _, err := second.Read(copiedPayload); err != nil {
+		t.Fatalf("Couldn't open copied file for reading.")
+	}
+
+	if string(copiedPayload) != payload {
+		t.Fatalf("payload not copied.")
+	}
+}

builder/amazon/chroot/device_test.go

@@ -0,0 +1,10 @@
+package chroot
+
+import "testing"
+
+func TestDevicePrefixMatch(t *testing.T) {
+	/*
+		if devicePrefixMatch("nvme0n1") != "" {
+		}
+	*/
+}

builder/amazon/chroot/step_attach_volume.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	awscommon "github.com/hashicorp/packer-plugin-amazon/builder/common"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepAttachVolume attaches the previously created volume to an
@@ -28,7 +28,7 @@ func (s *StepAttachVolume) Run(ctx context.Context, state multistep.StateBag) mu
 	ec2conn := state.Get("ec2").(*ec2.EC2)
 	device := state.Get("device").(string)
 	instance := state.Get("instance").(*ec2.Instance)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	volumeId := state.Get("volume_id").(string)
 
 	// For the API call, it expects "sd" prefixed devices.
@@ -65,7 +65,7 @@ func (s *StepAttachVolume) Run(ctx context.Context, state multistep.StateBag) mu
 }
 
 func (s *StepAttachVolume) Cleanup(state multistep.StateBag) {
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	if err := s.CleanupFunc(state); err != nil {
 		ui.Error(err.Error())
 	}
@@ -77,7 +77,7 @@ func (s *StepAttachVolume) CleanupFunc(state multistep.StateBag) error {
 	}
 
 	ec2conn := state.Get("ec2").(*ec2.EC2)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	ui.Say("Detaching EBS volume...")
 	_, err := ec2conn.DetachVolume(&ec2.DetachVolumeInput{VolumeId: &s.volumeId})

builder/amazon/chroot/step_attach_volume_test.go

@@ -0,0 +1,15 @@
+package chroot
+
+import (
+	"testing"
+
+	"github.com/hashicorp/packer/common/chroot"
+)
+
+func TestAttachVolumeCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
+	var raw interface{}
+	raw = new(StepAttachVolume)
+	if _, ok := raw.(chroot.Cleanup); !ok {
+		t.Fatalf("cleanup func should be a CleanupFunc")
+	}
+}

builder/amazon/chroot/step_check_root_device.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepCheckRootDevice makes sure the root device on the AMI is EBS-backed.
@@ -14,7 +14,7 @@ type StepCheckRootDevice struct{}
 
 func (s *StepCheckRootDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	image := state.Get("source_image").(*ec2.Image)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	ui.Say("Checking the root device on source AMI...")
 

builder/amazon/chroot/step_create_volume.go

@@ -8,11 +8,10 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	awscommon "github.com/hashicorp/packer-plugin-amazon/builder/common"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	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"
 )
 
 // StepCreateVolume creates a new volume from the snapshot of the root
@@ -21,21 +20,19 @@ import (
 // Produces:
 //   volume_id string - The ID of the created volume
 type StepCreateVolume struct {
-	PollingConfig         *awscommon.AWSPollingConfig
-	volumeId              string
-	RootVolumeSize        int64
-	RootVolumeType        string
-	RootVolumeTags        map[string]string
-	RootVolumeEncryptBoot config.Trilean
-	RootVolumeKmsKeyId    string
-	Ctx                   interpolate.Context
+	PollingConfig  *awscommon.AWSPollingConfig
+	volumeId       string
+	RootVolumeSize int64
+	RootVolumeType string
+	RootVolumeTags map[string]string
+	Ctx            interpolate.Context
 }
 
 func (s *StepCreateVolume) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
 	ec2conn := state.Get("ec2").(*ec2.EC2)
 	instance := state.Get("instance").(*ec2.Instance)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	volTags, err := awscommon.TagMap(s.RootVolumeTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
 	if err != nil {
@@ -132,7 +129,7 @@ func (s *StepCreateVolume) Cleanup(state multistep.StateBag) {
 	}
 
 	ec2conn := state.Get("ec2").(*ec2.EC2)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	ui.Say("Deleting the created EBS volume...")
 	_, err := ec2conn.DeleteVolume(&ec2.DeleteVolumeInput{VolumeId: &s.volumeId})
@@ -151,21 +148,11 @@ func (s *StepCreateVolume) buildCreateVolumeInput(az string, rootDevice *ec2.Blo
 		SnapshotId:       rootDevice.Ebs.SnapshotId,
 		VolumeType:       rootDevice.Ebs.VolumeType,
 		Iops:             rootDevice.Ebs.Iops,
-		Encrypted:        rootDevice.Ebs.Encrypted,
-		KmsKeyId:         rootDevice.Ebs.KmsKeyId,
 	}
 	if s.RootVolumeSize > *rootDevice.Ebs.VolumeSize {
 		createVolumeInput.Size = aws.Int64(s.RootVolumeSize)
 	}
 
-	if s.RootVolumeEncryptBoot.True() {
-		createVolumeInput.Encrypted = aws.Bool(true)
-	}
-
-	if s.RootVolumeKmsKeyId != "" {
-		createVolumeInput.KmsKeyId = aws.String(s.RootVolumeKmsKeyId)
-	}
-
 	if s.RootVolumeType == "" || s.RootVolumeType == *rootDevice.Ebs.VolumeType {
 		return createVolumeInput, nil
 	}

builder/amazon/chroot/step_create_volume_test.go

@@ -0,0 +1,74 @@
+package chroot
+
+import (
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/stretchr/testify/assert"
+)
+
+func buildTestRootDevice() *ec2.BlockDeviceMapping {
+	return &ec2.BlockDeviceMapping{
+		Ebs: &ec2.EbsBlockDevice{
+			VolumeSize: aws.Int64(10),
+			SnapshotId: aws.String("snap-1234"),
+			VolumeType: aws.String("gp2"),
+		},
+	}
+}
+
+func TestCreateVolume_Default(t *testing.T) {
+	stepCreateVolume := new(StepCreateVolume)
+	_, err := stepCreateVolume.buildCreateVolumeInput("test-az", buildTestRootDevice())
+	assert.NoError(t, err)
+}
+
+func TestCreateVolume_Shrink(t *testing.T) {
+	stepCreateVolume := StepCreateVolume{RootVolumeSize: 1}
+	testRootDevice := buildTestRootDevice()
+	ret, err := stepCreateVolume.buildCreateVolumeInput("test-az", testRootDevice)
+	assert.NoError(t, err)
+	// Ensure that the new value is equal to the size of the old root device
+	assert.Equal(t, *ret.Size, *testRootDevice.Ebs.VolumeSize)
+}
+
+func TestCreateVolume_Expand(t *testing.T) {
+	stepCreateVolume := StepCreateVolume{RootVolumeSize: 25}
+	testRootDevice := buildTestRootDevice()
+	ret, err := stepCreateVolume.buildCreateVolumeInput("test-az", testRootDevice)
+	assert.NoError(t, err)
+	// Ensure that the new value is equal to the size of the value passed in
+	assert.Equal(t, *ret.Size, stepCreateVolume.RootVolumeSize)
+}
+
+func TestCreateVolume_io1_to_io1(t *testing.T) {
+	stepCreateVolume := StepCreateVolume{RootVolumeType: "io1"}
+	testRootDevice := buildTestRootDevice()
+	testRootDevice.Ebs.VolumeType = aws.String("io1")
+	testRootDevice.Ebs.Iops = aws.Int64(1000)
+	ret, err := stepCreateVolume.buildCreateVolumeInput("test-az", testRootDevice)
+	assert.NoError(t, err)
+	assert.Equal(t, *ret.VolumeType, stepCreateVolume.RootVolumeType)
+	assert.Equal(t, *ret.Iops, *testRootDevice.Ebs.Iops)
+}
+
+func TestCreateVolume_io1_to_gp2(t *testing.T) {
+	stepCreateVolume := StepCreateVolume{RootVolumeType: "gp2"}
+	testRootDevice := buildTestRootDevice()
+	testRootDevice.Ebs.VolumeType = aws.String("io1")
+	testRootDevice.Ebs.Iops = aws.Int64(1000)
+
+	ret, err := stepCreateVolume.buildCreateVolumeInput("test-az", testRootDevice)
+	assert.NoError(t, err)
+	assert.Equal(t, *ret.VolumeType, stepCreateVolume.RootVolumeType)
+	assert.Nil(t, ret.Iops)
+}
+
+func TestCreateVolume_gp2_to_io1(t *testing.T) {
+	stepCreateVolume := StepCreateVolume{RootVolumeType: "io1"}
+	testRootDevice := buildTestRootDevice()
+
+	_, err := stepCreateVolume.buildCreateVolumeInput("test-az", testRootDevice)
+	assert.Error(t, err)
+}

builder/amazon/chroot/step_early_unflock.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer-plugin-sdk/chroot"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/common/chroot"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepEarlyUnflock unlocks the flock.
@@ -15,7 +15,7 @@ type StepEarlyUnflock struct{}
 
 func (s *StepEarlyUnflock) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	cleanup := state.Get("flock_cleanup").(chroot.Cleanup)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	log.Println("Unlocking file lock...")
 	if err := cleanup.CleanupFunc(state); err != nil {

builder/amazon/chroot/step_flock.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepFlock provisions the instance within a chroot.
@@ -20,7 +20,7 @@ type StepFlock struct {
 }
 
 func (s *StepFlock) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	lockfile := "/var/lock/packer-chroot/lock"
 	if err := os.MkdirAll(filepath.Dir(lockfile), 0755); err != nil {

builder/amazon/chroot/step_flock_test.go

@@ -0,0 +1,15 @@
+package chroot
+
+import (
+	"testing"
+
+	"github.com/hashicorp/packer/common/chroot"
+)
+
+func TestFlockCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
+	var raw interface{}
+	raw = new(StepFlock)
+	if _, ok := raw.(chroot.Cleanup); !ok {
+		t.Fatalf("cleanup func should be a CleanupFunc")
+	}
+}

builder/amazon/chroot/step_instance_info.go

@@ -8,8 +8,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepInstanceInfo verifies that this builder is running on an EC2 instance.
@@ -18,7 +18,7 @@ type StepInstanceInfo struct{}
 func (s *StepInstanceInfo) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	ec2conn := state.Get("ec2").(*ec2.EC2)
 	session := state.Get("awsSession").(*session.Session)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	// Get our own instance ID
 	ui.Say("Gathering information about this EC2 instance...")

builder/amazon/chroot/step_mount_device.go

@@ -10,11 +10,11 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-sdk/common"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/packerbuilderdata"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	"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"
 )
 
 type mountPathData struct {
@@ -36,7 +36,7 @@ type StepMountDevice struct {
 
 func (s *StepMountDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	device := state.Get("device").(string)
 	if config.NVMEDevicePath != "" {
 		// customizable device path for mounting NVME block devices on c5 and m5 HVM
@@ -127,7 +127,7 @@ func (s *StepMountDevice) Run(ctx context.Context, state multistep.StateBag) mul
 }
 
 func (s *StepMountDevice) Cleanup(state multistep.StateBag) {
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	if err := s.CleanupFunc(state); err != nil {
 		ui.Error(err.Error())
 	}
@@ -138,7 +138,7 @@ func (s *StepMountDevice) CleanupFunc(state multistep.StateBag) error {
 		return nil
 	}
 
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	wrappedCommand := state.Get("wrappedCommand").(common.CommandWrapper)
 
 	ui.Say("Unmounting the root device...")

builder/amazon/chroot/step_mount_device_test.go

@@ -0,0 +1,15 @@
+package chroot
+
+import (
+	"testing"
+
+	"github.com/hashicorp/packer/common/chroot"
+)
+
+func TestMountDeviceCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
+	var raw interface{}
+	raw = new(StepMountDevice)
+	if _, ok := raw.(chroot.Cleanup); !ok {
+		t.Fatalf("cleanup func should be a CleanupFunc")
+	}
+}

builder/amazon/chroot/step_prepare_device.go

@@ -6,9 +6,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepPrepareDevice finds an available device and sets it.
@@ -18,7 +18,7 @@ type StepPrepareDevice struct {
 
 func (s *StepPrepareDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	device := config.DevicePath
 	if device == "" {

builder/amazon/chroot/step_register_ami.go

@@ -6,11 +6,11 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	awscommon "github.com/hashicorp/packer-plugin-amazon/builder/common"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/random"
-	confighelper "github.com/hashicorp/packer-plugin-sdk/template/config"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/common/random"
+	confighelper "github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepRegisterAMI creates the AMI.
@@ -26,7 +26,7 @@ func (s *StepRegisterAMI) Run(ctx context.Context, state multistep.StateBag) mul
 	config := state.Get("config").(*Config)
 	ec2conn := state.Get("ec2").(*ec2.EC2)
 	snapshotID := state.Get("snapshot_id").(string)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	ui.Say("Registering the AMI...")
 

builder/amazon/chroot/step_register_ami_test.go

@@ -0,0 +1,216 @@
+package chroot
+
+import (
+	"testing"
+
+	amazon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/common"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
+)
+
+func testImage() ec2.Image {
+	return ec2.Image{
+		ImageId:      aws.String("ami-abcd1234"),
+		Name:         aws.String("ami_test_name"),
+		Architecture: aws.String("x86_64"),
+		KernelId:     aws.String("aki-abcd1234"),
+	}
+}
+
+func TestStepRegisterAmi_buildRegisterOpts_pv(t *testing.T) {
+	config := Config{}
+	config.AMIName = "test_ami_name"
+	config.AMIDescription = "test_ami_description"
+	config.AMIVirtType = "paravirtual"
+	rootDeviceName := "foo"
+
+	image := testImage()
+
+	blockDevices := []*ec2.BlockDeviceMapping{}
+
+	opts := buildRegisterOptsFromExistingImage(&config, &image, blockDevices, rootDeviceName, config.AMIName)
+
+	expected := config.AMIVirtType
+	if *opts.VirtualizationType != expected {
+		t.Fatalf("Unexpected VirtType value: expected %s got %s\n", expected, *opts.VirtualizationType)
+	}
+
+	expected = config.AMIName
+	if *opts.Name != expected {
+		t.Fatalf("Unexpected Name value: expected %s got %s\n", expected, *opts.Name)
+	}
+
+	expected = *image.KernelId
+	if *opts.KernelId != expected {
+		t.Fatalf("Unexpected KernelId value: expected %s got %s\n", expected, *opts.KernelId)
+	}
+
+	expected = rootDeviceName
+	if *opts.RootDeviceName != expected {
+		t.Fatalf("Unexpected RootDeviceName value: expected %s got %s\n", expected, *opts.RootDeviceName)
+	}
+}
+
+func TestStepRegisterAmi_buildRegisterOpts_hvm(t *testing.T) {
+	config := Config{}
+	config.AMIName = "test_ami_name"
+	config.AMIDescription = "test_ami_description"
+	config.AMIVirtType = "hvm"
+	rootDeviceName := "foo"
+
+	image := testImage()
+
+	blockDevices := []*ec2.BlockDeviceMapping{}
+
+	opts := buildRegisterOptsFromExistingImage(&config, &image, blockDevices, rootDeviceName, config.AMIName)
+
+	expected := config.AMIVirtType
+	if *opts.VirtualizationType != expected {
+		t.Fatalf("Unexpected VirtType value: expected %s got %s\n", expected, *opts.VirtualizationType)
+	}
+
+	expected = config.AMIName
+	if *opts.Name != expected {
+		t.Fatalf("Unexpected Name value: expected %s got %s\n", expected, *opts.Name)
+	}
+
+	if opts.KernelId != nil {
+		t.Fatalf("Unexpected KernelId value: expected nil got %s\n", *opts.KernelId)
+	}
+
+	expected = rootDeviceName
+	if *opts.RootDeviceName != expected {
+		t.Fatalf("Unexpected RootDeviceName value: expected %s got %s\n", expected, *opts.RootDeviceName)
+	}
+}
+
+func TestStepRegisterAmi_buildRegisterOptsFromScratch(t *testing.T) {
+	rootDeviceName := "/dev/sda"
+	snapshotID := "foo"
+	config := Config{
+		FromScratch:  true,
+		PackerConfig: common.PackerConfig{},
+		AMIMappings: []amazon.BlockDevice{
+			{
+				DeviceName: rootDeviceName,
+			},
+		},
+		RootDeviceName: rootDeviceName,
+	}
+	registerOpts := buildBaseRegisterOpts(&config, nil, 10, snapshotID, config.AMIName)
+
+	if len(registerOpts.BlockDeviceMappings) != 1 {
+		t.Fatal("Expected block device mapping of length 1")
+	}
+
+	if *registerOpts.BlockDeviceMappings[0].Ebs.SnapshotId != snapshotID {
+		t.Fatalf("Snapshot ID of root disk not set to snapshot id %s", rootDeviceName)
+	}
+}
+
+func TestStepRegisterAmi_buildRegisterOptFromExistingImage(t *testing.T) {
+	rootDeviceName := "/dev/sda"
+	snapshotID := "foo"
+
+	config := Config{
+		FromScratch:  false,
+		PackerConfig: common.PackerConfig{},
+	}
+	sourceImage := ec2.Image{
+		RootDeviceName: &rootDeviceName,
+		BlockDeviceMappings: []*ec2.BlockDeviceMapping{
+			{
+				DeviceName: &rootDeviceName,
+				Ebs: &ec2.EbsBlockDevice{
+					VolumeSize: aws.Int64(10),
+				},
+			},
+			// Throw in an ephemeral device, it seems like all devices in the return struct in a source AMI have
+			// a size, even if it's for ephemeral
+			{
+				DeviceName:  aws.String("/dev/sdb"),
+				VirtualName: aws.String("ephemeral0"),
+				Ebs: &ec2.EbsBlockDevice{
+					VolumeSize: aws.Int64(0),
+				},
+			},
+		},
+	}
+	registerOpts := buildBaseRegisterOpts(&config, &sourceImage, 15, snapshotID, config.AMIName)
+
+	if len(registerOpts.BlockDeviceMappings) != 2 {
+		t.Fatal("Expected block device mapping of length 2")
+	}
+
+	for _, dev := range registerOpts.BlockDeviceMappings {
+		if dev.Ebs.SnapshotId != nil && *dev.Ebs.SnapshotId == snapshotID {
+			// Even though root volume size is in config, it isn't used, instead we use the root volume size
+			// that's derived when we build the step
+			if *dev.Ebs.VolumeSize != 15 {
+				t.Fatalf("Root volume size not 15 GB instead %d", *dev.Ebs.VolumeSize)
+			}
+			return
+		}
+	}
+	t.Fatalf("Could not find device with snapshot ID %s", snapshotID)
+}
+
+func TestStepRegisterAmi_buildRegisterOptFromExistingImageWithBlockDeviceMappings(t *testing.T) {
+	const (
+		rootDeviceName = "/dev/xvda"
+		oldRootDevice  = "/dev/sda1"
+	)
+	snapshotId := "foo"
+
+	config := Config{
+		FromScratch:  false,
+		PackerConfig: common.PackerConfig{},
+		AMIMappings: []amazon.BlockDevice{
+			{
+				DeviceName: rootDeviceName,
+			},
+		},
+		RootDeviceName: rootDeviceName,
+	}
+
+	// Intentionally try to use a different root devicename
+	sourceImage := ec2.Image{
+		RootDeviceName: aws.String(oldRootDevice),
+		BlockDeviceMappings: []*ec2.BlockDeviceMapping{
+			{
+				DeviceName: aws.String(oldRootDevice),
+				Ebs: &ec2.EbsBlockDevice{
+					VolumeSize: aws.Int64(10),
+				},
+			},
+			// Throw in an ephemeral device, it seems like all devices in the return struct in a source AMI have
+			// a size, even if it's for ephemeral
+			{
+				DeviceName:  aws.String("/dev/sdb"),
+				VirtualName: aws.String("ephemeral0"),
+				Ebs: &ec2.EbsBlockDevice{
+					VolumeSize: aws.Int64(0),
+				},
+			},
+		},
+	}
+	registerOpts := buildBaseRegisterOpts(&config, &sourceImage, 15, snapshotId, config.AMIName)
+
+	if len(registerOpts.BlockDeviceMappings) != 1 {
+		t.Fatal("Expected block device mapping of length 1")
+	}
+
+	if *registerOpts.BlockDeviceMappings[0].Ebs.SnapshotId != snapshotId {
+		t.Fatalf("Snapshot ID of root disk set to '%s' expected '%s'", *registerOpts.BlockDeviceMappings[0].Ebs.SnapshotId, rootDeviceName)
+	}
+
+	if *registerOpts.RootDeviceName != rootDeviceName {
+		t.Fatalf("Root device set to '%s' expected %s", *registerOpts.RootDeviceName, rootDeviceName)
+	}
+
+	if *registerOpts.BlockDeviceMappings[0].Ebs.VolumeSize != 15 {
+		t.Fatalf("Size of root disk not set to 15 GB, instead %d", *registerOpts.BlockDeviceMappings[0].Ebs.VolumeSize)
+	}
+}

builder/amazon/chroot/step_snapshot.go

@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	awscommon "github.com/hashicorp/packer-plugin-amazon/builder/common"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 // StepSnapshot creates a snapshot of the created volume.
@@ -22,7 +22,7 @@ type StepSnapshot struct {
 
 func (s *StepSnapshot) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	ec2conn := state.Get("ec2").(*ec2.EC2)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	volumeId := state.Get("volume_id").(string)
 
 	ui.Say("Creating snapshot...")
@@ -72,7 +72,7 @@ func (s *StepSnapshot) Cleanup(state multistep.StateBag) {
 
 	if cancelled || halted {
 		ec2conn := state.Get("ec2").(*ec2.EC2)
-		ui := state.Get("ui").(packersdk.Ui)
+		ui := state.Get("ui").(packer.Ui)
 		ui.Say("Removing snapshot since we cancelled or halted...")
 		_, err := ec2conn.DeleteSnapshot(&ec2.DeleteSnapshotInput{SnapshotId: &s.snapshotId})
 		if err != nil {

builder/amazon/common/access_config.go

@@ -17,7 +17,8 @@ import (
 	"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-plugin-amazon/builder/common/awserrors"
+	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
+	"github.com/hashicorp/packer/template/interpolate"
 	vaultapi "github.com/hashicorp/vault/api"
 )
 
@@ -29,7 +30,7 @@ import (
 // HCL config example:
 //
 // ```HCL
-// source "amazon-ebs" "example" {
+// source "example" "amazon-ebs"{
 // 	assume_role {
 // 		role_arn     = "arn:aws:iam::ACCOUNT_ID:role/ROLE_NAME"
 // 		session_name = "SESSION_NAME"
@@ -140,8 +141,11 @@ type AccessConfig struct {
 	// The secret key used to communicate with AWS. [Learn how to set
 	// this](/docs/builders/amazon#specifying-amazon-credentials). This is not required
 	// if you are using `use_vault_aws_engine` for authentication instead.
-	SecretKey            string `mapstructure:"secret_key" required:"true"`
-	SkipMetadataApiCheck bool   `mapstructure:"skip_metadata_api_check"`
+	SecretKey string `mapstructure:"secret_key" required:"true"`
+	// Set to true if you want to skip
+	// 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
@@ -150,7 +154,7 @@ type AccessConfig struct {
 	// environmental variable.
 	Token   string `mapstructure:"token" required:"false"`
 	session *session.Session
-	// Get credentials from HashiCorp Vault's aws secrets engine. You must
+	// Get credentials from Hashicorp Vault's aws secrets engine. You must
 	// already have created a role to use. For more information about
 	// generating credentials via the Vault engine, see the [Vault
 	// docs.](https://www.vaultproject.io/api/secret/aws#generate-credentials)
@@ -174,16 +178,6 @@ type AccessConfig struct {
 	//     credential types) and GetFederationToken (for federation\_token
 	//     credential types) for more details.
 	//
-	// HCL2 example:
-	//
-	// ```hcl
-	// vault_aws_engine {
-	//     name = "myrole"
-	//     role_arn = "myarn"
-	//     ttl = "3600s"
-	// }
-	// ```
-	//
 	// JSON example:
 	//
 	// ```json
@@ -195,6 +189,16 @@ 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.
@@ -369,7 +373,7 @@ func (c *AccessConfig) GetCredsFromVault() error {
 	return nil
 }
 
-func (c *AccessConfig) Prepare() []error {
+func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
 	var errs []error
 
 	if c.SkipMetadataApiCheck {
@@ -402,12 +406,6 @@ func (c *AccessConfig) Prepare() []error {
 	}
 	c.PollingConfig.LogEnvOverrideWarnings()
 
-	// Default MaxRetries to 10, to make throttling issues less likely. The
-	// Aws sdk defaults this to 3, which regularly gets tripped by users.
-	if c.MaxRetries == 0 {
-		c.MaxRetries = 10
-	}
-
 	return errs
 }
 

builder/amazon/common/access_config.hcl2spec.go

@@ -1,5 +1,4 @@
 // Code generated by "mapstructure-to-hcl2 -type VaultAWSEngineOptions,AssumeRoleConfig"; DO NOT EDIT.
-
 package common
 
 import (

builder/amazon/common/access_config_test.go

@@ -0,0 +1,71 @@
+package common
+
+import (
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
+)
+
+func testAccessConfig() *AccessConfig {
+	return &AccessConfig{
+		getEC2Connection: func() ec2iface.EC2API {
+			return &mockEC2Client{}
+		},
+		PollingConfig: new(AWSPollingConfig),
+	}
+}
+
+func TestAccessConfigPrepare_Region(t *testing.T) {
+	c := testAccessConfig()
+
+	c.RawRegion = "us-east-12"
+	err := c.ValidateRegion(c.RawRegion)
+	if err == nil {
+		t.Fatalf("should have region validation err: %s", c.RawRegion)
+	}
+
+	c.RawRegion = "us-east-1"
+	err = c.ValidateRegion(c.RawRegion)
+	if err != nil {
+		t.Fatalf("shouldn't have region validation err: %s", c.RawRegion)
+	}
+
+	c.RawRegion = "custom"
+	err = c.ValidateRegion(c.RawRegion)
+	if err == nil {
+		t.Fatalf("should have region validation err: %s", c.RawRegion)
+	}
+
+	c.RawRegion = "custom"
+	c.SkipValidation = true
+	// testing whole prepare func here; this is checking that validation is
+	// skipped, so we don't need a mock connection
+	if err := c.Prepare(nil); err != nil {
+		t.Fatalf("shouldn't have err: %s", err)
+	}
+
+	c.SkipValidation = false
+	c.RawRegion = ""
+	if err := c.Prepare(nil); err != nil {
+		t.Fatalf("shouldn't have err: %s", err)
+	}
+}
+
+func TestAccessConfigPrepare_RegionRestricted(t *testing.T) {
+	c := testAccessConfig()
+
+	// Create a Session with a custom region
+	c.session = session.Must(session.NewSession(&aws.Config{
+		Region: aws.String("us-gov-west-1"),
+	}))
+
+	if err := c.Prepare(nil); err != nil {
+		t.Fatalf("shouldn't have err: %s", err)
+	}
+
+	if !c.IsGovCloud() {
+		t.Fatal("We should be in gov region.")
+	}
+}

builder/amazon/common/ami_config.go

@@ -7,8 +7,9 @@ import (
 	"log"
 	"regexp"
 
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // AMIConfig is for common configuration related to creating AMIs.
@@ -16,11 +17,11 @@ type AMIConfig struct {
 	// The name of the resulting AMI that will appear when managing AMIs in the
 	// AWS console or via APIs. This must be unique. To help make this unique,
 	// use a function like timestamp (see [template
-	// engine](/docs/templates/legacy_json_templates/engine) for more info).
+	// engine](/docs/templates/engine) for more info).
 	AMIName string `mapstructure:"ami_name" required:"true"`
 	// The description to set for the resulting
 	// AMI(s). By default this description is empty.  This is a
-	// [template engine](/docs/templates/legacy_json_templates/engine), see [Build template
+	// [template engine](/docs/templates/engine), see [Build template
 	// data](#build-template-data) for more information.
 	AMIDescription string `mapstructure:"ami_description" required:"false"`
 	// The type of virtualization for the AMI
@@ -47,14 +48,14 @@ type AMIConfig struct {
 	// 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/legacy_json_templates/engine), see [Build 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
-	// [`dynamic_block`](/docs/templates/hcl_templates/expressions#dynamic-blocks)
+	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	AMITag config.KeyValues `mapstructure:"tag" required:"false"`
+	AMITag hcl2template.KeyValues `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.
@@ -87,11 +88,6 @@ type AMIConfig struct {
 	// 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.
-	//
-	// Please note that if you are using an account with the global "Always
-	// encrypt new EBS volumes" option set to `true`, Packer will be unable to
-	// override this setting, and the final image will be encryoted whether
-	// you set this value or not.
 	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
@@ -135,8 +131,26 @@ 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"`
-
-	SnapshotConfig `mapstructure:",squash"`
+	// 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
+	// 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
+	// [`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"`
+	// 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
+	// volumes from the backing snapshot(s).
+	SnapshotUsers []string `mapstructure:"snapshot_users" required:"false"`
+	// A list of groups that have access to
+	// create volumes from the snapshot(s). By default no groups have permission
+	// to create volumes from the snapshot(s). all will make the snapshot
+	// publicly accessible.
+	SnapshotGroups []string `mapstructure:"snapshot_groups" required:"false"`
 }
 
 func stringInSlice(s []string, searchstr string) bool {
@@ -172,7 +186,7 @@ func (c *AMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context
 
 	// Prevent sharing of default KMS key encrypted volumes with other aws users
 	if len(c.AMIUsers) > 0 {
-		if len(c.AMIKmsKeyId) == 0 && len(c.AMIRegionKMSKeyIDs) == 0 && c.AMIEncryptBootVolume.True() {
+		if len(c.AMIKmsKeyId) == 0 && c.AMIEncryptBootVolume.True() {
 			errs = append(errs, fmt.Errorf("Cannot share AMI encrypted with default KMS key"))
 		}
 		if len(c.AMIRegionKMSKeyIDs) > 0 {
@@ -202,7 +216,7 @@ func (c *AMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context
 
 	}
 	for _, kmsKey := range kmsKeys {
-		if !ValidateKmsKey(kmsKey) {
+		if !validateKmsKey(kmsKey) {
 			errs = append(errs, fmt.Errorf("%q is not a valid KMS Key Id.", kmsKey))
 		}
 	}
@@ -276,7 +290,7 @@ func (c *AMIConfig) prepareRegions(accessConfig *AccessConfig) (errs []error) {
 }
 
 // See https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CopyImage.html
-func ValidateKmsKey(kmsKey string) (valid bool) {
+func validateKmsKey(kmsKey string) (valid bool) {
 	kmsKeyIdPattern := `[a-f0-9-]+$`
 	aliasPattern := `alias/[a-zA-Z0-9:/_-]+$`
 	kmsArnStartPattern := `^arn:aws(-us-gov)?:kms:([a-z]{2}-(gov-)?[a-z]+-\d{1})?:(\d{12}):`

builder/amazon/common/ami_config_test.go

@@ -0,0 +1,249 @@
+package common
+
+import (
+	"fmt"
+	"reflect"
+	"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/config"
+)
+
+func testAMIConfig() *AMIConfig {
+	return &AMIConfig{
+		AMIName: "foo",
+	}
+}
+
+func getFakeAccessConfig(region string) *AccessConfig {
+	c := testAccessConfig()
+	c.RawRegion = region
+	return c
+}
+
+func TestAMIConfigPrepare_name(t *testing.T) {
+	c := testAMIConfig()
+	accessConf := testAccessConfig()
+	if err := c.Prepare(accessConf, nil); err != nil {
+		t.Fatalf("shouldn't have err: %s", err)
+	}
+
+	c.AMIName = ""
+	if err := c.Prepare(accessConf, nil); err == nil {
+		t.Fatal("should have error")
+	}
+}
+
+type mockEC2Client struct {
+	ec2iface.EC2API
+}
+
+func (m *mockEC2Client) DescribeRegions(*ec2.DescribeRegionsInput) (*ec2.DescribeRegionsOutput, error) {
+	return &ec2.DescribeRegionsOutput{
+		Regions: []*ec2.Region{
+			{RegionName: aws.String("us-east-1")},
+			{RegionName: aws.String("us-east-2")},
+			{RegionName: aws.String("us-west-1")},
+		},
+	}, nil
+}
+
+func TestAMIConfigPrepare_regions(t *testing.T) {
+	c := testAMIConfig()
+	c.AMIRegions = nil
+
+	var errs []error
+	var err error
+	accessConf := testAccessConfig()
+	mockConn := &mockEC2Client{}
+	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
+		t.Fatalf("shouldn't have err: %#v", errs)
+	}
+
+	c.AMIRegions, err = listEC2Regions(mockConn)
+	if err != nil {
+		t.Fatalf("shouldn't have err: %s", err.Error())
+	}
+	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
+		t.Fatalf("shouldn't have err: %#v", errs)
+	}
+
+	c.AMIRegions = []string{"us-east-1", "us-west-1", "us-east-1"}
+	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
+		t.Fatalf("bad: %s", errs[0])
+	}
+
+	expected := []string{"us-east-1", "us-west-1"}
+	if !reflect.DeepEqual(c.AMIRegions, expected) {
+		t.Fatalf("bad: %#v", c.AMIRegions)
+	}
+
+	c.AMIRegions = []string{"custom"}
+	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
+		t.Fatal("shouldn't have error")
+	}
+
+	c.AMIRegions = []string{"us-east-1", "us-east-2", "us-west-1"}
+	c.AMIRegionKMSKeyIDs = map[string]string{
+		"us-east-1": "123-456-7890",
+		"us-west-1": "789-012-3456",
+		"us-east-2": "456-789-0123",
+	}
+	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
+		t.Fatal(fmt.Sprintf("shouldn't have error: %s", errs[0]))
+	}
+
+	c.AMIRegions = []string{"us-east-1", "us-east-2", "us-west-1"}
+	c.AMIRegionKMSKeyIDs = map[string]string{
+		"us-east-1": "123-456-7890",
+		"us-west-1": "789-012-3456",
+		"us-east-2": "",
+	}
+	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
+		t.Fatal("should have passed; we are able to use default KMS key if not sharing")
+	}
+
+	c.SnapshotUsers = []string{"user-foo", "user-bar"}
+	c.AMIRegions = []string{"us-east-1", "us-east-2", "us-west-1"}
+	c.AMIRegionKMSKeyIDs = map[string]string{
+		"us-east-1": "123-456-7890",
+		"us-west-1": "789-012-3456",
+		"us-east-2": "",
+	}
+	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
+		t.Fatal("should have an error b/c can't use default KMS key if sharing")
+	}
+
+	c.AMIRegions = []string{"us-east-1", "us-west-1"}
+	c.AMIRegionKMSKeyIDs = map[string]string{
+		"us-east-1": "123-456-7890",
+		"us-west-1": "789-012-3456",
+		"us-east-2": "456-789-0123",
+	}
+	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
+		t.Fatal("should have error b/c theres a region in the key map that isn't in ami_regions")
+	}
+
+	c.AMIRegions = []string{"us-east-1", "us-west-1", "us-east-2"}
+	c.AMIRegionKMSKeyIDs = map[string]string{
+		"us-east-1": "123-456-7890",
+		"us-west-1": "789-012-3456",
+	}
+
+	if err := c.Prepare(accessConf, nil); err == nil {
+		t.Fatal("should have error b/c theres a region in in ami_regions that isn't in the key map")
+	}
+
+	c.SnapshotUsers = []string{"foo", "bar"}
+	c.AMIKmsKeyId = "123-abc-456"
+	c.AMIEncryptBootVolume = config.TriTrue
+	c.AMIRegions = []string{"us-east-1", "us-west-1"}
+	c.AMIRegionKMSKeyIDs = map[string]string{
+		"us-east-1": "123-456-7890",
+		"us-west-1": "",
+	}
+	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
+		t.Fatal("should have error b/c theres a region in in ami_regions that isn't in the key map")
+	}
+
+	// allow rawregion to exist in ami_regions list.
+	accessConf = getFakeAccessConfig("us-east-1")
+	c.AMIRegions = []string{"us-east-1", "us-west-1", "us-east-2"}
+	c.AMIRegionKMSKeyIDs = nil
+	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
+		t.Fatal("should allow user to have the raw region in ami_regions")
+	}
+
+}
+
+func TestAMIConfigPrepare_Share_EncryptedBoot(t *testing.T) {
+	c := testAMIConfig()
+	c.AMIUsers = []string{"testAccountID"}
+	c.AMIEncryptBootVolume = config.TriTrue
+
+	accessConf := testAccessConfig()
+
+	c.AMIKmsKeyId = ""
+	if err := c.Prepare(accessConf, nil); err == nil {
+		t.Fatal("shouldn't be able to share ami with encrypted boot volume")
+	}
+	c.AMIKmsKeyId = "89c3fb9a-de87-4f2a-aedc-fddc5138193c"
+	if err := c.Prepare(accessConf, nil); err != nil {
+		t.Fatal("should be able to share ami with encrypted boot volume")
+	}
+}
+
+func TestAMIConfigPrepare_ValidateKmsKey(t *testing.T) {
+	c := testAMIConfig()
+	c.AMIEncryptBootVolume = config.TriTrue
+
+	accessConf := testAccessConfig()
+
+	validCases := []string{
+		"abcd1234-e567-890f-a12b-a123b4cd56ef",
+		"alias/foo/bar",
+		"arn:aws:kms:us-east-1:012345678910:key/abcd1234-a123-456a-a12b-a123b4cd56ef",
+		"arn:aws:kms:us-east-1:012345678910:alias/foo/bar",
+		"arn:aws-us-gov:kms:us-gov-east-1:123456789012:key/12345678-1234-abcd-0000-123456789012",
+	}
+	for _, validCase := range validCases {
+		c.AMIKmsKeyId = validCase
+		if err := c.Prepare(accessConf, nil); err != nil {
+			t.Fatalf("%s should not have failed KMS key validation", validCase)
+		}
+	}
+
+	invalidCases := []string{
+		"ABCD1234-e567-890f-a12b-a123b4cd56ef",
+		"ghij1234-e567-890f-a12b-a123b4cd56ef",
+		"ghij1234+e567_890f-a12b-a123b4cd56ef",
+		"foo/bar",
+		"arn:aws:kms:us-east-1:012345678910:foo/bar",
+		"arn:foo:kms:us-east-1:012345678910:key/abcd1234-a123-456a-a12b-a123b4cd56ef",
+	}
+	for _, invalidCase := range invalidCases {
+		c.AMIKmsKeyId = invalidCase
+		if err := c.Prepare(accessConf, nil); err == nil {
+			t.Fatalf("%s should have failed KMS key validation", invalidCase)
+		}
+	}
+
+}
+
+func TestAMINameValidation(t *testing.T) {
+	c := testAMIConfig()
+
+	accessConf := testAccessConfig()
+
+	c.AMIName = "aa"
+	if err := c.Prepare(accessConf, nil); err == nil {
+		t.Fatal("shouldn't be able to have an ami name with less than 3 characters")
+	}
+
+	var longAmiName string
+	for i := 0; i < 129; i++ {
+		longAmiName += "a"
+	}
+	c.AMIName = longAmiName
+	if err := c.Prepare(accessConf, nil); err == nil {
+		t.Fatal("shouldn't be able to have an ami name with great than 128 characters")
+	}
+
+	c.AMIName = "+aaa"
+	if err := c.Prepare(accessConf, nil); err == nil {
+		t.Fatal("shouldn't be able to have an ami name with invalid characters")
+	}
+
+	c.AMIName = "fooBAR1()[] ./-'@_"
+	if err := c.Prepare(accessConf, nil); err != nil {
+		t.Fatal("should be able to use all of the allowed AMI characters")
+	}
+
+	c.AMIName = `xyz-base-2017-04-05-1934`
+	if err := c.Prepare(accessConf, nil); err != nil {
+		t.Fatalf("expected `xyz-base-2017-04-05-1934` to pass validation.")
+	}
+
+}

builder/amazon/common/artifact.go

@@ -9,7 +9,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"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer"
 )
 
 // Artifact is an artifact implementation that contains built AMIs.
@@ -103,7 +103,7 @@ func (a *Artifact) Destroy() error {
 		if len(errors) == 1 {
 			return errors[0]
 		} else {
-			return &packersdk.MultiError{Errors: errors}
+			return &packer.MultiError{Errors: errors}
 		}
 	}
 

builder/amazon/common/artifact_test.go

@@ -0,0 +1,90 @@
+package common
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/hashicorp/packer/packer"
+)
+
+func TestArtifact_Impl(t *testing.T) {
+	var _ packer.Artifact = new(Artifact)
+}
+
+func TestArtifactId(t *testing.T) {
+	expected := `east:foo,west:bar`
+
+	amis := make(map[string]string)
+	amis["east"] = "foo"
+	amis["west"] = "bar"
+
+	a := &Artifact{
+		Amis: amis,
+	}
+
+	result := a.Id()
+	if result != expected {
+		t.Fatalf("bad: %s", result)
+	}
+}
+
+func TestArtifactState_atlasMetadata(t *testing.T) {
+	a := &Artifact{
+		Amis: map[string]string{
+			"east": "foo",
+			"west": "bar",
+		},
+	}
+
+	actual := a.State("atlas.artifact.metadata")
+	expected := map[string]string{
+		"region.east": "foo",
+		"region.west": "bar",
+	}
+	if !reflect.DeepEqual(actual, expected) {
+		t.Fatalf("bad: %#v", actual)
+	}
+}
+
+func TestArtifactString(t *testing.T) {
+	expected := `AMIs were created:
+east: foo
+west: bar
+`
+
+	amis := make(map[string]string)
+	amis["east"] = "foo"
+	amis["west"] = "bar"
+
+	a := &Artifact{Amis: amis}
+	result := a.String()
+	if result != expected {
+		t.Fatalf("bad: %s", result)
+	}
+}
+
+func TestArtifactState(t *testing.T) {
+	expectedData := "this is the data"
+	artifact := &Artifact{
+		StateData: map[string]interface{}{"state_data": expectedData},
+	}
+
+	// Valid state
+	result := artifact.State("state_data")
+	if result != expectedData {
+		t.Fatalf("Bad: State data was %s instead of %s", result, expectedData)
+	}
+
+	// Invalid state
+	result = artifact.State("invalid_key")
+	if result != nil {
+		t.Fatalf("Bad: State should be nil for invalid state data name")
+	}
+
+	// Nil StateData should not fail and should return nil
+	artifact = &Artifact{}
+	result = artifact.State("key")
+	if result != nil {
+		t.Fatalf("Bad: State should be nil for nil StateData")
+	}
+}

builder/amazon/common/block_device.go

@@ -9,17 +9,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-)
-
-const (
-	minIops       = 100
-	maxIops       = 64000
-	minIopsGp3    = 3000
-	maxIopsGp3    = 16000
-	minThroughput = 125
-	maxThroughput = 1000
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // These will be attached when launching your instance. Your
@@ -30,6 +21,18 @@ const (
 // 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"
+//   }
+// ]
+// ```
+//
 // HCL2 example:
 //
 // ```hcl
@@ -40,17 +43,6 @@ const (
 // }
 // ```
 //
-// JSON example:
-// ```json
-// "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.
 //
@@ -75,23 +67,18 @@ type BlockDevice struct {
 	// See the documentation on
 	// [IOPs](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EbsBlockDevice.html)
 	// for more information
-	IOPS *int64 `mapstructure:"iops" required:"false"`
+	IOPS int64 `mapstructure:"iops" required:"false"`
 	// Suppresses the specified device included in the block device mapping of
 	// the AMI.
 	NoDevice bool `mapstructure:"no_device" required:"false"`
 	// The ID of the snapshot.
 	SnapshotId string `mapstructure:"snapshot_id" required:"false"`
-	// The throughput for gp3 volumes, only valid for gp3 types
-	// See the documentation on
-	// [Throughput](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EbsBlockDevice.html)
-	// for more information
-	Throughput *int64 `mapstructure:"throughput" required:"false"`
 	// The virtual device name. See the documentation on Block Device Mapping
 	// for more information.
 	VirtualName string `mapstructure:"virtual_name" required:"false"`
-	// The volume type. gp2 & gp3 for General Purpose (SSD) volumes, io1 & io2
-	// for Provisioned IOPS (SSD) volumes, st1 for Throughput Optimized HDD,
-	// sc1 for Cold HDD, and standard for Magnetic volumes.
+	// The volume type. gp2 for General Purpose (SSD) volumes, io1 for
+	// Provisioned IOPS (SSD) volumes, st1 for Throughput Optimized HDD, sc1
+	// for Cold HDD, and standard for Magnetic volumes.
 	VolumeType string `mapstructure:"volume_type" required:"false"`
 	// The size of the volume, in GiB. Required if not specifying a
 	// snapshot_id.
@@ -147,14 +134,9 @@ func (blockDevice BlockDevice) BuildEC2BlockDeviceMapping() *ec2.BlockDeviceMapp
 		ebsBlockDevice.VolumeSize = aws.Int64(blockDevice.VolumeSize)
 	}
 
-	switch blockDevice.VolumeType {
-	case "io1", "io2", "gp3":
-		ebsBlockDevice.Iops = blockDevice.IOPS
-	}
-
-	// Throughput is only valid for gp3 types
-	if blockDevice.VolumeType == "gp3" {
-		ebsBlockDevice.Throughput = blockDevice.Throughput
+	// IOPS is only valid for io1 and io2 types
+	if blockDevice.VolumeType == "io1" || blockDevice.VolumeType == "io2" {
+		ebsBlockDevice.Iops = aws.Int64(blockDevice.IOPS)
 	}
 
 	// You cannot specify Encrypted if you specify a Snapshot ID
@@ -172,11 +154,6 @@ func (blockDevice BlockDevice) BuildEC2BlockDeviceMapping() *ec2.BlockDeviceMapp
 	return mapping
 }
 
-var iopsRatios = map[string]int64{
-	"io1": 50,
-	"io2": 500,
-}
-
 func (b *BlockDevice) Prepare(ctx *interpolate.Context) error {
 	if b.DeviceName == "" {
 		return fmt.Errorf("The `device_name` must be specified " +
@@ -189,33 +166,6 @@ func (b *BlockDevice) Prepare(ctx *interpolate.Context) error {
 			"true` when setting a kms_key_id.", b.DeviceName)
 	}
 
-	if ratio, ok := iopsRatios[b.VolumeType]; b.VolumeSize != 0 && ok {
-		if b.IOPS != nil && (*b.IOPS/b.VolumeSize > ratio) {
-			return fmt.Errorf("%s: the maximum ratio of provisioned IOPS to requested volume size "+
-				"(in GiB) is %v:1 for %s volumes", b.DeviceName, ratio, b.VolumeType)
-		}
-
-		if b.IOPS != nil && (*b.IOPS < minIops || *b.IOPS > maxIops) {
-			return fmt.Errorf("IOPS must be between %d and %d for device %s",
-				minIops, maxIops, b.DeviceName)
-		}
-	}
-
-	if b.VolumeType == "gp3" {
-		if b.Throughput != nil && (*b.Throughput < minThroughput || *b.Throughput > maxThroughput) {
-			return fmt.Errorf("Throughput must be between %d and %d for device %s",
-				minThroughput, maxThroughput, b.DeviceName)
-		}
-
-		if b.IOPS != nil && (*b.IOPS < minIopsGp3 || *b.IOPS > maxIopsGp3) {
-			return fmt.Errorf("IOPS must be between %d and %d for device %s",
-				minIopsGp3, maxIopsGp3, b.DeviceName)
-		}
-	} else if b.Throughput != nil {
-		return fmt.Errorf("Throughput is not available for device %s",
-			b.DeviceName)
-	}
-
 	_, err := interpolate.RenderInterface(&b, ctx)
 	return err
 }

builder/amazon/common/block_device.hcl2spec.go

@@ -1,5 +1,4 @@
 // Code generated by "mapstructure-to-hcl2 -type BlockDevice"; DO NOT EDIT.
-
 package common
 
 import (
@@ -16,7 +15,6 @@ type FlatBlockDevice struct {
 	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"`
-	Throughput          *int64  `mapstructure:"throughput" required:"false" cty:"throughput" hcl:"throughput"`
 	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"`
@@ -41,7 +39,6 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec {
 		"iops":                  &hcldec.AttrSpec{Name: "iops", Type: cty.Number, Required: false},
 		"no_device":             &hcldec.AttrSpec{Name: "no_device", Type: cty.Bool, Required: false},
 		"snapshot_id":           &hcldec.AttrSpec{Name: "snapshot_id", Type: cty.String, Required: false},
-		"throughput":            &hcldec.AttrSpec{Name: "throughput", Type: cty.Number, Required: false},
 		"virtual_name":          &hcldec.AttrSpec{Name: "virtual_name", Type: cty.String, Required: false},
 		"volume_type":           &hcldec.AttrSpec{Name: "volume_type", Type: cty.String, Required: false},
 		"volume_size":           &hcldec.AttrSpec{Name: "volume_size", Type: cty.Number, Required: false},

builder/amazon/common/block_device_test.go

@@ -0,0 +1,184 @@
+package common
+
+import (
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/google/go-cmp/cmp"
+	"github.com/hashicorp/packer/helper/config"
+)
+
+func TestBlockDevice(t *testing.T) {
+	cases := []struct {
+		Config *BlockDevice
+		Result *ec2.BlockDeviceMapping
+	}{
+		{
+			Config: &BlockDevice{
+				DeviceName:          "/dev/sdb",
+				SnapshotId:          "snap-1234",
+				VolumeType:          "standard",
+				VolumeSize:          8,
+				DeleteOnTermination: true,
+			},
+
+			Result: &ec2.BlockDeviceMapping{
+				DeviceName: aws.String("/dev/sdb"),
+				Ebs: &ec2.EbsBlockDevice{
+					SnapshotId:          aws.String("snap-1234"),
+					VolumeType:          aws.String("standard"),
+					VolumeSize:          aws.Int64(8),
+					DeleteOnTermination: aws.Bool(true),
+				},
+			},
+		},
+		{
+			Config: &BlockDevice{
+				DeviceName: "/dev/sdb",
+				VolumeSize: 8,
+			},
+
+			Result: &ec2.BlockDeviceMapping{
+				DeviceName: aws.String("/dev/sdb"),
+				Ebs: &ec2.EbsBlockDevice{
+					VolumeSize:          aws.Int64(8),
+					DeleteOnTermination: aws.Bool(false),
+				},
+			},
+		},
+		{
+			Config: &BlockDevice{
+				DeviceName:          "/dev/sdb",
+				VolumeType:          "io1",
+				VolumeSize:          8,
+				DeleteOnTermination: true,
+				IOPS:                1000,
+			},
+
+			Result: &ec2.BlockDeviceMapping{
+				DeviceName: aws.String("/dev/sdb"),
+				Ebs: &ec2.EbsBlockDevice{
+					VolumeType:          aws.String("io1"),
+					VolumeSize:          aws.Int64(8),
+					DeleteOnTermination: aws.Bool(true),
+					Iops:                aws.Int64(1000),
+				},
+			},
+		},
+		{
+			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",
+				VolumeType:          "gp2",
+				VolumeSize:          8,
+				DeleteOnTermination: true,
+				Encrypted:           config.TriTrue,
+			},
+
+			Result: &ec2.BlockDeviceMapping{
+				DeviceName: aws.String("/dev/sdb"),
+				Ebs: &ec2.EbsBlockDevice{
+					VolumeType:          aws.String("gp2"),
+					VolumeSize:          aws.Int64(8),
+					DeleteOnTermination: aws.Bool(true),
+					Encrypted:           aws.Bool(true),
+				},
+			},
+		},
+		{
+			Config: &BlockDevice{
+				DeviceName:          "/dev/sdb",
+				VolumeType:          "gp2",
+				VolumeSize:          8,
+				DeleteOnTermination: true,
+				Encrypted:           config.TriTrue,
+				KmsKeyId:            "2Fa48a521f-3aff-4b34-a159-376ac5d37812",
+			},
+
+			Result: &ec2.BlockDeviceMapping{
+				DeviceName: aws.String("/dev/sdb"),
+				Ebs: &ec2.EbsBlockDevice{
+					VolumeType:          aws.String("gp2"),
+					VolumeSize:          aws.Int64(8),
+					DeleteOnTermination: aws.Bool(true),
+					Encrypted:           aws.Bool(true),
+					KmsKeyId:            aws.String("2Fa48a521f-3aff-4b34-a159-376ac5d37812"),
+				},
+			},
+		},
+		{
+			Config: &BlockDevice{
+				DeviceName:          "/dev/sdb",
+				VolumeType:          "standard",
+				DeleteOnTermination: true,
+			},
+
+			Result: &ec2.BlockDeviceMapping{
+				DeviceName: aws.String("/dev/sdb"),
+				Ebs: &ec2.EbsBlockDevice{
+					VolumeType:          aws.String("standard"),
+					DeleteOnTermination: aws.Bool(true),
+				},
+			},
+		},
+		{
+			Config: &BlockDevice{
+				DeviceName:  "/dev/sdb",
+				VirtualName: "ephemeral0",
+			},
+
+			Result: &ec2.BlockDeviceMapping{
+				DeviceName:  aws.String("/dev/sdb"),
+				VirtualName: aws.String("ephemeral0"),
+			},
+		},
+		{
+			Config: &BlockDevice{
+				DeviceName: "/dev/sdb",
+				NoDevice:   true,
+			},
+
+			Result: &ec2.BlockDeviceMapping{
+				DeviceName: aws.String("/dev/sdb"),
+				NoDevice:   aws.String(""),
+			},
+		},
+	}
+
+	for _, tc := range cases {
+		var amiBlockDevices BlockDevices = []BlockDevice{*tc.Config}
+
+		var launchBlockDevices BlockDevices = []BlockDevice{*tc.Config}
+
+		expected := []*ec2.BlockDeviceMapping{tc.Result}
+
+		amiResults := amiBlockDevices.BuildEC2BlockDeviceMappings()
+		if diff := cmp.Diff(expected, amiResults); diff != "" {
+			t.Fatalf("Bad block device: %s", diff)
+		}
+
+		launchResults := launchBlockDevices.BuildEC2BlockDeviceMappings()
+		if diff := cmp.Diff(expected, launchResults); diff != "" {
+			t.Fatalf("Bad block device: %s", diff)
+		}
+	}
+}

builder/amazon/common/build_filter_test.go

@@ -0,0 +1,31 @@
+package common
+
+import (
+	"testing"
+)
+
+func TestStepSourceAmiInfo_BuildFilter(t *testing.T) {
+	filter_key := "name"
+	filter_value := "foo"
+	filter_key2 := "name2"
+	filter_value2 := "foo2"
+
+	inputFilter := map[string]string{filter_key: filter_value, filter_key2: filter_value2}
+	outputFilter := buildEc2Filters(inputFilter)
+
+	// deconstruct filter back into things we can test
+	foundMap := map[string]bool{filter_key: false, filter_key2: false}
+	for _, filter := range outputFilter {
+		for key, value := range inputFilter {
+			if *filter.Name == key && *filter.Values[0] == value {
+				foundMap[key] = true
+			}
+		}
+	}
+
+	for k, v := range foundMap {
+		if !v {
+			t.Fatalf("Fail: should have found value for key: %s", k)
+		}
+	}
+}

builder/amazon/common/errors_test.go

@@ -0,0 +1,70 @@
+package common
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/sts"
+
+	"github.com/aws/aws-sdk-go/aws/awserr"
+)
+
+type mockSTS struct {
+}
+
+func (m *mockSTS) DecodeAuthorizationMessage(input *sts.DecodeAuthorizationMessageInput) (*sts.DecodeAuthorizationMessageOutput, error) {
+	return &sts.DecodeAuthorizationMessageOutput{
+		DecodedMessage: aws.String(`{
+			"allowed": false,
+			"explicitDeny": true,
+			"matchedStatements": {}
+		}`),
+	}, nil
+}
+
+func TestErrorsParsing_RequestFailure(t *testing.T) {
+
+	ae := awserr.New("UnauthorizedOperation",
+		`You are not authorized to perform this operation. Encoded authorization failure message: D9Q7oicjOMr9l2CC-NPP1FiZXK9Ijia1k-3l0siBFCcrK3oSuMFMkBIO5TNj0HdXE-WfwnAcdycFOohfKroNO6toPJEns8RFVfy_M_IjNGmrEFJ6E62pnmBW0OLrMsXxR9FQE4gB4gJzSM0AD6cV6S3FOfqYzWBRX-sQdOT4HryGkFNRoFBr9Xbp-tRwiadwkbdHdfnV9fbRkXmnwCdULml16NBSofC4ZPepLMKmIB5rKjwk-m179UUh2XA-J5no0si6XcRo5GbHQB5QfCIwSHL4vsro2wLZUd16-8OWKyr3tVlTbQe0ERZskqRqRQ5E28QuiBCVV6XstUyo-T4lBSr75Fgnyr3wCO-dS3b_5Ns3WzA2JD4E2AJOAStXIU8IH5YuKkAg7C-dJMuBMPpmKCBEXhNoHDwCyOo5PsV3xMlc0jSb0qYGpfst_TDDtejcZfn7NssUjxVq9qkdH-OXz2gPoQB-hX8ycmZCL5UZwKc3TCLUr7TGnudHjmnMrE9cUo-yTCWfyHPLprhiYhTCKW18EikJ0O1EKI3FJ_b4F19_jFBPARjSwQc7Ut6MNCVzrPdZGYSF6acj5gPaxdy9uSkVQwWXK7Pd5MFP7EBDE1_DgYbzodgwDO2PXeVFUbSLBHKWo_ebZS9ZX2nYPcGss_sYaly0ZVSIJXp7G58B5BoFVhvVH6jYnF9XiAOjMltuP_ycu1pQP1lki500RY3baLvfeYeAsB38XZHKEgWZzq7Fei-uh89q0cjJTmlVyrfRU3q6`,
+		fmt.Errorf("You can't do it!!"))
+	rf := awserr.NewRequestFailure(ae, 400, "abc-def-123-456")
+
+	result := decodeAWSError(&mockSTS{}, rf)
+	if result == nil {
+		t.Error("Expected resulting error")
+	}
+	if !strings.Contains(result.Error(), "Authorization failure message:") {
+		t.Error("Expected authorization failure message")
+	}
+}
+
+func TestErrorsParsing_NonAuthorizationFailure(t *testing.T) {
+
+	ae := awserr.New("BadRequest",
+		`You did something wrong. Try again`,
+		fmt.Errorf("Request was no good."))
+	rf := awserr.NewRequestFailure(ae, 400, "abc-def-123-456")
+
+	result := decodeAWSError(&mockSTS{}, rf)
+	if result == nil {
+		t.Error("Expected resulting error")
+	}
+	if result != rf {
+		t.Error("Expected original error to be returned unchanged")
+	}
+}
+
+func TestErrorsParsing_NonAWSError(t *testing.T) {
+
+	err := fmt.Errorf("Random error occurred")
+
+	result := decodeAWSError(&mockSTS{}, err)
+	if result == nil {
+		t.Error("Expected resulting error")
+	}
+	if result != err {
+		t.Error("Expected original error to be returned unchanged")
+	}
+}

builder/amazon/common/helper_funcs.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-amazon/builder/common/awserrors"
-	"github.com/hashicorp/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
+	"github.com/hashicorp/packer/common/retry"
 )
 
 // DestroyAMIs deregisters the AWS machine images in imageids from an active AWS account

builder/amazon/common/interpolate_build_info.go

@@ -3,8 +3,8 @@ package common
 import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"github.com/hashicorp/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/common/packerbuilderdata"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 type BuildInfoTemplate struct {

builder/amazon/common/interpolate_build_info_test.go

@@ -0,0 +1,91 @@
+package common
+
+import (
+	"reflect"
+	"testing"
+
+	"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/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"),
+				Value: aws.String("value-1"),
+			},
+			{
+				Key:   aws.String("key-2"),
+				Value: aws.String("value-2"),
+			},
+		},
+	}
+}
+
+func testState() multistep.StateBag {
+	state := new(multistep.BasicStateBag)
+	return state
+}
+
+func testGeneratedData(state multistep.StateBag) packerbuilderdata.GeneratedData {
+	generatedData := packerbuilderdata.GeneratedData{State: state}
+	return generatedData
+}
+
+func TestInterpolateBuildInfo_extractBuildInfo_noSourceImage(t *testing.T) {
+	state := testState()
+	generatedData := testGeneratedData(state)
+	buildInfo := extractBuildInfo("foo", state, &generatedData)
+
+	expected := BuildInfoTemplate{
+		BuildRegion: "foo",
+	}
+	if !reflect.DeepEqual(*buildInfo, expected) {
+		t.Fatalf("Unexpected BuildInfoTemplate: expected %#v got %#v\n", expected, *buildInfo)
+	}
+}
+
+func TestInterpolateBuildInfo_extractBuildInfo_withSourceImage(t *testing.T) {
+	state := testState()
+	state.Put("source_image", testImage())
+	generatedData := testGeneratedData(state)
+	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",
+		SourceAMITags: map[string]string{
+			"key-1": "value-1",
+			"key-2": "value-2",
+		},
+	}
+	if !reflect.DeepEqual(*buildInfo, expected) {
+		t.Fatalf("Unexpected BuildInfoTemplate: expected %#v got %#v\n", expected, *buildInfo)
+	}
+}
+
+func TestInterpolateBuildInfo_extractBuildInfo_GeneratedDataWithSourceImageName(t *testing.T) {
+	state := testState()
+	state.Put("source_image", testImage())
+	generatedData := testGeneratedData(state)
+	extractBuildInfo("foo", state, &generatedData)
+
+	generatedDataState := state.Get("generated_data").(map[string]interface{})
+
+	if generatedDataState["SourceAMIName"] != "ami_test_name" {
+		t.Fatalf("Unexpected state SourceAMIName: expected %#v got %#v\n", "ami_test_name", generatedDataState["SourceAMIName"])
+	}
+}

builder/amazon/common/run_config.go

@@ -1,5 +1,5 @@
 //go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type AmiFilterOptions,SecurityGroupFilterOptions,SubnetFilterOptions,VpcFilterOptions,PolicyDocument,Statement,MetadataOptions
+//go:generate mapstructure-to-hcl2 -type AmiFilterOptions,SecurityGroupFilterOptions,SubnetFilterOptions,VpcFilterOptions,PolicyDocument,Statement
 
 package common
 
@@ -11,22 +11,45 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	"github.com/hashicorp/packer-plugin-sdk/uuid"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")
 
+type AmiFilterOptions struct {
+	hcl2template.KeyValueFilter `mapstructure:",squash"`
+	Owners                      []string
+	MostRecent                  bool `mapstructure:"most_recent"`
+}
+
+func (d *AmiFilterOptions) GetOwners() []*string {
+	res := make([]*string, 0, len(d.Owners))
+	for _, owner := range d.Owners {
+		i := owner
+		res = append(res, &i)
+	}
+	return res
+}
+
+func (d *AmiFilterOptions) Empty() bool {
+	return len(d.Owners) == 0 && d.KeyValueFilter.Empty()
+}
+
+func (d *AmiFilterOptions) NoOwner() bool {
+	return len(d.Owners) == 0
+}
+
 type SubnetFilterOptions struct {
-	config.NameValueFilter `mapstructure:",squash"`
-	MostFree               bool `mapstructure:"most_free"`
-	Random                 bool `mapstructure:"random"`
+	hcl2template.NameValueFilter `mapstructure:",squash"`
+	MostFree                     bool `mapstructure:"most_free"`
+	Random                       bool `mapstructure:"random"`
 }
 
 type VpcFilterOptions struct {
-	config.NameValueFilter `mapstructure:",squash"`
+	hcl2template.NameValueFilter `mapstructure:",squash"`
 }
 
 type Statement struct {
@@ -41,21 +64,7 @@ type PolicyDocument struct {
 }
 
 type SecurityGroupFilterOptions struct {
-	config.NameValueFilter `mapstructure:",squash"`
-}
-
-// Configures the metadata options.
-// See [Configure IMDS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) for details.
-type MetadataOptions struct {
-	// A string to enable or disble the IMDS endpoint for an instance. Defaults to enabled.
-	// Accepts either "enabled" or "disabled"
-	HttpEndpoint string `mapstructure:"http_endpoint" required:"false"`
-	// A string to either set the use of IMDSv2 for the instance to optional or required. Defaults to "optional".
-	// Accepts either "optional" or "required"
-	HttpTokens string `mapstructure:"http_tokens" required:"false"`
-	// A numerical value to set an upper limit for the amount of hops allowed when communicating with IMDS endpoints.
-	// Defaults to 1.
-	HttpPutResponseHopLimit int64 `mapstructure:"http_put_response_hop_limit" required:"false"`
+	hcl2template.NameValueFilter `mapstructure:",squash"`
 }
 
 // RunConfig contains configuration for running an instance from a source
@@ -76,7 +85,7 @@ type RunConfig struct {
 	BlockDurationMinutes int64 `mapstructure:"block_duration_minutes" required:"false"`
 	// Packer normally stops the build instance after all provisioners have
 	// run. For Windows instances, it is sometimes desirable to [run
-	// Sysprep](https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/Creating_EBSbacked_WinAMI.html)
+	// Sysprep](http://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ami-create-standard.html)
 	// 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
@@ -132,21 +141,8 @@ type RunConfig struct {
 	// Whether or not to check if the IAM instance profile exists. Defaults to false
 	SkipProfileValidation bool `mapstructure:"skip_profile_validation" required:"false"`
 	// Temporary IAM instance profile policy document
-	// If IamInstanceProfile is specified it will be used instead.
+	// If IamInstanceProfile is specified it will be used instead. Example:
 	//
-	// HCL2 example:
-	// ```hcl
-	//temporary_iam_instance_profile_policy_document {
-	//	Statement {
-	//		Action   = ["logs:*"]
-	//		Effect   = "Allow"
-	//		Resource = "*"
-	//	}
-	//	Version = "2012-10-17"
-	//}
-	// ```
-	//
-	// JSON example:
 	// ```json
 	//{
 	//	"Version": "2012-10-17",
@@ -170,7 +166,17 @@ 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.
+	// Filters used to populate the `security_group_ids` field. JSON Example:
+	//
+	// ```json
+	// {
+	//   "security_group_filter": {
+	//     "filters": {
+	//       "tag:Class": "packer"
+	//     }
+	//   }
+	// }
+	// ```
 	//
 	// HCL2 Example:
 	//
@@ -182,17 +188,6 @@ type RunConfig struct {
 	//   }
 	// ```
 	//
-	// JSON Example:
-	// ```json
-	// {
-	//   "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
@@ -204,14 +199,14 @@ type RunConfig struct {
 	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/legacy_json_templates/engine), see [Build 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
-	// [`dynamic_block`](/docs/templates/hcl_templates/expressions#dynamic-blocks)
+	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	RunTag config.KeyValues `mapstructure:"run_tag" required:"false"`
+	RunTag hcl2template.KeyValues `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.
@@ -224,27 +219,12 @@ type RunConfig struct {
 	SecurityGroupIds []string `mapstructure:"security_group_ids" required:"false"`
 	// The source AMI whose root volume will be copied and
 	// provisioned on the currently running instance. This must be an EBS-backed
-	// AMI with a root volume snapshot that you have access to.
+	// AMI with a root volume snapshot that you have access to. Note: this is not
+	// used when from_scratch is set to true.
 	SourceAmi string `mapstructure:"source_ami" required:"true"`
 	// Filters used to populate the `source_ami`
-	// field.
+	// field. JSON Example:
 	//
-	// 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
-	//   }
-	// }
-	// ```
-	//
-	// JSON Example:
 	// ```json
 	// "builders" [
 	//   {
@@ -261,6 +241,21 @@ type RunConfig struct {
 	//   }
 	// ]
 	// ```
+	// 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,
@@ -324,26 +319,12 @@ type RunConfig struct {
 	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
-	// [`dynamic_block`](/docs/templates/hcl_templates/expressions#dynamic-blocks)
+	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	SpotTag config.KeyValues `mapstructure:"spot_tag" required:"false"`
+	SpotTag hcl2template.KeyValues `mapstructure:"spot_tag" required:"false"`
 	// Filters used to populate the `subnet_id` field.
-	//
-	// HCL2 example:
-	//
-	// ```hcl
-	// source "amazon-ebs" "basic-example" {
-	//   subnet_filter {
-	//     filters = {
-	//           "tag:Class": "build"
-	//     }
-	//     most_free = true
-	//     random = false
-	//   }
-	// }
-	// ```
-	//
 	// JSON Example:
+	//
 	// ```json
 	// "builders" [
 	//   {
@@ -358,6 +339,19 @@ type RunConfig struct {
 	//   }
 	// ]
 	// ```
+	// 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
@@ -388,6 +382,10 @@ type RunConfig struct {
 	// 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.
+	TemporaryKeyPairName string `mapstructure:"temporary_key_pair_name" required:"false"`
 	// A list of IPv4 CIDR blocks to be authorized access to the instance, when
 	// packer is creating a temporary security group.
 	//
@@ -404,21 +402,8 @@ type RunConfig struct {
 	// data when launching the instance.
 	UserDataFile string `mapstructure:"user_data_file" required:"false"`
 	// Filters used to populate the `vpc_id` field.
-	//
-	// HCL2 example:
-	// ```hcl
-	// source "amazon-ebs" "basic-example" {
-	//   vpc_filter {
-	//     filters = {
-	//       "tag:Class": "build",
-	//       "isDefault": "false",
-	//       "cidr": "/24"
-	//     }
-	//   }
-	// }
-	// ```
-	//
 	// JSON Example:
+	//
 	// ```json
 	// "builders" [
 	//   {
@@ -433,6 +418,19 @@ type RunConfig struct {
 	//   }
 	// ]
 	// ```
+	// HCL2 example:
+	//
+	// ```hcl
+	// source "amazon-ebs" "basic-example" {
+	//   vpc_filter {
+	//     filters = {
+	//       "tag:Class": "build",
+	//       "isDefault": "false",
+	//       "cidr": "/24"
+	//     }
+	//   }
+	// }
+	// ```
 	//
 	// This selects the VPC with tag `Class` with the value `build`, which is not
 	// the default VPC, and have a IPv4 CIDR block of `/24`. NOTE: This will fail
@@ -456,9 +454,6 @@ type RunConfig struct {
 	// 10m
 	WindowsPasswordTimeout time.Duration `mapstructure:"windows_password_timeout" required:"false"`
 
-	// [Metadata Settings](#metadata-settings)
-	Metadata MetadataOptions `mapstructure:"metadata_options" required:"false"`
-
 	// Communicator settings
 	Comm communicator.Config `mapstructure:",squash"`
 
@@ -519,38 +514,12 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 	// Validation
 	errs := c.Comm.Prepare(ctx)
 
-	if c.Metadata.HttpEndpoint == "" {
-		c.Metadata.HttpEndpoint = "enabled"
-	}
-
-	if c.Metadata.HttpTokens == "" {
-		c.Metadata.HttpTokens = "optional"
-	}
-
-	if c.Metadata.HttpPutResponseHopLimit == 0 {
-		c.Metadata.HttpPutResponseHopLimit = 1
-	}
-
-	if c.Metadata.HttpEndpoint != "enabled" && c.Metadata.HttpEndpoint != "disabled" {
-		msg := fmt.Errorf("http_endpoint requires either disabled or enabled as its value")
-		errs = append(errs, msg)
-	}
-
-	if c.Metadata.HttpTokens != "optional" && c.Metadata.HttpTokens != "required" {
-		msg := fmt.Errorf("http_tokens requires either optional or required as its value")
-		errs = append(errs, msg)
-	}
-
-	if c.Metadata.HttpPutResponseHopLimit < 1 || c.Metadata.HttpPutResponseHopLimit > 64 {
-		msg := fmt.Errorf("http_put_response_hop_limit requires a number between 1 and 64")
-		errs = append(errs, msg)
-	}
-
 	// Copy singular tag maps
 	errs = append(errs, c.RunTag.CopyOn(&c.RunTags)...)
 	errs = append(errs, c.SpotTag.CopyOn(&c.SpotTags)...)
 
 	for _, preparer := range []interface{ Prepare() []error }{
+		&c.SourceAmiFilter,
 		&c.SecurityGroupFilter,
 		&c.SubnetFilter,
 		&c.VpcFilter,

builder/amazon/common/run_config.hcl2spec.go

@@ -1,19 +1,19 @@
-// Code generated by "mapstructure-to-hcl2 -type AmiFilterOptions,SecurityGroupFilterOptions,SubnetFilterOptions,VpcFilterOptions,PolicyDocument,Statement,MetadataOptions"; DO NOT EDIT.
-
+// Code generated by "mapstructure-to-hcl2 -type AmiFilterOptions,SecurityGroupFilterOptions,SubnetFilterOptions,VpcFilterOptions,PolicyDocument,Statement"; DO NOT EDIT.
 package common
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/hcl2template"
 	"github.com/zclconf/go-cty/cty"
 )
 
 // FlatAmiFilterOptions is an auto-generated flat version of AmiFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatAmiFilterOptions struct {
-	Filters    map[string]string `mapstructure:"filters" cty:"filters" hcl:"filters"`
-	Owners     []string          `mapstructure:"owners" cty:"owners" hcl:"owners"`
-	MostRecent *bool             `mapstructure:"most_recent" cty:"most_recent" hcl:"most_recent"`
+	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"`
 }
 
 // FlatMapstructure returns a new FlatAmiFilterOptions.
@@ -29,39 +29,13 @@ 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())},
 		"owners":      &hcldec.AttrSpec{Name: "owners", Type: cty.List(cty.String), Required: false},
 		"most_recent": &hcldec.AttrSpec{Name: "most_recent", Type: cty.Bool, Required: false},
 	}
 	return s
 }
 
-// FlatMetadataOptions is an auto-generated flat version of MetadataOptions.
-// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
-type FlatMetadataOptions struct {
-	HttpEndpoint            *string `mapstructure:"http_endpoint" required:"false" cty:"http_endpoint" hcl:"http_endpoint"`
-	HttpTokens              *string `mapstructure:"http_tokens" required:"false" cty:"http_tokens" hcl:"http_tokens"`
-	HttpPutResponseHopLimit *int64  `mapstructure:"http_put_response_hop_limit" required:"false" cty:"http_put_response_hop_limit" hcl:"http_put_response_hop_limit"`
-}
-
-// FlatMapstructure returns a new FlatMetadataOptions.
-// FlatMetadataOptions is an auto-generated flat version of MetadataOptions.
-// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
-func (*MetadataOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
-	return new(FlatMetadataOptions)
-}
-
-// HCL2Spec returns the hcl spec of a MetadataOptions.
-// This spec is used by HCL to read the fields of MetadataOptions.
-// The decoded values from this spec will then be applied to a FlatMetadataOptions.
-func (*FlatMetadataOptions) HCL2Spec() map[string]hcldec.Spec {
-	s := map[string]hcldec.Spec{
-		"http_endpoint":               &hcldec.AttrSpec{Name: "http_endpoint", Type: cty.String, Required: false},
-		"http_tokens":                 &hcldec.AttrSpec{Name: "http_tokens", Type: cty.String, Required: false},
-		"http_put_response_hop_limit": &hcldec.AttrSpec{Name: "http_put_response_hop_limit", Type: cty.Number, Required: false},
-	}
-	return s
-}
-
 // 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 {
@@ -90,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  []config.FlatNameValue `cty:"filter" hcl:"filter"`
+	Filters map[string]string            `cty:"filters" hcl:"filters"`
+	Filter  []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
 }
 
 // FlatMapstructure returns a new FlatSecurityGroupFilterOptions.
@@ -107,7 +81,7 @@ func (*SecurityGroupFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[
 func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
+		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 	}
 	return s
 }
@@ -142,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   []config.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" 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"`
 }
 
 // FlatMapstructure returns a new FlatSubnetFilterOptions.
@@ -161,7 +135,7 @@ func (*SubnetFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]
 func (*FlatSubnetFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters":   &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":    &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
+		"filter":    &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 		"most_free": &hcldec.AttrSpec{Name: "most_free", Type: cty.Bool, Required: false},
 		"random":    &hcldec.AttrSpec{Name: "random", Type: cty.Bool, Required: false},
 	}
@@ -171,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  []config.FlatNameValue `cty:"filter" hcl:"filter"`
+	Filters map[string]string            `cty:"filters" hcl:"filters"`
+	Filter  []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
 }
 
 // FlatMapstructure returns a new FlatVpcFilterOptions.
@@ -188,7 +162,7 @@ func (*VpcFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl
 func (*FlatVpcFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
+		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
 	}
 	return s
 }

builder/amazon/common/run_config_test.go

@@ -0,0 +1,254 @@
+package common
+
+import (
+	"io/ioutil"
+	"os"
+	"regexp"
+	"testing"
+
+	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/helper/communicator"
+)
+
+func init() {
+	// Clear out the AWS access key env vars so they don't
+	// affect our tests.
+	os.Setenv("AWS_ACCESS_KEY_ID", "")
+	os.Setenv("AWS_ACCESS_KEY", "")
+	os.Setenv("AWS_SECRET_ACCESS_KEY", "")
+	os.Setenv("AWS_SECRET_KEY", "")
+}
+
+func testConfig() *RunConfig {
+	return &RunConfig{
+		SourceAmi:    "abcd",
+		InstanceType: "m1.small",
+
+		Comm: communicator.Config{
+			SSH: communicator.SSH{
+				SSHUsername: "foo",
+			},
+		},
+	}
+}
+
+func testConfigFilter() *RunConfig {
+	config := testConfig()
+	config.SourceAmi = ""
+	config.SourceAmiFilter = AmiFilterOptions{}
+	return config
+}
+
+func TestRunConfigPrepare(t *testing.T) {
+	c := testConfig()
+	err := c.Prepare(nil)
+	if len(err) > 0 {
+		t.Fatalf("err: %s", err)
+	}
+}
+
+func TestRunConfigPrepare_InstanceType(t *testing.T) {
+	c := testConfig()
+	c.InstanceType = ""
+	if err := c.Prepare(nil); len(err) != 1 {
+		t.Fatalf("Should error if an instance_type is not specified")
+	}
+}
+
+func TestRunConfigPrepare_SourceAmi(t *testing.T) {
+	c := testConfig()
+	c.SourceAmi = ""
+	if err := c.Prepare(nil); len(err) != 2 {
+		t.Fatalf("Should error if a source_ami (or source_ami_filter) is not specified")
+	}
+}
+
+func TestRunConfigPrepare_SourceAmiFilterBlank(t *testing.T) {
+	c := testConfigFilter()
+	if err := c.Prepare(nil); len(err) != 2 {
+		t.Fatalf("Should error if source_ami_filter is empty or not specified (and source_ami is not specified)")
+	}
+}
+
+func TestRunConfigPrepare_SourceAmiFilterOwnersBlank(t *testing.T) {
+	c := testConfigFilter()
+	filter_key := "name"
+	filter_value := "foo"
+	c.SourceAmiFilter.Filters = map[string]string{filter_key: filter_value}
+	if err := c.Prepare(nil); len(err) != 1 {
+		t.Fatalf("Should error if Owners is not specified)")
+	}
+}
+
+func TestRunConfigPrepare_SourceAmiFilterGood(t *testing.T) {
+	c := testConfigFilter()
+	owner := "123"
+	filter_key := "name"
+	filter_value := "foo"
+	goodFilter := AmiFilterOptions{
+		Owners: []string{owner},
+		KeyValueFilter: hcl2template.KeyValueFilter{
+			Filters: map[string]string{filter_key: filter_value},
+		},
+	}
+	c.SourceAmiFilter = goodFilter
+	if err := c.Prepare(nil); len(err) != 0 {
+		t.Fatalf("err: %s", err)
+	}
+}
+
+func TestRunConfigPrepare_EnableT2UnlimitedGood(t *testing.T) {
+	c := testConfig()
+	// Must have a T2 instance type if T2 Unlimited is enabled
+	c.InstanceType = "t2.micro"
+	c.EnableT2Unlimited = true
+	err := c.Prepare(nil)
+	if len(err) > 0 {
+		t.Fatalf("err: %s", err)
+	}
+}
+
+func TestRunConfigPrepare_EnableT2UnlimitedBadInstanceType(t *testing.T) {
+	c := testConfig()
+	// T2 Unlimited cannot be used with instance types other than T2
+	c.InstanceType = "m5.large"
+	c.EnableT2Unlimited = true
+	err := c.Prepare(nil)
+	if len(err) != 1 {
+		t.Fatalf("Should error if T2 Unlimited is enabled with non-T2 instance_type")
+	}
+}
+
+func TestRunConfigPrepare_EnableT2UnlimitedBadWithSpotInstanceRequest(t *testing.T) {
+	c := testConfig()
+	// T2 Unlimited cannot be used with Spot Instances
+	c.InstanceType = "t2.micro"
+	c.EnableT2Unlimited = true
+	c.SpotPrice = "auto"
+	err := c.Prepare(nil)
+	if len(err) != 1 {
+		t.Fatalf("Should error if T2 Unlimited has been used in conjuntion with a Spot Price request")
+	}
+}
+
+func TestRunConfigPrepare_SpotAuto(t *testing.T) {
+	c := testConfig()
+	c.SpotPrice = "auto"
+	if err := c.Prepare(nil); len(err) != 0 {
+		t.Fatalf("err: %s", err)
+	}
+
+	// Shouldn't error (YET) even though SpotPriceAutoProduct is deprecated
+	c.SpotPriceAutoProduct = "Linux/Unix"
+	if err := c.Prepare(nil); len(err) != 0 {
+		t.Fatalf("err: %s", err)
+	}
+}
+
+func TestRunConfigPrepare_SSHPort(t *testing.T) {
+	c := testConfig()
+	c.Comm.SSHPort = 0
+	if err := c.Prepare(nil); len(err) != 0 {
+		t.Fatalf("err: %s", err)
+	}
+
+	if c.Comm.SSHPort != 22 {
+		t.Fatalf("invalid value: %d", c.Comm.SSHPort)
+	}
+
+	c.Comm.SSHPort = 44
+	if err := c.Prepare(nil); len(err) != 0 {
+		t.Fatalf("err: %s", err)
+	}
+
+	if c.Comm.SSHPort != 44 {
+		t.Fatalf("invalid value: %d", c.Comm.SSHPort)
+	}
+}
+
+func TestRunConfigPrepare_UserData(t *testing.T) {
+	c := testConfig()
+	tf, err := ioutil.TempFile("", "packer")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	defer os.Remove(tf.Name())
+	defer tf.Close()
+
+	c.UserData = "foo"
+	c.UserDataFile = tf.Name()
+	if err := c.Prepare(nil); len(err) != 1 {
+		t.Fatalf("Should error if user_data string and user_data_file have both been specified")
+	}
+}
+
+func TestRunConfigPrepare_UserDataFile(t *testing.T) {
+	c := testConfig()
+	if err := c.Prepare(nil); len(err) != 0 {
+		t.Fatalf("err: %s", err)
+	}
+
+	c.UserDataFile = "idontexistidontthink"
+	if err := c.Prepare(nil); len(err) != 1 {
+		t.Fatalf("Should error if the file specified by user_data_file does not exist")
+	}
+
+	tf, err := ioutil.TempFile("", "packer")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	defer os.Remove(tf.Name())
+	defer tf.Close()
+
+	c.UserDataFile = tf.Name()
+	if err := c.Prepare(nil); len(err) != 0 {
+		t.Fatalf("err: %s", err)
+	}
+}
+
+func TestRunConfigPrepare_TemporaryKeyPairName(t *testing.T) {
+	c := testConfig()
+	c.Comm.SSHTemporaryKeyPairName = ""
+	if err := c.Prepare(nil); len(err) != 0 {
+		t.Fatalf("err: %s", err)
+	}
+
+	if c.Comm.SSHTemporaryKeyPairName == "" {
+		t.Fatal("keypair name is empty")
+	}
+
+	// Match prefix and UUID, e.g. "packer_5790d491-a0b8-c84c-c9d2-2aea55086550".
+	r := regexp.MustCompile(`\Apacker_(?:(?i)[a-f\d]{8}(?:-[a-f\d]{4}){3}-[a-f\d]{12}?)\z`)
+	if !r.MatchString(c.Comm.SSHTemporaryKeyPairName) {
+		t.Fatal("keypair name is not valid")
+	}
+
+	c.Comm.SSHTemporaryKeyPairName = "ssh-key-123"
+	if err := c.Prepare(nil); len(err) != 0 {
+		t.Fatalf("err: %s", err)
+	}
+
+	if c.Comm.SSHTemporaryKeyPairName != "ssh-key-123" {
+		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

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 type ec2Describer interface {

builder/amazon/common/ssh_test.go

@@ -0,0 +1,141 @@
+package common
+
+import (
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/helper/multistep"
+)
+
+const (
+	privateIP       = "10.0.0.1"
+	publicIP        = "192.168.1.1"
+	privateDNS      = "private.dns.test"
+	publicDNS       = "public.dns.test"
+	localhost       = "localhost"
+	sshHostTemplate = "custom.host.value"
+)
+
+func TestSSHHost(t *testing.T) {
+	origSshHostSleepDuration := sshHostSleepDuration
+	defer func() { sshHostSleepDuration = origSshHostSleepDuration }()
+	sshHostSleepDuration = 0
+
+	var cases = []struct {
+		allowTries   int
+		vpcId        string
+		sshInterface string
+
+		ok              bool
+		wantHost        string
+		sshHostOverride string
+	}{
+		{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, ""},
+		{2, "vpc-id", "private_ip", true, privateIP, ""},
+		{2, "vpc-id", "private_dns", true, privateDNS, ""},
+		{2, "vpc-id", "public_dns", true, publicDNS, ""},
+		{2, "vpc-id", "public_ip", true, publicIP, ""},
+		{3, "", "", false, "", ""},
+		{3, "", "private_ip", false, "", ""},
+		{3, "vpc-id", "", false, "", ""},
+		{3, "vpc-id", "private_ip", false, "", ""},
+		{3, "vpc-id", "private_dns", false, "", ""},
+		{3, "vpc-id", "public_dns", false, "", ""},
+		{3, "vpc-id", "public_ip", false, "", ""},
+		{1, "", "", true, sshHostTemplate, sshHostTemplate},
+		{1, "vpc-id", "", true, sshHostTemplate, sshHostTemplate},
+		{2, "vpc-id", "private_dns", true, sshHostTemplate, sshHostTemplate},
+	}
+
+	for _, c := range cases {
+		testSSHHost(t, c.allowTries, c.vpcId, c.sshInterface, c.ok, c.wantHost,
+			c.sshHostOverride)
+	}
+}
+
+func testSSHHost(t *testing.T, allowTries int, vpcId string, sshInterface string,
+	ok bool, wantHost string, sshHostOverride string) {
+	t.Logf("allowTries=%d vpcId=%s sshInterface=%s ok=%t wantHost=%q sshHostOverride=%s",
+		allowTries, vpcId, sshInterface, ok, wantHost, sshHostOverride)
+
+	e := &fakeEC2Describer{
+		allowTries: allowTries,
+		vpcId:      vpcId,
+		privateIP:  privateIP,
+		publicIP:   publicIP,
+		privateDNS: privateDNS,
+		publicDNS:  publicDNS,
+	}
+
+	f := SSHHost(e, sshInterface, sshHostOverride)
+	st := &multistep.BasicStateBag{}
+	st.Put("instance", &ec2.Instance{
+		InstanceId: aws.String("instance-id"),
+	})
+
+	host, err := f(st)
+
+	if e.tries > allowTries {
+		t.Fatalf("got %d ec2 DescribeInstances tries, want %d", e.tries, allowTries)
+	}
+
+	switch {
+	case ok && err != nil:
+		t.Fatalf("expected no error, got %+v", err)
+	case !ok && err == nil:
+		t.Fatalf("expected error, got none and host %s", host)
+	}
+
+	if host != wantHost {
+		t.Fatalf("got host %s, want %s", host, wantHost)
+	}
+}
+
+type fakeEC2Describer struct {
+	allowTries int
+	tries      int
+
+	vpcId                                      string
+	privateIP, publicIP, privateDNS, publicDNS string
+}
+
+func (d *fakeEC2Describer) DescribeInstances(in *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) {
+	d.tries++
+
+	instance := &ec2.Instance{
+		InstanceId: aws.String("instance-id"),
+	}
+
+	if d.vpcId != "" {
+		instance.VpcId = aws.String(d.vpcId)
+	}
+
+	if d.tries >= d.allowTries {
+		instance.PublicIpAddress = aws.String(d.publicIP)
+		instance.PrivateIpAddress = aws.String(d.privateIP)
+		instance.PublicDnsName = aws.String(d.publicDNS)
+		instance.PrivateDnsName = aws.String(d.privateDNS)
+	}
+
+	out := &ec2.DescribeInstancesOutput{
+		Reservations: []*ec2.Reservation{
+			{
+				Instances: []*ec2.Instance{instance},
+			},
+		},
+	}
+
+	return out, nil
+}

builder/amazon/common/ssm/session.go

@@ -12,10 +12,10 @@ import (
 	"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-plugin-amazon/builder/common/awserrors"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/retry"
-	"github.com/hashicorp/packer-plugin-sdk/shell-local/localexec"
+	"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 {
@@ -89,7 +89,7 @@ func (s Session) getCommand(ctx context.Context) ([]string, string, error) {
 // 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 packersdk.Ui) error {
+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)

builder/amazon/common/state.go

@@ -14,7 +14,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/helper/multistep"
 )
 
 // StateRefreshFunc is a function type used for StateChangeConf that is
@@ -42,8 +42,17 @@ type StateChangeConf struct {
 
 // Polling configuration for the AWS waiter. Configures the waiter for resources creation or actions like attaching
 // volumes or importing image.
+// Usage example:
 //
-// HCL2 example:
+// In JSON:
+// ```json
+// "aws_polling" : {
+// 	 "delay_seconds": 30,
+// 	 "max_attempts": 50
+// }
+// ```
+//
+// In HCL2:
 // ```hcl
 // aws_polling {
 //	 delay_seconds = 30
@@ -51,13 +60,6 @@ type StateChangeConf struct {
 // }
 // ```
 //
-// JSON example:
-// ```json
-// "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.
@@ -149,22 +151,15 @@ func (w *AWSPollingConfig) WaitUntilVolumeAvailable(ctx aws.Context, conn *ec2.E
 	return err
 }
 
-func (w *AWSPollingConfig) WaitUntilSnapshotDone(ctx aws.Context, conn ec2iface.EC2API, snapshotID string) error {
+func (w *AWSPollingConfig) WaitUntilSnapshotDone(ctx aws.Context, conn *ec2.EC2, snapshotID string) error {
 	snapInput := ec2.DescribeSnapshotsInput{
 		SnapshotIds: []*string{&snapshotID},
 	}
 
-	waitOpts := w.getWaiterOptions()
-	if len(waitOpts) == 0 {
-		// Bump this default to 30 minutes.
-		// Large snapshots can take a long time for the copy to s3
-		waitOpts = append(waitOpts, request.WithWaiterMaxAttempts(120))
-	}
-
 	err := conn.WaitUntilSnapshotCompletedWithContext(
 		ctx,
 		&snapInput,
-		waitOpts...)
+		w.getWaiterOptions()...)
 	return err
 }
 

builder/amazon/common/state.hcl2spec.go

@@ -1,5 +1,4 @@
 // Code generated by "mapstructure-to-hcl2 -type AWSPollingConfig"; DO NOT EDIT.
-
 package common
 
 import (

builder/amazon/common/state_test.go

@@ -0,0 +1,66 @@
+package common
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws/request"
+)
+
+func testGetWaiterOptions(t *testing.T) {
+	// no vars are set
+	envValues := overridableWaitVars{
+		envInfo{"AWS_POLL_DELAY_SECONDS", 2, false},
+		envInfo{"AWS_MAX_ATTEMPTS", 0, false},
+		envInfo{"AWS_TIMEOUT_SECONDS", 300, false},
+	}
+	options := applyEnvOverrides(envValues)
+	if len(options) > 0 {
+		t.Fatalf("Did not expect any waiter options to be generated; actual: %#v", options)
+	}
+
+	// all vars are set
+	envValues = overridableWaitVars{
+		envInfo{"AWS_POLL_DELAY_SECONDS", 1, true},
+		envInfo{"AWS_MAX_ATTEMPTS", 800, true},
+		envInfo{"AWS_TIMEOUT_SECONDS", 20, true},
+	}
+	options = applyEnvOverrides(envValues)
+	expected := []request.WaiterOption{
+		request.WithWaiterDelay(request.ConstantWaiterDelay(time.Duration(1) * time.Second)),
+		request.WithWaiterMaxAttempts(800),
+	}
+	if !reflect.DeepEqual(options, expected) {
+		t.Fatalf("expected != actual!! Expected: %#v; Actual: %#v.", expected, options)
+	}
+
+	// poll delay is not set
+	envValues = overridableWaitVars{
+		envInfo{"AWS_POLL_DELAY_SECONDS", 2, false},
+		envInfo{"AWS_MAX_ATTEMPTS", 800, true},
+		envInfo{"AWS_TIMEOUT_SECONDS", 300, false},
+	}
+	options = applyEnvOverrides(envValues)
+	expected = []request.WaiterOption{
+		request.WithWaiterMaxAttempts(800),
+	}
+	if !reflect.DeepEqual(options, expected) {
+		t.Fatalf("expected != actual!! Expected: %#v; Actual: %#v.", expected, options)
+	}
+
+	// poll delay is not set but timeout seconds is
+	envValues = overridableWaitVars{
+		envInfo{"AWS_POLL_DELAY_SECONDS", 2, false},
+		envInfo{"AWS_MAX_ATTEMPTS", 0, false},
+		envInfo{"AWS_TIMEOUT_SECONDS", 20, true},
+	}
+	options = applyEnvOverrides(envValues)
+	expected = []request.WaiterOption{
+		request.WithWaiterDelay(request.ConstantWaiterDelay(time.Duration(2) * time.Second)),
+		request.WithWaiterMaxAttempts(10),
+	}
+	if !reflect.DeepEqual(options, expected) {
+		t.Fatalf("expected != actual!! Expected: %#v; Actual: %#v.", expected, options)
+	}
+}

builder/amazon/common/step_ami_region_copy.go

@@ -8,9 +8,9 @@ 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-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type StepAMIRegionCopy struct {
@@ -24,7 +24,6 @@ type StepAMIRegionCopy struct {
 
 	toDelete           string
 	getRegionConn      func(*AccessConfig, string) (ec2iface.EC2API, error)
-	AMISkipCreateImage bool
 	AMISkipBuildRegion bool
 }
 
@@ -63,13 +62,7 @@ func (s *StepAMIRegionCopy) DeduplicateRegions(intermediary bool) {
 }
 
 func (s *StepAMIRegionCopy) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ui := state.Get("ui").(packersdk.Ui)
-
-	if s.AMISkipCreateImage {
-		ui.Say("Skipping AMI region copy...")
-		return multistep.ActionContinue
-	}
-
+	ui := state.Get("ui").(packer.Ui)
 	amis := state.Get("amis").(map[string]string)
 	snapshots := state.Get("snapshots").(map[string][]string)
 	intermediary, _ := state.Get("intermediary_image").(bool)
@@ -111,7 +104,7 @@ func (s *StepAMIRegionCopy) Run(ctx context.Context, state multistep.StateBag) m
 
 	var lock sync.Mutex
 	var wg sync.WaitGroup
-	errs := new(packersdk.MultiError)
+	errs := new(packer.MultiError)
 	wg.Add(len(s.Regions))
 	for _, region := range s.Regions {
 		var regKeyID string
@@ -135,7 +128,7 @@ func (s *StepAMIRegionCopy) Run(ctx context.Context, state multistep.StateBag) m
 			amis[region] = id
 			snapshots[region] = snapshotIds
 			if err != nil {
-				errs = packersdk.MultiErrorAppend(errs, err)
+				errs = packer.MultiErrorAppend(errs, err)
 			}
 		}(region)
 	}
@@ -157,7 +150,7 @@ func (s *StepAMIRegionCopy) Run(ctx context.Context, state multistep.StateBag) m
 
 func (s *StepAMIRegionCopy) Cleanup(state multistep.StateBag) {
 	ec2conn := state.Get("ec2").(*ec2.EC2)
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	if len(s.toDelete) == 0 {
 		return

builder/amazon/common/step_ami_region_copy_test.go

@@ -0,0 +1,404 @@
+package common
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"sync"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// Define a mock struct to be used in unit tests for common aws steps.
+type mockEC2Conn struct {
+	ec2iface.EC2API
+	Config *aws.Config
+
+	// Counters to figure out what code path was taken
+	copyImageCount       int
+	describeImagesCount  int
+	deregisterImageCount int
+	deleteSnapshotCount  int
+	waitCount            int
+
+	lock sync.Mutex
+}
+
+func (m *mockEC2Conn) CopyImage(copyInput *ec2.CopyImageInput) (*ec2.CopyImageOutput, error) {
+	m.lock.Lock()
+	m.copyImageCount++
+	m.lock.Unlock()
+	copiedImage := fmt.Sprintf("%s-copied-%d", *copyInput.SourceImageId, m.copyImageCount)
+	output := &ec2.CopyImageOutput{
+		ImageId: &copiedImage,
+	}
+	return output, nil
+}
+
+// functions we have to create mock responses for in order for test to run
+func (m *mockEC2Conn) DescribeImages(*ec2.DescribeImagesInput) (*ec2.DescribeImagesOutput, error) {
+	m.lock.Lock()
+	m.describeImagesCount++
+	m.lock.Unlock()
+	output := &ec2.DescribeImagesOutput{
+		Images: []*ec2.Image{{}},
+	}
+	return output, nil
+}
+
+func (m *mockEC2Conn) DeregisterImage(*ec2.DeregisterImageInput) (*ec2.DeregisterImageOutput, error) {
+	m.lock.Lock()
+	m.deregisterImageCount++
+	m.lock.Unlock()
+	output := &ec2.DeregisterImageOutput{}
+	return output, nil
+}
+
+func (m *mockEC2Conn) DeleteSnapshot(*ec2.DeleteSnapshotInput) (*ec2.DeleteSnapshotOutput, error) {
+	m.lock.Lock()
+	m.deleteSnapshotCount++
+	m.lock.Unlock()
+	output := &ec2.DeleteSnapshotOutput{}
+	return output, nil
+}
+
+func (m *mockEC2Conn) WaitUntilImageAvailableWithContext(aws.Context, *ec2.DescribeImagesInput, ...request.WaiterOption) error {
+	m.lock.Lock()
+	m.waitCount++
+	m.lock.Unlock()
+	return nil
+}
+
+func getMockConn(config *AccessConfig, target string) (ec2iface.EC2API, error) {
+	mockConn := &mockEC2Conn{
+		Config: aws.NewConfig(),
+	}
+
+	return mockConn, nil
+}
+
+// Create statebag for running test
+func tState() multistep.StateBag {
+	state := new(multistep.BasicStateBag)
+	state.Put("ui", &packer.BasicUi{
+		Reader: new(bytes.Buffer),
+		Writer: new(bytes.Buffer),
+	})
+	state.Put("amis", map[string]string{"us-east-1": "ami-12345"})
+	state.Put("snapshots", map[string][]string{"us-east-1": {"snap-0012345"}})
+	conn, _ := getMockConn(&AccessConfig{}, "us-east-2")
+	state.Put("ec2", conn)
+	return state
+}
+
+func TestStepAMIRegionCopy_duplicates(t *testing.T) {
+	// ------------------------------------------------------------------------
+	// Test that if the original region is added to both Regions and Region,
+	// the ami is only copied once (with encryption).
+	// ------------------------------------------------------------------------
+
+	stepAMIRegionCopy := StepAMIRegionCopy{
+		AccessConfig: testAccessConfig(),
+		Regions:      []string{"us-east-1"},
+		AMIKmsKeyId:  "12345",
+		// Original region key in regionkeyids is different than in amikmskeyid
+		RegionKeyIds:      map[string]string{"us-east-1": "12345"},
+		EncryptBootVolume: config.TriTrue,
+		Name:              "fake-ami-name",
+		OriginalRegion:    "us-east-1",
+	}
+	// mock out the region connection code
+	stepAMIRegionCopy.getRegionConn = getMockConn
+
+	state := tState()
+	state.Put("intermediary_image", true)
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if len(stepAMIRegionCopy.Regions) != 1 {
+		t.Fatalf("Should have added original ami to Regions one time only")
+	}
+
+	// ------------------------------------------------------------------------
+	// Both Region and Regions set, but no encryption - shouldn't copy anything
+	// ------------------------------------------------------------------------
+
+	// the ami is only copied once.
+	stepAMIRegionCopy = StepAMIRegionCopy{
+		AccessConfig:   testAccessConfig(),
+		Regions:        []string{"us-east-1"},
+		Name:           "fake-ami-name",
+		OriginalRegion: "us-east-1",
+	}
+	// mock out the region connection code
+	state.Put("intermediary_image", false)
+	stepAMIRegionCopy.getRegionConn = getMockConn
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if len(stepAMIRegionCopy.Regions) != 0 {
+		t.Fatalf("Should not have added original ami to Regions; not encrypting")
+	}
+
+	// ------------------------------------------------------------------------
+	// Both Region and Regions set, but no encryption - shouldn't copy anything,
+	// this tests false as opposed to nil value above.
+	// ------------------------------------------------------------------------
+
+	// the ami is only copied once.
+	stepAMIRegionCopy = StepAMIRegionCopy{
+		AccessConfig:      testAccessConfig(),
+		Regions:           []string{"us-east-1"},
+		EncryptBootVolume: config.TriFalse,
+		Name:              "fake-ami-name",
+		OriginalRegion:    "us-east-1",
+	}
+	// mock out the region connection code
+	state.Put("intermediary_image", false)
+	stepAMIRegionCopy.getRegionConn = getMockConn
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if len(stepAMIRegionCopy.Regions) != 0 {
+		t.Fatalf("Should not have added original ami to Regions once; not" +
+			"encrypting")
+	}
+
+	// ------------------------------------------------------------------------
+	// Multiple regions, many duplicates, and encryption (this shouldn't ever
+	// happen because of our template validation, but good to test it.)
+	// ------------------------------------------------------------------------
+
+	stepAMIRegionCopy = StepAMIRegionCopy{
+		AccessConfig: testAccessConfig(),
+		// Many duplicates for only 3 actual values
+		Regions:     []string{"us-east-1", "us-west-2", "us-west-2", "ap-east-1", "ap-east-1", "ap-east-1"},
+		AMIKmsKeyId: "IlikePancakes",
+		// Original region key in regionkeyids is different than in amikmskeyid
+		RegionKeyIds:      map[string]string{"us-east-1": "12345", "us-west-2": "abcde", "ap-east-1": "xyz"},
+		EncryptBootVolume: config.TriTrue,
+		Name:              "fake-ami-name",
+		OriginalRegion:    "us-east-1",
+	}
+	// mock out the region connection code
+	stepAMIRegionCopy.getRegionConn = getMockConn
+	state.Put("intermediary_image", true)
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if len(stepAMIRegionCopy.Regions) != 3 {
+		t.Fatalf("Each AMI should have been added to Regions one time only.")
+	}
+
+	// Also verify that we respect RegionKeyIds over AMIKmsKeyIds:
+	if stepAMIRegionCopy.RegionKeyIds["us-east-1"] != "12345" {
+		t.Fatalf("RegionKeyIds should take precedence over AmiKmsKeyIds")
+	}
+
+	// ------------------------------------------------------------------------
+	// Multiple regions, many duplicates, NO encryption
+	// ------------------------------------------------------------------------
+
+	stepAMIRegionCopy = StepAMIRegionCopy{
+		AccessConfig: testAccessConfig(),
+		// Many duplicates for only 3 actual values
+		Regions:        []string{"us-east-1", "us-west-2", "us-west-2", "ap-east-1", "ap-east-1", "ap-east-1"},
+		Name:           "fake-ami-name",
+		OriginalRegion: "us-east-1",
+	}
+	// mock out the region connection code
+	stepAMIRegionCopy.getRegionConn = getMockConn
+	state.Put("intermediary_image", false)
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if len(stepAMIRegionCopy.Regions) != 2 {
+		t.Fatalf("Each AMI should have been added to Regions one time only, " +
+			"and original region shouldn't be added at all")
+	}
+}
+
+func TestStepAmiRegionCopy_nil_encryption(t *testing.T) {
+	// create step
+	stepAMIRegionCopy := StepAMIRegionCopy{
+		AccessConfig:      testAccessConfig(),
+		Regions:           make([]string, 0),
+		AMIKmsKeyId:       "",
+		RegionKeyIds:      make(map[string]string),
+		EncryptBootVolume: config.TriUnset,
+		Name:              "fake-ami-name",
+		OriginalRegion:    "us-east-1",
+	}
+	// mock out the region connection code
+	stepAMIRegionCopy.getRegionConn = getMockConn
+
+	state := tState()
+	state.Put("intermediary_image", false)
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if stepAMIRegionCopy.toDelete != "" {
+		t.Fatalf("Shouldn't have an intermediary ami if encrypt is nil")
+	}
+	if len(stepAMIRegionCopy.Regions) != 0 {
+		t.Fatalf("Should not have added original ami to original region")
+	}
+}
+
+func TestStepAmiRegionCopy_true_encryption(t *testing.T) {
+	// create step
+	stepAMIRegionCopy := StepAMIRegionCopy{
+		AccessConfig:      testAccessConfig(),
+		Regions:           make([]string, 0),
+		AMIKmsKeyId:       "",
+		RegionKeyIds:      make(map[string]string),
+		EncryptBootVolume: config.TriTrue,
+		Name:              "fake-ami-name",
+		OriginalRegion:    "us-east-1",
+	}
+	// mock out the region connection code
+	stepAMIRegionCopy.getRegionConn = getMockConn
+
+	state := tState()
+	state.Put("intermediary_image", true)
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if stepAMIRegionCopy.toDelete == "" {
+		t.Fatalf("Should delete original AMI if encrypted=true")
+	}
+	if len(stepAMIRegionCopy.Regions) == 0 {
+		t.Fatalf("Should have added original ami to Regions")
+	}
+}
+
+func TestStepAmiRegionCopy_nil_intermediary(t *testing.T) {
+	// create step
+	stepAMIRegionCopy := StepAMIRegionCopy{
+		AccessConfig:      testAccessConfig(),
+		Regions:           make([]string, 0),
+		AMIKmsKeyId:       "",
+		RegionKeyIds:      make(map[string]string),
+		EncryptBootVolume: config.TriFalse,
+		Name:              "fake-ami-name",
+		OriginalRegion:    "us-east-1",
+	}
+	// mock out the region connection code
+	stepAMIRegionCopy.getRegionConn = getMockConn
+
+	state := tState()
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if stepAMIRegionCopy.toDelete != "" {
+		t.Fatalf("Should not delete original AMI if no intermediary")
+	}
+	if len(stepAMIRegionCopy.Regions) != 0 {
+		t.Fatalf("Should not have added original ami to Regions")
+	}
+}
+
+func TestStepAmiRegionCopy_AMISkipBuildRegion(t *testing.T) {
+	// ------------------------------------------------------------------------
+	// skip build region is true
+	// ------------------------------------------------------------------------
+
+	stepAMIRegionCopy := StepAMIRegionCopy{
+		AccessConfig:       testAccessConfig(),
+		Regions:            []string{"us-west-1"},
+		AMIKmsKeyId:        "",
+		RegionKeyIds:       map[string]string{"us-west-1": "abcde"},
+		Name:               "fake-ami-name",
+		OriginalRegion:     "us-east-1",
+		AMISkipBuildRegion: true,
+	}
+	// mock out the region connection code
+	stepAMIRegionCopy.getRegionConn = getMockConn
+
+	state := tState()
+	state.Put("intermediary_image", true)
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if stepAMIRegionCopy.toDelete == "" {
+		t.Fatalf("Should delete original AMI if skip_save_build_region=true")
+	}
+	if len(stepAMIRegionCopy.Regions) != 1 {
+		t.Fatalf("Should not have added original ami to Regions; Regions: %#v", stepAMIRegionCopy.Regions)
+	}
+
+	// ------------------------------------------------------------------------
+	// skip build region is false.
+	// ------------------------------------------------------------------------
+	stepAMIRegionCopy = StepAMIRegionCopy{
+		AccessConfig:       testAccessConfig(),
+		Regions:            []string{"us-west-1"},
+		AMIKmsKeyId:        "",
+		RegionKeyIds:       make(map[string]string),
+		Name:               "fake-ami-name",
+		OriginalRegion:     "us-east-1",
+		AMISkipBuildRegion: false,
+	}
+	// mock out the region connection code
+	stepAMIRegionCopy.getRegionConn = getMockConn
+
+	state.Put("intermediary_image", false) // not encrypted
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if stepAMIRegionCopy.toDelete != "" {
+		t.Fatalf("Shouldn't have an intermediary AMI, so dont delete original ami")
+	}
+	if len(stepAMIRegionCopy.Regions) != 1 {
+		t.Fatalf("Should not have added original ami to Regions; Regions: %#v", stepAMIRegionCopy.Regions)
+	}
+
+	// ------------------------------------------------------------------------
+	// skip build region is false, but encrypt is true
+	// ------------------------------------------------------------------------
+	stepAMIRegionCopy = StepAMIRegionCopy{
+		AccessConfig:       testAccessConfig(),
+		Regions:            []string{"us-west-1"},
+		AMIKmsKeyId:        "",
+		RegionKeyIds:       map[string]string{"us-west-1": "abcde"},
+		Name:               "fake-ami-name",
+		OriginalRegion:     "us-east-1",
+		AMISkipBuildRegion: false,
+		EncryptBootVolume:  config.TriTrue,
+	}
+	// mock out the region connection code
+	stepAMIRegionCopy.getRegionConn = getMockConn
+
+	state.Put("intermediary_image", true) //encrypted
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if stepAMIRegionCopy.toDelete == "" {
+		t.Fatalf("Have to delete intermediary AMI")
+	}
+	if len(stepAMIRegionCopy.Regions) != 2 {
+		t.Fatalf("Should have added original ami to Regions; Regions: %#v", stepAMIRegionCopy.Regions)
+	}
+
+	// ------------------------------------------------------------------------
+	// skip build region is true, and encrypt is true
+	// ------------------------------------------------------------------------
+	stepAMIRegionCopy = StepAMIRegionCopy{
+		AccessConfig:       testAccessConfig(),
+		Regions:            []string{"us-west-1"},
+		AMIKmsKeyId:        "",
+		RegionKeyIds:       map[string]string{"us-west-1": "abcde"},
+		Name:               "fake-ami-name",
+		OriginalRegion:     "us-east-1",
+		AMISkipBuildRegion: true,
+		EncryptBootVolume:  config.TriTrue,
+	}
+	// mock out the region connection code
+	stepAMIRegionCopy.getRegionConn = getMockConn
+
+	state.Put("intermediary_image", true) //encrypted
+	stepAMIRegionCopy.Run(context.Background(), state)
+
+	if stepAMIRegionCopy.toDelete == "" {
+		t.Fatalf("Have to delete intermediary AMI")
+	}
+	if len(stepAMIRegionCopy.Regions) != 1 {
+		t.Fatalf("Should not have added original ami to Regions; Regions: %#v", stepAMIRegionCopy.Regions)
+	}
+}

builder/amazon/common/step_cleanup_volumes.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 // stepCleanupVolumes cleans up any orphaned volumes that were not designated to
@@ -29,7 +29,7 @@ func (s *StepCleanupVolumes) Cleanup(state multistep.StateBag) {
 	if instanceRaw != nil {
 		instance = instanceRaw.(*ec2.Instance)
 	}
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 	if instance == nil {
 		ui.Say("No volumes to clean up, skipping")
 		return

builder/amazon/common/step_create_ssm_tunnel.go

@@ -9,10 +9,10 @@ import (
 	"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-plugin-amazon/builder/common/ssm"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"github.com/hashicorp/packer-plugin-sdk/net"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	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 {
@@ -27,7 +27,7 @@ type StepCreateSSMTunnel struct {
 
 // 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").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	if !s.SSMAgentEnabled {
 		return multistep.ActionContinue