chore: upgrade nextjs-scripts & next

Merge pull request #10492 from hashicorp/website-redirects
redirects-next.js: Fix regex for builder redirects
2021-02-09 09:56:51 -06:00 · 2021-01-15 16:21:05 -05:00 · 2021-01-14 16:26:51 -05:00 · 2021-01-14 09:56:45 -08:00 · 2021-01-06 16:38:22 -05:00 · 2021-01-06 16:38:07 -05:00
3318 changed files with 110866 additions and 207148 deletions
@@ -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:
@@ -61,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:
@@ -74,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:
@@ -19,7 +19,7 @@ can quickly merge or address your contributions.
  already fixed the bug you're experiencing.

 - Run the command with debug output with the environment variable `PACKER_LOG`.
-  For example: `PACKER_LOG=1 packer build template.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.
@@ -64,9 +64,7 @@ can quickly merge or address your contributions.
 If you have never worked with Go before, you will have to install its
 runtime in order to build packer.

-1. This project always releases from the latest version of golang.
-[Install go](https://golang.org/doc/install#install) 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

@@ -74,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
@@ -92,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.
@@ -463,8 +462,8 @@ The following example has been adapted from a shell-local provisioner test:

 ```
 import (
-  "github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc"
-  "github.com/hashicorp/packer-plugin-sdk/acctest/testutils"
+  "github.com/hashicorp/packer/packer-plugin-sdk/acctest/provisioneracc"
+  "github.com/hashicorp/packer/packer-plugin-sdk/acctest/testutils"
 )

 // ...
@@ -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:
@@ -1,37 +1,14 @@
-on:
-  pull_request:
-    paths:
-      - 'website/**'
-
-name: Check markdown links on modified website files
+on: [pull_request]
+name: Check Markdown links for modified files
 jobs:
-  vercel-deployment-poll:
-    runs-on: ubuntu-latest
-    timeout-minutes: 3 #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
+    - uses: actions/checkout@master
+    - 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'
+
@@ -6,9 +6,6 @@ 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:
@@ -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](###blog-post-url###). 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}."
-}
-
@@ -1,111 +1,15 @@
-## 1.7.1 (Upcoming)
-
-### IMPROVEMENTS
-* builder/amazon: allow creation of ebs snapshots wihtout volumes. [GH-9591]
-* builder/scaleway: add support for timeout in shutdown step. [GH-10503]
-* builder/virtualbox: Add template options for chipset, firmware, nic, graphics
-    controller, and audio controller. [GH-10671]
-* builder/virtualbox: Support for "virtio" storage and ISO drive. [GH-10632]
-* builder/vmware: Added "attach_snapshot" parameter to vmware vmx builder.
-    [GH-10651]
-* core: Change template parsing error to include warning about file extensions.
-    [GH-10652]
-* hcl2_upgrade: hcl2_upgrade command can now upgrade json var-files [GH-10676]
-
-### BUG FIXES
-* builder/amazon: Update amazon SDK to fix an SSO login issue. [GH-10668]
-* builder/azure: Don't overwrite subscription id if unset. [GH-10659]
-* builder/oracle-oci: Update Oracle Go SDK to fix issue with reading key file.
-    [GH-10560]
-* builder/vmware: Added a fallback file check when trying to determine the
-    network-mapping configuration. [GH-10543]
-* core/hcl2_upgrade: Make hcl2_upgrade command correctly translate
-    pause_before. [GH-10654]
-* core: Templates previously could not interpolate the environment variable
-    PACKER_LOG_PATH. [GH-10660]
-* provisioner/chef-solo: HCL2 templates can support the json_string option.
-    [GH-10655]
-
-## 1.7.0 (February 17, 2021)
-
-### FEATURES
-* **New Command** (HCL only) `packer init` command will download plugins defined
-    in a new `required_plugins` block [GH-10304] [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.7.0 (Upcoming)

 ## 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
@@ -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
@@ -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.
@@ -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)
@@ -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/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/go-homedir"
 )

@@ -7,7 +7,7 @@ import (
 	"strings"

 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type Artifact struct {
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"

-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 func TestArtifact_Impl(t *testing.T) {
@@ -9,13 +9,13 @@ 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/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 // The unique ID for this builder
@@ -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/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )

@@ -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/packer-plugin-sdk/acctest"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 const defaultTestRegion = "cn-beijing"
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"

-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	helperconfig "github.com/hashicorp/packer-plugin-sdk/template/config"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	helperconfig "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )

 func testBuilderConfig() map[string]interface{} {
@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"strings"

-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 // The "AlicloudDiskDevice" object us used for the `ECSSystemDiskMapping` and
@@ -153,7 +153,7 @@ 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"`
 	AlicloudDiskDevices `mapstructure:",squash"`
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strconv"

-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 func cleanUpMessage(state multistep.StateBag, module string) {
@@ -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/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )

 type RunConfig struct {
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"

-	"github.com/hashicorp/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/communicator"
 )

 func testConfig() *RunConfig {
@@ -3,7 +3,7 @@ package ecs
 import (
 	"time"

-	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )

 var (
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepAttachKeyPair struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepCheckAlicloudSourceImage struct {
@@ -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/packer-plugin-sdk/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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepConfigAlicloudEIP struct {
@@ -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/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepConfigAlicloudKeyPair struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepConfigAlicloudPublicIP struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )

 type stepConfigAlicloudSecurityGroup struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )

 type stepConfigAlicloudVPC struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )

 type stepConfigAlicloudVSwitch struct {
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"time"

-	"github.com/hashicorp/packer-plugin-sdk/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )

 type stepCreateAlicloudImage struct {
@@ -7,14 +7,14 @@ import (
 	"io/ioutil"
 	"strconv"

-	"github.com/hashicorp/packer-plugin-sdk/uuid"
+	"github.com/hashicorp/packer/packer-plugin-sdk/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"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )

 type stepCreateAlicloudInstance struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepCreateAlicloudSnapshot struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepCreateTags struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepDeleteAlicloudImageSnapshots struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepPreValidate struct {
@@ -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"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )

 type stepRegionCopyAlicloudImage struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepRunAlicloudInstance struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepShareAlicloudImage struct {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type stepStopAlicloudInstance struct {
@@ -1,7 +1,7 @@
 package version

 import (
-	"github.com/hashicorp/packer-plugin-sdk/version"
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
 	packerVersion "github.com/hashicorp/packer/version"
 )

@@ -15,15 +15,15 @@ import (

 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"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/packer-plugin-sdk/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 // The unique ID for this builder
@@ -162,12 +162,12 @@ 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
@@ -285,7 +285,9 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	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, b.config.SourceAmiFilter.Prepare()...)
+
+	errs = packersdk.MultiErrorAppend(errs, b.config.AccessConfig.Prepare(&b.config.ctx)...)
 	errs = packersdk.MultiErrorAppend(errs,
 		b.config.AMIConfig.Prepare(&b.config.AccessConfig, &b.config.ctx)...)

@@ -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-sdk/template/config"
 	"github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )

@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"

-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 func testConfig() map[string]interface{} {
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"testing"

-	"github.com/hashicorp/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 )

 func TestCopyFile(t *testing.T) {
@@ -7,9 +7,9 @@ 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"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 // StepAttachVolume attaches the previously created volume to an
@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"

-	"github.com/hashicorp/packer-plugin-sdk/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
 )

 func TestAttachVolumeCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 // StepCheckRootDevice makes sure the root device on the AMI is EBS-backed.
@@ -8,11 +8,11 @@ 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-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 // StepCreateVolume creates a new volume from the snapshot of the root
@@ -5,7 +5,7 @@ import (

 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	confighelper "github.com/hashicorp/packer-plugin-sdk/template/config"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/stretchr/testify/assert"
 )

@@ -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/packer-plugin-sdk/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 // StepEarlyUnflock unlocks the flock.
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 // StepFlock provisions the instance within a chroot.
@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"

-	"github.com/hashicorp/packer-plugin-sdk/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
 )

 func TestFlockCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 // StepInstanceInfo verifies that this builder is running on an EC2 instance.
@@ -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/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 type mountPathData struct {
@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"

-	"github.com/hashicorp/packer-plugin-sdk/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
 )

 func TestMountDeviceCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )

 // StepPrepareDevice finds an available device and sets it.
@@ -6,11 +6,11 @@ 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-plugin-sdk/random"
-	confighelper "github.com/hashicorp/packer-plugin-sdk/template/config"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )

 // StepRegisterAMI creates the AMI.
@@ -3,8 +3,8 @@ package chroot
 import (
 	"testing"

-	"github.com/hashicorp/packer-plugin-sdk/common"
 	amazon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"

 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
@@ -6,9 +6,9 @@ import (
 	"time"

 	"github.com/aws/aws-sdk-go/service/ec2"
-	"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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 // StepSnapshot creates a snapshot of the created volume.
@@ -18,6 +18,7 @@ import (
 	awsbase "github.com/hashicorp/aws-sdk-go-base"
 	cleanhttp "github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
+	"github.com/hashicorp/packer/packer-plugin-sdk/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"
@@ -174,16 +175,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 +186,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 +370,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 {
@@ -1,5 +1,4 @@
 // Code generated by "mapstructure-to-hcl2 -type VaultAWSEngineOptions,AssumeRoleConfig"; DO NOT EDIT.
-
 package common

 import (
@@ -5,10 +5,20 @@ import (

 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 )

+func testAccessConfig() *AccessConfig {
+	return &AccessConfig{
+		getEC2Connection: func() ec2iface.EC2API {
+			return &mockEC2Client{}
+		},
+		PollingConfig: new(AWSPollingConfig),
+	}
+}
+
 func TestAccessConfigPrepare_Region(t *testing.T) {
-	c := FakeAccessConfig()
+	c := testAccessConfig()

 	c.RawRegion = "us-east-12"
 	err := c.ValidateRegion(c.RawRegion)
@@ -30,14 +40,14 @@ func TestAccessConfigPrepare_Region(t *testing.T) {
 }

 func TestAccessConfigPrepare_RegionRestricted(t *testing.T) {
-	c := FakeAccessConfig()
+	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(); err != nil {
+	if err := c.Prepare(nil); err != nil {
 		t.Fatalf("shouldn't have err: %s", err)
 	}

@@ -7,8 +7,8 @@ import (
 	"log"
 	"regexp"

-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 // AMIConfig is for common configuration related to creating AMIs.
@@ -16,11 +16,11 @@ type AMIConfig struct {
 	// The name of the resulting AMI that will appear when managing AMIs in the
 	// AWS console or via APIs. This must be unique. To help make this unique,
 	// use a function like timestamp (see [template
-	// engine](/docs/templates/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,12 +47,12 @@ 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"`
 	// Enable enhanced networking (ENA but not SriovNetSupport) on
@@ -135,8 +135,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 config.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 +190,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 {
@@ -7,7 +7,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/aws/aws-sdk-go/service/ec2/ec2iface"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )

 func testAMIConfig() *AMIConfig {
@@ -17,14 +18,14 @@ func testAMIConfig() *AMIConfig {
 }

 func getFakeAccessConfig(region string) *AccessConfig {
-	c := FakeAccessConfig()
+	c := testAccessConfig()
 	c.RawRegion = region
 	return c
 }

 func TestAMIConfigPrepare_name(t *testing.T) {
 	c := testAMIConfig()
-	accessConf := FakeAccessConfig()
+	accessConf := testAccessConfig()
 	if err := c.Prepare(accessConf, nil); err != nil {
 		t.Fatalf("shouldn't have err: %s", err)
 	}
@@ -35,6 +36,10 @@ func TestAMIConfigPrepare_name(t *testing.T) {
 	}
 }

+type mockEC2Client struct {
+	ec2iface.EC2API
+}
+
 func (m *mockEC2Client) DescribeRegions(*ec2.DescribeRegionsInput) (*ec2.DescribeRegionsOutput, error) {
 	return &ec2.DescribeRegionsOutput{
 		Regions: []*ec2.Region{
@@ -51,7 +56,7 @@ func TestAMIConfigPrepare_regions(t *testing.T) {

 	var errs []error
 	var err error
-	accessConf := FakeAccessConfig()
+	accessConf := testAccessConfig()
 	mockConn := &mockEC2Client{}
 	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
 		t.Fatalf("shouldn't have err: %#v", errs)
@@ -158,7 +163,7 @@ func TestAMIConfigPrepare_Share_EncryptedBoot(t *testing.T) {
 	c.AMIUsers = []string{"testAccountID"}
 	c.AMIEncryptBootVolume = config.TriTrue

-	accessConf := FakeAccessConfig()
+	accessConf := testAccessConfig()

 	c.AMIKmsKeyId = ""
 	if err := c.Prepare(accessConf, nil); err == nil {
@@ -174,7 +179,7 @@ func TestAMIConfigPrepare_ValidateKmsKey(t *testing.T) {
 	c := testAMIConfig()
 	c.AMIEncryptBootVolume = config.TriTrue

-	accessConf := FakeAccessConfig()
+	accessConf := testAccessConfig()

 	validCases := []string{
 		"abcd1234-e567-890f-a12b-a123b4cd56ef",
@@ -210,7 +215,7 @@ func TestAMIConfigPrepare_ValidateKmsKey(t *testing.T) {
 func TestAMINameValidation(t *testing.T) {
 	c := testAMIConfig()

-	accessConf := FakeAccessConfig()
+	accessConf := testAccessConfig()

 	c.AMIName = "aa"
 	if err := c.Prepare(accessConf, nil); err == nil {
@@ -1,80 +0,0 @@
-//go:generate struct-markdown
-package common
-
-import (
-	"fmt"
-	"log"
-
-	"github.com/aws/aws-sdk-go/service/ec2"
-)
-
-type AmiFilterOptions struct {
-	// Filters used to select an AMI. Any filter described in the docs for
-	// [DescribeImages](http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImages.html)
-	// is valid.
-	Filters map[string]string `mapstructure:"filters"`
-	// Filters the images by their owner. You
-	// may specify one or more AWS account IDs, "self" (which will use the
-	// account whose credentials you are using to run Packer), or an AWS owner
-	// alias: for example, `amazon`, `aws-marketplace`, or `microsoft`. This
-	// option is required for security reasons.
-	Owners []string `mapstructure:"owners"`
-	// Selects the newest created image when true.
-	// This is most useful for selecting a daily distro build.
-	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 && len(d.Filters) == 0
-}
-
-func (d *AmiFilterOptions) NoOwner() bool {
-	return len(d.Owners) == 0
-}
-
-func (d *AmiFilterOptions) GetFilteredImage(params *ec2.DescribeImagesInput, ec2conn *ec2.EC2) (*ec2.Image, error) {
-	// We have filters to apply
-	if len(d.Filters) > 0 {
-		params.Filters = buildEc2Filters(d.Filters)
-	}
-	if len(d.Owners) > 0 {
-		params.Owners = d.GetOwners()
-	}
-
-	log.Printf("Using AMI Filters %v", params)
-	req, imageResp := ec2conn.DescribeImagesRequest(params)
-	req.RetryCount = 11
-
-	err := req.Send()
-	if err != nil {
-		err := fmt.Errorf("Error querying AMI: %s", err)
-		return nil, err
-	}
-
-	if len(imageResp.Images) == 0 {
-		err := fmt.Errorf("No AMI was found matching filters: %v", params)
-		return nil, err
-	}
-
-	if len(imageResp.Images) > 1 && !d.MostRecent {
-		err := fmt.Errorf("Your query returned more than one result. Please try a more specific search, or set most_recent to true.")
-		return nil, err
-	}
-
-	var image *ec2.Image
-	if d.MostRecent {
-		image = mostRecentAmi(imageResp.Images)
-	} else {
-		image = imageResp.Images[0]
-	}
-	return image, nil
-}
@@ -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"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 // Artifact is an artifact implementation that contains built AMIs.
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"

-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 func TestArtifact_Impl(t *testing.T) {
@@ -9,8 +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"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 const (
@@ -30,6 +30,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 +52,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,7 +76,7 @@ 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"`
@@ -85,7 +86,7 @@ type BlockDevice struct {
 	// 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"`
+	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"`
@@ -149,12 +150,12 @@ func (blockDevice BlockDevice) BuildEC2BlockDeviceMapping() *ec2.BlockDeviceMapp

 	switch blockDevice.VolumeType {
 	case "io1", "io2", "gp3":
-		ebsBlockDevice.Iops = blockDevice.IOPS
+		ebsBlockDevice.Iops = aws.Int64(blockDevice.IOPS)
 	}

 	// Throughput is only valid for gp3 types
 	if blockDevice.VolumeType == "gp3" {
-		ebsBlockDevice.Throughput = blockDevice.Throughput
+		ebsBlockDevice.Throughput = aws.Int64(blockDevice.Throughput)
 	}

 	// You cannot specify Encrypted if you specify a Snapshot ID
@@ -190,28 +191,28 @@ func (b *BlockDevice) Prepare(ctx *interpolate.Context) error {
 	}

 	if ratio, ok := iopsRatios[b.VolumeType]; b.VolumeSize != 0 && ok {
-		if b.IOPS != nil && (*b.IOPS/b.VolumeSize > ratio) {
+		if 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) {
+		if 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) {
+		if 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) {
+		if 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 {
+	} else if b.Throughput > 0 {
 		return fmt.Errorf("Throughput is not available for device %s",
 			b.DeviceName)
 	}
@@ -1,5 +1,4 @@
 // Code generated by "mapstructure-to-hcl2 -type BlockDevice"; DO NOT EDIT.
-
 package common

 import (
@@ -6,8 +6,8 @@ import (
 	"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-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 func TestBlockDevice(t *testing.T) {
@@ -54,7 +54,7 @@ func TestBlockDevice(t *testing.T) {
 				VolumeType:          "io1",
 				VolumeSize:          8,
 				DeleteOnTermination: true,
-				IOPS:                aws.Int64(1000),
+				IOPS:                1000,
 			},

 			Result: &ec2.BlockDeviceMapping{
@@ -73,7 +73,7 @@ func TestBlockDevice(t *testing.T) {
 				VolumeType:          "io2",
 				VolumeSize:          8,
 				DeleteOnTermination: true,
-				IOPS:                aws.Int64(1000),
+				IOPS:                1000,
 			},

 			Result: &ec2.BlockDeviceMapping{
@@ -168,8 +168,8 @@ func TestBlockDevice(t *testing.T) {
 				DeviceName:          "/dev/sdb",
 				VolumeType:          "gp3",
 				VolumeSize:          8,
-				Throughput:          aws.Int64(125),
-				IOPS:                aws.Int64(3000),
+				Throughput:          125,
+				IOPS:                3000,
 				DeleteOnTermination: true,
 				Encrypted:           config.TriTrue,
 			},
@@ -219,7 +219,7 @@ func TestIOPSValidation(t *testing.T) {
 			device: BlockDevice{
 				DeviceName: "/dev/sdb",
 				VolumeType: "io1",
-				IOPS:       aws.Int64(1000),
+				IOPS:       1000,
 			},
 			ok: true,
 		},
@@ -227,7 +227,7 @@ func TestIOPSValidation(t *testing.T) {
 			device: BlockDevice{
 				DeviceName: "/dev/sdb",
 				VolumeType: "io2",
-				IOPS:       aws.Int64(1000),
+				IOPS:       1000,
 			},
 			ok: true,
 		},
@@ -237,7 +237,7 @@ func TestIOPSValidation(t *testing.T) {
 				DeviceName: "/dev/sdb",
 				VolumeType: "io1",
 				VolumeSize: 50,
-				IOPS:       aws.Int64(1000),
+				IOPS:       1000,
 			},
 			ok: true,
 		},
@@ -246,7 +246,7 @@ func TestIOPSValidation(t *testing.T) {
 				DeviceName: "/dev/sdb",
 				VolumeType: "io2",
 				VolumeSize: 100,
-				IOPS:       aws.Int64(1000),
+				IOPS:       1000,
 			},
 			ok: true,
 		},
@@ -256,7 +256,7 @@ func TestIOPSValidation(t *testing.T) {
 				DeviceName: "/dev/sdb",
 				VolumeType: "io1",
 				VolumeSize: 10,
-				IOPS:       aws.Int64(2000),
+				IOPS:       2000,
 			},
 			ok:  false,
 			msg: "/dev/sdb: the maximum ratio of provisioned IOPS to requested volume size (in GiB) is 50:1 for io1 volumes",
@@ -266,7 +266,7 @@ func TestIOPSValidation(t *testing.T) {
 				DeviceName: "/dev/sdb",
 				VolumeType: "io2",
 				VolumeSize: 50,
-				IOPS:       aws.Int64(30000),
+				IOPS:       30000,
 			},
 			ok:  false,
 			msg: "/dev/sdb: the maximum ratio of provisioned IOPS to requested volume size (in GiB) is 500:1 for io2 volumes",
@@ -277,7 +277,7 @@ func TestIOPSValidation(t *testing.T) {
 				DeviceName: "/dev/sdb",
 				VolumeType: "io2",
 				VolumeSize: 500,
-				IOPS:       aws.Int64(99999),
+				IOPS:       99999,
 			},
 			ok:  false,
 			msg: "IOPS must be between 100 and 64000 for device /dev/sdb",
@@ -288,7 +288,7 @@ func TestIOPSValidation(t *testing.T) {
 				DeviceName: "/dev/sdb",
 				VolumeType: "io2",
 				VolumeSize: 50,
-				IOPS:       aws.Int64(10),
+				IOPS:       10,
 			},
 			ok:  false,
 			msg: "IOPS must be between 100 and 64000 for device /dev/sdb",
@@ -299,8 +299,8 @@ func TestIOPSValidation(t *testing.T) {
 				DeviceName: "/dev/sdb",
 				VolumeType: "gp3",
 				VolumeSize: 50,
-				Throughput: aws.Int64(125),
-				IOPS:       aws.Int64(99999),
+				Throughput: 125,
+				IOPS:       99999,
 			},
 			ok:  false,
 			msg: "IOPS must be between 3000 and 16000 for device /dev/sdb",
@@ -311,8 +311,8 @@ func TestIOPSValidation(t *testing.T) {
 				DeviceName: "/dev/sdb",
 				VolumeType: "gp3",
 				VolumeSize: 50,
-				Throughput: aws.Int64(125),
-				IOPS:       aws.Int64(10),
+				Throughput: 125,
+				IOPS:       10,
 			},
 			ok:  false,
 			msg: "IOPS must be between 3000 and 16000 for device /dev/sdb",
@@ -346,8 +346,8 @@ func TestThroughputValidation(t *testing.T) {
 			device: BlockDevice{
 				DeviceName: "/dev/sdb",
 				VolumeType: "gp3",
-				Throughput: aws.Int64(125),
-				IOPS:       aws.Int64(3000),
+				Throughput: 125,
+				IOPS:       3000,
 			},
 			ok: true,
 		},
@@ -355,8 +355,8 @@ func TestThroughputValidation(t *testing.T) {
 			device: BlockDevice{
 				DeviceName: "/dev/sdb",
 				VolumeType: "gp3",
-				Throughput: aws.Int64(1000),
-				IOPS:       aws.Int64(3000),
+				Throughput: 1000,
+				IOPS:       3000,
 			},
 			ok: true,
 		},
@@ -365,8 +365,8 @@ func TestThroughputValidation(t *testing.T) {
 			device: BlockDevice{
 				DeviceName: "/dev/sdb",
 				VolumeType: "gp3",
-				Throughput: aws.Int64(1001),
-				IOPS:       aws.Int64(3000),
+				Throughput: 1001,
+				IOPS:       3000,
 			},
 			ok:  false,
 			msg: "Throughput must be between 125 and 1000 for device /dev/sdb",
@@ -376,8 +376,8 @@ func TestThroughputValidation(t *testing.T) {
 			device: BlockDevice{
 				DeviceName: "/dev/sdb",
 				VolumeType: "gp3",
-				Throughput: aws.Int64(124),
-				IOPS:       aws.Int64(3000),
+				Throughput: 124,
+				IOPS:       3000,
 			},
 			ok:  false,
 			msg: "Throughput must be between 125 and 1000 for device /dev/sdb",
@@ -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-sdk/retry"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )

 // DestroyAMIs deregisters the AWS machine images in imageids from an active AWS account
@@ -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/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )

 type BuildInfoTemplate struct {
@@ -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"
-	"github.com/hashicorp/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )

 func testImage() *ec2.Image {
@@ -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,14 +11,37 @@ 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/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )

 var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")

+type AmiFilterOptions struct {
+	config.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"`
@@ -44,20 +67,6 @@ 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"`
-}
-
 // RunConfig contains configuration for running an instance from a source
 // AMI and details on how to access that launched image.
 type RunConfig struct {
@@ -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,12 +199,12 @@ 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"`
 	// The ID (not the name) of the security
@@ -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"`
 	// 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
@@ -404,21 +398,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 +414,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 +450,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 +510,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,
@@ -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/packer-plugin-sdk/template/config"
 	"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     []config.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((*config.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 {
@@ -6,7 +6,8 @@ import (
 	"regexp"
 	"testing"

-	"github.com/hashicorp/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )

 func init() {
@@ -85,8 +86,10 @@ func TestRunConfigPrepare_SourceAmiFilterGood(t *testing.T) {
 	filter_key := "name"
 	filter_value := "foo"
 	goodFilter := AmiFilterOptions{
-		Owners:  []string{owner},
-		Filters: map[string]string{filter_key: filter_value},
+		Owners: []string{owner},
+		KeyValueFilter: config.KeyValueFilter{
+			Filters: map[string]string{filter_key: filter_value},
+		},
 	}
 	c.SourceAmiFilter = goodFilter
 	if err := c.Prepare(nil); len(err) != 0 {
@@ -1,29 +0,0 @@
-//go:generate struct-markdown
-
-package common
-
-import "github.com/hashicorp/packer-plugin-sdk/template/config"
-
-// SnapshotConfig is for common configuration related to creating AMIs.
-type SnapshotConfig struct {
-	// 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/legacy_json_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/templates/hcl_templates/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	SnapshotTag config.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"`
-}
@@ -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/packer-plugin-sdk/multistep"
 )

 type ec2Describer interface {
@@ -5,7 +5,7 @@ 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/packer-plugin-sdk/multistep"
 )

 const (
@@ -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"
-	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"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec"
 )

 type Session struct {
@@ -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/packer-plugin-sdk/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
 }

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

 import (
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )

 type StepAMIRegionCopy struct {
@@ -24,7 +24,6 @@ type StepAMIRegionCopy struct {

 	toDelete           string
 	getRegionConn      func(*AccessConfig, string) (ec2iface.EC2API, error)
-	AMISkipCreateImage bool
 	AMISkipBuildRegion bool
 }

@@ -64,12 +63,6 @@ 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
-	}
-
 	amis := state.Get("amis").(map[string]string)
 	snapshots := state.Get("snapshots").(map[string][]string)
 	intermediary, _ := state.Get("intermediary_image").(bool)
@@ -11,9 +11,9 @@ 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"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )

 // Define a mock struct to be used in unit tests for common aws steps.
@@ -105,7 +105,7 @@ func TestStepAMIRegionCopy_duplicates(t *testing.T) {
 	// ------------------------------------------------------------------------

 	stepAMIRegionCopy := StepAMIRegionCopy{
-		AccessConfig: FakeAccessConfig(),
+		AccessConfig: testAccessConfig(),
 		Regions:      []string{"us-east-1"},
 		AMIKmsKeyId:  "12345",
 		// Original region key in regionkeyids is different than in amikmskeyid
@@ -131,7 +131,7 @@ func TestStepAMIRegionCopy_duplicates(t *testing.T) {

 	// the ami is only copied once.
 	stepAMIRegionCopy = StepAMIRegionCopy{
-		AccessConfig:   FakeAccessConfig(),
+		AccessConfig:   testAccessConfig(),
 		Regions:        []string{"us-east-1"},
 		Name:           "fake-ami-name",
 		OriginalRegion: "us-east-1",
@@ -152,7 +152,7 @@ func TestStepAMIRegionCopy_duplicates(t *testing.T) {

 	// the ami is only copied once.
 	stepAMIRegionCopy = StepAMIRegionCopy{
-		AccessConfig:      FakeAccessConfig(),
+		AccessConfig:      testAccessConfig(),
 		Regions:           []string{"us-east-1"},
 		EncryptBootVolume: config.TriFalse,
 		Name:              "fake-ami-name",
@@ -174,7 +174,7 @@ func TestStepAMIRegionCopy_duplicates(t *testing.T) {
 	// ------------------------------------------------------------------------

 	stepAMIRegionCopy = StepAMIRegionCopy{
-		AccessConfig: FakeAccessConfig(),
+		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",
@@ -203,7 +203,7 @@ func TestStepAMIRegionCopy_duplicates(t *testing.T) {
 	// ------------------------------------------------------------------------

 	stepAMIRegionCopy = StepAMIRegionCopy{
-		AccessConfig: FakeAccessConfig(),
+		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",
@@ -223,7 +223,7 @@ func TestStepAMIRegionCopy_duplicates(t *testing.T) {
 func TestStepAmiRegionCopy_nil_encryption(t *testing.T) {
 	// create step
 	stepAMIRegionCopy := StepAMIRegionCopy{
-		AccessConfig:      FakeAccessConfig(),
+		AccessConfig:      testAccessConfig(),
 		Regions:           make([]string, 0),
 		AMIKmsKeyId:       "",
 		RegionKeyIds:      make(map[string]string),
@@ -249,7 +249,7 @@ func TestStepAmiRegionCopy_nil_encryption(t *testing.T) {
 func TestStepAmiRegionCopy_true_encryption(t *testing.T) {
 	// create step
 	stepAMIRegionCopy := StepAMIRegionCopy{
-		AccessConfig:      FakeAccessConfig(),
+		AccessConfig:      testAccessConfig(),
 		Regions:           make([]string, 0),
 		AMIKmsKeyId:       "",
 		RegionKeyIds:      make(map[string]string),
@@ -275,7 +275,7 @@ func TestStepAmiRegionCopy_true_encryption(t *testing.T) {
 func TestStepAmiRegionCopy_nil_intermediary(t *testing.T) {
 	// create step
 	stepAMIRegionCopy := StepAMIRegionCopy{
-		AccessConfig:      FakeAccessConfig(),
+		AccessConfig:      testAccessConfig(),
 		Regions:           make([]string, 0),
 		AMIKmsKeyId:       "",
 		RegionKeyIds:      make(map[string]string),
@@ -303,7 +303,7 @@ func TestStepAmiRegionCopy_AMISkipBuildRegion(t *testing.T) {
 	// ------------------------------------------------------------------------

 	stepAMIRegionCopy := StepAMIRegionCopy{
-		AccessConfig:       FakeAccessConfig(),
+		AccessConfig:       testAccessConfig(),
 		Regions:            []string{"us-west-1"},
 		AMIKmsKeyId:        "",
 		RegionKeyIds:       map[string]string{"us-west-1": "abcde"},
@@ -329,7 +329,7 @@ func TestStepAmiRegionCopy_AMISkipBuildRegion(t *testing.T) {
 	// skip build region is false.
 	// ------------------------------------------------------------------------
 	stepAMIRegionCopy = StepAMIRegionCopy{
-		AccessConfig:       FakeAccessConfig(),
+		AccessConfig:       testAccessConfig(),
 		Regions:            []string{"us-west-1"},
 		AMIKmsKeyId:        "",
 		RegionKeyIds:       make(map[string]string),
@@ -354,7 +354,7 @@ func TestStepAmiRegionCopy_AMISkipBuildRegion(t *testing.T) {
 	// skip build region is false, but encrypt is true
 	// ------------------------------------------------------------------------
 	stepAMIRegionCopy = StepAMIRegionCopy{
-		AccessConfig:       FakeAccessConfig(),
+		AccessConfig:       testAccessConfig(),
 		Regions:            []string{"us-west-1"},
 		AMIKmsKeyId:        "",
 		RegionKeyIds:       map[string]string{"us-west-1": "abcde"},
@@ -380,7 +380,7 @@ func TestStepAmiRegionCopy_AMISkipBuildRegion(t *testing.T) {
 	// skip build region is true, and encrypt is true
 	// ------------------------------------------------------------------------
 	stepAMIRegionCopy = StepAMIRegionCopy{
-		AccessConfig:       FakeAccessConfig(),
+		AccessConfig:       testAccessConfig(),
 		Regions:            []string{"us-west-1"},
 		AMIKmsKeyId:        "",
 		RegionKeyIds:       map[string]string{"us-west-1": "abcde"},
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 // stepCleanupVolumes cleans up any orphaned volumes that were not designated to
@@ -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"
-	"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/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type StepCreateSSMTunnel struct {
@@ -8,16 +8,14 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/retry"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 type StepCreateTags struct {
-	AMISkipCreateImage bool
-
 	Tags         map[string]string
 	SnapshotTags map[string]string
 	Ctx          interpolate.Context
@@ -27,12 +25,6 @@ func (s *StepCreateTags) Run(ctx context.Context, state multistep.StateBag) mult
 	ec2conn := state.Get("ec2").(*ec2.EC2)
 	session := state.Get("awsSession").(*session.Session)
 	ui := state.Get("ui").(packersdk.Ui)
-
-	if s.AMISkipCreateImage {
-		ui.Say("Skipping AMI create tags...")
-		return multistep.ActionContinue
-	}
-
 	amis := state.Get("amis").(map[string]string)

 	if len(s.Tags) == 0 && len(s.SnapshotTags) == 0 {
@@ -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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 type StepDeregisterAMI struct {
@@ -12,10 +12,10 @@ import (
 	"time"

 	"github.com/aws/aws-sdk-go/service/ec2"
-	"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-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )

 // StepGetPassword reads the password from a Windows server and sets it
@@ -8,9 +8,9 @@ import (

 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/iam"
-	"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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )

 type StepIamInstanceProfile struct {
@@ -8,10 +8,10 @@ import (
 	"time"

 	"github.com/aws/aws-sdk-go/service/ec2"
-	"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-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )

 type StepKeyPair struct {
@@ -7,15 +7,13 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 type StepModifyAMIAttributes struct {
-	AMISkipCreateImage bool
-
 	Users          []string
 	Groups         []string
 	SnapshotUsers  []string
@@ -31,12 +29,6 @@ func (s *StepModifyAMIAttributes) Run(ctx context.Context, state multistep.State
 	ec2conn := state.Get("ec2").(*ec2.EC2)
 	session := state.Get("awsSession").(*session.Session)
 	ui := state.Get("ui").(packersdk.Ui)
-
-	if s.AMISkipCreateImage {
-		ui.Say("Skipping AMI modify attributes...")
-		return multistep.ActionContinue
-	}
-
 	amis := state.Get("amis").(map[string]string)
 	snapshots := state.Get("snapshots").(map[string][]string)

@@ -7,9 +7,9 @@ import (

 	"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"
-	confighelper "github.com/hashicorp/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )

 type StepModifyEBSBackedInstance struct {
@@ -8,8 +8,8 @@ import (
 	"sort"

 	"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/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 // StepNetworkInfo queries AWS for information about
@@ -9,10 +9,10 @@ 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/retry"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )

 // StepPreValidate provides an opportunity to pre-validate any configuration for
@@ -11,12 +11,12 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"

-	"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-plugin-sdk/retry"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
+	"github.com/hashicorp/packer/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 type StepRunSourceInstance struct {
@@ -29,9 +29,6 @@ type StepRunSourceInstance struct {
 	EbsOptimized                      bool
 	EnableT2Unlimited                 bool
 	ExpectedRootDevice                string
-	HttpEndpoint                      string
-	HttpTokens                        string
-	HttpPutResponseHopLimit           int64
 	InstanceInitiatedShutdownBehavior string
 	InstanceType                      string
 	IsRestricted                      bool
@@ -147,10 +144,6 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 		runOpts.CreditSpecification = &ec2.CreditSpecificationRequest{CpuCredits: &creditOption}
 	}

-	if s.HttpEndpoint == "enabled" {
-		runOpts.MetadataOptions = &ec2.InstanceMetadataOptionsRequest{HttpEndpoint: &s.HttpEndpoint, HttpTokens: &s.HttpTokens, HttpPutResponseHopLimit: &s.HttpPutResponseHopLimit}
-	}
-
 	// Collect tags for tagging on resource creation
 	var tagSpecs []*ec2.TagSpecification

@@ -258,7 +251,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
 		if resp, e := ec2conn.DescribeInstances(describeInstance); e == nil {
 			if len(resp.Reservations) > 0 && len(resp.Reservations[0].Instances) > 0 {
 				instance := resp.Reservations[0].Instances[0]
-				if instance.StateTransitionReason != nil && instance.StateReason != nil && instance.StateReason.Message != nil {
+				if instance.StateTransitionReason != nil && instance.StateReason.Message != nil {
 					ui.Error(fmt.Sprintf("Instance state change details: %s: %s",
 						*instance.StateTransitionReason, *instance.StateReason.Message))
 				}
@@ -12,13 +12,13 @@ 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/communicator"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/random"
-	"github.com/hashicorp/packer-plugin-sdk/retry"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
+	"github.com/hashicorp/packer/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )

 type EC2BlockDeviceMappingsBuilder interface {
@@ -34,9 +34,6 @@ type StepRunSpotInstance struct {
 	Comm                              *communicator.Config
 	EbsOptimized                      bool
 	ExpectedRootDevice                string
-	HttpEndpoint                      string
-	HttpTokens                        string
-	HttpPutResponseHopLimit           int64
 	InstanceInitiatedShutdownBehavior string
 	InstanceType                      string
 	Region                            string
@@ -54,24 +51,6 @@ type StepRunSpotInstance struct {
 	instanceId string
 }

-// The EbsBlockDevice and LaunchTemplateEbsBlockDeviceRequest structs are
-// nearly identical except for the struct's name and one extra field in
-// EbsBlockDeviceResuest, which unfortunately means you can't just cast one
-// into the other. THANKS AMAZON.
-func castBlockDeviceToRequest(bd *ec2.EbsBlockDevice) *ec2.LaunchTemplateEbsBlockDeviceRequest {
-	out := &ec2.LaunchTemplateEbsBlockDeviceRequest{
-		DeleteOnTermination: bd.DeleteOnTermination,
-		Encrypted:           bd.Encrypted,
-		Iops:                bd.Iops,
-		KmsKeyId:            bd.KmsKeyId,
-		SnapshotId:          bd.SnapshotId,
-		Throughput:          bd.Throughput,
-		VolumeSize:          bd.VolumeSize,
-		VolumeType:          bd.VolumeType,
-	}
-	return out
-}
-
 func (s *StepRunSpotInstance) CreateTemplateData(userData *string, az string,
 	state multistep.StateBag, marketOptions *ec2.LaunchTemplateInstanceMarketOptionsRequest) *ec2.RequestLaunchTemplateData {
 	blockDeviceMappings := s.LaunchMappings.BuildEC2BlockDeviceMappings()
@@ -79,12 +58,15 @@ func (s *StepRunSpotInstance) CreateTemplateData(userData *string, az string,
 	// LaunchTemplateBlockDeviceMappingRequest. These structs are identical,
 	// except for the EBS field -- on one, that field contains a
 	// LaunchTemplateEbsBlockDeviceRequest, and on the other, it contains an
-	// EbsBlockDevice.
+	// EbsBlockDevice. The EbsBlockDevice and
+	// LaunchTemplateEbsBlockDeviceRequest structs are themselves
+	// identical except for the struct's name, so you can cast one directly
+	// into the other.
 	var launchMappingRequests []*ec2.LaunchTemplateBlockDeviceMappingRequest
 	for _, mapping := range blockDeviceMappings {
 		launchRequest := &ec2.LaunchTemplateBlockDeviceMappingRequest{
 			DeviceName:  mapping.DeviceName,
-			Ebs:         castBlockDeviceToRequest(mapping.Ebs),
+			Ebs:         (*ec2.LaunchTemplateEbsBlockDeviceRequest)(mapping.Ebs),
 			VirtualName: mapping.VirtualName,
 		}
 		launchMappingRequests = append(launchMappingRequests, launchRequest)
@@ -145,10 +127,6 @@ func (s *StepRunSpotInstance) CreateTemplateData(userData *string, az string,

 	}

-	if s.HttpEndpoint == "enabled" {
-		templateData.MetadataOptions = &ec2.LaunchTemplateInstanceMetadataOptionsRequest{HttpEndpoint: &s.HttpEndpoint, HttpTokens: &s.HttpTokens, HttpPutResponseHopLimit: &s.HttpPutResponseHopLimit}
-	}
-
 	// If instance type is not set, we'll just pick the lowest priced instance
 	// available.
 	if s.InstanceType != "" {
@@ -232,15 +210,6 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 	// instance yet
 	ec2Tags.Report(ui)

-	volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, s.Region, state)
-	if err != nil {
-		err := fmt.Errorf("Error generating volume tags: %s", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-	volumeTags.Report(ui)
-
 	spotOptions := ec2.LaunchTemplateSpotMarketOptionsRequest{}
 	// The default is to set the maximum price to the OnDemand price.
 	if s.SpotPrice != "auto" {
@@ -293,28 +262,8 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 		}
 	}

-	if len(ec2Tags) > 0 {
-		launchTemplate.LaunchTemplateData.TagSpecifications = append(
-			launchTemplate.LaunchTemplateData.TagSpecifications,
-			&ec2.LaunchTemplateTagSpecificationRequest{
-				ResourceType: aws.String("instance"),
-				Tags:         ec2Tags,
-			},
-		)
-	}
-
-	if len(volumeTags) > 0 {
-		launchTemplate.LaunchTemplateData.TagSpecifications = append(
-			launchTemplate.LaunchTemplateData.TagSpecifications,
-			&ec2.LaunchTemplateTagSpecificationRequest{
-				ResourceType: aws.String("volume"),
-				Tags:         volumeTags,
-			},
-		)
-	}
-
 	// Tell EC2 to create the template
-	createLaunchTemplateOutput, err := ec2conn.CreateLaunchTemplate(launchTemplate)
+	_, err = ec2conn.CreateLaunchTemplate(launchTemplate)
 	if err != nil {
 		err := fmt.Errorf("Error creating launch template for spot instance: %s", err)
 		state.Put("error", err)
@@ -322,9 +271,6 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 		return multistep.ActionHalt
 	}

-	launchTemplateId := createLaunchTemplateOutput.LaunchTemplate.LaunchTemplateId
-	ui.Message(fmt.Sprintf("Created Spot Fleet launch template: %s", *launchTemplateId))
-
 	// Add overrides for each user-provided instance type
 	var overrides []*ec2.FleetLaunchTemplateOverridesRequest
 	for _, instanceType := range s.SpotInstanceTypes {
@@ -491,6 +437,16 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)

 	if len(volumeIds) > 0 && len(s.VolumeTags) > 0 {
 		ui.Say("Adding tags to source EBS Volumes")
+
+		volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, s.Region, state)
+		if err != nil {
+			err := fmt.Errorf("Error tagging source EBS Volumes on %s: %s", *instance.InstanceId, err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+		volumeTags.Report(ui)
+
 		_, err = ec2conn.CreateTags(&ec2.CreateTagsInput{
 			Resources: volumeIds,
 			Tags:      volumeTags,
@@ -9,9 +9,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/communicator"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
 )

 // Create statebag for running test
@@ -190,7 +190,7 @@ func (m *runSpotEC2ConnMock) CreateTags(req *ec2.CreateTagsInput) (*ec2.CreateTa
 	}
 }

-func defaultEc2Mock(instanceId, spotRequestId, volumeId, launchTemplateId *string) *runSpotEC2ConnMock {
+func defaultEc2Mock(instanceId, spotRequestId, volumeId *string) *runSpotEC2ConnMock {
 	instance := &ec2.Instance{
 		InstanceId:            instanceId,
 		SpotInstanceRequestId: spotRequestId,
@@ -205,10 +205,8 @@ func defaultEc2Mock(instanceId, spotRequestId, volumeId, launchTemplateId *strin
 	return &runSpotEC2ConnMock{
 		CreateLaunchTemplateFn: func(in *ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) {
 			return &ec2.CreateLaunchTemplateOutput{
-				LaunchTemplate: &ec2.LaunchTemplate{
-					LaunchTemplateId: launchTemplateId,
-				},
-				Warning: nil,
+				LaunchTemplate: nil,
+				Warning:        nil,
 			}, nil
 		},
 		CreateFleetFn: func(*ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error) {
@@ -239,8 +237,7 @@ func TestRun(t *testing.T) {
 	instanceId := aws.String("test-instance-id")
 	spotRequestId := aws.String("spot-id")
 	volumeId := aws.String("volume-id")
-	launchTemplateId := aws.String("launchTemplateId")
-	ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId, launchTemplateId)
+	ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId)

 	uiMock := packersdk.TestUi(t)

@@ -332,8 +329,7 @@ func TestRun_NoSpotTags(t *testing.T) {
 	instanceId := aws.String("test-instance-id")
 	spotRequestId := aws.String("spot-id")
 	volumeId := aws.String("volume-id")
-	launchTemplateId := aws.String("lt-id")
-	ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId, launchTemplateId)
+	ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId)

 	uiMock := packersdk.TestUi(t)

@@ -10,10 +10,10 @@ import (
 	"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/hashicorp/packer-plugin-sdk/communicator"
-	"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/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )

 type StepSecurityGroup struct {
@@ -4,8 +4,8 @@ import (
 	"context"

 	"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/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )

 // &awscommon.StepSetGeneratedData{
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bryce Kalow	7900ed99cc	chore: upgrade nextjs-scripts & next	2021-02-09 09:56:51 -06:00
Wilken Rivera	69c080165f	Merge pull request #10492 from hashicorp/website-redirects redirects-next.js: Fix regex for builder redirects	2021-01-15 16:21:05 -05:00
Jeff Escalante	dc5fd80b09	Website: prepare for vercel hosting move (#10402 ) * prepare to move to vercel hosting * add html extension handling * add back netlify files for transition	2021-01-14 16:26:51 -05:00
Brandon Romano	e557af14b3	Website StackMenu updates for 1/14	2021-01-14 09:56:45 -08:00
Wilken Rivera	ba47ee8efd	Merge pull request #10442 from hashicorp/d-broken-link-check Add GitHub action to check for broken markdown links	2021-01-06 16:38:22 -05:00
Wilken Rivera	2e78193cc8	Add regenerated docs from packer-plugin-sdk ``` cd $HOME/Development/packer-plugin-sdk PROJECT_ROOT=packer-plugin-sdk go generate ./... rsync -av multistep/commonsteps/packer-plugin-sdk/website/content/partials/ ../packer/website/content/partials/ rsync -av bootcommand/packer-plugin-sdk/website/content/partials/ ../packer/website/content/partials/ rsync -av shutdowncommand/packer-plugin-sdk/website/content/partials/ ../packer/website/content/partials/ rsync -av communicator/packer-plugin-sdk/website/content/partials/ ../packer/website/content/partials/ ```	2021-01-06 16:38:07 -05:00
Wilken Rivera	5ade0dc87b	Fix broken links detected by link checker - Fix broken example links - Fix broken provisioner links - Ignore linode.com because of DDOS protection settings	2021-01-06 16:36:46 -05:00
Jeff Escalante	85b56043c3	set main branch to master for 'edit this page' links (#10447 )	2021-01-06 16:19:49 -05:00
Felix Hillingshaeuser	3a9cc74e64	docs: Add default value for cloud_init in builders/proxmox (#10445 )	2021-01-06 10:38:25 -05:00