update ssh library

.circleci/config.yml

@@ -1,242 +0,0 @@
-orbs:
-  win: circleci/windows@1.0.0
-  codecov: codecov/codecov@1.0.5
-
-version: 2.1
-
-executors:
-  golang:
-    docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.16
-    resource_class: medium+
-  darwin:
-    macos:
-      xcode: "12.0.0"
-
-commands:
-  install-go-run-tests-unix:
-    parameters:
-      GOOS:
-        type: string
-      GOVERSION:
-        type: string
-    steps:
-      - checkout
-      - run: curl https://dl.google.com/go/go<< parameters.GOVERSION >>.<< parameters.GOOS >>-amd64.tar.gz | tar -C ~/ -xz
-      - run: ~/go/bin/go test ./... -coverprofile=coverage.txt  -covermode=atomic
-  install-go-run-tests-windows:
-    parameters:
-      GOVERSION:
-        type: string
-    steps:
-      - checkout
-      - run: curl https://dl.google.com/go/go<< parameters.GOVERSION >>.windows-amd64.zip --output ~/go<< parameters.GOVERSION >>.windows-amd64.zip
-      - run: unzip ~/go<< parameters.GOVERSION >>.windows-amd64.zip -d ~/
-      - run: ~/go/bin/go test ./... -coverprofile=coverage.txt  -covermode=atomic
-  build-and-persist-packer-binary:
-    parameters:
-      GOOS:
-        type: string
-      GOARCH:
-        default: "amd64"
-        type: string
-    steps:
-      - checkout
-      - run: GOOS=<< parameters.GOOS >> GOARCH=<<parameters.GOARCH>> go build -ldflags="-s -w -X github.com/hashicorp/packer/version.GitCommit=${CIRCLE_SHA1}" -o ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >> .
-      - run: zip ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >>.zip ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >>
-      - run: rm ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >>
-      - persist_to_workspace:
-          root: .
-          paths:
-            - ./pkg/
-
-# Golang CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-go/ for more details
-jobs:
-  test-linux:
-    executor: golang
-    resource_class: large
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - checkout
-      - run: TESTARGS="-coverprofile=coverage.txt  -covermode=atomic" make ci
-      - codecov/upload:
-          file: coverage.txt
-  test-darwin:
-    executor: darwin
-    working_directory: ~/go/github.com/hashicorp/packer
-    steps:
-      - install-go-run-tests-unix:
-          GOOS: darwin
-          GOVERSION: "1.16"
-      - codecov/upload:
-          file: coverage.txt
-  test-windows:
-    executor:
-      name: win/vs2019
-      shell: bash.exe
-    steps:
-      - install-go-run-tests-windows:
-          GOVERSION: "1.16"
-      - codecov/upload:
-          file: coverage.txt
-  check-lint:
-    executor: golang
-    resource_class: xlarge
-    steps:
-      - checkout
-      - run: git fetch --all
-      - run:
-          command: make ci-lint
-          no_output_timeout: 30m
-  check-vendor-vs-mod:
-    executor: golang
-    working_directory: /go/src/github.com/hashicorp/packer
-    environment:
-      GO111MODULE: "off"
-    steps:
-      - checkout
-      - run: GO111MODULE=on go run . --help
-      - run: make check-vendor-vs-mod
-  check-fmt:
-    executor: golang
-    steps:
-      - checkout
-      - run: make fmt-check
-  check-generate:
-    executor: golang
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - checkout
-      - run: make generate-check
-  build_linux:
-    executor: golang
-    steps:
-      - build-and-persist-packer-binary:
-          GOOS: linux
-  build_windows:
-    executor: golang
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - build-and-persist-packer-binary:
-          GOOS: windows
-  build_darwin:
-    executor: golang
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - build-and-persist-packer-binary:
-          GOOS: darwin
-  build_darwin_arm64:
-    executor: golang
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - build-and-persist-packer-binary:
-          GOOS: darwin
-          GOARCH: arm64
-  build_freebsd:
-    executor: golang
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - build-and-persist-packer-binary:
-          GOOS: freebsd
-  build_solaris:
-    executor: golang
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - build-and-persist-packer-binary:
-          GOOS: solaris
-  build_openbsd:
-    executor: golang
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - build-and-persist-packer-binary:
-          GOOS: openbsd
-  store_artifacts:
-    executor: golang
-    steps:
-      - attach_workspace:
-          at: .
-      - store_artifacts:
-          path: ./pkg/
-          destination: /
-  build-website-docker-image:
-    docker:
-      - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Build Docker Image if Necessary
-          command: |
-            IMAGE_TAG=$(cat website/Dockerfile website/package-lock.json | sha256sum | awk '{print $1;}')
-            echo "Using $IMAGE_TAG"
-            if curl https://hub.docker.com/v2/repositories/hashicorp/packer-website/tags/$IMAGE_TAG -fsL > /dev/null; then
-                echo "Dependencies have not changed, not building a new website docker image."
-            else
-                cd website/
-                docker login -u $WEBSITE_DOCKER_USER -p $WEBSITE_DOCKER_PASS
-                docker build -t hashicorp/packer-website:$IMAGE_TAG .
-                docker tag hashicorp/packer-website:$IMAGE_TAG hashicorp/packer-website:latest
-                docker push hashicorp/packer-website
-            fi
-  algolia-index:
-    docker:
-      - image: docker.mirror.hashicorp.services/node:12
-    steps:
-      - checkout
-      - run:
-          name: Push content to Algolia Index
-          command: |
-            if  [ "$CIRCLE_REPOSITORY_URL" != "git@github.com:hashicorp/packer.git" ]; then
-              echo "Not Packer OSS Repo, not indexing Algolia"
-              exit 0
-            fi
-            cd website/
-            npm install
-            node scripts/index_search_content.js
-
-workflows:
-  version: 2
-  test:
-    jobs:
-      - test-linux
-      - test-darwin
-      - test-windows
-  check-code:
-    jobs:
-      - check-lint
-      - check-vendor-vs-mod
-      - check-fmt
-      - check-generate
-  build_packer_binaries:
-    jobs:
-      - build_linux
-      - build_darwin
-      - build_darwin_arm64
-      - build_windows
-      - build_freebsd
-      - build_openbsd
-      - build_solaris
-      - store_artifacts:
-          requires:
-            - build_linux
-            - build_darwin
-            - build_darwin_arm64
-            - build_windows
-            - build_freebsd
-            - build_openbsd
-            - build_solaris
-  website:
-    jobs:
-      - build-website-docker-image:
-          filters:
-            branches:
-              only:
-                - master
-      - algolia-index:
-          filters:
-            branches:
-              only:
-                - stable-website

.codecov.yml

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

.gitattributes

@@ -1,13 +1,2 @@
-* text=auto
-*.go text eol=lf
-*.sh text eol=lf
-*.json text eol=lf
-*.md text eol=lf
-*.mdx text eol=lf
-*.ps1 text eol=lf
-*.hcl text eol=lf
-*.tmpl text eol=lf
-*.txt text eol=lf
-go.mod text eol=lf
-go.sum text eol=lf
-common/test-fixtures/root/*	eol=lf
+
+common/test-fixtures/root/*	eol=lf

.github/CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # Contributing to Packer
 
 **First:** if you're unsure or afraid of _anything_, just ask or submit the
-issue or pull request anyway. You won't be yelled at for giving your best
+issue or pull request anyways. You won't be yelled at for giving your best
 effort. The worst that can happen is that you'll be politely asked to change
 something. We appreciate any sort of contributions, and don't want a wall of
 rules to get in the way of that.
@@ -11,30 +11,24 @@ contribute to the project, read on. This document will cover what we're looking
 for. By addressing all the points we're looking for, it raises the chances we
 can quickly merge or address your contributions.
 
-When contributing in any way to the Packer project (new issue, PR, etc), please 
-be aware that our team identifies with many gender pronouns. Please remember to 
-use nonbinary pronouns (they/them) and gender neutral language ("Hello folks") 
-when addressing our team. For more reading on our code of conduct, please see the 
-[HashiCorp community guidelines](https://www.hashicorp.com/community-guidelines).
-
 ## Issues
 
 ### Reporting an Issue
 
-- Make sure you test against the latest released version. It is possible we
+* Make sure you test against the latest released version. It is possible we
   already fixed the bug you're experiencing.
 
-- Run the command with debug output with the environment variable `PACKER_LOG`.
-  For example: `PACKER_LOG=1 packer build template.pkr.hcl`. Take the _entire_
+* Run the command with debug output with the environment variable `PACKER_LOG`.
+  For example: `PACKER_LOG=1 packer build template.json`. Take the _entire_
   output and create a [gist](https://gist.github.com) for linking to in your
   issue. Packer should strip sensitive keys from the output, but take a look
   through just in case.
 
-- Provide a reproducible test case. If a contributor can't reproduce an issue,
+* Provide a reproducible test case. If a contributor can't reproduce an issue,
   then it dramatically lowers the chances it'll get fixed. And in some cases,
   the issue will eventually be closed.
 
-- Respond promptly to any questions made by the Packer team to your issue. Stale
+* Respond promptly to any questions made by the Packer team to your issue. Stale
   issues will be closed.
 
 ### Issue Lifecycle
@@ -43,7 +37,7 @@ when addressing our team. For more reading on our code of conduct, please see th
 
 2. The issue is verified and categorized by a Packer collaborator.
    Categorization is done via tags. For example, bugs are marked as "bugs" and
-   simple fixes are marked as "good first issue".
+   easy fixes are marked as "easy".
 
 3. Unless it is critical, the issue is left for a period of time (sometimes many
    weeks), giving outside contributors a chance to address the issue.
@@ -52,75 +46,49 @@ when addressing our team. For more reading on our code of conduct, please see th
    referenced in the commit message so that the code that fixes it is clearly
    linked.
 
-5. Sometimes, if you have a specialized environment or use case, the maintainers
-   may ask for your help testing the patch. You are able to download an
-   experimental binary of Packer containing the Pull Request's patch via from
-   the Pull Request page on github. You can do this by scrolling to the
-   "checks" section on github, and clicking "details" on the
-   "store_artifacts" check. This will take you to Packer's Circle CI page for
-   the build, and you will be able to click a tab named "Artifacts" which will
-   contain zipped Packer binaries for each major OS architecture.
+5. The issue is closed.
 
-6. The issue is closed.
+## Setting up Go to work on Packer
 
-
-
-## Setting up Go
-
-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
-
-## Setting up Packer for dev
-
-If/when you have go installed you can already `go get` packer and `make` in
-order to compile and test Packer. These instructions target
-POSIX-like environments (macOS, Linux, Cygwin, etc.) so you may need to
+If you have never worked with Go before, you will have to complete the following
+steps in order to be able to compile and test Packer. These instructions target
+POSIX-like environments (Mac OS X, Linux, Cygwin, etc.) so you may need to
 adjust them for Windows or other shells.
 
-1. Download the Packer source (and its dependencies) by running
+1. [Download](https://golang.org/dl) and install Go. The instructions below are
+   for go 1.7. Earlier versions of Go are no longer supported.
+
+2. Set and export the `GOPATH` environment variable and update your `PATH`. For
+   example, you can add the following to your `.bash_profile` (or comparable
+   shell startup scripts):
+
+```
+export GOPATH=$HOME/go
+export PATH=$PATH:$GOPATH/bin
+```
+
+3. Download the Packer source (and its dependencies) by running
    `go get github.com/hashicorp/packer`. This will download the Packer source to
    `$GOPATH/src/github.com/hashicorp/packer`.
 
-2. When working on Packer, first `cd $GOPATH/src/github.com/hashicorp/packer`
+4. When working on Packer, first `cd $GOPATH/src/github.com/hashicorp/packer`
    so you can run `make` and easily access other files. Run `make help` to get
    information about make targets.
 
-3. Make your changes to the Packer source. You can run `make` in
+5. Make your changes to the Packer source. You can run `make` in
    `$GOPATH/src/github.com/hashicorp/packer` to run tests and build the Packer
    binary. Any compilation errors will be shown when the binaries are
    rebuilding. If you don't have `make` you can simply run
    `go build -o bin/packer .` from the project root.
 
-4. After running building Packer successfully, use
+6. 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
+7. If everything works well and the tests pass, run `go fmt` on your code before
    submitting a pull-request.
 
-### Windows Systems
-
-On windows systems you need at least the [MinGW Tools](http://www.mingw.org/), e.g. install via [choco](https://chocolatey.org/):
-
-```
-choco install mingw -y
-```
-
-This installs the GCC compiler, as well as a `mingw32-make` which can be used wherever
-this documentation mentions `make`
-
-when building using `go` you also need to mention the windows
-executable extension
-
-```
-go build -o bin/packer.exe
-```
-
 ### Opening an Pull Request
 
 Thank you for contributing! When you are ready to open a pull-request, you will
@@ -142,163 +110,64 @@ From there, open your fork in your browser to open a new pull-request.
 will break if you `git clone` your fork instead of using `go get` on the main
 Packer project.
 
-**Note:** See '[Working with
-forks](https://help.github.com/articles/working-with-forks/)' for a better way
-to use `git push ...`.
-
 ### Pull Request Lifecycle
 
 1. You are welcome to submit your pull request for commentary or review before
-   it is fully completed. Please prefix the title of your pull request with
-   "[WIP]" to indicate this. It's also a good idea to include specific questions
-   or items you'd like feedback on.
+  it is fully completed. Please prefix the title of your pull request with
+  "[WIP]" to indicate this. It's also a good idea to include specific questions
+  or items you'd like feedback on.
 
-2. Once you believe your pull request is ready to be merged, you can remove any
-   "[WIP]" prefix from the title and a core team member will review.
+1. Once you believe your pull request is ready to be merged, you can remove any
+  "[WIP]" prefix from the title and a core team member will review. 
 
-3. One of Packer's core team members will look over your contribution and
-   either merge, or provide comments letting you know if there is anything left
-   to do. We do our best to provide feedback in a timely manner, but it may take
-   some time for us to respond. We may also have questions that we need answered
-   about the code, either because something doesn't make sense to us or because
-   we want to understand your thought process.
+1. One of Packer's core team members will look over your contribution and
+  either provide comments letting you know if there is anything left to do. We
+  do our best to provide feedback in a timely manner, but it may take some time
+  for us to respond.
 
-4. If we have requested changes, you can either make those changes or, if you
-   disagree with the suggested changes, we can have a conversation about our
-   reasoning and agree on a path forward. This may be a multi-step process. Our
-   view is that pull requests are a chance to collaborate, and we welcome
-   conversations about how to do things better. It is the contributor's
-   responsibility to address any changes requested. While reviewers are happy to
-   give guidance, it is unsustainable for us to perform the coding work necessary
-   to get a PR into a mergeable state.
+1. Once all outstanding comments and checklist items have been addressed, your
+  contribution will be merged! Merged PRs will be included in the next
+  Packer release. The core team takes care of updating the CHANGELOG as they
+  merge.
 
-5. Once all outstanding comments and checklist items have been addressed, your
-   contribution will be merged! Merged PRs will be included in the next
-   Packer release. The core team takes care of updating the
-   [CHANGELOG.md](../CHANGELOG.md) as they merge.
-
-6. In rare cases, we might decide that a PR should be closed without merging.
-   We'll make sure to provide clear reasoning when this happens.
+1. In rare cases, we might decide that a PR should be closed. We'll make sure to
+  provide clear reasoning when this happens.
 
 ### Tips for Working on Packer
 
-#### Getting Your Pull Requests Merged Faster
-
-It is much easier to review pull requests that are:
-
-1. Well-documented: Try to explain in the pull request comments what your
-   change does, why you have made the change, and provide instructions for how
-   to produce the new behavior introduced in the pull request. If you can,
-   provide screen captures or terminal output to show what the changes look
-   like. This helps the reviewers understand and test the change.
-
-2. Small: Try to only make one change per pull request. If you found two bugs
-   and want to fix them both, that's _awesome_, but it's still best to submit
-   the fixes as separate pull requests. This makes it much easier for reviewers
-   to keep in their heads all of the implications of individual code changes,
-   and that means the PR takes less effort and energy to merge. In general, the
-   smaller the pull request, the sooner reviewers will be able to make time to
-   review it.
-
-3. Passing Tests: Based on how much time we have, we may not review pull
-   requests which aren't passing our tests. (Look below for advice on how to
-   run unit tests). If you need help figuring out why tests are failing, please
-   feel free to ask, but while we're happy to give guidance it is generally
-   your responsibility to make sure that tests are passing. If your pull request
-   changes an interface or invalidates an assumption that causes a bunch of
-   tests to fail, then you need to fix those tests before we can merge your PR.
-
-If we request changes, try to make those changes in a timely manner. Otherwise,
-PRs can go stale and be a lot more work for all of us to merge in the future.
-
-Even with everyone making their best effort to be responsive, it can be
-time-consuming to get a PR merged. It can be frustrating to deal with
-the back-and-forth as we make sure that we understand the changes fully. Please
-bear with us, and please know that we appreciate the time and energy you put
-into the project.
-
 #### Working on forks
 
 The easiest way to work on a fork is to set it as a remote of the Packer
 project. After following the steps in "Setting up Go to work on Packer":
 
-1. Navigate to the code:
-
-   `cd $GOPATH/src/github.com/hashicorp/packer`
-
-2. Add the remote by running:
-
-   `git remote add <name of remote> <github url of fork>`
-
-   For example:
-
-   `git remote add mwhooker https://github.com/mwhooker/packer.git`
-
-3. Checkout a feature branch:
-
-   `git checkout -b new-feature`
-
-4. Make changes.
+1. Navigate to `$GOPATH/src/github.com/hashicorp/packer`
+2. Add the remote by running
+   `git remote add <name of remote> <github url of fork>`. For example:
+   `git remote add mwhooker https://github.com/mwhooker/packer.git`.
+3. Checkout a feature branch: `git checkout -b new-feature`
+4. Make changes
 5. (Optional) Push your changes to the fork:
-
    `git push -u <name of remote> new-feature`
 
 This way you can push to your fork to create a PR, but the code on disk still
 lives in the spot where the go cli tools are expecting to find it.
 
-#### Go modules & go vendor
+#### Govendor
 
-If you are submitting a change that requires new or updated dependencies,
-please include them in `go.mod`/`go.sum` and in the `vendor/` folder. This
-helps everything get tested properly in CI.
+If you are submitting a change that requires new or updated dependencies, please
+include them in `vendor/vendor.json` and in the `vendor/` folder. This helps
+everything get tested properly in CI.
 
-Note that you will need to use [go
-mod](https://github.com/golang/go/wiki/Modules) to do this. This step is
-recommended but not required.
+Note that you will need to use [govendor](https://github.com/kardianos/govendor)
+to do this. This step is recommended but not required; if you don't use govendor
+please indicate in your PR which dependencies have changed and to what versions.
 
-Use `go get <project>` to add dependencies to the project and `go mod vendor`
-to make vendored copy of dependencies. See [go mod quick
-start](https://github.com/golang/go/wiki/Modules#quick-start) for examples.
+Use `govendor fetch <project>` to add dependencies to the project. See
+[govendor quick start](https://github.com/kardianos/govendor#quick-start-also-see-the-faq)
+for examples.
 
-Please only apply the minimal vendor changes to get your PR to work. Packer
-does not attempt to track the latest version for each dependency.
-
-#### Code generation
-
-Packer relies on `go generate` to generate a [peg parser for boot
-commands](https://github.com/hashicorp/packer/blob/master/packer-plugin-sdk/bootcommand/boot_command.go),
-[docs](https://github.com/hashicorp/packer/blob/master/website/pages/partials/builder/amazon/chroot/_Config-not-required.mdx)
-and HCL2's bridging code. Packer's testing suite will run `make check-generate`
-to check that all the generated files Packer needs are what they should be.
-`make generate` re-generates all these file and can take a while depending on
-your machine's performances. To make it faster it is recommended to run
-localized code generation. Say you are working on the Amazon builder: running
-`go generate ./builder/amazon/...` will do that for you. Make sure that the
-latest code generation tool is installed by running `make install-gen-deps`.
-
-#### Code linting
-
-Packer relies on [golangci-lint](https://github.com/golangci/golangci-lint) for linting its Go code base, excluding any generated code created by `go generate`. Linting is executed on new files during Travis builds via `make ci`; the linting of existing code base is only executed when running `make lint`. Linting a large project like Packer is an iterative process so existing code base will have issues that are actively being fixed; pull-requests that fix existing linting issues are always welcomed :smile:.
-
-The main configuration for golangci-lint is the `.golangci.yml` in the project root. See `golangci-lint --help` for a list of flags that can be used to override the default configuration.
-
-Run golangci-lint on the entire Packer code base.
-
-```
-make lint
-```
-
-Run golangci-lint on a single pkg or directory; PKG_NAME expands to /builder/amazon/...
-
-```
-make lint PKG_NAME=builder/amazon
-```
-
-Note: linting on Travis uses the `--new-from-rev` flag to only lint new files added within a branch or pull-request. To run this check locally you can use the `ci-lint` make target. See [golangci-lint in CI](https://github.com/golangci/golangci-lint#faq) for more information.
-
-```
-make ci-lint
-```
+Please only apply the minimal vendor changes to get your PR to work. Packer does
+not attempt to track the latest version for each dependency.
 
 #### Running Unit Tests
 
@@ -308,15 +177,15 @@ You can run tests for individual packages using commands like this:
 make test TEST=./builder/amazon/...
 ```
 
-#### Running Builder Acceptance Tests
+#### Running Acceptance Tests
 
 Packer has [acceptance tests](https://en.wikipedia.org/wiki/Acceptance_testing)
 for various builders. These typically require an API key (AWS, GCE), or
 additional software to be installed on your computer (VirtualBox, VMware).
 
-If you're working on a new builder or builder feature and want to verify it is
-functioning (and also hasn't broken anything else), we recommend creating or
-running the acceptance tests.
+If you're working on a new builder or builder feature and want verify it is
+functioning (and also hasn't broken anything else), we recommend running the
+acceptance tests.
 
 **Warning:** The acceptance tests create/destroy/modify _real resources_, which
 may incur costs for real money. In the presence of a bug, it is possible that
@@ -346,288 +215,3 @@ make testacc TEST=./builder/amazon/ebs TESTARGS="-run TestBuilderAcc_forceDelete
 Acceptance tests typically require other environment variables to be set for
 things such as API tokens and keys. Each test should error and tell you which
 credentials are missing, so those are not documented here.
-
-#### Running Provisioner Acceptance Tests
-
-**Warning:** The acceptance tests create/destroy/modify _real resources_, which
-may incur costs for real money. In the presence of a bug, it is possible that
-resources may be left behind, which can cost money even though you were not
-using them. We recommend running tests in an account used only for that purpose
-so it is easy to see if there are any dangling resources, and so production
-resources are not accidentally destroyed or overwritten during testing.
-Also, these typically require an API key (AWS, GCE), or additional software
-to be installed on your computer (VirtualBox, VMware).
-
-To run the Provisioners Acceptance Tests you should use the
-**ACC_TEST_BUILDERS** environment variable to tell the tests which builder the
-test should be run against.
-
-Examples of usage:
-
-- Run the Shell provisioner acceptance tests against the Amazon EBS builder.
-    ```
-    ACC_TEST_BUILDERS=amazon-ebs go test ./provisioner/shell/... -v -timeout=1h
-    ```
-- Do the same but using the Makefile
-    ```
-    ACC_TEST_BUILDERS=amazon-ebs make provisioners-acctest TEST=./provisioner/shell
-    ```
-- Run all provisioner acceptance tests against the Amazon EBS builder.
-    ```
-    ACC_TEST_BUILDERS=amazon-ebs make provisioners-acctest  TEST=./...
-    ```
-- Run all provisioner acceptance tests against all builders whenever they are compatible.
-    ```
-    ACC_TEST_BUILDERS=all make provisioners-acctest  TEST=./...
-    ```
-
-The **ACC_TEST_BUILDERS** env variable accepts a list of builders separated by
-commas. (e.g. `ACC_TEST_BUILDERS=amazon-ebs,virtualbox-iso`)
-
-
-#### Writing Provisioner Acceptance Tests
-
-Packer has implemented a `ProvisionerTestCase` structure to help write
-provisioner acceptance tests.
-
-```go
-type ProvisionerTestCase struct {
-  // Check is called after this step is executed in order to test that
-  // the step executed successfully. If this is not set, then the next
-  // step will be called
-  Check func(*exec.Cmd, string) error
-  // IsCompatible checks whether a provisioner is able to run against a
-  // given builder type and guest operating system, and returns a boolean.
-  // if it returns true, the test combination is okay to run. If false, the
-  // test combination is not okay to run.
-  IsCompatible func(builderType string, BuilderGuestOS string) bool
-  // Name is the name of the test case. Be simple but unique and descriptive.
-  Name string
-  // Setup, if non-nil, will be called once before the test case
-  // runs. This can be used for some setup like setting environment
-  // variables, or for validation prior to the
-  // test running. For example, you can use this to make sure certain
-  // binaries are installed, or text fixtures are in place.
-  Setup func() error
-  // Teardown will be called before the test case is over regardless
-  // of if the test succeeded or failed. This should return an error
-  // in the case that the test can't guarantee all resources were
-  // properly cleaned up.
-  Teardown builderT.TestTeardownFunc
-  // Template is the provisioner template to use.
-  // The provisioner template fragment must be a json-formatted string
-  // containing the provisioner definition but no other portions of a packer
-  // template. For
-  // example:
-  //
-  // ```json
-  // {
-  //  "type": "shell-local",
-  //  "inline", ["echo hello world"]
-  // }
-  //```
-  //
-  // is a valid entry for "template" here, but the complete Packer template:
-  //
-  // ```json
-  // {
-  //  "provisioners": [
-  //    {
-  //      "type": "shell-local",
-  //      "inline", ["echo hello world"]
-  //    }
-  //  ]
-  // }
-  // ```
-  //
-  // is invalid as input.
-  //
-  // You may provide multiple provisioners in the same template. For example:
-  // ```json
-  // {
-  //  "type": "shell-local",
-  //  "inline", ["echo hello world"]
-  // },
-  // {
-  //  "type": "shell-local",
-  //  "inline", ["echo hello world 2"]
-  // }
-  // ```
-  Template string
-  // Type is the type of provisioner.
-  Type string
-}
-
-```
-
-To start writing a new provisioner acceptance test, you should add a test file
-named `provisioner_acc_test.go` in the same folder as your provisioner is
-defined. Create a test case by implementing the above struct, and run it
-by calling `provisioneracc.TestProvisionersAgainstBuilders(testCase, t)`
-
-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"
-)
-
-// ...
-
-func TestAccShellProvisioner_basic(t *testing.T) {
-  // Create a json template fragment containing just the provisioners you want
-  // to run.
-  templateString := `{
-    "type": "shell-local",
-    "script": "test-fixtures/script.sh",
-    "max_retries" : 5
-}`
-
-  // instantiate a test case.
-  testCase := &provisioneracc.ProvisionerTestCase{
-    IsCompatible: func() bool {return true},
-    Name:         "shell-local-provisioner-basic",
-    Teardown: func() error {
-      testutils.CleanupFiles("test-fixtures/file.txt")
-      return nil
-    },
-    Template: templateString,
-    Type:     "shell-local",
-    Check: func(buildcommand *exec.Cmd, logfile string) error {
-      if buildcommand.ProcessState != nil {
-        if buildcommand.ProcessState.ExitCode() != 0 {
-          return fmt.Errorf("Bad exit code. Logfile: %s", logfile)
-        }
-      }
-      filecontents, err := loadFile("file.txt")
-      if err != nil {
-        return err
-      }
-      if !strings.Contains(filecontents, "hello") {
-        return fmt.Errorf("file contents were wrong: %s", filecontents)
-      }
-      return nil
-    },
-  }
-
-  provisioneracc.TestProvisionersAgainstBuilders(testCase, t)
-}
-
-```
-
-
-After writing the struct and implementing the interface, now is time to write the test that will run all
-of this code you wrote. Your test should be like:
-
-```go
-func TestShellProvisioner(t *testing.T) {
-	acc.TestProvisionersPreCheck("shell", t)
-	acc.TestProvisionersAgainstBuilders(new(ShellProvisionerAccTest), t)
-}
-```
-
-The method `TestProvisionersAgainstBuilders` will run the provisioner against
-all available and compatible builders. If there are not builders compatible with
-the test you want to run, you can add a builder using the following steps:
-
-Create a subdirectory in provisioneracc/test-fixtures for the type of builder
-you are adding. In this subdirectory, add one json file containing a single
-builder fragment. For example, one of our amazon-ebs builders is defined in
-provisioneracc/test-fixtures/amazon-ebs/amazon-ebs.txt and contains:
-
-```json
-{
-  "type": "amazon-ebs",
-  "ami_name": "packer-acc-test",
-  "instance_type": "t2.micro",
-  "region": "us-east-1",
-  "ssh_username": "ubuntu",
-  "source_ami_filter": {
-    "filters": {
-      "virtualization-type": "hvm",
-      "name": "ubuntu/images/*ubuntu-xenial-16.04-amd64-server-*",
-      "root-device-type": "ebs"
-    },
-    "owners": ["099720109477"],
-    "most_recent": true
-  },
-  "force_deregister" : true,
-  "tags": {
-    "packer-test": "true"
-  }
-}
-```
-
-note that this fragment does not contain anything other than a single builder
-definition. The testing framework will combine this with the provisioner
-fragment to create a working json template.
-
-In order to tell the testing framework how to use this builder fragment, you
-need to implement a `BuilderFixture` struct:
-
-```go
-type BuilderFixture struct {
-  // Name is the name of the builder fixture.
-  // Be simple and descriptive.
-  Name string
-  // Setup creates necessary extra test fixtures, and renders their values
-  // into the BuilderFixture.Template.
-  Setup func()
-  // Template is the path to a builder template fragment.
-  // The builder template fragment must be a json-formatted file containing
-  // the builder definition but no other portions of a packer template. For
-  // example:
-  //
-  // ```json
-  // {
-  //  "type": "null",
-  //  "communicator", "none"
-  // }
-  //```
-  //
-  // is a valid entry for "template" here, but the complete Packer template:
-  //
-  // ```json
-  // {
-  //  "builders": [
-  //    "type": "null",
-  //    "communicator": "none"
-  //  ]
-  // }
-  // ```
-  //
-  // is invalid as input.
-  //
-  // Only provide one builder template fragment per file.
-  TemplatePath string
-
-  // GuestOS says what guest os type the builder template fragment creates.
-  // Valid values are "windows", "linux" or "darwin" guests.
-  GuestOS string
-
-  // HostOS says what host os type the builder is capable of running on.
-  // Valid values are "any", windows", or "posix". If you set "posix", then
-  // this builder can run on a "linux" or "darwin" platform. If you set
-  // "any", then this builder can be used on any platform.
-  HostOS string
-
-  Teardown builderT.TestTeardownFunc
-}
-```
-Implement this struct to the file "provisioneracc/builders.go", then add
-the new implementation to the `BuildersAccTest` map in
-`provisioneracc/provisioners.go`
-
-Once you finish these steps, you should be ready to run your new provisioner
-acceptance test by setting the name used in the BuildersAccTest map as your
-`ACC_TEST_BUILDERS` environment variable.
-
-#### Debugging Plugins
-
-Each packer plugin runs in a separate process and communicates via RPC over a
-socket therefore using a debugger will not work (be complicated at least).
-
-But most of the Packer code is really simple and easy to follow with PACKER_LOG
-turned on. If that doesn't work adding some extra debug print outs when you have
-homed in on the problem is usually enough.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,26 @@
+_Please read these instructions before submitting_
+
+**DELETE THIS TEMPLATE BEFORE SUBMITTING**
+
+_Only use Github issues to report bugs or feature requests, see
+https://www.packer.io/community.html_
+
+For example, _Timeouts waiting for SSH/WinRM_ are generally not bugs within packer and are better addressed by the mailing list. Ask on the mailing list if you are unsure.
+
+If you are planning to open a pull-request just open the pull-request instead of making an issue first.
+
+FOR FEATURES:
+
+Describe the feature you want and your use case _clearly_.
+
+FOR BUGS:
+
+Describe the problem and include the following information:
+
+- Packer version from `packer version`
+- Host platform
+- Debug log output from `PACKER_LOG=1 packer build template.json`.
+  Please paste this in a gist https://gist.github.com
+- The _simplest example template and scripts_ needed to reproduce the bug.
+  Include these in your gist https://gist.github.com
+  

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,40 +0,0 @@
----
-name: Bug Report
-about: You're experiencing an issue with Packer that is different than the documented behavior.
-labels: bug
----
-
-When filing a bug, please include the following headings if possible. Any
-example text in this template can be deleted.
-
-#### Overview of the Issue
-
-A paragraph or two about the issue you're experiencing.
-
-#### Reproduction Steps
-
-Steps to reproduce this issue
-
-### Packer version
-
-From `packer version`
-
-### Simplified Packer Buildfile
-
-If the file is longer than a few dozen lines, please include the URL to the
-[gist](https://gist.github.com/) of the log or use the [Github detailed
-format](https://gist.github.com/ericclemmons/b146fe5da72ca1f706b2ef72a20ac39d)
-instead of posting it directly in the issue.
-
-### Operating system and Environment details
-
-OS, Architecture, and any other information you can provide about the
-environment.
-
-### Log Fragments and crash.log files
-
-Include appropriate log fragments. If the log is longer than a few dozen lines,
-please include the URL to the [gist](https://gist.github.com/) of the log or
-use the [Github detailed format](https://gist.github.com/ericclemmons/b146fe5da72ca1f706b2ef72a20ac39d) instead of posting it directly in the issue.
-
-Set the env var `PACKER_LOG=1` for maximum log detail.

.github/ISSUE_TEMPLATE/feature_requests.md

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

.github/ISSUE_TEMPLATE/question.md

@@ -1,15 +0,0 @@
----
-name: Question
-about: If you have a question, please check out our other community resources instead of opening an issue.
-labels: question
----
-
-Issues on GitHub are intended to be related to bugs or feature requests, so we
-recommend using our other community resources instead of asking here if you
-have a question.
-
-- Packer Guides: https://www.packer.io/guides
-- Discussion List: https://groups.google.com/group/packer-tool
-- Any other questions can be sent to the packer section of the HashiCorp
-  forum: https://discuss.hashicorp.com/c/packer
-- Packer community links: https://www.packer.io/community

.github/ISSUE_TEMPLATE/ssh_or_winrm_times_out.md

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,10 @@
 **DELETE THIS TEMPLATE BEFORE SUBMITTING**
 
-In order to have a good experience with our community, we recommend that you
-read the contributing guidelines for making a PR, and understand the lifecycle
-of a Packer PR:
-
-https://github.com/hashicorp/packer/blob/master/.github/CONTRIBUTING.md#opening-an-pull-request
-
 Describe the change you are making here!
 
 Please include tests. Check out these examples:
 
-- https://github.com/hashicorp/packer/blob/master/builder/parallels/common/ssh_config_test.go#L34
+- https://github.com/hashicorp/packer/blob/master/builder/virtualbox/common/ssh_config_test.go#L19-L37
 - https://github.com/hashicorp/packer/blob/master/post-processor/compress/post-processor_test.go#L153-L182
 
 If your PR resolves any open issue(s), please indicate them like this so they will be closed when your PR is merged:

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

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

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

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

.github/workflows/issues.yml

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

.github/workflows/linkchecker.yml

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

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

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

.gitignore

@@ -4,7 +4,6 @@
 /src
 /website/.sass-cache
 /website/build
-/website/tmp
 .DS_Store
 .vagrant
 .idea
@@ -24,7 +23,4 @@ packer-test*.log
 .idea/
 *.iml
 Thumbs.db
-/packer.exe
-.project
-cache
-/.vscode/
+/packer.exe

.golangci.yml

@@ -1,124 +0,0 @@
-issues:
-  # List of regexps of issue texts to exclude, empty list by default.
-  # But independently from this option we use default exclude patterns,
-  # it can be disabled by `exclude-use-default: false`. To list all
-  # excluded by default patterns execute `golangci-lint run --help`
-
-  exclude-rules:
-    # Exclude gosimple bool check
-    - linters:
-      - gosimple
-      text: "S(1002|1008|1021)"
-    # Exclude failing staticchecks for now
-    - linters:
-        - staticcheck
-      text: "SA(1006|1019|4006|4010|4017|5007|6005|9004):"
-    # Exclude lll issues for long lines with go:generate
-    - linters:
-        - lll
-      source: "^//go:generate "
-
-  # Maximum issues count per one linter. Set to 0 to disable. Default is 50.
-  max-issues-per-linter: 0
-
-  # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
-  max-same-issues: 0
-
-linters:
-  disable-all: true
-  enable:
-    - deadcode
-    - errcheck
-    - goimports
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - unconvert
-    - unused
-    - varcheck
-  fast: true
-
-# options for analysis running
-run:
-  # default concurrency is a available CPU number
-  concurrency: 4
-
-  # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 10m
-
-  # exit code when at least one issue was found, default is 1
-  issues-exit-code: 1
-
-  # include test files or not, default is true
-  tests: true
-
-  # list of build tags, all linters use it. Default is empty list.
-  #build-tags:
-  #  - mytag
-
-  # which dirs to skip: issues from them won't be reported;
-  # can use regexp here: generated.*, regexp is applied on full path;
-  # default value is empty list, but default dirs are skipped independently
-  # from this option's value (see skip-dirs-use-default).
-  #skip-dirs:
-  #  - src/external_libs
-  #  - autogenerated_by_my_lib
-
-  # default is true. Enables skipping of directories:
-  #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-  skip-dirs-use-default: true
-
-  # which files to skip: they will be analyzed, but issues from them
-  # won't be reported. Default value is empty list, but there is
-  # no need to include all autogenerated files, we confidently recognize
-  # autogenerated files. If it's not please let us know.
-  skip-files:
-    - ".*\\.hcl2spec\\.go$"
-  #  - lib/bad.go
-
-  # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
-  # If invoked with -mod=readonly, the go command is disallowed from the implicit
-  # automatic updating of go.mod described above. Instead, it fails when any changes
-  # to go.mod are needed. This setting is most useful to check that go.mod does
-  # not need updates, such as in a continuous integration and testing system.
-  # If invoked with -mod=vendor, the go command assumes that the vendor
-  # directory holds the correct copies of dependencies and ignores
-  # the dependency descriptions in go.mod.
-  modules-download-mode: vendor
-
-
-# output configuration options
-output:
-  # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
-  format: colored-line-number
-
-  # print lines of code with issue, default is true
-  print-issued-lines: true
-
-  # print linter name in the end of issue text, default is true
-  print-linter-name: true
-
-  # make issues output unique by line, default is true
-  uniq-by-line: true
-
-
-# all available settings of specific linters
-linters-settings:
- errcheck:
-    # report about not checking of errors in type assetions: `a := b.(MyStruct)`;
-    # default is false: such cases aren't reported by default.
-    check-type-assertions: false
-
-    # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
-    # default is false: such cases aren't reported by default.
-    check-blank: false
-
-    # [deprecated] comma-separated list of pairs of the form pkg:regex
-    # the regex is used to ignore names within pkg. (default "fmt:.*").
-    # see https://github.com/kisielk/errcheck#the-deprecated-method for details
-    ignore: fmt:.*,io/ioutil:^Read.*,io:Close
-
-    # path to a file containing a list of functions to exclude from checking
-    # see https://github.com/kisielk/errcheck#excluding-functions for details
-    #exclude: /path/to/file.txt

.hashibot.hcl

@@ -1,42 +0,0 @@
-
-behavior "regexp_issue_labeler" "panic_label" {
-    regexp = "panic:"
-    labels = ["crash", "bug"]
-}
-
-behavior "remove_labels_on_reply" "remove_stale" {
-    labels = ["waiting-reply", "stale"]
-    only_non_maintainers = true
-}
-
-poll "closed_issue_locker" "locker" {
-  schedule             = "0 50 1 * * *"
-  closed_for           = "720h" # 30 days
-  max_issues           = 500
-  sleep_between_issues = "5s"
-  no_comment_if_no_activity_for = "4320h" # 180 days
-
-  message = <<-EOF
-    I'm going to lock this issue because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues.
-
-    If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.
-  EOF
-}
-
-poll "label_issue_migrater" "remote_plugin_migrater" {
-  schedule                = "0 20 * * * *"
-  new_owner               = "hashicorp"
-  repo_prefix             = "packer-plugin-"
-  label_prefix            = "remote-plugin/"
-  excluded_label_prefixes  = ["communicator/"]
-  excluded_labels         = ["build", "core", "new-plugin-contribution", "website"]
-
-  issue_header     = <<-EOF
-    _This issue was originally opened by @${var.user} as ${var.repository}#${var.issue_number}. It was migrated here as a result of the [Packer plugin split](https://github.com/hashicorp/packer/issues/8610#issuecomment-770034737). The original body of the issue is below._
-
-    <hr>
-
-    EOF
-  migrated_comment = "This issue has been automatically migrated to ${var.repository}#${var.issue_number} because it looks like an issue with that plugin. If you believe this is _not_ an issue with the plugin, please reply to ${var.repository}#${var.issue_number}."
-}
-

.travis.yml

@@ -0,0 +1,24 @@
+env:
+    - USER=travis
+
+sudo: false
+
+language: go
+
+go:
+  - 1.8.x
+  - 1.9.x
+  - 1.x
+
+install:
+  - make deps
+
+script:
+  - GOMAXPROCS=2 make ci
+
+branches:
+  only:
+    - master
+
+matrix:
+  fast_finish: true

CODEOWNERS

@@ -2,93 +2,27 @@
 
 # builders
 
-/examples/alicloud/                     @chhaj5236 @alexyueer
-/builder/alicloud/                      @chhaj5236 @alexyueer
-/website/pages/docs/builders/alicloud* @chhaj5236 @alexyueer
-
-/examples/azure/                     @paulmey
-/builder/azure/                      @paulmey
-/website/pages/docs/builders/azure* @paulmey
-
-/builder/digitalocean/                     @andrewsomething
-/website/pages/docs/builders/digitalocean* @andrewsomething
-
-/builder/hyperv/                      @taliesins
-/website/pages/docs/builders/hyperv* @taliesins
-
-/examples/jdcloud/                     @XiaohanLiang @remrain
-/builder/jdcloud/                      @XiaohanLiang @remrain
-/website/pages/docs/builders/jdcloud* @XiaohanLiang @remrain
-
-/builder/linode/                      @displague @ctreatma @stvnjacobs @charliekenney23 @phillc
-/website/pages/docs/builders/linode* @displague @ctreatma @stvnjacobs @charliekenney23 @phillc
-
-/builder/lxc/                      @ChrisLundquist
-/website/pages/docs/builders/lxc*  @ChrisLundquist
-/test/fixtures/builder-lxc/        @ChrisLundquist
-/test/builder_lxc*                 @ChrisLundquist
-
-/builder/lxd/                      @ChrisLundquist
-/website/pages/docs/builders/lxd* @ChrisLundquist
-
-/builder/oneandone/                      @jasmingacic
-/website/pages/docs/builders/oneandone* @jasmingacic
-
-/builder/oracle/                      @prydie @owainlewis
-/website/pages/docs/builders/oracle* @prydie @owainlewis
-
-/builder/profitbricks/                      @LiviusP @mflorin
-/website/pages/docs/builders/profitbricks* @LiviusP @mflorin
-
-/builder/triton/                      @sean-
-/website/pages/docs/builders/triton* @sean-
-
-/builder/ncloud/                      @YuSungDuk
-/website/pages/docs/builders/ncloud* @YuSungDuk
-
-/builder/proxmox/                      @carlpett
-/website/pages/docs/builders/proxmox* @carlpett
-
-/builder/scaleway/                      @scaleway/devtools
-/website/pages/docs/builders/scaleway* @scaleway/devtools
-
-/builder/hcloud/                      @LKaemmerling
-/website/pages/docs/builders/hcloud* @LKaemmerling
-
-/examples/hyperone/                    @m110 @gregorybrzeski @ad-m
-/builder/hyperone/                     @m110 @gregorybrzeski @ad-m
-/website/pages/docs/builders/hyperone* @m110 @gregorybrzeski @ad-m
-/test/builder_hyperone*                @m110 @gregorybrzeski @ad-m
-/test/fixtures/builder-hyperone/       @m110 @gregorybrzeski @ad-m
-
-/examples/ucloud/                     @shawnmssu
-/builder/ucloud/                      @shawnmssu
-/website/pages/docs/builders/ucloud* @shawnmssu
-
-/builder/yandex/                      @GennadySpb @alexanderKhaustov @seukyaso
-/website/pages/docs/builders/yandex* @GennadySpb @alexanderKhaustov @seukyaso
-
-/builder/osc/                      @marinsalinas @Hakujou
-/website/pages/docs/builders/osc* @marinsalinas @Hakujou
-
-/examples/tencentcloud/                      @likexian
-/builder/tencentcloud/                      @likexian
-/website/pages/docs/builders/tencentcloud* @likexian
-
-
+/builder/alicloud/                      dongxiao.zzh@alibaba-inc.com
+/builder/amazon/ebssurrogate/           @jen20
+/builder/amazon/ebsvolume/              @jen20
+/builder/azure/                         @boumenot
+/builder/hyperv/                        @taliesins
+/builder/lxc/                           @ChrisLundquist
+/builder/lxd/                           @ChrisLundquist
+/builder/oneandone/                     @jasmingacic
+/builder/oracle/                        @prydie @owainlewis
+/builder/profitbricks/                  @jasmingacic
+/builder/triton/                        @jen20 @sean-
+/builder/ncloud/                        @YuSungDuk
+/builder/scaleway/                      @dimtion @edouardb
 
 # provisioners
 
-/examples/ansible/                      @bhcleek
 /provisioner/ansible/                   @bhcleek
 /provisioner/converge/                  @stevendborrelli
 
 # post-processors
-
 /post-processor/alicloud-import/        dongxiao.zzh@alibaba-inc.com
 /post-processor/checksum/               v.tolstov@selfip.ru
 /post-processor/googlecompute-export/   crunkleton@google.com
-/post-processor/yandex-export/          @GennadySpb
-/post-processor/yandex-import/          @GennadySpb
 /post-processor/vsphere-template/       nelson@bennu.cl
-/post-processor/ucloud-import/          @shawnmssu

Dockerfile

@@ -1,30 +0,0 @@
-FROM docker.mirror.hashicorp.services/ubuntu:16.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && apt-get install -y \
-    locales \
-    openssh-server \
-    sudo
-
-RUN locale-gen en_US.UTF-8
-
-RUN if ! getent passwd vagrant; then useradd -d /home/vagrant -m -s /bin/bash vagrant; fi \
-    && echo 'vagrant ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers \
-    && mkdir -p /etc/sudoers.d \
-    && echo 'vagrant ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/vagrant \
-    && chmod 0440 /etc/sudoers.d/vagrant
-
-RUN mkdir -p /home/vagrant/.ssh \
-    && chmod 0700 /home/vagrant/.ssh \
-    && wget --no-check-certificate \
-      https://raw.github.com/hashicorp/vagrant/master/keys/vagrant.pub \
-      -O /home/vagrant/.ssh/authorized_keys \
-    && chmod 0600 /home/vagrant/.ssh/authorized_keys \
-    && chown -R vagrant /home/vagrant/.ssh
-
-RUN mkdir -p /run/sshd
-
-CMD /usr/sbin/sshd -D \
-    -o UseDNS=no \
-    -o PidFile=/tmp/sshd.pid

Makefile

@@ -1,72 +1,52 @@
-TEST?=$(shell go list ./...)
-COUNT?=1
-VET?=$(shell go list ./...)
-
-ACC_TEST_BUILDERS?=all
-ACC_TEST_PROVISIONERS?=all
+TEST?=$(shell go list ./... | grep -v vendor)
+VET?=$(shell ls -d */ | grep -v vendor | grep -v website)
 # Get the current full sha from git
 GITSHA:=$(shell git rev-parse HEAD)
 # Get the current local branch name from git (if we can, this may be blank)
 GITBRANCH:=$(shell git symbolic-ref --short HEAD 2>/dev/null)
+GOFMT_FILES?=$$(find . -not -path "./vendor/*" -name "*.go")
 GOOS=$(shell go env GOOS)
 GOARCH=$(shell go env GOARCH)
 GOPATH=$(shell go env GOPATH)
 
-EXECUTABLE_FILES=$(shell find . -type f -executable | egrep -v '^\./(website/[vendor|tmp]|vendor/|\.git|bin/|scripts/|pkg/)' | egrep -v '.*(\.sh|\.bats|\.git)' | egrep -v './provisioner/(ansible|inspec)/test-fixtures/exit1')
-
 # Get the git commit
 GIT_DIRTY=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
 GIT_COMMIT=$(shell git rev-parse --short HEAD)
 GIT_IMPORT=github.com/hashicorp/packer/version
-UNAME_S := $(shell uname -s)
-LDFLAGS=-s -w
-GOLDFLAGS=-X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY) $(LDFLAGS)
+GOLDFLAGS=-X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY)
 
 export GOLDFLAGS
 
-.PHONY: bin checkversion ci ci-lint default install-build-deps install-gen-deps fmt fmt-docs fmt-examples generate install-lint-deps lint \
-	releasebin test testacc testrace
+default: deps generate test dev
 
-default: install-build-deps install-gen-deps generate dev
+ci: deps test
 
-ci: testrace ## Test in continuous integration
+release: deps test releasebin package ## Build a release build
 
-release: install-build-deps test releasebin package ## Build a release build
-
-bin: install-build-deps ## Build debug/test build
+bin: deps ## Build debug/test build
+	@go get github.com/mitchellh/gox
 	@echo "WARN: 'make bin' is for debug / test builds only. Use 'make release' for release builds."
-	@GO111MODULE=auto sh -c "$(CURDIR)/scripts/build.sh"
+	@sh -c "$(CURDIR)/scripts/build.sh"
 
-releasebin: install-build-deps
+releasebin: deps
+	@go get github.com/mitchellh/gox
 	@grep 'const VersionPrerelease = "dev"' version/version.go > /dev/null ; if [ $$? -eq 0 ]; then \
 		echo "ERROR: You must remove prerelease tags from version/version.go prior to release."; \
 		exit 1; \
 	fi
-	@GO111MODULE=auto sh -c "$(CURDIR)/scripts/build.sh"
+	@sh -c "$(CURDIR)/scripts/build.sh"
 
 package:
 	$(if $(VERSION),,@echo 'VERSION= needed to release; Use make package skip compilation'; exit 1)
 	@sh -c "$(CURDIR)/scripts/dist.sh $(VERSION)"
 
-install-build-deps: ## Install dependencies for bin build
-	@go install github.com/mitchellh/gox@v1.0.1
+deps:
+	@go get golang.org/x/tools/cmd/stringer
+	@go get -u github.com/mna/pigeon
+	@go get github.com/kardianos/govendor
+	@govendor sync
 
-install-gen-deps: ## Install dependencies for code generation
-	# to avoid having to tidy our go deps, we `go get` our binaries from a temp
-	# dir. `go get` will change our deps and the following deps are not part of
-	# out code dependencies; so a go mod tidy will remove them again. `go
-	# install` seems to install the last tagged version and we want to install
-	# master.
-	@(cd $(TEMPDIR) && GO111MODULE=on go get github.com/alvaroloes/enumer@master)
-	@go install ./cmd/struct-markdown
-	@go install ./cmd/mapstructure-to-hcl2
-
-install-lint-deps: ## Install linter dependencies
-	# Pinning golangci-lint at v1.23.8 as --new-from-rev seems to work properly; the latest 1.24.0 has caused issues with memory consumption
-	@echo "==> Updating linter dependencies..."
-	@curl -sSfL -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.23.8
-
-dev: ## Build and install a development build
+dev: deps ## Build and install a development build
 	@grep 'const VersionPrerelease = ""' version/version.go > /dev/null ; if [ $$? -eq 0 ]; then \
 		echo "ERROR: You must add prerelease tags to version/version.go prior to making a dev build."; \
 		exit 1; \
@@ -77,41 +57,14 @@ dev: ## Build and install a development build
 	@cp $(GOPATH)/bin/packer bin/packer
 	@cp $(GOPATH)/bin/packer pkg/$(GOOS)_$(GOARCH)
 
-lint: install-lint-deps ## Lint Go code
-	@if [ ! -z  $(PKG_NAME) ]; then \
-		echo "golangci-lint run ./$(PKG_NAME)/..."; \
-		golangci-lint run ./$(PKG_NAME)/...; \
-	else \
-		echo "golangci-lint run ./..."; \
-		golangci-lint run ./...; \
-	fi
-
-ci-lint: install-lint-deps ## On ci only lint newly added Go source files
-	@echo "==> Running linter on newly added Go source files..."
-	GO111MODULE=on golangci-lint run --new-from-rev=$(shell git merge-base origin/master HEAD) ./...
-
 fmt: ## Format Go code
-	@go fmt ./...
+	@gofmt -w -s $(GOFMT_FILES)
 
-fmt-check: fmt ## Check go code formatting
-	@echo "==> Checking that code complies with go fmt requirements..."
-	@git diff --exit-code; if [ $$? -eq 1 ]; then \
-		echo "Found files that are not fmt'ed."; \
-		echo "You can use the command: \`make fmt\` to reformat code."; \
-		exit 1; \
-	fi
+fmt-check: ## Check go code formatting
+	$(CURDIR)/scripts/gofmtcheck.sh $(GOFMT_FILES)
 
-mode-check: ## Check that only certain files are executable
-	@echo "==> Checking that only certain files are executable..."
-	@if [ ! -z "$(EXECUTABLE_FILES)" ]; then \
-		echo "These files should not be executable or they must be white listed in the Makefile:"; \
-		echo "$(EXECUTABLE_FILES)" | xargs -n1; \
-		exit 1; \
-	else \
-		echo "Check passed."; \
-	fi
 fmt-docs:
-	@find ./website/pages/docs -name "*.md" -exec pandoc --wrap auto --columns 79 --atx-headers -s -f "markdown_github+yaml_metadata_block" -t "markdown_github+yaml_metadata_block" {} -o {} \;
+	@find ./website/source/docs -name "*.md" -exec pandoc --wrap auto --columns 79 --atx-headers -s -f "markdown_github+yaml_metadata_block" -t "markdown_github+yaml_metadata_block" {} -o {} \;
 
 # Install js-beautify with npm install -g js-beautify
 fmt-examples:
@@ -119,54 +72,31 @@ fmt-examples:
 
 # generate runs `go generate` to build the dynamically generated
 # source files.
-generate: install-gen-deps ## Generate dynamically generated code
-	@echo "==> removing autogenerated markdown..." # but don't remove partials generated in the SDK and copied over.
-	@find website/pages -path website/pages/partials/packer-plugin-sdk -prune -o -type f | xargs grep -l '^<!-- Code generated' | xargs rm -f
-	@echo "==> removing autogenerated code..."
-	@find post-processor helper builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm -f
-	PROJECT_ROOT="$(shell pwd)" go generate $(shell go list ./... | grep -v packer-plugin-sdk)
+generate: deps ## Generate dynamically generated code
+	go generate .
+	gofmt -w common/bootcommand/boot_command.go
+	goimports -w common/bootcommand/boot_command.go
+	gofmt -w command/plugin.go
 
-generate-check: generate ## Check go code generation is on par
-	@echo "==> Checking that auto-generated code is not changed..."
-	@git diff --exit-code; if [ $$? -eq 1 ]; then \
-		echo "Found diffs in go generated code."; \
-		echo "You can use the command: \`make generate\` to reformat code."; \
-		exit 1; \
-	fi
-
-test: mode-check vet ## Run unit tests
-	@go test -count $(COUNT) $(TEST) $(TESTARGS) -timeout=3m
-
-# acctest runs provisioners acceptance tests
-provisioners-acctest: #install-build-deps generate
-	ACC_TEST_BUILDERS=$(ACC_TEST_BUILDERS) go test $(TEST) $(TESTARGS) -timeout=1h
-
-# testacc runs acceptance tests
-testacc: # install-build-deps generate ## Run acceptance tests
-	@echo "WARN: Acceptance tests will take a long time to run and may cost money. Ctrl-C if you want to cancel."
-	PACKER_ACC=1 go test -count $(COUNT) -v $(TEST) $(TESTARGS) -timeout=120m
-
-testrace: mode-check vet ## Test with race detection enabled
-	@GO111MODULE=off go test -count $(COUNT) -race $(TEST) $(TESTARGS) -timeout=3m -p=8
-
-# Runs code coverage and open a html page with report
-cover:
-	go test -count $(COUNT) $(TEST) $(TESTARGS) -timeout=3m -coverprofile=coverage.out
-	go tool cover -html=coverage.out
-	rm coverage.out
-
-check-vendor-vs-mod: ## Check that go modules and vendored code are on par
-	@GO111MODULE=on go mod vendor
-	@git diff --exit-code --ignore-space-change --ignore-space-at-eol -- vendor ; if [ $$? -eq 1 ]; then \
-		echo "ERROR: vendor dir is not on par with go modules definition." && \
-		exit 1; \
-	fi
-
-vet: ## Vet Go code
-	@go vet $(VET)  ; if [ $$? -eq 1 ]; then \
+test: deps fmt-check ## Run unit tests
+	@go test $(TEST) $(TESTARGS) -timeout=2m
+	@go tool vet $(VET)  ; if [ $$? -eq 1 ]; then \
 		echo "ERROR: Vet found problems in the code."; \
 		exit 1; \
 	fi
 
+# testacc runs acceptance tests
+testacc: deps generate ## Run acceptance tests
+	@echo "WARN: Acceptance tests will take a long time to run and may cost money. Ctrl-C if you want to cancel."
+	PACKER_ACC=1 go test -v $(TEST) $(TESTARGS) -timeout=45m
+
+testrace: deps ## Test for race conditions
+	@go test -race $(TEST) $(TESTARGS) -timeout=2m
+
+updatedeps:
+	@echo "INFO: Packer deps are managed by govendor. See .github/CONTRIBUTING.md"
+
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+.PHONY: bin checkversion ci default deps fmt fmt-docs fmt-examples generate releasebin test testacc testrace updatedeps

README.md

@@ -1,24 +1,22 @@
 # Packer
 
-[![Build Status][circleci-badge]][circleci]
-[![Discuss](https://img.shields.io/badge/discuss-packer-3d89ff?style=flat)](https://discuss.hashicorp.com/c/packer)
-[![PkgGoDev](https://pkg.go.dev/badge/github.com/hashicorp/packer)](https://pkg.go.dev/github.com/hashicorp/packer)
+[![Build Status][travis-badge]][travis]
+[![Windows Build Status][appveyor-badge]][appveyor]
+[![GoDoc][godoc-badge]][godoc]
 [![GoReportCard][report-badge]][report]
-[![codecov](https://codecov.io/gh/hashicorp/packer/branch/master/graph/badge.svg)](https://codecov.io/gh/hashicorp/packer)
 
-[circleci-badge]: https://circleci.com/gh/hashicorp/packer.svg?style=svg
-[circleci]: https://app.circleci.com/pipelines/github/hashicorp/packer
+[travis-badge]: https://travis-ci.org/hashicorp/packer.svg?branch=master
+[travis]: https://travis-ci.org/hashicorp/packer
 [appveyor-badge]: https://ci.appveyor.com/api/projects/status/miavlgnp989e5obc/branch/master?svg=true
+[appveyor]: https://ci.appveyor.com/project/hashicorp/packer
 [godoc-badge]: https://godoc.org/github.com/hashicorp/packer?status.svg
-[godoc]: https://godoc.org/github.com/hashicorp/packer	
-[report-badge]: https://goreportcard.com/badge/github.com/hashicorp/packer	
+[godoc]: https://godoc.org/github.com/hashicorp/packer
+[report-badge]: https://goreportcard.com/badge/github.com/hashicorp/packer
 [report]: https://goreportcard.com/report/github.com/hashicorp/packer
 
-<p align="center" style="text-align:center;">
-  <a href="https://www.packer.io">
-    <img alt="HashiCorp Packer logo" src="website/public/img/logo-packer-padded.svg" width="500" />
-  </a>
-</p>
+* Website: https://www.packer.io
+* IRC: `#packer-tool` on Freenode
+* Mailing list: [Google Groups](https://groups.google.com/forum/#!forum/packer-tool)
 
 Packer is a tool for building identical machine images for multiple platforms
 from a single source configuration.
@@ -26,7 +24,7 @@ from a single source configuration.
 Packer is lightweight, runs on every major operating system, and is highly
 performant, creating machine images for multiple platforms in parallel. Packer
 comes out of the box with support for many platforms, the full list of which can
-be found at https://www.packer.io/docs/builders.
+be found at https://www.packer.io/docs/builders/index.html. 
 
 Support for other platforms can be added via plugins.
 
@@ -34,6 +32,10 @@ The images that Packer creates can easily be turned into
 [Vagrant](http://www.vagrantup.com) boxes.
 
 ## Quick Start
+Download and install packages and dependencies
+```
+go get github.com/hashicorp/packer
+```
 
 **Note:** There is a great
 [introduction and getting started guide](https://www.packer.io/intro)
@@ -48,43 +50,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
 ...
 ```
 
@@ -92,32 +84,17 @@ Packer will build an AMI according to the "quick-start" template. The AMI
 will be available in your AWS account. To delete the AMI, you must manually
 delete it using the [AWS console](https://console.aws.amazon.com/). Packer
 builds your images, it does not manage their lifecycle. Where they go, how
-they're run, etc., is up to you.
+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)
 for best practices and instructions on setting up your development environment
 to work on Packer.
-
-## Unmaintained Plugins
-As contributors' circumstances change, development on a community maintained
-plugin can slow. When this happens, the Packer team may mark a plugin as
-unmaintained, to clearly signal the plugin's status to users.
-
-What does **unmaintained** mean?
-
-1. The code repository and all commit history will still be available.
-1. Documentation will remain on the Packer website.
-1. Issues and pull requests are monitored as a best effort.
-1. No active development will be performed by the Packer team.
-
-If anyone form them community is interested in maintaining a community
-supported plugin, please feel free to submit contributions via a pull-
-request for review; reviews are generally prioritized over feature work
-when possible. For a list of open plugin issues and pending feature requests see the [Packer Issue Tracker](https://github.com/hashicorp/packer/issues/).

Vagrantfile

@@ -5,10 +5,6 @@ LINUX_BASE_BOX = "bento/ubuntu-16.04"
 FREEBSD_BASE_BOX = "jen20/FreeBSD-12.0-CURRENT"
 
 Vagrant.configure(2) do |config|
-	if Vagrant.has_plugin?("vagrant-cachier")
-		config.cache.scope = :box
-	end
-
 	# Compilation and development boxes
 	config.vm.define "linux", autostart: true, primary: true do |vmCfg|
 		vmCfg.vm.box = LINUX_BASE_BOX
@@ -73,12 +69,6 @@ def configureProviders(vmCfg, cpus: "2", memory: "2048")
 		end
 	end
 
-	vmCfg.vm.provider "docker" do |d, override|
-		d.build_dir = "."
-		d.has_ssh = true
-		override.vm.box = nil
-	end
-
 	return vmCfg
 end
 

appveyor.yml

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

background_check.go

@@ -1,22 +0,0 @@
-// +build !openbsd
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/shirou/gopsutil/process"
-)
-
-func checkProcess(currentPID int) (bool, error) {
-	myProc, err := process.NewProcess(int32(currentPID))
-	if err != nil {
-		return false, fmt.Errorf("Process check error: %s", err)
-	}
-	bg, err := myProc.Background()
-	if err != nil {
-		return bg, fmt.Errorf("Process background check error: %s", err)
-	}
-
-	return bg, nil
-}

background_check_openbsd.go

@@ -1,10 +0,0 @@
-package main
-
-import (
-	"fmt"
-)
-
-func checkProcess(currentPID int) (bool, error) {
-	return false, fmt.Errorf("cannot determine if process is backgrounded in " +
-		"openbsd")
-}

builder/alicloud/ecs/access_config.go

@@ -1,88 +1,39 @@
-//go:generate struct-markdown
-
 package ecs
 
 import (
-	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
-	"runtime"
-	"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/mitchellh/go-homedir"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // Config of alicloud
 type AlicloudAccessConfig struct {
-	// Alicloud access key must be provided unless `profile` is set, but it can
-	// also be sourced from the `ALICLOUD_ACCESS_KEY` environment variable.
-	AlicloudAccessKey string `mapstructure:"access_key" required:"true"`
-	// Alicloud secret key must be provided unless `profile` is set, but it can
-	// also be sourced from the `ALICLOUD_SECRET_KEY` environment variable.
-	AlicloudSecretKey string `mapstructure:"secret_key" required:"true"`
-	// Alicloud region must be provided unless `profile` is set, but it can
-	// also be sourced from the `ALICLOUD_REGION` environment variable.
-	AlicloudRegion string `mapstructure:"region" required:"true"`
-	// The region validation can be skipped if this value is true, the default
-	// value is false.
-	AlicloudSkipValidation bool `mapstructure:"skip_region_validation" required:"false"`
-	// The image validation can be skipped if this value is true, the default
-	// value is false.
-	AlicloudSkipImageValidation bool `mapstructure:"skip_image_validation" required:"false"`
-	// Alicloud profile must be set unless `access_key` is set; it can also be
-	// sourced from the `ALICLOUD_PROFILE` environment variable.
-	AlicloudProfile string `mapstructure:"profile" required:"false"`
-	// Alicloud shared credentials file path. If this file exists, access and
-	// secret keys will be read from this file.
-	AlicloudSharedCredentialsFile string `mapstructure:"shared_credentials_file" required:"false"`
-	// STS access token, can be set through template or by exporting as
-	// environment variable such as `export SECURITY_TOKEN=value`.
-	SecurityToken string `mapstructure:"security_token" required:"false"`
-
-	client *ClientWrapper
+	AlicloudAccessKey      string `mapstructure:"access_key"`
+	AlicloudSecretKey      string `mapstructure:"secret_key"`
+	AlicloudRegion         string `mapstructure:"region"`
+	AlicloudSkipValidation bool   `mapstructure:"skip_region_validation"`
+	SecurityToken          string `mapstructure:"security_token"`
 }
 
-const Packer = "HashiCorp-Packer"
-const DefaultRequestReadTimeout = 10 * time.Second
-
 // Client for AlicloudClient
-func (c *AlicloudAccessConfig) Client() (*ClientWrapper, error) {
-	if c.client != nil {
-		return c.client, nil
+func (c *AlicloudAccessConfig) Client() (*ecs.Client, error) {
+	if err := c.loadAndValidate(); err != nil {
+		return nil, err
 	}
 	if c.SecurityToken == "" {
 		c.SecurityToken = os.Getenv("SECURITY_TOKEN")
 	}
+	client := ecs.NewECSClientWithSecurityToken(c.AlicloudAccessKey, c.AlicloudSecretKey,
+		c.SecurityToken, common.Region(c.AlicloudRegion))
 
-	var getProviderConfig = func(str string, key string) string {
-		value, err := getConfigFromProfile(c, key)
-		if err == nil && value != nil {
-			str = value.(string)
-		}
-		return str
-	}
-
-	if c.AlicloudAccessKey == "" || c.AlicloudSecretKey == "" {
-		c.AlicloudAccessKey = getProviderConfig(c.AlicloudAccessKey, "access_key_id")
-		c.AlicloudSecretKey = getProviderConfig(c.AlicloudSecretKey, "access_key_secret")
-		c.AlicloudRegion = getProviderConfig(c.AlicloudRegion, "region_id")
-		c.SecurityToken = getProviderConfig(c.SecurityToken, "sts_token")
-	}
-
-	client, err := ecs.NewClientWithStsToken(c.AlicloudRegion, c.AlicloudAccessKey, c.AlicloudSecretKey, c.SecurityToken)
-	if err != nil {
+	client.SetBusinessInfo("Packer")
+	if _, err := client.DescribeRegions(); err != nil {
 		return nil, err
 	}
-
-	client.AppendUserAgent(Packer, version.AlicloudPluginVersion.FormattedVersion())
-	client.SetReadTimeout(DefaultRequestReadTimeout)
-	c.client = &ClientWrapper{client}
-
-	return c.client, nil
+	return client, nil
 }
 
 func (c *AlicloudAccessConfig) Prepare(ctx *interpolate.Context) []error {
@@ -91,12 +42,10 @@ func (c *AlicloudAccessConfig) Prepare(ctx *interpolate.Context) []error {
 		errs = append(errs, err)
 	}
 
-	if c.AlicloudRegion == "" {
-		c.AlicloudRegion = os.Getenv("ALICLOUD_REGION")
-	}
-
-	if c.AlicloudRegion == "" {
-		errs = append(errs, fmt.Errorf("region option or ALICLOUD_REGION must be provided in template file or environment variables."))
+	if c.AlicloudRegion != "" && !c.AlicloudSkipValidation {
+		if c.validateRegion() != nil {
+			errs = append(errs, fmt.Errorf("Unknown alicloud region: %s", c.AlicloudRegion))
+		}
 	}
 
 	if len(errs) > 0 {
@@ -113,114 +62,28 @@ func (c *AlicloudAccessConfig) Config() error {
 	if c.AlicloudSecretKey == "" {
 		c.AlicloudSecretKey = os.Getenv("ALICLOUD_SECRET_KEY")
 	}
-	if c.AlicloudProfile == "" {
-		c.AlicloudProfile = os.Getenv("ALICLOUD_PROFILE")
-	}
-	if c.AlicloudSharedCredentialsFile == "" {
-		c.AlicloudSharedCredentialsFile = os.Getenv("ALICLOUD_SHARED_CREDENTIALS_FILE")
-	}
-	if (c.AlicloudAccessKey == "" || c.AlicloudSecretKey == "") && c.AlicloudProfile == "" {
+	if c.AlicloudAccessKey == "" || c.AlicloudSecretKey == "" {
 		return fmt.Errorf("ALICLOUD_ACCESS_KEY and ALICLOUD_SECRET_KEY must be set in template file or environment variables.")
 	}
 	return nil
 
 }
 
-func (c *AlicloudAccessConfig) ValidateRegion(region string) error {
-
-	supportedRegions, err := c.getSupportedRegions()
-	if err != nil {
+func (c *AlicloudAccessConfig) loadAndValidate() error {
+	if err := c.validateRegion(); err != nil {
 		return err
 	}
 
-	for _, supportedRegion := range supportedRegions {
-		if region == supportedRegion {
+	return nil
+}
+
+func (c *AlicloudAccessConfig) validateRegion() error {
+
+	for _, valid := range common.ValidRegions {
+		if c.AlicloudRegion == string(valid) {
 			return nil
 		}
 	}
 
-	return fmt.Errorf("Not a valid alicloud region: %s", region)
-}
-
-func (c *AlicloudAccessConfig) getSupportedRegions() ([]string, error) {
-	client, err := c.Client()
-	if err != nil {
-		return nil, err
-	}
-
-	regionsRequest := ecs.CreateDescribeRegionsRequest()
-	regionsResponse, err := client.DescribeRegions(regionsRequest)
-	if err != nil {
-		return nil, err
-	}
-
-	validRegions := make([]string, len(regionsResponse.Regions.Region))
-	for _, valid := range regionsResponse.Regions.Region {
-		validRegions = append(validRegions, valid.RegionId)
-	}
-
-	return validRegions, nil
-}
-
-func getConfigFromProfile(c *AlicloudAccessConfig, ProfileKey string) (interface{}, error) {
-	providerConfig := make(map[string]interface{})
-	current := c.AlicloudProfile
-	if current != "" {
-		profilePath, err := homedir.Expand(c.AlicloudSharedCredentialsFile)
-		if err != nil {
-			return nil, err
-		}
-		if profilePath == "" {
-			profilePath = fmt.Sprintf("%s/.aliyun/config.json", os.Getenv("HOME"))
-			if runtime.GOOS == "windows" {
-				profilePath = fmt.Sprintf("%s/.aliyun/config.json", os.Getenv("USERPROFILE"))
-			}
-		}
-		_, err = os.Stat(profilePath)
-		if !os.IsNotExist(err) {
-			data, err := ioutil.ReadFile(profilePath)
-			if err != nil {
-				return nil, err
-			}
-			config := map[string]interface{}{}
-			err = json.Unmarshal(data, &config)
-			if err != nil {
-				return nil, err
-			}
-			for _, v := range config["profiles"].([]interface{}) {
-				if current == v.(map[string]interface{})["name"] {
-					providerConfig = v.(map[string]interface{})
-				}
-			}
-		}
-	}
-	mode := ""
-	if v, ok := providerConfig["mode"]; ok {
-		mode = v.(string)
-	} else {
-		return v, nil
-	}
-	switch ProfileKey {
-	case "access_key_id", "access_key_secret":
-		if mode == "EcsRamRole" {
-			return "", nil
-		}
-	case "ram_role_name":
-		if mode != "EcsRamRole" {
-			return "", nil
-		}
-	case "sts_token":
-		if mode != "StsToken" {
-			return "", nil
-		}
-	case "ram_role_arn", "ram_session_name":
-		if mode != "RamRoleArn" {
-			return "", nil
-		}
-	case "expired_seconds":
-		if mode != "RamRoleArn" {
-			return float64(0), nil
-		}
-	}
-	return providerConfig[ProfileKey], nil
+	return fmt.Errorf("Not a valid alicloud region: %s", c.AlicloudRegion)
 }

builder/alicloud/ecs/access_config_test.go

@@ -1,7 +1,6 @@
 package ecs
 
 import (
-	"os"
 	"testing"
 )
 
@@ -15,10 +14,14 @@ func testAlicloudAccessConfig() *AlicloudAccessConfig {
 
 func TestAlicloudAccessConfigPrepareRegion(t *testing.T) {
 	c := testAlicloudAccessConfig()
-
 	c.AlicloudRegion = ""
+	if err := c.Prepare(nil); err != nil {
+		t.Fatalf("shouldn't have err: %s", err)
+	}
+
+	c.AlicloudRegion = "cn-beijing-3"
 	if err := c.Prepare(nil); err == nil {
-		t.Fatalf("should have err")
+		t.Fatal("should have error")
 	}
 
 	c.AlicloudRegion = "cn-beijing"
@@ -26,27 +29,16 @@ func TestAlicloudAccessConfigPrepareRegion(t *testing.T) {
 		t.Fatalf("shouldn't have err: %s", err)
 	}
 
-	os.Setenv("ALICLOUD_REGION", "cn-hangzhou")
-	c.AlicloudRegion = ""
-	if err := c.Prepare(nil); err != nil {
-		t.Fatalf("shouldn't have err: %s", err)
-	}
-
-	c.AlicloudAccessKey = ""
+	c.AlicloudRegion = "unknown"
 	if err := c.Prepare(nil); err == nil {
 		t.Fatalf("should have err")
 	}
 
-	c.AlicloudProfile = "default"
+	c.AlicloudRegion = "unknown"
+	c.AlicloudSkipValidation = true
 	if err := c.Prepare(nil); err != nil {
 		t.Fatalf("shouldn't have err: %s", err)
 	}
-
-	c.AlicloudProfile = ""
-	os.Setenv("ALICLOUD_PROFILE", "default")
-	if err := c.Prepare(nil); err != nil {
-		t.Fatalf("shouldn't have err: %s", err)
-	}
-
 	c.AlicloudSkipValidation = false
+
 }

builder/alicloud/ecs/artifact.go

@@ -6,8 +6,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/packer"
 )
 
 type Artifact struct {
@@ -18,7 +19,7 @@ type Artifact struct {
 	BuilderIdValue string
 
 	// Alcloud connection for performing API stuff.
-	Client *ClientWrapper
+	Client *ecs.Client
 }
 
 func (a *Artifact) BuilderId() string {
@@ -63,118 +64,66 @@ func (a *Artifact) State(name string) interface{} {
 func (a *Artifact) Destroy() error {
 	errors := make([]error, 0)
 
-	copyingImages := make(map[string]string, len(a.AlicloudImages))
-	sourceImage := make(map[string]*ecs.Image, 1)
-	for regionId, imageId := range a.AlicloudImages {
-		describeImagesRequest := ecs.CreateDescribeImagesRequest()
-		describeImagesRequest.RegionId = regionId
-		describeImagesRequest.ImageId = imageId
-		describeImagesRequest.Status = ImageStatusQueried
-		imagesResponse, err := a.Client.DescribeImages(describeImagesRequest)
+	for region, imageId := range a.AlicloudImages {
+		log.Printf("Delete alicloud image ID (%s) from region (%s)", imageId, region)
+
+		// Get alicloud image metadata
+		images, _, err := a.Client.DescribeImages(&ecs.DescribeImagesArgs{
+			RegionId: common.Region(region),
+			ImageId:  imageId})
 		if err != nil {
 			errors = append(errors, err)
 		}
-
-		images := imagesResponse.Images.Image
 		if len(images) == 0 {
 			err := fmt.Errorf("Error retrieving details for alicloud image(%s), no alicloud images found", imageId)
 			errors = append(errors, err)
 			continue
 		}
-
-		if images[0].IsCopied && images[0].Status != ImageStatusAvailable {
-			copyingImages[regionId] = imageId
-		} else {
-			sourceImage[regionId] = &images[0]
-		}
-	}
-
-	for regionId, imageId := range copyingImages {
-		log.Printf("Cancel copying alicloud image (%s) from region (%s)", imageId, regionId)
-
-		errs := a.unsharedAccountsOnImages(regionId, imageId)
-		if errs != nil {
-			errors = append(errors, errs...)
-		}
-
-		cancelImageCopyRequest := ecs.CreateCancelCopyImageRequest()
-		cancelImageCopyRequest.RegionId = regionId
-		cancelImageCopyRequest.ImageId = imageId
-		if _, err := a.Client.CancelCopyImage(cancelImageCopyRequest); err != nil {
+		//Unshared the shared account before destroy
+		sharePermissions, err := a.Client.DescribeImageSharePermission(&ecs.ModifyImageSharePermissionArgs{RegionId: common.Region(region), ImageId: imageId})
+		if err != nil {
 			errors = append(errors, err)
 		}
-	}
+		accountsNumber := len(sharePermissions.Accounts.Account)
+		if accountsNumber > 0 {
+			accounts := make([]string, accountsNumber)
+			for index, account := range sharePermissions.Accounts.Account {
+				accounts[index] = account.AliyunId
+			}
+			err := a.Client.ModifyImageSharePermission(&ecs.ModifyImageSharePermissionArgs{
 
-	for regionId, image := range sourceImage {
-		imageId := image.ImageId
-		log.Printf("Delete alicloud image (%s) from region (%s)", imageId, regionId)
-
-		errs := a.unsharedAccountsOnImages(regionId, imageId)
-		if errs != nil {
-			errors = append(errors, errs...)
-		}
-
-		deleteImageRequest := ecs.CreateDeleteImageRequest()
-		deleteImageRequest.RegionId = regionId
-		deleteImageRequest.ImageId = imageId
-		if _, err := a.Client.DeleteImage(deleteImageRequest); err != nil {
-			errors = append(errors, err)
-		}
-
-		//Delete the snapshot of this images
-		for _, diskDevices := range image.DiskDeviceMappings.DiskDeviceMapping {
-			deleteSnapshotRequest := ecs.CreateDeleteSnapshotRequest()
-			deleteSnapshotRequest.SnapshotId = diskDevices.SnapshotId
-			_, err := a.Client.DeleteSnapshot(deleteSnapshotRequest)
+				RegionId:      common.Region(region),
+				ImageId:       imageId,
+				RemoveAccount: accounts,
+			})
 			if err != nil {
 				errors = append(errors, err)
 			}
 		}
+		// Delete alicloud images
+		if err := a.Client.DeleteImage(common.Region(region), imageId); err != nil {
+			errors = append(errors, err)
+		}
+		//Delete the snapshot of this images
+		for _, diskDevices := range images[0].DiskDeviceMappings.DiskDeviceMapping {
+			if err := a.Client.DeleteSnapshot(diskDevices.SnapshotId); err != nil {
+				errors = append(errors, err)
+			}
+		}
+
 	}
 
 	if len(errors) > 0 {
 		if len(errors) == 1 {
 			return errors[0]
 		} else {
-			return &packersdk.MultiError{Errors: errors}
+			return &packer.MultiError{Errors: errors}
 		}
 	}
 
 	return nil
 }
 
-func (a *Artifact) unsharedAccountsOnImages(regionId string, imageId string) []error {
-	var errors []error
-
-	describeImageShareRequest := ecs.CreateDescribeImageSharePermissionRequest()
-	describeImageShareRequest.RegionId = regionId
-	describeImageShareRequest.ImageId = imageId
-	imageShareResponse, err := a.Client.DescribeImageSharePermission(describeImageShareRequest)
-	if err != nil {
-		errors = append(errors, err)
-		return errors
-	}
-
-	accountsNumber := len(imageShareResponse.Accounts.Account)
-	if accountsNumber > 0 {
-		accounts := make([]string, accountsNumber)
-		for index, account := range imageShareResponse.Accounts.Account {
-			accounts[index] = account.AliyunId
-		}
-
-		modifyImageShareRequest := ecs.CreateModifyImageSharePermissionRequest()
-		modifyImageShareRequest.RegionId = regionId
-		modifyImageShareRequest.ImageId = imageId
-		modifyImageShareRequest.RemoveAccount = &accounts
-		_, err := a.Client.ModifyImageSharePermission(modifyImageShareRequest)
-		if err != nil {
-			errors = append(errors, err)
-		}
-	}
-
-	return errors
-}
-
 func (a *Artifact) stateAtlasMetadata() interface{} {
 	metadata := make(map[string]string)
 	for region, imageId := range a.AlicloudImages {

builder/alicloud/ecs/artifact_test.go

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

builder/alicloud/ecs/builder.go

@@ -1,21 +1,18 @@
-//go:generate mapstructure-to-hcl2 -type Config,AlicloudDiskDevice
-
-// The alicloud  contains a packersdk.Builder implementation that
+// The alicloud  contains a packer.Builder implementation that
 // builds ecs images for alicloud.
 package ecs
 
 import (
-	"context"
+	"log"
+
 	"fmt"
 
-	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer-plugin-sdk/common"
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -38,16 +35,15 @@ type Builder struct {
 type InstanceNetWork string
 
 const (
+	ClassicNet                     = InstanceNetWork("classic")
+	VpcNet                         = InstanceNetWork("vpc")
 	ALICLOUD_DEFAULT_SHORT_TIMEOUT = 180
 	ALICLOUD_DEFAULT_TIMEOUT       = 1800
 	ALICLOUD_DEFAULT_LONG_TIMEOUT  = 3600
 )
 
-func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstructure().HCL2Spec() }
-
-func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
+func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 	err := config.Decode(&b.config, &config.DecodeOpts{
-		PluginType:         BuilderId,
 		Interpolate:        true,
 		InterpolateContext: &b.config.ctx,
 		InterpolateFilter: &interpolate.RenderFilter{
@@ -58,36 +54,31 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	}, raws...)
 	b.config.ctx.EnableEnv = true
 	if err != nil {
-		return nil, nil, err
-	}
-
-	if b.config.PackerConfig.PackerForce {
-		b.config.AlicloudImageForceDelete = true
-		b.config.AlicloudImageForceDeleteSnapshots = true
+		return nil, err
 	}
 
 	// Accumulate any errors
-	var errs *packersdk.MultiError
-	errs = packersdk.MultiErrorAppend(errs, b.config.AlicloudAccessConfig.Prepare(&b.config.ctx)...)
-	errs = packersdk.MultiErrorAppend(errs, b.config.AlicloudImageConfig.Prepare(&b.config.ctx)...)
-	errs = packersdk.MultiErrorAppend(errs, b.config.RunConfig.Prepare(&b.config.ctx)...)
+	var errs *packer.MultiError
+	errs = packer.MultiErrorAppend(errs, b.config.AlicloudAccessConfig.Prepare(&b.config.ctx)...)
+	errs = packer.MultiErrorAppend(errs, b.config.AlicloudImageConfig.Prepare(&b.config.ctx)...)
+	errs = packer.MultiErrorAppend(errs, b.config.RunConfig.Prepare(&b.config.ctx)...)
 
 	if errs != nil && len(errs.Errors) > 0 {
-		return nil, nil, errs
+		return nil, errs
 	}
 
-	packersdk.LogSecretFilter.Set(b.config.AlicloudAccessKey, b.config.AlicloudSecretKey)
-	return nil, nil, nil
+	log.Println(common.ScrubConfig(b.config, b.config.AlicloudAccessKey, b.config.AlicloudSecretKey))
+	return nil, nil
 }
 
-func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook) (packersdk.Artifact, error) {
+func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) {
 
 	client, err := b.config.Client()
 	if err != nil {
 		return nil, err
 	}
 	state := new(multistep.BasicStateBag)
-	state.Put("config", &b.config)
+	state.Put("config", b.config)
 	state.Put("client", client)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
@@ -103,14 +94,17 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 		&stepCheckAlicloudSourceImage{
 			SourceECSImageId: b.config.AlicloudSourceImage,
 		},
-		&stepConfigAlicloudKeyPair{
-			Debug:        b.config.PackerDebug,
-			Comm:         &b.config.Comm,
-			DebugKeyPath: fmt.Sprintf("ecs_%s.pem", b.config.PackerBuildName),
-			RegionId:     b.config.AlicloudRegion,
+		&StepConfigAlicloudKeyPair{
+			Debug:                b.config.PackerDebug,
+			KeyPairName:          b.config.SSHKeyPairName,
+			PrivateKeyFile:       b.config.Comm.SSHPrivateKey,
+			TemporaryKeyPairName: b.config.TemporaryKeyPairName,
+			SSHAgentAuth:         b.config.Comm.SSHAgentAuth,
+			DebugKeyPath:         fmt.Sprintf("ecs_%s.pem", b.config.PackerBuildName),
+			RegionId:             b.config.AlicloudRegion,
 		},
 	}
-	if b.chooseNetworkType() == InstanceNetworkVpc {
+	if b.chooseNetworkType() == VpcNet {
 		steps = append(steps,
 			&stepConfigAlicloudVPC{
 				VpcId:     b.config.VpcId,
@@ -141,74 +135,55 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 			InstanceName:            b.config.InstanceName,
 			ZoneId:                  b.config.ZoneId,
 		})
-	if b.chooseNetworkType() == InstanceNetworkVpc {
-		steps = append(steps, &stepConfigAlicloudEIP{
+	if b.chooseNetworkType() == VpcNet {
+		steps = append(steps, &setpConfigAlicloudEIP{
 			AssociatePublicIpAddress: b.config.AssociatePublicIpAddress,
 			RegionId:                 b.config.AlicloudRegion,
 			InternetChargeType:       b.config.InternetChargeType,
-			InternetMaxBandwidthOut:  b.config.InternetMaxBandwidthOut,
-			SSHPrivateIp:             b.config.SSHPrivateIp,
 		})
 	} else {
 		steps = append(steps, &stepConfigAlicloudPublicIP{
-			RegionId:     b.config.AlicloudRegion,
-			SSHPrivateIp: b.config.SSHPrivateIp,
+			RegionId: b.config.AlicloudRegion,
 		})
 	}
 	steps = append(steps,
-		&stepAttachKeyPair{},
+		&stepAttachKeyPar{},
 		&stepRunAlicloudInstance{},
+		&stepMountAlicloudDisk{},
 		&communicator.StepConnect{
 			Config: &b.config.RunConfig.Comm,
 			Host: SSHHost(
 				client,
 				b.config.SSHPrivateIp),
-			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
-		},
-		&commonsteps.StepProvision{},
-		&commonsteps.StepCleanupTempKeys{
-			Comm: &b.config.RunConfig.Comm,
+			SSHConfig: SSHConfig(
+				b.config.RunConfig.Comm.SSHAgentAuth,
+				b.config.RunConfig.Comm.SSHUsername,
+				b.config.RunConfig.Comm.SSHPassword),
 		},
+		&common.StepProvision{},
 		&stepStopAlicloudInstance{
-			ForceStop:   b.config.ForceStopInstance,
-			DisableStop: b.config.DisableStopInstance,
+			ForceStop: b.config.ForceStopInstance,
 		},
 		&stepDeleteAlicloudImageSnapshots{
 			AlicloudImageForceDeleteSnapshots: b.config.AlicloudImageForceDeleteSnapshots,
 			AlicloudImageForceDelete:          b.config.AlicloudImageForceDelete,
 			AlicloudImageName:                 b.config.AlicloudImageName,
-			AlicloudImageDestinationRegions:   b.config.AlicloudImageConfig.AlicloudImageDestinationRegions,
-			AlicloudImageDestinationNames:     b.config.AlicloudImageConfig.AlicloudImageDestinationNames,
-		})
-
-	if b.config.AlicloudImageIgnoreDataDisks {
-		steps = append(steps, &stepCreateAlicloudSnapshot{
-			WaitSnapshotReadyTimeout: b.getSnapshotReadyTimeout(),
-		})
-	}
-
-	steps = append(steps,
-		&stepCreateAlicloudImage{
-			AlicloudImageIgnoreDataDisks: b.config.AlicloudImageIgnoreDataDisks,
-			WaitSnapshotReadyTimeout:     b.getSnapshotReadyTimeout(),
 		},
-		&stepCreateTags{
-			Tags: b.config.AlicloudImageTags,
-		},
-		&stepRegionCopyAlicloudImage{
+		&stepCreateAlicloudImage{},
+		&setpRegionCopyAlicloudImage{
 			AlicloudImageDestinationRegions: b.config.AlicloudImageDestinationRegions,
 			AlicloudImageDestinationNames:   b.config.AlicloudImageDestinationNames,
 			RegionId:                        b.config.AlicloudRegion,
 		},
-		&stepShareAlicloudImage{
+		&setpShareAlicloudImage{
 			AlicloudImageShareAccounts:   b.config.AlicloudImageShareAccounts,
 			AlicloudImageUNShareAccounts: b.config.AlicloudImageUNShareAccounts,
 			RegionId:                     b.config.AlicloudRegion,
 		})
 
 	// Run!
-	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
-	b.runner.Run(ctx, state)
+	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner.Run(state)
 
 	// If there was an error, return that
 	if rawErr, ok := state.GetOk("error"); ok {
@@ -230,11 +205,18 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 	return artifact, nil
 }
 
+func (b *Builder) Cancel() {
+	if b.runner != nil {
+		log.Println("Cancelling the step runner...")
+		b.runner.Cancel()
+	}
+}
+
 func (b *Builder) chooseNetworkType() InstanceNetWork {
 	if b.isVpcNetRequired() {
-		return InstanceNetworkVpc
+		return VpcNet
 	} else {
-		return InstanceNetworkClassic
+		return ClassicNet
 	}
 }
 
@@ -249,7 +231,7 @@ func (b *Builder) isVpcSpecified() bool {
 
 func (b *Builder) isUserDataNeeded() bool {
 	// Public key setup requires userdata
-	if b.config.RunConfig.Comm.SSHPrivateKeyFile != "" {
+	if b.config.RunConfig.Comm.SSHPrivateKey != "" {
 		return true
 	}
 
@@ -257,13 +239,5 @@ func (b *Builder) isUserDataNeeded() bool {
 }
 
 func (b *Builder) isKeyPairNeeded() bool {
-	return b.config.Comm.SSHKeyPairName != "" || b.config.Comm.SSHTemporaryKeyPairName != ""
-}
-
-func (b *Builder) getSnapshotReadyTimeout() int {
-	if b.config.WaitSnapshotReadyTimeout > 0 {
-		return b.config.WaitSnapshotReadyTimeout
-	}
-
-	return ALICLOUD_DEFAULT_LONG_TIMEOUT
+	return b.config.SSHKeyPairName != "" || b.config.TemporaryKeyPairName != ""
 }

builder/alicloud/ecs/builder.hcl2spec.go

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

builder/alicloud/ecs/builder_acc_test.go

@@ -1,48 +1,18 @@
 package ecs
 
 import (
-	"encoding/json"
-	"fmt"
 	"os"
-	"strings"
 	"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"
+	"fmt"
+
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	builderT "github.com/hashicorp/packer/helper/builder/testing"
+	"github.com/hashicorp/packer/packer"
 )
 
-const defaultTestRegion = "cn-beijing"
-
-func TestBuilderAcc_validateRegion(t *testing.T) {
-	t.Parallel()
-
-	if os.Getenv(builderT.TestEnvVar) == "" {
-		t.Skip(fmt.Sprintf("Acceptance tests skipped unless env '%s' set", builderT.TestEnvVar))
-		return
-	}
-
-	testAccPreCheck(t)
-
-	access := &AlicloudAccessConfig{AlicloudRegion: "cn-beijing"}
-	err := access.Config()
-	if err != nil {
-		t.Fatalf("init AlicloudAccessConfig failed: %s", err)
-	}
-
-	err = access.ValidateRegion("cn-hangzhou")
-	if err != nil {
-		t.Fatalf("Expect pass with valid region id but failed: %s", err)
-	}
-
-	err = access.ValidateRegion("invalidRegionId")
-	if err == nil {
-		t.Fatal("Expect failure due to invalid region id but passed")
-	}
-}
-
 func TestBuilderAcc_basic(t *testing.T) {
-	t.Parallel()
 	builderT.Test(t, builderT.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
@@ -52,326 +22,28 @@ func TestBuilderAcc_basic(t *testing.T) {
 	})
 }
 
-const testBuilderAccBasic = `
-{	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.n1.tiny",
-		"source_image":"ubuntu_18_04_64_20G_alibase_20190509.vhd",
-		"io_optimized":"true",
-		"ssh_username":"root",
-		"image_name": "packer-test-basic_{{timestamp}}"
-	}]
-}`
+//func TestBuilderAcc_windows(t *testing.T) {
+//	builderT.Test(t, builderT.TestCase{
+//		PreCheck: func() {
+//			testAccPreCheck(t)
+//		},
+//		Builder:  &Builder{},
+//		Template: testBuilderAccWindows,
+//	})
+//}
 
-func TestBuilderAcc_withDiskSettings(t *testing.T) {
-	t.Parallel()
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
-		Builder:  &Builder{},
-		Template: testBuilderAccWithDiskSettings,
-		Check:    checkImageDisksSettings(),
-	})
-}
-
-const testBuilderAccWithDiskSettings = `
-{	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.n1.tiny",
-		"source_image":"ubuntu_18_04_64_20G_alibase_20190509.vhd",
-		"io_optimized":"true",
-		"ssh_username":"root",
-		"image_name": "packer-test-withDiskSettings_{{timestamp}}",
-		"system_disk_mapping": {
-			"disk_size": 60
-		},
-		"image_disk_mappings": [
-			{
-				"disk_name": "datadisk1",
-				"disk_size": 25,
-				"disk_delete_with_instance": true
-			},
-			{
-				"disk_name": "datadisk2",
-				"disk_size": 25,
-				"disk_delete_with_instance": true
-			}
-		]
-	}]
-}`
-
-func checkImageDisksSettings() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
-		if len(artifacts) > 1 {
-			return fmt.Errorf("more than 1 artifact")
-		}
-
-		// Get the actual *Artifact pointer so we can access the AMIs directly
-		artifactRaw := artifacts[0]
-		artifact, ok := artifactRaw.(*Artifact)
-		if !ok {
-			return fmt.Errorf("unknown artifact: %#v", artifactRaw)
-		}
-		imageId := artifact.AlicloudImages[defaultTestRegion]
-
-		// describe the image, get block devices with a snapshot
-		client, _ := testAliyunClient()
-
-		describeImagesRequest := ecs.CreateDescribeImagesRequest()
-		describeImagesRequest.RegionId = defaultTestRegion
-		describeImagesRequest.ImageId = imageId
-		imagesResponse, err := client.DescribeImages(describeImagesRequest)
-		if err != nil {
-			return fmt.Errorf("describe images failed due to %s", err)
-		}
-
-		if len(imagesResponse.Images.Image) == 0 {
-			return fmt.Errorf("image %s generated can not be found", imageId)
-		}
-
-		image := imagesResponse.Images.Image[0]
-		if image.Size != 60 {
-			return fmt.Errorf("the size of image %s should be equal to 60G but got %dG", imageId, image.Size)
-		}
-		if len(image.DiskDeviceMappings.DiskDeviceMapping) != 3 {
-			return fmt.Errorf("image %s should contains 3 disks", imageId)
-		}
-
-		var snapshotIds []string
-		for _, mapping := range image.DiskDeviceMappings.DiskDeviceMapping {
-			if mapping.Type == DiskTypeSystem {
-				if mapping.Size != "60" {
-					return fmt.Errorf("the system snapshot size of image %s should be equal to 60G but got %sG", imageId, mapping.Size)
-				}
-			} else {
-				if mapping.Size != "25" {
-					return fmt.Errorf("the data disk size of image %s should be equal to 25G but got %sG", imageId, mapping.Size)
-				}
-
-				snapshotIds = append(snapshotIds, mapping.SnapshotId)
-			}
-		}
-
-		data, _ := json.Marshal(snapshotIds)
-
-		describeSnapshotRequest := ecs.CreateDescribeSnapshotsRequest()
-		describeSnapshotRequest.RegionId = defaultTestRegion
-		describeSnapshotRequest.SnapshotIds = string(data)
-		describeSnapshotsResponse, err := client.DescribeSnapshots(describeSnapshotRequest)
-		if err != nil {
-			return fmt.Errorf("describe data snapshots failed due to %s", err)
-		}
-		if len(describeSnapshotsResponse.Snapshots.Snapshot) != 2 {
-			return fmt.Errorf("expect %d data snapshots but got %d", len(snapshotIds), len(describeSnapshotsResponse.Snapshots.Snapshot))
-		}
-
-		var dataDiskIds []string
-		for _, snapshot := range describeSnapshotsResponse.Snapshots.Snapshot {
-			dataDiskIds = append(dataDiskIds, snapshot.SourceDiskId)
-		}
-		data, _ = json.Marshal(dataDiskIds)
-
-		describeDisksRequest := ecs.CreateDescribeDisksRequest()
-		describeDisksRequest.RegionId = defaultTestRegion
-		describeDisksRequest.DiskIds = string(data)
-		describeDisksResponse, err := client.DescribeDisks(describeDisksRequest)
-		if err != nil {
-			return fmt.Errorf("describe snapshots failed due to %s", err)
-		}
-		if len(describeDisksResponse.Disks.Disk) != 0 {
-			return fmt.Errorf("data disks should be deleted but %d left", len(describeDisksResponse.Disks.Disk))
-		}
-
-		return nil
-	}
-}
-
-func TestBuilderAcc_withIgnoreDataDisks(t *testing.T) {
-	t.Parallel()
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
-		Builder:  &Builder{},
-		Template: testBuilderAccIgnoreDataDisks,
-		Check:    checkIgnoreDataDisks(),
-	})
-}
-
-const testBuilderAccIgnoreDataDisks = `
-{	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.gn5-c8g1.2xlarge",
-		"source_image":"ubuntu_18_04_64_20G_alibase_20190509.vhd",
-		"io_optimized":"true",
-		"ssh_username":"root",
-		"image_name": "packer-test-ignoreDataDisks_{{timestamp}}",
-		"image_ignore_data_disks": true
-	}]
-}`
-
-func checkIgnoreDataDisks() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
-		if len(artifacts) > 1 {
-			return fmt.Errorf("more than 1 artifact")
-		}
-
-		// Get the actual *Artifact pointer so we can access the AMIs directly
-		artifactRaw := artifacts[0]
-		artifact, ok := artifactRaw.(*Artifact)
-		if !ok {
-			return fmt.Errorf("unknown artifact: %#v", artifactRaw)
-		}
-		imageId := artifact.AlicloudImages[defaultTestRegion]
-
-		// describe the image, get block devices with a snapshot
-		client, _ := testAliyunClient()
-
-		describeImagesRequest := ecs.CreateDescribeImagesRequest()
-		describeImagesRequest.RegionId = defaultTestRegion
-		describeImagesRequest.ImageId = imageId
-		imagesResponse, err := client.DescribeImages(describeImagesRequest)
-		if err != nil {
-			return fmt.Errorf("describe images failed due to %s", err)
-		}
-
-		if len(imagesResponse.Images.Image) == 0 {
-			return fmt.Errorf("image %s generated can not be found", imageId)
-		}
-
-		image := imagesResponse.Images.Image[0]
-		if len(image.DiskDeviceMappings.DiskDeviceMapping) != 1 {
-			return fmt.Errorf("image %s should only contain one disks", imageId)
-		}
-
-		return nil
-	}
-}
-
-func TestBuilderAcc_windows(t *testing.T) {
-	t.Parallel()
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
-		Builder:  &Builder{},
-		Template: testBuilderAccWindows,
-	})
-}
-
-const testBuilderAccWindows = `
-{	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.n1.tiny",
-		"source_image":"winsvr_64_dtcC_1809_en-us_40G_alibase_20190318.vhd",
-		"io_optimized":"true",
-		"communicator": "winrm",
-		"winrm_port": 5985,
-		"winrm_username": "Administrator",
-		"winrm_password": "Test1234",
-		"image_name": "packer-test-windows_{{timestamp}}",
-		"user_data_file": "../../../examples/alicloud/basic/winrm_enable_userdata.ps1"
-	}]
-}`
-
-func TestBuilderAcc_regionCopy(t *testing.T) {
-	t.Parallel()
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
-		Builder:  &Builder{},
-		Template: testBuilderAccRegionCopy,
-		Check:    checkRegionCopy([]string{"cn-hangzhou", "cn-shenzhen"}),
-	})
-}
-
-const testBuilderAccRegionCopy = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.n1.tiny",
-		"source_image":"ubuntu_18_04_64_20G_alibase_20190509.vhd",
-		"io_optimized":"true",
-		"ssh_username":"root",
-		"image_name": "packer-test-regionCopy_{{timestamp}}",
-		"image_copy_regions": ["cn-hangzhou", "cn-shenzhen"],
-		"image_copy_names": ["packer-copy-test-hz_{{timestamp}}", "packer-copy-test-sz_{{timestamp}}"]
-	}]
-}
-`
-
-func checkRegionCopy(regions []string) builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
-		if len(artifacts) > 1 {
-			return fmt.Errorf("more than 1 artifact")
-		}
-
-		// Get the actual *Artifact pointer so we can access the AMIs directly
-		artifactRaw := artifacts[0]
-		artifact, ok := artifactRaw.(*Artifact)
-		if !ok {
-			return fmt.Errorf("unknown artifact: %#v", artifactRaw)
-		}
-
-		// Verify that we copied to only the regions given
-		regionSet := make(map[string]struct{})
-		for _, r := range regions {
-			regionSet[r] = struct{}{}
-		}
-
-		for r := range artifact.AlicloudImages {
-			if r == "cn-beijing" {
-				delete(regionSet, r)
-				continue
-			}
-
-			if _, ok := regionSet[r]; !ok {
-				return fmt.Errorf("region %s is not the target region but found in artifacts", r)
-			}
-
-			delete(regionSet, r)
-		}
-
-		if len(regionSet) > 0 {
-			return fmt.Errorf("following region(s) should be the copying targets but corresponding artifact(s) not found: %#v", regionSet)
-		}
-
-		client, _ := testAliyunClient()
-		for regionId, imageId := range artifact.AlicloudImages {
-			describeImagesRequest := ecs.CreateDescribeImagesRequest()
-			describeImagesRequest.RegionId = regionId
-			describeImagesRequest.ImageId = imageId
-			describeImagesRequest.Status = ImageStatusQueried
-			describeImagesResponse, err := client.DescribeImages(describeImagesRequest)
-			if err != nil {
-				return fmt.Errorf("describe generated image %s failed due to %s", imageId, err)
-			}
-			if len(describeImagesResponse.Images.Image) == 0 {
-				return fmt.Errorf("image %s in artifacts can not be found", imageId)
-			}
-
-			image := describeImagesResponse.Images.Image[0]
-			if image.IsCopied && regionId == "cn-hangzhou" && !strings.HasPrefix(image.ImageName, "packer-copy-test-hz") {
-				return fmt.Errorf("the name of image %s in artifacts should begin with %s but got %s", imageId, "packer-copy-test-hz", image.ImageName)
-			}
-			if image.IsCopied && regionId == "cn-shenzhen" && !strings.HasPrefix(image.ImageName, "packer-copy-test-sz") {
-				return fmt.Errorf("the name of image %s in artifacts should begin with %s but got %s", imageId, "packer-copy-test-sz", image.ImageName)
-			}
-		}
-
-		return nil
-	}
-}
+//func TestBuilderAcc_regionCopy(t *testing.T) {
+//	builderT.Test(t, builderT.TestCase{
+//		PreCheck: func() {
+//			testAccPreCheck(t)
+//		},
+//		Builder:  &Builder{},
+//		Template: testBuilderAccRegionCopy,
+//		Check:    checkRegionCopy([]string{"cn-hangzhou", "cn-shenzhen"}),
+//	})
+//}
 
 func TestBuilderAcc_forceDelete(t *testing.T) {
-	t.Parallel()
 	// Build the same alicloud image twice, with ecs_image_force_delete on the second run
 	builderT.Test(t, builderT.TestCase{
 		PreCheck: func() {
@@ -391,27 +63,7 @@ func TestBuilderAcc_forceDelete(t *testing.T) {
 	})
 }
 
-func buildForceDeregisterConfig(val, name string) string {
-	return fmt.Sprintf(testBuilderAccForceDelete, val, name)
-}
-
-const testBuilderAccForceDelete = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.n1.tiny",
-		"source_image":"ubuntu_18_04_64_20G_alibase_20190509.vhd",
-		"io_optimized":"true",
-		"ssh_username":"root",
-		"image_force_delete": "%s",
-		"image_name": "packer-test-forceDelete_%s"
-	}]
-}
-`
-
 func TestBuilderAcc_ECSImageSharing(t *testing.T) {
-	t.Parallel()
 	builderT.Test(t, builderT.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
@@ -422,57 +74,7 @@ func TestBuilderAcc_ECSImageSharing(t *testing.T) {
 	})
 }
 
-const testBuilderAccSharing = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.n1.tiny",
-		"source_image":"ubuntu_18_04_64_20G_alibase_20190509.vhd",
-		"io_optimized":"true",
-		"ssh_username":"root",
-		"image_name": "packer-test-ECSImageSharing_{{timestamp}}",
-		"image_share_account":["1309208528360047"]
-	}]
-}
-`
-
-func checkECSImageSharing(uid string) builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
-		if len(artifacts) > 1 {
-			return fmt.Errorf("more than 1 artifact")
-		}
-
-		// Get the actual *Artifact pointer so we can access the AMIs directly
-		artifactRaw := artifacts[0]
-		artifact, ok := artifactRaw.(*Artifact)
-		if !ok {
-			return fmt.Errorf("unknown artifact: %#v", artifactRaw)
-		}
-
-		// describe the image, get block devices with a snapshot
-		client, _ := testAliyunClient()
-
-		describeImageShareRequest := ecs.CreateDescribeImageSharePermissionRequest()
-		describeImageShareRequest.RegionId = "cn-beijing"
-		describeImageShareRequest.ImageId = artifact.AlicloudImages["cn-beijing"]
-		imageShareResponse, err := client.DescribeImageSharePermission(describeImageShareRequest)
-
-		if err != nil {
-			return fmt.Errorf("Error retrieving Image Attributes for ECS Image Artifact (%#v) "+
-				"in ECS Image Sharing Test: %s", artifact, err)
-		}
-
-		if len(imageShareResponse.Accounts.Account) != 1 && imageShareResponse.Accounts.Account[0].AliyunId != uid {
-			return fmt.Errorf("share account is incorrect %d", len(imageShareResponse.Accounts.Account))
-		}
-
-		return nil
-	}
-}
-
 func TestBuilderAcc_forceDeleteSnapshot(t *testing.T) {
-	t.Parallel()
 	destImageName := "delete"
 
 	// Build the same alicloud image name twice, with force_delete_snapshot on the second run
@@ -487,13 +89,11 @@ func TestBuilderAcc_forceDeleteSnapshot(t *testing.T) {
 
 	// Get image data by image image name
 	client, _ := testAliyunClient()
+	images, _, _ := client.DescribeImages(&ecs.DescribeImagesArgs{
+		ImageName: "packer-test-" + destImageName,
+		RegionId:  common.Region("cn-beijing")})
 
-	describeImagesRequest := ecs.CreateDescribeImagesRequest()
-	describeImagesRequest.RegionId = "cn-beijing"
-	describeImagesRequest.ImageName = "packer-test-" + destImageName
-	images, _ := client.DescribeImages(describeImagesRequest)
-
-	image := images.Images.Image[0]
+	image := images[0]
 
 	// Get snapshot ids for image
 	snapshotIds := []string{}
@@ -513,44 +113,17 @@ func TestBuilderAcc_forceDeleteSnapshot(t *testing.T) {
 	})
 }
 
-func buildForceDeleteSnapshotConfig(val, name string) string {
-	return fmt.Sprintf(testBuilderAccForceDeleteSnapshot, val, val, name)
-}
-
-const testBuilderAccForceDeleteSnapshot = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.n1.tiny",
-		"source_image":"ubuntu_18_04_64_20G_alibase_20190509.vhd",
-		"io_optimized":"true",
-		"ssh_username":"root",
-		"image_force_delete_snapshots": "%s",
-		"image_force_delete": "%s",
-		"image_name": "packer-test-%s"
-	}]
-}
-`
-
 func checkSnapshotsDeleted(snapshotIds []string) builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+	return func(artifacts []packer.Artifact) error {
 		// Verify the snapshots are gone
 		client, _ := testAliyunClient()
-		data, err := json.Marshal(snapshotIds)
-		if err != nil {
-			return fmt.Errorf("Marshal snapshotIds array failed %v", err)
-		}
-
-		describeSnapshotsRequest := ecs.CreateDescribeSnapshotsRequest()
-		describeSnapshotsRequest.RegionId = "cn-beijing"
-		describeSnapshotsRequest.SnapshotIds = string(data)
-		snapshotResp, err := client.DescribeSnapshots(describeSnapshotsRequest)
+		snapshotResp, _, err := client.DescribeSnapshots(
+			&ecs.DescribeSnapshotsArgs{RegionId: common.Region("cn-beijing"), SnapshotIds: snapshotIds},
+		)
 		if err != nil {
 			return fmt.Errorf("Query snapshot failed %v", err)
 		}
-		snapshots := snapshotResp.Snapshots.Snapshot
-		if len(snapshots) > 0 {
+		if len(snapshotResp) > 0 {
 			return fmt.Errorf("Snapshots weren't successfully deleted by " +
 				"`ecs_image_force_delete_snapshots`")
 		}
@@ -558,165 +131,44 @@ func checkSnapshotsDeleted(snapshotIds []string) builderT.TestCheckFunc {
 	}
 }
 
-func TestBuilderAcc_imageTags(t *testing.T) {
-	t.Parallel()
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
-		Builder:  &Builder{},
-		Template: testBuilderAccImageTags,
-		Check:    checkImageTags(),
-	})
-}
-
-const testBuilderAccImageTags = `
-{	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.n1.tiny",
-		"source_image":"ubuntu_18_04_64_20G_alibase_20190509.vhd",
-		"ssh_username": "root",
-		"io_optimized":"true",
-		"image_name": "packer-test-imageTags_{{timestamp}}",
-		"tags": {
-			"TagKey1": "TagValue1",
-			"TagKey2": "TagValue2"
-       }
-	}]
-}`
-
-func checkImageTags() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+func checkECSImageSharing(uid string) builderT.TestCheckFunc {
+	return func(artifacts []packer.Artifact) error {
 		if len(artifacts) > 1 {
 			return fmt.Errorf("more than 1 artifact")
 		}
+
 		// Get the actual *Artifact pointer so we can access the AMIs directly
 		artifactRaw := artifacts[0]
 		artifact, ok := artifactRaw.(*Artifact)
 		if !ok {
 			return fmt.Errorf("unknown artifact: %#v", artifactRaw)
 		}
-		imageId := artifact.AlicloudImages[defaultTestRegion]
 
 		// describe the image, get block devices with a snapshot
 		client, _ := testAliyunClient()
+		imageSharePermissionResponse, err := client.DescribeImageSharePermission(
+			&ecs.ModifyImageSharePermissionArgs{
+				RegionId: "cn-beijing",
+				ImageId:  artifact.AlicloudImages["cn-beijing"],
+			})
 
-		describeImageTagsRequest := ecs.CreateDescribeTagsRequest()
-		describeImageTagsRequest.RegionId = defaultTestRegion
-		describeImageTagsRequest.ResourceType = TagResourceImage
-		describeImageTagsRequest.ResourceId = imageId
-		imageTagsResponse, err := client.DescribeTags(describeImageTagsRequest)
 		if err != nil {
 			return fmt.Errorf("Error retrieving Image Attributes for ECS Image Artifact (%#v) "+
-				"in ECS Image Tags Test: %s", artifact, err)
+				"in ECS Image Sharing Test: %s", artifact, err)
 		}
 
-		if len(imageTagsResponse.Tags.Tag) != 2 {
-			return fmt.Errorf("expect 2 tags set on image %s but got %d", imageId, len(imageTagsResponse.Tags.Tag))
-		}
-
-		for _, tag := range imageTagsResponse.Tags.Tag {
-			if tag.TagKey != "TagKey1" && tag.TagKey != "TagKey2" {
-				return fmt.Errorf("tags on image %s should be within the list of TagKey1 and TagKey2 but got %s", imageId, tag.TagKey)
-			}
-
-			if tag.TagKey == "TagKey1" && tag.TagValue != "TagValue1" {
-				return fmt.Errorf("the value for tag %s on image %s should be TagValue1 but got %s", tag.TagKey, imageId, tag.TagValue)
-			} else if tag.TagKey == "TagKey2" && tag.TagValue != "TagValue2" {
-				return fmt.Errorf("the value for tag %s on image %s should be TagValue2 but got %s", tag.TagKey, imageId, tag.TagValue)
-			}
-		}
-
-		describeImagesRequest := ecs.CreateDescribeImagesRequest()
-		describeImagesRequest.RegionId = defaultTestRegion
-		describeImagesRequest.ImageId = imageId
-		imagesResponse, err := client.DescribeImages(describeImagesRequest)
-		if err != nil {
-			return fmt.Errorf("describe images failed due to %s", err)
-		}
-
-		if len(imagesResponse.Images.Image) == 0 {
-			return fmt.Errorf("image %s generated can not be found", imageId)
-		}
-
-		image := imagesResponse.Images.Image[0]
-		for _, mapping := range image.DiskDeviceMappings.DiskDeviceMapping {
-			describeSnapshotTagsRequest := ecs.CreateDescribeTagsRequest()
-			describeSnapshotTagsRequest.RegionId = defaultTestRegion
-			describeSnapshotTagsRequest.ResourceType = TagResourceSnapshot
-			describeSnapshotTagsRequest.ResourceId = mapping.SnapshotId
-			snapshotTagsResponse, err := client.DescribeTags(describeSnapshotTagsRequest)
-			if err != nil {
-				return fmt.Errorf("failed to get snapshot tags due to %s", err)
-			}
-
-			if len(snapshotTagsResponse.Tags.Tag) != 2 {
-				return fmt.Errorf("expect 2 tags set on snapshot %s but got %d", mapping.SnapshotId, len(snapshotTagsResponse.Tags.Tag))
-			}
-
-			for _, tag := range snapshotTagsResponse.Tags.Tag {
-				if tag.TagKey != "TagKey1" && tag.TagKey != "TagKey2" {
-					return fmt.Errorf("tags on snapshot %s should be within the list of TagKey1 and TagKey2 but got %s", mapping.SnapshotId, tag.TagKey)
-				}
-
-				if tag.TagKey == "TagKey1" && tag.TagValue != "TagValue1" {
-					return fmt.Errorf("the value for tag %s on snapshot %s should be TagValue1 but got %s", tag.TagKey, mapping.SnapshotId, tag.TagValue)
-				} else if tag.TagKey == "TagKey2" && tag.TagValue != "TagValue2" {
-					return fmt.Errorf("the value for tag %s on snapshot %s should be TagValue2 but got %s", tag.TagKey, mapping.SnapshotId, tag.TagValue)
-				}
-			}
+		if len(imageSharePermissionResponse.Accounts.Account) != 1 &&
+			imageSharePermissionResponse.Accounts.Account[0].AliyunId != uid {
+			return fmt.Errorf("share account is incorrect %d",
+				len(imageSharePermissionResponse.Accounts.Account))
 		}
 
 		return nil
 	}
 }
 
-func TestBuilderAcc_dataDiskEncrypted(t *testing.T) {
-	t.Parallel()
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
-		Builder:  &Builder{},
-		Template: testBuilderAccDataDiskEncrypted,
-		Check:    checkDataDiskEncrypted(),
-	})
-}
-
-const testBuilderAccDataDiskEncrypted = `
-{	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.n1.tiny",
-		"source_image":"ubuntu_18_04_64_20G_alibase_20190509.vhd",
-		"io_optimized":"true",
-		"ssh_username":"root",
-		"image_name": "packer-test-dataDiskEncrypted_{{timestamp}}",
-		"image_disk_mappings": [
-			{
-				"disk_name": "data_disk1",
-				"disk_size": 25,
-				"disk_encrypted": true,
-				"disk_delete_with_instance": true
-			},
-			{
-				"disk_name": "data_disk2",
-				"disk_size": 35,
-				"disk_encrypted": false,
-				"disk_delete_with_instance": true
-			},
-			{
-				"disk_name": "data_disk3",
-				"disk_size": 45,
-				"disk_delete_with_instance": true
-			}
-		]
-	}]
-}`
-
-func checkDataDiskEncrypted() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
+func checkRegionCopy(regions []string) builderT.TestCheckFunc {
+	return func(artifacts []packer.Artifact) error {
 		if len(artifacts) > 1 {
 			return fmt.Errorf("more than 1 artifact")
 		}
@@ -727,141 +179,30 @@ func checkDataDiskEncrypted() builderT.TestCheckFunc {
 		if !ok {
 			return fmt.Errorf("unknown artifact: %#v", artifactRaw)
 		}
-		imageId := artifact.AlicloudImages[defaultTestRegion]
 
-		// describe the image, get block devices with a snapshot
-		client, _ := testAliyunClient()
-
-		describeImagesRequest := ecs.CreateDescribeImagesRequest()
-		describeImagesRequest.RegionId = defaultTestRegion
-		describeImagesRequest.ImageId = imageId
-		imagesResponse, err := client.DescribeImages(describeImagesRequest)
-		if err != nil {
-			return fmt.Errorf("describe images failed due to %s", err)
+		// Verify that we copied to only the regions given
+		regionSet := make(map[string]struct{})
+		for _, r := range regions {
+			regionSet[r] = struct{}{}
 		}
-
-		if len(imagesResponse.Images.Image) == 0 {
-			return fmt.Errorf("image %s generated can not be found", imageId)
-		}
-		image := imagesResponse.Images.Image[0]
-
-		var snapshotIds []string
-		for _, mapping := range image.DiskDeviceMappings.DiskDeviceMapping {
-			snapshotIds = append(snapshotIds, mapping.SnapshotId)
-		}
-
-		data, _ := json.Marshal(snapshotIds)
-
-		describeSnapshotRequest := ecs.CreateDescribeSnapshotsRequest()
-		describeSnapshotRequest.RegionId = defaultTestRegion
-		describeSnapshotRequest.SnapshotIds = string(data)
-		describeSnapshotsResponse, err := client.DescribeSnapshots(describeSnapshotRequest)
-		if err != nil {
-			return fmt.Errorf("describe data snapshots failed due to %s", err)
-		}
-		if len(describeSnapshotsResponse.Snapshots.Snapshot) != 4 {
-			return fmt.Errorf("expect %d data snapshots but got %d", len(snapshotIds), len(describeSnapshotsResponse.Snapshots.Snapshot))
-		}
-		snapshots := describeSnapshotsResponse.Snapshots.Snapshot
-		for _, snapshot := range snapshots {
-			if snapshot.SourceDiskType == DiskTypeSystem {
-				if snapshot.Encrypted != false {
-					return fmt.Errorf("the system snapshot expected to be non-encrypted but got true")
-				}
-
+		for r := range artifact.AlicloudImages {
+			if r == "cn-beijing" {
+				delete(regionSet, r)
 				continue
 			}
-
-			if snapshot.SourceDiskSize == "25" && snapshot.Encrypted != true {
-				return fmt.Errorf("the first snapshot expected to be encrypted but got false")
+			if _, ok := regionSet[r]; !ok {
+				return fmt.Errorf("unknown region: %s", r)
 			}
 
-			if snapshot.SourceDiskSize == "35" && snapshot.Encrypted != false {
-				return fmt.Errorf("the second snapshot expected to be non-encrypted but got true")
-			}
-
-			if snapshot.SourceDiskSize == "45" && snapshot.Encrypted != false {
-				return fmt.Errorf("the third snapshot expected to be non-encrypted but got true")
-			}
+			delete(regionSet, r)
 		}
-		return nil
-	}
-}
-
-func TestBuilderAcc_systemDiskEncrypted(t *testing.T) {
-	t.Parallel()
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() {
-			testAccPreCheck(t)
-		},
-		Builder:  &Builder{},
-		Template: testBuilderAccSystemDiskEncrypted,
-		Check:    checkSystemDiskEncrypted(),
-	})
-}
-
-const testBuilderAccSystemDiskEncrypted = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "cn-beijing",
-		"instance_type": "ecs.n1.tiny",
-		"source_image":"ubuntu_18_04_64_20G_alibase_20190509.vhd",
-		"io_optimized":"true",
-		"ssh_username":"root",
-		"image_name": "packer-test_{{timestamp}}",
-		"image_encrypted": "true"
-	}]
-}`
-
-func checkSystemDiskEncrypted() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
-		if len(artifacts) > 1 {
-			return fmt.Errorf("more than 1 artifact")
+		if len(regionSet) > 0 {
+			return fmt.Errorf("didn't copy to: %#v", regionSet)
 		}
-
-		// Get the actual *Artifact pointer so we can access the AMIs directly
-		artifactRaw := artifacts[0]
-		artifact, ok := artifactRaw.(*Artifact)
-		if !ok {
-			return fmt.Errorf("unknown artifact: %#v", artifactRaw)
-		}
-
-		// describe the image, get block devices with a snapshot
 		client, _ := testAliyunClient()
-		imageId := artifact.AlicloudImages[defaultTestRegion]
-
-		describeImagesRequest := ecs.CreateDescribeImagesRequest()
-		describeImagesRequest.RegionId = defaultTestRegion
-		describeImagesRequest.ImageId = imageId
-		describeImagesRequest.Status = ImageStatusQueried
-		imagesResponse, err := client.DescribeImages(describeImagesRequest)
-		if err != nil {
-			return fmt.Errorf("describe images failed due to %s", err)
+		for key, value := range artifact.AlicloudImages {
+			client.WaitForImageReady(common.Region(key), value, 1800)
 		}
-
-		if len(imagesResponse.Images.Image) == 0 {
-			return fmt.Errorf("image %s generated can not be found", imageId)
-		}
-
-		image := imagesResponse.Images.Image[0]
-		if image.IsCopied == false {
-			return fmt.Errorf("image %s generated expexted to be copied but false", image.ImageId)
-		}
-
-		describeSnapshotRequest := ecs.CreateDescribeSnapshotsRequest()
-		describeSnapshotRequest.RegionId = defaultTestRegion
-		describeSnapshotRequest.SnapshotIds = fmt.Sprintf("[\"%s\"]", image.DiskDeviceMappings.DiskDeviceMapping[0].SnapshotId)
-		describeSnapshotsResponse, err := client.DescribeSnapshots(describeSnapshotRequest)
-		if err != nil {
-			return fmt.Errorf("describe system snapshots failed due to %s", err)
-		}
-		snapshots := describeSnapshotsResponse.Snapshots.Snapshot[0]
-
-		if snapshots.Encrypted != true {
-			return fmt.Errorf("system snapshot of image %s expected to be encrypted but got false", imageId)
-		}
-
 		return nil
 	}
 }
@@ -876,7 +217,7 @@ func testAccPreCheck(t *testing.T) {
 	}
 }
 
-func testAliyunClient() (*ClientWrapper, error) {
+func testAliyunClient() (*ecs.Client, error) {
 	access := &AlicloudAccessConfig{AlicloudRegion: "cn-beijing"}
 	err := access.Config()
 	if err != nil {
@@ -889,3 +230,102 @@ func testAliyunClient() (*ClientWrapper, error) {
 
 	return client, nil
 }
+
+const testBuilderAccBasic = `
+{	"builders": [{
+		"type": "test",
+		"region": "cn-beijing",
+		"instance_type": "ecs.n1.tiny",
+		"source_image":"ubuntu_16_0402_64_40G_base_20170222.vhd",
+		"ssh_username": "ubuntu",
+		"io_optimized":"true",
+		"ssh_username":"root",
+		"image_name": "packer-test_{{timestamp}}"
+	}]
+}`
+
+const testBuilderAccRegionCopy = `
+{
+	"builders": [{
+		"type": "test",
+		"region": "cn-beijing",
+		"instance_type": "ecs.n1.tiny",
+		"source_image":"ubuntu_16_0402_64_40G_base_20170222.vhd",
+		"io_optimized":"true",
+		"ssh_username":"root",
+		"image_name": "packer-test_{{timestamp}}",
+		"image_copy_regions": ["cn-hangzhou", "cn-shenzhen"]
+	}]
+}
+`
+
+const testBuilderAccForceDelete = `
+{
+	"builders": [{
+		"type": "test",
+		"region": "cn-beijing",
+		"instance_type": "ecs.n1.tiny",
+		"source_image":"ubuntu_16_0402_64_40G_base_20170222.vhd",
+		"io_optimized":"true",
+		"ssh_username":"root",
+		"image_force_delete": "%s",
+		"image_name": "packer-test_%s"
+	}]
+}
+`
+
+const testBuilderAccForceDeleteSnapshot = `
+{
+	"builders": [{
+		"type": "test",
+		"region": "cn-beijing",
+		"instance_type": "ecs.n1.tiny",
+		"source_image":"ubuntu_16_0402_64_40G_base_20170222.vhd",
+		"io_optimized":"true",
+		"ssh_username":"root",
+		"image_force_delete_snapshots": "%s",
+		"image_force_delete": "%s",
+		"image_name": "packer-test-%s"
+	}]
+}
+`
+
+// share with catsby
+const testBuilderAccSharing = `
+{
+	"builders": [{
+		"type": "test",
+		"region": "cn-beijing",
+		"instance_type": "ecs.n1.tiny",
+		"source_image":"ubuntu_16_0402_64_40G_base_20170222.vhd",
+		"io_optimized":"true",
+		"ssh_username":"root",
+		"image_name": "packer-test_{{timestamp}}",
+		"image_share_account":["1309208528360047"]
+	}]
+}
+`
+
+func buildForceDeregisterConfig(val, name string) string {
+	return fmt.Sprintf(testBuilderAccForceDelete, val, name)
+}
+
+func buildForceDeleteSnapshotConfig(val, name string) string {
+	return fmt.Sprintf(testBuilderAccForceDeleteSnapshot, val, val, name)
+}
+
+const testBuilderAccWindows = `
+{	"builders": [{
+		"type": "test",
+		"region": "cn-beijing",
+		"instance_type": "ecs.n1.tiny",
+		"source_image":"win2008_64_ent_r2_zh-cn_40G_alibase_20170301.vhd",
+		"io_optimized":"true",
+		"image_force_delete":"true",
+		"communicator": "winrm",
+		"winrm_port": 5985,
+		"winrm_username": "Administrator",
+		"winrm_password": "Test1234",
+		"image_name": "packer-test_{{timestamp}}"
+	}]
+}`

builder/alicloud/ecs/builder_test.go

@@ -1,11 +1,9 @@
 package ecs
 
 import (
-	"reflect"
 	"testing"
 
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	helperconfig "github.com/hashicorp/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer"
 )
 
 func testBuilderConfig() map[string]interface{} {
@@ -24,7 +22,7 @@ func testBuilderConfig() map[string]interface{} {
 func TestBuilder_ImplementsBuilder(t *testing.T) {
 	var raw interface{}
 	raw = &Builder{}
-	if _, ok := raw.(packersdk.Builder); !ok {
+	if _, ok := raw.(packer.Builder); !ok {
 		t.Fatalf("Builder should be a builder")
 	}
 }
@@ -35,7 +33,7 @@ func TestBuilder_Prepare_BadType(t *testing.T) {
 		"access_key": []string{},
 	}
 
-	_, warnings, err := b.Prepare(c)
+	warnings, err := b.Prepare(c)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -50,7 +48,7 @@ func TestBuilderPrepare_ECSImageName(t *testing.T) {
 
 	// Test good
 	config["image_name"] = "ecs.n1.tiny"
-	_, warnings, err := b.Prepare(config)
+	warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -61,7 +59,7 @@ func TestBuilderPrepare_ECSImageName(t *testing.T) {
 	// Test bad
 	config["ecs_image_name"] = "foo {{"
 	b = Builder{}
-	_, warnings, err = b.Prepare(config)
+	warnings, err = b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -72,7 +70,7 @@ func TestBuilderPrepare_ECSImageName(t *testing.T) {
 	// Test bad
 	delete(config, "image_name")
 	b = Builder{}
-	_, warnings, err = b.Prepare(config)
+	warnings, err = b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -87,7 +85,7 @@ func TestBuilderPrepare_InvalidKey(t *testing.T) {
 
 	// Add a random key
 	config["i_should_not_be_valid"] = true
-	_, warnings, err := b.Prepare(config)
+	warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -95,143 +93,3 @@ func TestBuilderPrepare_InvalidKey(t *testing.T) {
 		t.Fatal("should have error")
 	}
 }
-
-func TestBuilderPrepare_Devices(t *testing.T) {
-	var b Builder
-	config := testBuilderConfig()
-	config["system_disk_mapping"] = map[string]interface{}{
-		"disk_category":    "cloud",
-		"disk_description": "system disk",
-		"disk_name":        "system_disk",
-		"disk_size":        60,
-	}
-	config["image_disk_mappings"] = []map[string]interface{}{
-		{
-			"disk_category":             "cloud_efficiency",
-			"disk_name":                 "data_disk1",
-			"disk_size":                 100,
-			"disk_snapshot_id":          "s-1",
-			"disk_description":          "data disk1",
-			"disk_device":               "/dev/xvdb",
-			"disk_delete_with_instance": false,
-		},
-		{
-			"disk_name":   "data_disk2",
-			"disk_device": "/dev/xvdc",
-		},
-	}
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-	expected := AlicloudDiskDevice{
-		DiskCategory: "cloud",
-		Description:  "system disk",
-		DiskName:     "system_disk",
-		DiskSize:     60,
-		Encrypted:    helperconfig.TriUnset,
-	}
-	if !reflect.DeepEqual(b.config.ECSSystemDiskMapping, expected) {
-		t.Fatalf("system disk is not set properly, actual: %v; expected: %v", b.config.ECSSystemDiskMapping, expected)
-	}
-	if !reflect.DeepEqual(b.config.ECSImagesDiskMappings, []AlicloudDiskDevice{
-		{
-			DiskCategory:       "cloud_efficiency",
-			DiskName:           "data_disk1",
-			DiskSize:           100,
-			SnapshotId:         "s-1",
-			Description:        "data disk1",
-			Device:             "/dev/xvdb",
-			DeleteWithInstance: false,
-		},
-		{
-			DiskName: "data_disk2",
-			Device:   "/dev/xvdc",
-		},
-	}) {
-		t.Fatalf("data disks are not set properly, actual: %#v", b.config.ECSImagesDiskMappings)
-	}
-}
-
-func TestBuilderPrepare_IgnoreDataDisks(t *testing.T) {
-	var b Builder
-	config := testBuilderConfig()
-
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	if b.config.AlicloudImageIgnoreDataDisks != false {
-		t.Fatalf("image_ignore_data_disks is not set properly, expect: %t, actual: %t", false, b.config.AlicloudImageIgnoreDataDisks)
-	}
-
-	config["image_ignore_data_disks"] = "false"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	if b.config.AlicloudImageIgnoreDataDisks != false {
-		t.Fatalf("image_ignore_data_disks is not set properly, expect: %t, actual: %t", false, b.config.AlicloudImageIgnoreDataDisks)
-	}
-
-	config["image_ignore_data_disks"] = "true"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	if b.config.AlicloudImageIgnoreDataDisks != true {
-		t.Fatalf("image_ignore_data_disks is not set properly, expect: %t, actual: %t", true, b.config.AlicloudImageIgnoreDataDisks)
-	}
-}
-
-func TestBuilderPrepare_WaitSnapshotReadyTimeout(t *testing.T) {
-	var b Builder
-	config := testBuilderConfig()
-
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	if b.config.WaitSnapshotReadyTimeout != 0 {
-		t.Fatalf("wait_snapshot_ready_timeout is not set properly, expect: %d, actual: %d", 0, b.config.WaitSnapshotReadyTimeout)
-	}
-	if b.getSnapshotReadyTimeout() != ALICLOUD_DEFAULT_LONG_TIMEOUT {
-		t.Fatalf("default timeout is not set properly, expect: %d, actual: %d", ALICLOUD_DEFAULT_LONG_TIMEOUT, b.getSnapshotReadyTimeout())
-	}
-
-	config["wait_snapshot_ready_timeout"] = ALICLOUD_DEFAULT_TIMEOUT
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	if b.config.WaitSnapshotReadyTimeout != ALICLOUD_DEFAULT_TIMEOUT {
-		t.Fatalf("wait_snapshot_ready_timeout is not set properly, expect: %d, actual: %d", ALICLOUD_DEFAULT_TIMEOUT, b.config.WaitSnapshotReadyTimeout)
-	}
-
-	if b.getSnapshotReadyTimeout() != ALICLOUD_DEFAULT_TIMEOUT {
-		t.Fatalf("default timeout is not set properly, expect: %d, actual: %d", ALICLOUD_DEFAULT_TIMEOUT, b.getSnapshotReadyTimeout())
-	}
-}

builder/alicloud/ecs/client.go

@@ -1,310 +0,0 @@
-package ecs
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-)
-
-type ClientWrapper struct {
-	*ecs.Client
-}
-
-const (
-	InstanceStatusRunning  = "Running"
-	InstanceStatusStarting = "Starting"
-	InstanceStatusStopped  = "Stopped"
-	InstanceStatusStopping = "Stopping"
-)
-
-const (
-	ImageStatusWaiting      = "Waiting"
-	ImageStatusCreating     = "Creating"
-	ImageStatusCreateFailed = "CreateFailed"
-	ImageStatusAvailable    = "Available"
-)
-
-var ImageStatusQueried = fmt.Sprintf("%s,%s,%s,%s", ImageStatusWaiting, ImageStatusCreating, ImageStatusCreateFailed, ImageStatusAvailable)
-
-const (
-	SnapshotStatusAll          = "all"
-	SnapshotStatusProgressing  = "progressing"
-	SnapshotStatusAccomplished = "accomplished"
-	SnapshotStatusFailed       = "failed"
-)
-
-const (
-	DiskStatusInUse     = "In_use"
-	DiskStatusAvailable = "Available"
-	DiskStatusAttaching = "Attaching"
-	DiskStatusDetaching = "Detaching"
-	DiskStatusCreating  = "Creating"
-	DiskStatusReIniting = "ReIniting"
-)
-
-const (
-	VpcStatusPending   = "Pending"
-	VpcStatusAvailable = "Available"
-)
-
-const (
-	VSwitchStatusPending   = "Pending"
-	VSwitchStatusAvailable = "Available"
-)
-
-const (
-	EipStatusAssociating   = "Associating"
-	EipStatusUnassociating = "Unassociating"
-	EipStatusInUse         = "InUse"
-	EipStatusAvailable     = "Available"
-)
-
-const (
-	ImageOwnerSystem      = "system"
-	ImageOwnerSelf        = "self"
-	ImageOwnerOthers      = "others"
-	ImageOwnerMarketplace = "marketplace"
-)
-
-const (
-	IOOptimizedNone      = "none"
-	IOOptimizedOptimized = "optimized"
-)
-
-const (
-	InstanceNetworkClassic = "classic"
-	InstanceNetworkVpc     = "vpc"
-)
-
-const (
-	DiskTypeSystem = "system"
-	DiskTypeData   = "data"
-)
-
-const (
-	TagResourceImage    = "image"
-	TagResourceInstance = "instance"
-	TagResourceSnapshot = "snapshot"
-	TagResourceDisk     = "disk"
-)
-
-const (
-	IpProtocolAll  = "all"
-	IpProtocolTCP  = "tcp"
-	IpProtocolUDP  = "udp"
-	IpProtocolICMP = "icmp"
-	IpProtocolGRE  = "gre"
-)
-
-const (
-	NicTypeInternet = "internet"
-	NicTypeIntranet = "intranet"
-)
-
-const (
-	DefaultPortRange = "-1/-1"
-	DefaultCidrIp    = "0.0.0.0/0"
-	DefaultCidrBlock = "172.16.0.0/24"
-)
-
-const (
-	defaultRetryInterval = 5 * time.Second
-	defaultRetryTimes    = 12
-	shortRetryTimes      = 36
-	mediumRetryTimes     = 360
-	longRetryTimes       = 720
-)
-
-type WaitForExpectEvalResult struct {
-	evalPass  bool
-	stopRetry bool
-}
-
-var (
-	WaitForExpectSuccess = WaitForExpectEvalResult{
-		evalPass:  true,
-		stopRetry: true,
-	}
-
-	WaitForExpectToRetry = WaitForExpectEvalResult{
-		evalPass:  false,
-		stopRetry: false,
-	}
-
-	WaitForExpectFailToStop = WaitForExpectEvalResult{
-		evalPass:  false,
-		stopRetry: true,
-	}
-)
-
-type WaitForExpectArgs struct {
-	RequestFunc   func() (responses.AcsResponse, error)
-	EvalFunc      func(response responses.AcsResponse, err error) WaitForExpectEvalResult
-	RetryInterval time.Duration
-	RetryTimes    int
-	RetryTimeout  time.Duration
-}
-
-func (c *ClientWrapper) WaitForExpected(args *WaitForExpectArgs) (responses.AcsResponse, error) {
-	if args.RetryInterval <= 0 {
-		args.RetryInterval = defaultRetryInterval
-	}
-	if args.RetryTimes <= 0 {
-		args.RetryTimes = defaultRetryTimes
-	}
-
-	var timeoutPoint time.Time
-	if args.RetryTimeout > 0 {
-		timeoutPoint = time.Now().Add(args.RetryTimeout)
-	}
-
-	var lastResponse responses.AcsResponse
-	var lastError error
-
-	for i := 0; ; i++ {
-		if args.RetryTimeout > 0 && time.Now().After(timeoutPoint) {
-			break
-		}
-
-		if args.RetryTimeout <= 0 && i >= args.RetryTimes {
-			break
-		}
-
-		response, err := args.RequestFunc()
-		lastResponse = response
-		lastError = err
-
-		evalResult := args.EvalFunc(response, err)
-		if evalResult.evalPass {
-			return response, nil
-		}
-		if evalResult.stopRetry {
-			return response, err
-		}
-
-		time.Sleep(args.RetryInterval)
-	}
-
-	if lastError == nil {
-		lastError = fmt.Errorf("<no error>")
-	}
-
-	if args.RetryTimeout > 0 {
-		return lastResponse, fmt.Errorf("evaluate failed after %d seconds timeout with %d seconds retry interval: %s", int(args.RetryTimeout.Seconds()), int(args.RetryInterval.Seconds()), lastError)
-	}
-
-	return lastResponse, fmt.Errorf("evaluate failed after %d times retry with %d seconds retry interval: %s", args.RetryTimes, int(args.RetryInterval.Seconds()), lastError)
-}
-
-func (c *ClientWrapper) WaitForInstanceStatus(regionId string, instanceId string, expectedStatus string) (responses.AcsResponse, error) {
-	return c.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			request := ecs.CreateDescribeInstancesRequest()
-			request.RegionId = regionId
-			request.InstanceIds = fmt.Sprintf("[\"%s\"]", instanceId)
-			return c.DescribeInstances(request)
-		},
-		EvalFunc: func(response responses.AcsResponse, err error) WaitForExpectEvalResult {
-			if err != nil {
-				return WaitForExpectToRetry
-			}
-
-			instancesResponse := response.(*ecs.DescribeInstancesResponse)
-			instances := instancesResponse.Instances.Instance
-			for _, instance := range instances {
-				if instance.Status == expectedStatus {
-					return WaitForExpectSuccess
-				}
-			}
-			return WaitForExpectToRetry
-		},
-		RetryTimes: mediumRetryTimes,
-	})
-}
-
-func (c *ClientWrapper) WaitForImageStatus(regionId string, imageId string, expectedStatus string, timeout time.Duration) (responses.AcsResponse, error) {
-	return c.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			request := ecs.CreateDescribeImagesRequest()
-			request.RegionId = regionId
-			request.ImageId = imageId
-			request.Status = ImageStatusQueried
-			return c.DescribeImages(request)
-		},
-		EvalFunc: func(response responses.AcsResponse, err error) WaitForExpectEvalResult {
-			if err != nil {
-				return WaitForExpectToRetry
-			}
-
-			imagesResponse := response.(*ecs.DescribeImagesResponse)
-			images := imagesResponse.Images.Image
-			for _, image := range images {
-				if image.Status == expectedStatus {
-					return WaitForExpectSuccess
-				}
-			}
-
-			return WaitForExpectToRetry
-		},
-		RetryTimeout: timeout,
-	})
-}
-
-func (c *ClientWrapper) WaitForSnapshotStatus(regionId string, snapshotId string, expectedStatus string, timeout time.Duration) (responses.AcsResponse, error) {
-	return c.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			request := ecs.CreateDescribeSnapshotsRequest()
-			request.RegionId = regionId
-			request.SnapshotIds = fmt.Sprintf("[\"%s\"]", snapshotId)
-			return c.DescribeSnapshots(request)
-		},
-		EvalFunc: func(response responses.AcsResponse, err error) WaitForExpectEvalResult {
-			if err != nil {
-				return WaitForExpectToRetry
-			}
-
-			snapshotsResponse := response.(*ecs.DescribeSnapshotsResponse)
-			snapshots := snapshotsResponse.Snapshots.Snapshot
-			for _, snapshot := range snapshots {
-				if snapshot.Status == expectedStatus {
-					return WaitForExpectSuccess
-				}
-			}
-			return WaitForExpectToRetry
-		},
-		RetryTimeout: timeout,
-	})
-}
-
-type EvalErrorType bool
-
-const (
-	EvalRetryErrorType    = EvalErrorType(true)
-	EvalNotRetryErrorType = EvalErrorType(false)
-)
-
-func (c *ClientWrapper) EvalCouldRetryResponse(evalErrors []string, evalErrorType EvalErrorType) func(response responses.AcsResponse, err error) WaitForExpectEvalResult {
-	return func(response responses.AcsResponse, err error) WaitForExpectEvalResult {
-		if err == nil {
-			return WaitForExpectSuccess
-		}
-
-		e, ok := err.(errors.Error)
-		if !ok {
-			return WaitForExpectToRetry
-		}
-
-		if evalErrorType == EvalRetryErrorType && !ContainsInArray(evalErrors, e.ErrorCode()) {
-			return WaitForExpectFailToStop
-		}
-
-		if evalErrorType == EvalNotRetryErrorType && ContainsInArray(evalErrors, e.ErrorCode()) {
-			return WaitForExpectFailToStop
-		}
-
-		return WaitForExpectToRetry
-	}
-}

builder/alicloud/ecs/client_test.go

@@ -1,80 +0,0 @@
-package ecs
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
-)
-
-func TestWaitForExpectedExceedRetryTimes(t *testing.T) {
-	c := ClientWrapper{}
-
-	iter := 0
-	waitDone := make(chan bool, 1)
-
-	go func() {
-		_, _ = c.WaitForExpected(&WaitForExpectArgs{
-			RequestFunc: func() (responses.AcsResponse, error) {
-				iter++
-				return nil, fmt.Errorf("test: let iteration %d failed", iter)
-			},
-			EvalFunc: func(response responses.AcsResponse, err error) WaitForExpectEvalResult {
-				if err != nil {
-					fmt.Printf("need retry: %s\n", err)
-					return WaitForExpectToRetry
-				}
-
-				return WaitForExpectSuccess
-			},
-		})
-
-		waitDone <- true
-	}()
-
-	select {
-	case <-waitDone:
-		if iter != defaultRetryTimes {
-			t.Fatalf("WaitForExpected should terminate at the %d iterations", defaultRetryTimes)
-		}
-	}
-}
-
-func TestWaitForExpectedExceedRetryTimeout(t *testing.T) {
-	c := ClientWrapper{}
-
-	expectTimeout := 10 * time.Second
-	iter := 0
-	waitDone := make(chan bool, 1)
-
-	go func() {
-		_, _ = c.WaitForExpected(&WaitForExpectArgs{
-			RequestFunc: func() (responses.AcsResponse, error) {
-				iter++
-				return nil, fmt.Errorf("test: let iteration %d failed", iter)
-			},
-			EvalFunc: func(response responses.AcsResponse, err error) WaitForExpectEvalResult {
-				if err != nil {
-					fmt.Printf("need retry: %s\n", err)
-					return WaitForExpectToRetry
-				}
-
-				return WaitForExpectSuccess
-			},
-			RetryTimeout: expectTimeout,
-		})
-
-		waitDone <- true
-	}()
-
-	timeTolerance := 1 * time.Second
-	select {
-	case <-waitDone:
-		if iter > int(expectTimeout/defaultRetryInterval) {
-			t.Fatalf("WaitForExpected should terminate before the %d iterations", int(expectTimeout/defaultRetryInterval))
-		}
-	case <-time.After(expectTimeout + timeTolerance):
-		t.Fatalf("WaitForExpected should terminate within %f seconds", (expectTimeout + timeTolerance).Seconds())
-	}
-}

builder/alicloud/ecs/image_config.go

@@ -1,167 +1,46 @@
-//go:generate struct-markdown
-
 package ecs
 
 import (
 	"fmt"
+
 	"regexp"
 	"strings"
 
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
-// The "AlicloudDiskDevice" object us used for the `ECSSystemDiskMapping` and
-// `ECSImagesDiskMappings` options, and contains the following fields:
 type AlicloudDiskDevice struct {
-	// The value of disk name is blank by default. [2,
-	// 128] English or Chinese characters, must begin with an
-	// uppercase/lowercase letter or Chinese character. Can contain numbers,
-	// ., _ and -. The disk name will appear on the console. It cannot
-	// begin with `http://` or `https://`.
-	DiskName string `mapstructure:"disk_name" required:"false"`
-	// Category of the system disk. Optional values are:
-	//     -   cloud - general cloud disk
-	//     -   cloud_efficiency - efficiency cloud disk
-	//     -   cloud_ssd - cloud SSD
-	DiskCategory string `mapstructure:"disk_category" required:"false"`
-	// Size of the system disk, measured in GiB. Value
-	// range: [20, 500]. The specified value must be equal to or greater
-	// than max{20, ImageSize}. Default value: max{40, ImageSize}.
-	DiskSize int `mapstructure:"disk_size" required:"false"`
-	// Snapshots are used to create the data
-	// disk After this parameter is specified, Size is ignored. The actual
-	// size of the created disk is the size of the specified snapshot.
-	// This field is only used in the ECSImagesDiskMappings option, not
-	// the ECSSystemDiskMapping option.
-	SnapshotId string `mapstructure:"disk_snapshot_id" required:"false"`
-	// The value of disk description is blank by
-	// default. [2, 256] characters. The disk description will appear on the
-	// console. It cannot begin with `http://` or `https://`.
-	Description string `mapstructure:"disk_description" required:"false"`
-	// Whether or not the disk is
-	// released along with the instance:
-	DeleteWithInstance bool `mapstructure:"disk_delete_with_instance" required:"false"`
-	// Device information of the related instance:
-	// such as /dev/xvdb It is null unless the Status is In_use.
-	Device string `mapstructure:"disk_device" required:"false"`
-	// Whether or not to encrypt the data disk.
-	// If this option is set to true, the data disk will be encryped and
-	// corresponding snapshot in the target image will also be encrypted. By
-	// default, if this is an extra data disk, Packer will not encrypt the
-	// data disk. Otherwise, Packer will keep the encryption setting to what
-	// it was in the source image. Please refer to Introduction of ECS disk
-	// encryption for more details.
-	Encrypted config.Trilean `mapstructure:"disk_encrypted" required:"false"`
+	DiskName           string `mapstructure:"disk_name"`
+	DiskCategory       string `mapstructure:"disk_category"`
+	DiskSize           int    `mapstructure:"disk_size"`
+	SnapshotId         string `mapstructure:"disk_snapshot_id"`
+	Description        string `mapstructure:"disk_description"`
+	DeleteWithInstance bool   `mapstructure:"disk_delete_with_instance"`
+	Device             string `mapstructure:"disk_device"`
 }
 
-// The "AlicloudDiskDevices" object is used to define disk mappings for your
-// instance.
 type AlicloudDiskDevices struct {
-	// Image disk mapping for the system disk.
-	// See the [disk device configuration](#disk-devices-configuration) section
-	// for more information on options.
-	// Usage example:
-	//
-	// ```json
-	// "builders": [{
-	//   "type":"alicloud-ecs",
-	//   "system_disk_mapping": {
-	//     "disk_size": 50,
-	//     "disk_name": "mydisk"
-	//   },
-	//   ...
-	// }
-	// ```
-	ECSSystemDiskMapping AlicloudDiskDevice `mapstructure:"system_disk_mapping" required:"false"`
-	// Add one or more data disks to the image.
-	// See the [disk device configuration](#disk-devices-configuration) section
-	// for more information on options.
-	// Usage example:
-	//
-	// ```json
-	//  "builders": [{
-	//    "type":"alicloud-ecs",
-	//    "image_disk_mappings": [
-	//      {
-	//        "disk_snapshot_id": "someid",
-	//        "disk_device": "dev/xvdb"
-	//      }
-	//    ],
-	//    ...
-	//  }
-	//  ```
-	ECSImagesDiskMappings []AlicloudDiskDevice `mapstructure:"image_disk_mappings" required:"false"`
+	ECSImagesDiskMappings []AlicloudDiskDevice `mapstructure:"image_disk_mappings"`
 }
 
 type AlicloudImageConfig struct {
-	// The name of the user-defined image, [2, 128] English or Chinese
-	// characters. It must begin with an uppercase/lowercase letter or a
-	// Chinese character, and may contain numbers, `_` or `-`. It cannot begin
-	// with `http://` or `https://`.
-	AlicloudImageName string `mapstructure:"image_name" required:"true"`
-	// The version number of the image, with a length limit of 1 to 40 English
-	// characters.
-	AlicloudImageVersion string `mapstructure:"image_version" required:"false"`
-	// The description of the image, with a length limit of 0 to 256
-	// characters. Leaving it blank means null, which is the default value. It
-	// cannot begin with `http://` or `https://`.
-	AlicloudImageDescription string `mapstructure:"image_description" required:"false"`
-	// The IDs of to-be-added Aliyun accounts to which the image is shared. The
-	// number of accounts is 1 to 10. If number of accounts is greater than 10,
-	// this parameter is ignored.
-	AlicloudImageShareAccounts   []string `mapstructure:"image_share_account" required:"false"`
-	AlicloudImageUNShareAccounts []string `mapstructure:"image_unshare_account"`
-	// Copy to the destination regionIds.
-	AlicloudImageDestinationRegions []string `mapstructure:"image_copy_regions" required:"false"`
-	// The name of the destination image, [2, 128] English or Chinese
-	// characters. It must begin with an uppercase/lowercase letter or a
-	// Chinese character, and may contain numbers, _ or -. It cannot begin with
-	// `http://` or `https://`.
-	AlicloudImageDestinationNames []string `mapstructure:"image_copy_names" required:"false"`
-	// Whether or not to encrypt the target images,            including those
-	// copied if image_copy_regions is specified. If this option is set to
-	// true, a temporary image will be created from the provisioned instance in
-	// the main region and an encrypted copy will be generated in the same
-	// region. By default, Packer will keep the encryption setting to what it
-	// was in the source image.
-	ImageEncrypted config.Trilean `mapstructure:"image_encrypted" required:"false"`
-	// If this value is true, when the target image names including those
-	// copied are duplicated with existing images, it will delete the existing
-	// images and then create the target images, otherwise, the creation will
-	// fail. The default value is false. Check `image_name` and
-	// `image_copy_names` options for names of target images. If
-	// [-force](/docs/commands/build#force) option is provided in `build`
-	// command, this option can be omitted and taken as true.
-	AlicloudImageForceDelete bool `mapstructure:"image_force_delete" required:"false"`
-	// If this value is true, when delete the duplicated existing images, the
-	// source snapshots of those images will be delete either. If
-	// [-force](/docs/commands/build#force) option is provided in `build`
-	// command, this option can be omitted and taken as true.
-	AlicloudImageForceDeleteSnapshots bool `mapstructure:"image_force_delete_snapshots" required:"false"`
-	AlicloudImageForceDeleteInstances bool `mapstructure:"image_force_delete_instances"`
-	// If this value is true, the image created will not include any snapshot
-	// of data disks. This option would be useful for any circumstance that
-	// default data disks with instance types are not concerned. The default
-	// value is false.
-	AlicloudImageIgnoreDataDisks bool `mapstructure:"image_ignore_data_disks" required:"false"`
-	// The region validation can be skipped if this value is true, the default
-	// value is false.
-	AlicloudImageSkipRegionValidation bool `mapstructure:"skip_region_validation" required:"false"`
-	// Key/value pair tags applied to the destination image and relevant
-	// snapshots.
-	AlicloudImageTags map[string]string `mapstructure:"tags" required:"false"`
-	// Same as [`tags`](#tags) but defined as a singular repeatable block
-	// containing a `key` and a `value` field. In HCL2 mode the
-	// [`dynamic_block`](/docs/templates/hcl_templates/expressions#dynamic-blocks)
-	// will allow you to create those programatically.
-	AlicloudImageTag    config.KeyValues `mapstructure:"tag" required:"false"`
-	AlicloudDiskDevices `mapstructure:",squash"`
+	AlicloudImageName                 string   `mapstructure:"image_name"`
+	AlicloudImageVersion              string   `mapstructure:"image_version"`
+	AlicloudImageDescription          string   `mapstructure:"image_description"`
+	AlicloudImageShareAccounts        []string `mapstructure:"image_share_account"`
+	AlicloudImageUNShareAccounts      []string `mapstructure:"image_unshare_account"`
+	AlicloudImageDestinationRegions   []string `mapstructure:"image_copy_regions"`
+	AlicloudImageDestinationNames     []string `mapstructure:"image_copy_names"`
+	AlicloudImageForceDelete          bool     `mapstructure:"image_force_delete"`
+	AlicloudImageForceDeleteSnapshots bool     `mapstructure:"image_force_delete_snapshots"`
+	AlicloudImageForceDeleteInstances bool     `mapstructure:"image_force_delete_instances"`
+	AlicloudImageSkipRegionValidation bool     `mapstructure:"skip_region_validation"`
+	AlicloudDiskDevices               `mapstructure:",squash"`
 }
 
 func (c *AlicloudImageConfig) Prepare(ctx *interpolate.Context) []error {
 	var errs []error
-	errs = append(errs, c.AlicloudImageTag.CopyOn(&c.AlicloudImageTags)...)
 	if c.AlicloudImageName == "" {
 		errs = append(errs, fmt.Errorf("image_name must be specified"))
 	} else if len(c.AlicloudImageName) < 2 || len(c.AlicloudImageName) > 128 {
@@ -170,7 +49,7 @@ func (c *AlicloudImageConfig) Prepare(ctx *interpolate.Context) []error {
 		strings.HasPrefix(c.AlicloudImageName, "https://") {
 		errs = append(errs, fmt.Errorf("image_name can't start with 'http://' or 'https://'"))
 	}
-	reg := regexp.MustCompile(`\s+`)
+	reg := regexp.MustCompile("\\s+")
 	if reg.FindString(c.AlicloudImageName) != "" {
 		errs = append(errs, fmt.Errorf("image_name can't include spaces"))
 	}
@@ -187,11 +66,35 @@ func (c *AlicloudImageConfig) Prepare(ctx *interpolate.Context) []error {
 
 			// Mark that we saw the region
 			regionSet[region] = struct{}{}
+
+			if !c.AlicloudImageSkipRegionValidation {
+				// Verify the region is real
+				if valid := validateRegion(region); valid != nil {
+					errs = append(errs, fmt.Errorf("Unknown region: %s", region))
+					continue
+				}
+			}
+
 			regions = append(regions, region)
 		}
 
 		c.AlicloudImageDestinationRegions = regions
 	}
 
-	return errs
+	if len(errs) > 0 {
+		return errs
+	}
+
+	return nil
+}
+
+func validateRegion(region string) error {
+
+	for _, valid := range common.ValidRegions {
+		if region == string(valid) {
+			return nil
+		}
+	}
+
+	return fmt.Errorf("Not a valid alicloud region: %s", region)
 }

builder/alicloud/ecs/image_config_test.go

@@ -2,6 +2,8 @@ package ecs
 
 import (
 	"testing"
+
+	"github.com/denverdino/aliyungo/common"
 )
 
 func testAlicloudImageConfig() *AlicloudImageConfig {
@@ -29,33 +31,34 @@ func TestAMIConfigPrepare_regions(t *testing.T) {
 		t.Fatalf("shouldn't have err: %s", err)
 	}
 
+	c.AlicloudImageDestinationRegions = regionsToString()
+	if err := c.Prepare(nil); err != nil {
+		t.Fatalf("shouldn't have err: %s", err)
+	}
+
+	c.AlicloudImageDestinationRegions = []string{"foo"}
+	if err := c.Prepare(nil); err == nil {
+		t.Fatal("should have error")
+	}
+
 	c.AlicloudImageDestinationRegions = []string{"cn-beijing", "cn-hangzhou", "eu-central-1"}
 	if err := c.Prepare(nil); err != nil {
 		t.Fatalf("bad: %s", err)
 	}
 
-	c.AlicloudImageDestinationRegions = nil
+	c.AlicloudImageDestinationRegions = []string{"unknow"}
 	c.AlicloudImageSkipRegionValidation = true
 	if err := c.Prepare(nil); err != nil {
 		t.Fatal("shouldn't have error")
 	}
 	c.AlicloudImageSkipRegionValidation = false
+
 }
 
-func TestECSImageConfigPrepare_imageTags(t *testing.T) {
-	c := testAlicloudImageConfig()
-	c.AlicloudImageTags = map[string]string{
-		"TagKey1": "TagValue1",
-		"TagKey2": "TagValue2",
-	}
-	if err := c.Prepare(nil); len(err) != 0 {
-		t.Fatalf("err: %s", err)
-	}
-	if len(c.AlicloudImageTags) != 2 || c.AlicloudImageTags["TagKey1"] != "TagValue1" ||
-		c.AlicloudImageTags["TagKey2"] != "TagValue2" {
-		t.Fatalf("invalid value, expected: %s, actual: %s", map[string]string{
-			"TagKey1": "TagValue1",
-			"TagKey2": "TagValue2",
-		}, c.AlicloudImageTags)
+func regionsToString() []string {
+	var regions []string
+	for _, region := range common.ValidRegions {
+		regions = append(regions, string(region))
 	}
+	return regions
 }

builder/alicloud/ecs/packer_helper.go

@@ -2,51 +2,21 @@ package ecs
 
 import (
 	"fmt"
-	"strconv"
 
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
-func cleanUpMessage(state multistep.StateBag, module string) {
+func message(state multistep.StateBag, module string) {
 	_, cancelled := state.GetOk(multistep.StateCancelled)
 	_, halted := state.GetOk(multistep.StateHalted)
 
-	ui := state.Get("ui").(packersdk.Ui)
+	ui := state.Get("ui").(packer.Ui)
 
 	if cancelled || halted {
 		ui.Say(fmt.Sprintf("Deleting %s because of cancellation or error...", module))
 	} else {
 		ui.Say(fmt.Sprintf("Cleaning up '%s'", module))
 	}
-}
-
-func halt(state multistep.StateBag, err error, prefix string) multistep.StepAction {
-	ui := state.Get("ui").(packersdk.Ui)
-
-	if prefix != "" {
-		err = fmt.Errorf("%s: %s", prefix, err)
-	}
-
-	state.Put("error", err)
-	ui.Error(err.Error())
-	return multistep.ActionHalt
-}
-
-func convertNumber(value int) string {
-	if value <= 0 {
-		return ""
-	}
-
-	return strconv.Itoa(value)
-}
-
-func ContainsInArray(arr []string, value string) bool {
-	for _, item := range arr {
-		if item == value {
-			return true
-		}
-	}
-
-	return false
+
 }

builder/alicloud/ecs/run_config.go

@@ -1,5 +1,3 @@
-//go:generate struct-markdown
-
 package ecs
 
 import (
@@ -8,124 +6,44 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	"github.com/hashicorp/packer-plugin-sdk/uuid"
+	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type RunConfig struct {
-	AssociatePublicIpAddress bool `mapstructure:"associate_public_ip_address"`
-	// ID of the zone to which the disk belongs.
-	ZoneId string `mapstructure:"zone_id" required:"false"`
-	// Whether an ECS instance is I/O optimized or not. If this option is not
-	// provided, the value will be determined by product API according to what
-	// `instance_type` is used.
-	IOOptimized config.Trilean `mapstructure:"io_optimized" required:"false"`
-	// Type of the instance. For values, see [Instance Type
-	// Table](https://www.alibabacloud.com/help/doc-detail/25378.htm?spm=a3c0i.o25499en.a3.9.14a36ac8iYqKRA).
-	// You can also obtain the latest instance type table by invoking the
-	// [Querying Instance Type
-	// Table](https://intl.aliyun.com/help/doc-detail/25620.htm?spm=a3c0i.o25499en.a3.6.Dr1bik)
-	// interface.
-	InstanceType string `mapstructure:"instance_type" required:"true"`
-	Description  string `mapstructure:"description"`
-	// This is the base image id which you want to
-	// create your customized images.
-	AlicloudSourceImage string `mapstructure:"source_image" required:"true"`
-	// Whether to force shutdown upon device
-	// restart. The default value is `false`.
-	//
-	// If it is set to `false`, the system is shut down normally; if it is set to
-	// `true`, the system is forced to shut down.
-	ForceStopInstance bool `mapstructure:"force_stop_instance" required:"false"`
-	// If this option is set to true, Packer
-	// will not stop the instance for you, and you need to make sure the instance
-	// will be stopped in the final provisioner command. Otherwise, Packer will
-	// timeout while waiting the instance to be stopped. This option is provided
-	// for some specific scenarios that you want to stop the instance by yourself.
-	// E.g., Sysprep a windows which may shutdown the instance within its command.
-	// The default value is false.
-	DisableStopInstance bool `mapstructure:"disable_stop_instance" required:"false"`
-	// ID of the security group to which a newly
-	// created instance belongs. Mutual access is allowed between instances in one
-	// security group. If not specified, the newly created instance will be added
-	// to the default security group. If the default group doesn’t exist, or the
-	// number of instances in it has reached the maximum limit, a new security
-	// group will be created automatically.
-	SecurityGroupId string `mapstructure:"security_group_id" required:"false"`
-	// The security group name. The default value
-	// is blank. [2, 128] English or Chinese characters, must begin with an
-	// uppercase/lowercase letter or Chinese character. Can contain numbers, .,
-	// _ or -. It cannot begin with `http://` or `https://`.
-	SecurityGroupName string `mapstructure:"security_group_name" required:"false"`
-	// User data to apply when launching the instance. Note
-	// that you need to be careful about escaping characters due to the templates
-	// being JSON. It is often more convenient to use user_data_file, instead.
-	// Packer will not automatically wait for a user script to finish before
-	// shutting down the instance this must be handled in a provisioner.
-	UserData string `mapstructure:"user_data" required:"false"`
-	// Path to a file that will be used for the user
-	// data when launching the instance.
-	UserDataFile string `mapstructure:"user_data_file" required:"false"`
-	// VPC ID allocated by the system.
-	VpcId string `mapstructure:"vpc_id" required:"false"`
-	// The VPC name. The default value is blank. [2, 128]
-	// English or Chinese characters, must begin with an uppercase/lowercase
-	// letter or Chinese character. Can contain numbers, _ and -. The disk
-	// description will appear on the console. Cannot begin with `http://` or
-	// `https://`.
-	VpcName string `mapstructure:"vpc_name" required:"false"`
-	// Value options: 192.168.0.0/16 and
-	// 172.16.0.0/16. When not specified, the default value is 172.16.0.0/16.
-	CidrBlock string `mapstructure:"vpc_cidr_block" required:"false"`
-	// The ID of the VSwitch to be used.
-	VSwitchId string `mapstructure:"vswitch_id" required:"false"`
-	// The ID of the VSwitch to be used.
-	VSwitchName string `mapstructure:"vswitch_name" required:"false"`
-	// Display name of the instance, which is a string of 2 to 128 Chinese or
-	// English characters. It must begin with an uppercase/lowercase letter or
-	// a Chinese character and can contain numerals, `.`, `_`, or `-`. The
-	// instance name is displayed on the Alibaba Cloud console. If this
-	// parameter is not specified, the default value is InstanceId of the
-	// instance. It cannot begin with `http://` or `https://`.
-	InstanceName string `mapstructure:"instance_name" required:"false"`
-	// Internet charge type, which can be
-	// `PayByTraffic` or `PayByBandwidth`. Optional values:
-	// -   `PayByBandwidth`
-	// -   `PayByTraffic`
-	//
-	// If this parameter is not specified, the default value is `PayByBandwidth`.
-	// For the regions out of China, currently only support `PayByTraffic`, you
-	// must set it manfully.
-	InternetChargeType string `mapstructure:"internet_charge_type" required:"false"`
-	// Maximum outgoing bandwidth to the
-	// public network, measured in Mbps (Mega bits per second).
-	//
-	// Value range:
-	// -   `PayByBandwidth`: \[0, 100\]. If this parameter is not specified, API
-	//     automatically sets it to 0 Mbps.
-	// -   `PayByTraffic`: \[1, 100\]. If this parameter is not specified, an
-	//     error is returned.
-	InternetMaxBandwidthOut int `mapstructure:"internet_max_bandwidth_out" required:"false"`
-	// Timeout of creating snapshot(s).
-	// The default timeout is 3600 seconds if this option is not set or is set
-	// to 0. For those disks containing lots of data, it may require a higher
-	// timeout value.
-	WaitSnapshotReadyTimeout int `mapstructure:"wait_snapshot_ready_timeout" required:"false"`
+	AssociatePublicIpAddress bool   `mapstructure:"associate_public_ip_address"`
+	ZoneId                   string `mapstructure:"zone_id"`
+	IOOptimized              bool   `mapstructure:"io_optimized"`
+	InstanceType             string `mapstructure:"instance_type"`
+	Description              string `mapstructure:"description"`
+	AlicloudSourceImage      string `mapstructure:"source_image"`
+	ForceStopInstance        bool   `mapstructure:"force_stop_instance"`
+	SecurityGroupId          string `mapstructure:"security_group_id"`
+	SecurityGroupName        string `mapstructure:"security_group_name"`
+	UserData                 string `mapstructure:"user_data"`
+	UserDataFile             string `mapstructure:"user_data_file"`
+	VpcId                    string `mapstructure:"vpc_id"`
+	VpcName                  string `mapstructure:"vpc_name"`
+	CidrBlock                string `mapstructure:"vpc_cidr_block"`
+	VSwitchId                string `mapstructure:"vswitch_id"`
+	VSwitchName              string `mapstructure:"vswitch_id"`
+	InstanceName             string `mapstructure:"instance_name"`
+	InternetChargeType       string `mapstructure:"internet_charge_type"`
+	InternetMaxBandwidthOut  int    `mapstructure:"internet_max_bandwidth_out"`
+	TemporaryKeyPairName     string `mapstructure:"temporary_key_pair_name"`
+
 	// Communicator settings
-	Comm communicator.Config `mapstructure:",squash"`
-	// If this value is true, packer will connect to
-	// the ECS created through private ip instead of allocating a public ip or an
-	// EIP. The default value is false.
-	SSHPrivateIp bool `mapstructure:"ssh_private_ip" required:"false"`
+	Comm           communicator.Config `mapstructure:",squash"`
+	SSHKeyPairName string              `mapstructure:"ssh_keypair_name"`
+	SSHPrivateIp   bool                `mapstructure:"ssh_private_ip"`
 }
 
 func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
-	if c.Comm.SSHKeyPairName == "" && c.Comm.SSHTemporaryKeyPairName == "" &&
-		c.Comm.SSHPrivateKeyFile == "" && c.Comm.SSHPassword == "" && c.Comm.WinRMPassword == "" {
+	if c.SSHKeyPairName == "" && c.TemporaryKeyPairName == "" &&
+		c.Comm.SSHPrivateKey == "" && c.Comm.SSHPassword == "" && c.Comm.WinRMPassword == "" {
 
-		c.Comm.SSHTemporaryKeyPairName = fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID())
+		c.TemporaryKeyPairName = fmt.Sprintf("packer_%s", uuid.TimeOrderedUUID())
 	}
 
 	// Validation

builder/alicloud/ecs/run_config_test.go

@@ -2,10 +2,9 @@ package ecs
 
 import (
 	"io/ioutil"
-	"os"
 	"testing"
 
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer/helper/communicator"
 )
 
 func testConfig() *RunConfig {
@@ -13,9 +12,7 @@ func testConfig() *RunConfig {
 		AlicloudSourceImage: "alicloud_images",
 		InstanceType:        "ecs.n1.tiny",
 		Comm: communicator.Config{
-			SSH: communicator.SSH{
-				SSHUsername: "alicloud",
-			},
+			SSHUsername: "alicloud",
 		},
 	}
 }
@@ -71,7 +68,6 @@ func TestRunConfigPrepare_UserData(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
-	defer os.Remove(tf.Name())
 	defer tf.Close()
 
 	c.UserData = "foo"
@@ -96,7 +92,6 @@ func TestRunConfigPrepare_UserDataFile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
-	defer os.Remove(tf.Name())
 	defer tf.Close()
 
 	c.UserDataFile = tf.Name()
@@ -107,72 +102,21 @@ func TestRunConfigPrepare_UserDataFile(t *testing.T) {
 
 func TestRunConfigPrepare_TemporaryKeyPairName(t *testing.T) {
 	c := testConfig()
-	c.Comm.SSHTemporaryKeyPairName = ""
+	c.TemporaryKeyPairName = ""
 	if err := c.Prepare(nil); len(err) != 0 {
 		t.Fatalf("err: %s", err)
 	}
 
-	if c.Comm.SSHTemporaryKeyPairName == "" {
+	if c.TemporaryKeyPairName == "" {
 		t.Fatal("keypair name is empty")
 	}
 
-	c.Comm.SSHTemporaryKeyPairName = "ssh-key-123"
+	c.TemporaryKeyPairName = "ssh-key-123"
 	if err := c.Prepare(nil); len(err) != 0 {
 		t.Fatalf("err: %s", err)
 	}
 
-	if c.Comm.SSHTemporaryKeyPairName != "ssh-key-123" {
+	if c.TemporaryKeyPairName != "ssh-key-123" {
 		t.Fatal("keypair name does not match")
 	}
 }
-
-func TestRunConfigPrepare_SSHPrivateIp(t *testing.T) {
-	c := testConfig()
-	if err := c.Prepare(nil); len(err) != 0 {
-		t.Fatalf("err: %s", err)
-	}
-	if c.SSHPrivateIp != false {
-		t.Fatalf("invalid value, expected: %t, actul: %t", false, c.SSHPrivateIp)
-	}
-	c.SSHPrivateIp = true
-	if err := c.Prepare(nil); len(err) != 0 {
-		t.Fatalf("err: %s", err)
-	}
-	if c.SSHPrivateIp != true {
-		t.Fatalf("invalid value, expected: %t, actul: %t", true, c.SSHPrivateIp)
-	}
-	c.SSHPrivateIp = false
-	if err := c.Prepare(nil); len(err) != 0 {
-		t.Fatalf("err: %s", err)
-	}
-	if c.SSHPrivateIp != false {
-		t.Fatalf("invalid value, expected: %t, actul: %t", false, c.SSHPrivateIp)
-	}
-}
-
-func TestRunConfigPrepare_DisableStopInstance(t *testing.T) {
-	c := testConfig()
-
-	if err := c.Prepare(nil); len(err) != 0 {
-		t.Fatalf("err: %s", err)
-	}
-	if c.DisableStopInstance != false {
-		t.Fatalf("invalid value, expected: %t, actul: %t", false, c.DisableStopInstance)
-	}
-
-	c.DisableStopInstance = true
-	if err := c.Prepare(nil); len(err) != 0 {
-		t.Fatalf("err: %s", err)
-	}
-	if c.DisableStopInstance != true {
-		t.Fatalf("invalid value, expected: %t, actul: %t", true, c.DisableStopInstance)
-	}
-
-	c.DisableStopInstance = false
-	if err := c.Prepare(nil); len(err) != 0 {
-		t.Fatalf("err: %s", err)
-	}
-	if c.DisableStopInstance != false {
-		t.Fatalf("invalid value, expected: %t, actul: %t", false, c.DisableStopInstance)
-	}
-}

builder/alicloud/ecs/ssh_helper.go

@@ -1,9 +1,15 @@
 package ecs
 
 import (
+	"fmt"
+	"net"
+	"os"
 	"time"
 
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	packerssh "github.com/hashicorp/packer/communicator/ssh"
+	"github.com/hashicorp/packer/helper/multistep"
+	"golang.org/x/crypto/ssh"
+	"golang.org/x/crypto/ssh/agent"
 )
 
 var (
@@ -21,3 +27,57 @@ func SSHHost(e alicloudSSHHelper, private bool) func(multistep.StateBag) (string
 		return ipAddress, nil
 	}
 }
+
+// SSHConfig returns a function that can be used for the SSH communicator
+// config for connecting to the instance created over SSH using the private key
+// or password.
+func SSHConfig(useAgent bool, username, password string) func(multistep.StateBag) (*ssh.ClientConfig, error) {
+	return func(state multistep.StateBag) (*ssh.ClientConfig, error) {
+		if useAgent {
+			authSock := os.Getenv("SSH_AUTH_SOCK")
+			if authSock == "" {
+				return nil, fmt.Errorf("SSH_AUTH_SOCK is not set")
+			}
+
+			sshAgent, err := net.Dial("unix", authSock)
+			if err != nil {
+				return nil, fmt.Errorf("Cannot connect to SSH Agent socket %q: %s", authSock, err)
+			}
+
+			return &ssh.ClientConfig{
+				User: username,
+				Auth: []ssh.AuthMethod{
+					ssh.PublicKeysCallback(agent.NewClient(sshAgent).Signers),
+				},
+				HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+			}, nil
+		}
+
+		privateKey, hasKey := state.GetOk("privateKey")
+		if hasKey {
+
+			signer, err := ssh.ParsePrivateKey([]byte(privateKey.(string)))
+			if err != nil {
+				return nil, fmt.Errorf("Error setting up SSH config: %s", err)
+			}
+			return &ssh.ClientConfig{
+				User: username,
+				Auth: []ssh.AuthMethod{
+					ssh.PublicKeys(signer),
+				},
+				HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+			}, nil
+
+		} else {
+			return &ssh.ClientConfig{
+				User: username,
+				Auth: []ssh.AuthMethod{
+					ssh.Password(password),
+					ssh.KeyboardInteractive(
+						packerssh.PasswordKeyboardInteractive(password)),
+				},
+				HostKeyCallback: ssh.InsecureIgnoreHostKey(),
+			}, nil
+		}
+	}
+}

builder/alicloud/ecs/step_attach_keypair.go

@@ -4,66 +4,64 @@ import (
 	"context"
 	"fmt"
 
-	"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"
+	"time"
+
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
-type stepAttachKeyPair struct {
+type stepAttachKeyPar struct {
 }
 
-var attachKeyPairNotRetryErrors = []string{
-	"MissingParameter",
-	"DependencyViolation.WindowsInstance",
-	"InvalidKeyPairName.NotFound",
-	"InvalidRegionId.NotFound",
-}
-
-func (s *stepAttachKeyPair) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ui := state.Get("ui").(packersdk.Ui)
-	client := state.Get("client").(*ClientWrapper)
-	config := state.Get("config").(*Config)
-	instance := state.Get("instance").(*ecs.Instance)
-	keyPairName := config.Comm.SSHKeyPairName
+func (s *stepAttachKeyPar) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	keyPairName := state.Get("keyPair").(string)
 	if keyPairName == "" {
 		return multistep.ActionContinue
 	}
-
-	_, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			request := ecs.CreateAttachKeyPairRequest()
-			request.RegionId = config.AlicloudRegion
-			request.KeyPairName = keyPairName
-			request.InstanceIds = "[\"" + instance.InstanceId + "\"]"
-			return client.AttachKeyPair(request)
-		},
-		EvalFunc: client.EvalCouldRetryResponse(attachKeyPairNotRetryErrors, EvalNotRetryErrorType),
-	})
-
-	if err != nil {
-		return halt(state, err, fmt.Sprintf("Error attaching keypair %s to instance %s", keyPairName, instance.InstanceId))
+	ui := state.Get("ui").(packer.Ui)
+	client := state.Get("client").(*ecs.Client)
+	config := state.Get("config").(Config)
+	instance := state.Get("instance").(*ecs.InstanceAttributesType)
+	timeoutPoint := time.Now().Add(120 * time.Second)
+	for {
+		err := client.AttachKeyPair(&ecs.AttachKeyPairArgs{RegionId: common.Region(config.AlicloudRegion),
+			KeyPairName: keyPairName, InstanceIds: "[\"" + instance.InstanceId + "\"]"})
+		if err != nil {
+			e, _ := err.(*common.Error)
+			if (!(e.Code == "MissingParameter" || e.Code == "DependencyViolation.WindowsInstance" ||
+				e.Code == "InvalidKeyPairName.NotFound" || e.Code == "InvalidRegionId.NotFound")) &&
+				time.Now().Before(timeoutPoint) {
+				time.Sleep(5 * time.Second)
+				continue
+			}
+			err := fmt.Errorf("Error attaching keypair %s to instance %s : %s",
+				keyPairName, instance.InstanceId, err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+		break
 	}
 
 	ui.Message(fmt.Sprintf("Attach keypair %s to instance: %s", keyPairName, instance.InstanceId))
+
 	return multistep.ActionContinue
 }
 
-func (s *stepAttachKeyPair) Cleanup(state multistep.StateBag) {
-	client := state.Get("client").(*ClientWrapper)
-	config := state.Get("config").(*Config)
-	ui := state.Get("ui").(packersdk.Ui)
-	instance := state.Get("instance").(*ecs.Instance)
-	keyPairName := config.Comm.SSHKeyPairName
+func (s *stepAttachKeyPar) Cleanup(state multistep.StateBag) {
+	keyPairName := state.Get("keyPair").(string)
 	if keyPairName == "" {
 		return
 	}
+	client := state.Get("client").(*ecs.Client)
+	config := state.Get("config").(Config)
+	ui := state.Get("ui").(packer.Ui)
+	instance := state.Get("instance").(*ecs.InstanceAttributesType)
 
-	detachKeyPairRequest := ecs.CreateDetachKeyPairRequest()
-	detachKeyPairRequest.RegionId = config.AlicloudRegion
-	detachKeyPairRequest.KeyPairName = keyPairName
-	detachKeyPairRequest.InstanceIds = fmt.Sprintf("[\"%s\"]", instance.InstanceId)
-	_, err := client.DetachKeyPair(detachKeyPairRequest)
+	err := client.DetachKeyPair(&ecs.DetachKeyPairArgs{RegionId: common.Region(config.AlicloudRegion),
+		KeyPairName: keyPairName, InstanceIds: "[\"" + instance.InstanceId + "\"]"})
 	if err != nil {
 		err := fmt.Errorf("Error Detaching keypair %s to instance %s : %s", keyPairName,
 			instance.InstanceId, err)

builder/alicloud/ecs/step_check_source_image.go

@@ -4,48 +4,34 @@ import (
 	"context"
 	"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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCheckAlicloudSourceImage struct {
 	SourceECSImageId string
 }
 
-func (s *stepCheckAlicloudSourceImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
-	config := state.Get("config").(*Config)
-	ui := state.Get("ui").(packersdk.Ui)
-
-	describeImagesRequest := ecs.CreateDescribeImagesRequest()
-	describeImagesRequest.RegionId = config.AlicloudRegion
-	describeImagesRequest.ImageId = config.AlicloudSourceImage
-	if config.AlicloudSkipImageValidation {
-		describeImagesRequest.ShowExpired = "true"
-	}
-	imagesResponse, err := client.DescribeImages(describeImagesRequest)
+func (s *stepCheckAlicloudSourceImage) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	config := state.Get("config").(Config)
+	ui := state.Get("ui").(packer.Ui)
+	images, _, err := client.DescribeImages(&ecs.DescribeImagesArgs{RegionId: common.Region(config.AlicloudRegion),
+		ImageId: config.AlicloudSourceImage})
 	if err != nil {
-		return halt(state, err, "Error querying alicloud image")
-	}
-
-	images := imagesResponse.Images.Image
-
-	// Describe marketplace image
-	describeImagesRequest.ImageOwnerAlias = "marketplace"
-	marketImagesResponse, err := client.DescribeImages(describeImagesRequest)
-	if err != nil {
-		return halt(state, err, "Error querying alicloud marketplace image")
-	}
-
-	marketImages := marketImagesResponse.Images.Image
-	if len(marketImages) > 0 {
-		images = append(images, marketImages...)
+		err := fmt.Errorf("Error querying alicloud image: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
 	}
 
 	if len(images) == 0 {
 		err := fmt.Errorf("No alicloud image was found matching filters: %v", config.AlicloudSourceImage)
-		return halt(state, err, "")
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
 	}
 
 	ui.Message(fmt.Sprintf("Found image ID: %s", images[0].ImageId))

builder/alicloud/ecs/step_config_eip.go

@@ -4,162 +4,77 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
-	"github.com/hashicorp/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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
-type stepConfigAlicloudEIP struct {
+type setpConfigAlicloudEIP struct {
 	AssociatePublicIpAddress bool
 	RegionId                 string
 	InternetChargeType       string
-	InternetMaxBandwidthOut  int
 	allocatedId              string
-	SSHPrivateIp             bool
 }
 
-var allocateEipAddressRetryErrors = []string{
-	"LastTokenProcessing",
-}
-
-func (s *stepConfigAlicloudEIP) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-	instance := state.Get("instance").(*ecs.Instance)
-
-	if s.SSHPrivateIp {
-		ipaddress := instance.VpcAttributes.PrivateIpAddress.IpAddress
-		if len(ipaddress) == 0 {
-			ui.Say("Failed to get private ip of instance")
-			return multistep.ActionHalt
-		}
-		state.Put("ipaddress", ipaddress[0])
-		return multistep.ActionContinue
-	}
-
-	ui.Say("Allocating eip...")
-
-	allocateEipAddressRequest := s.buildAllocateEipAddressRequest(state)
-	allocateEipAddressResponse, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			return client.AllocateEipAddress(allocateEipAddressRequest)
-		},
-		EvalFunc: client.EvalCouldRetryResponse(allocateEipAddressRetryErrors, EvalRetryErrorType),
+func (s *setpConfigAlicloudEIP) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
+	instance := state.Get("instance").(*ecs.InstanceAttributesType)
+	ui.Say("Allocating eip")
+	ipaddress, allocateId, err := client.AllocateEipAddress(&ecs.AllocateEipAddressArgs{
+		RegionId: common.Region(s.RegionId), InternetChargeType: common.InternetChargeType(s.InternetChargeType),
 	})
-
 	if err != nil {
-		return halt(state, err, "Error allocating eip")
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Error allocating eip: %s", err))
+		return multistep.ActionHalt
 	}
-
-	ipaddress := allocateEipAddressResponse.(*ecs.AllocateEipAddressResponse).EipAddress
-	ui.Message(fmt.Sprintf("Allocated eip: %s", ipaddress))
-
-	allocateId := allocateEipAddressResponse.(*ecs.AllocateEipAddressResponse).AllocationId
 	s.allocatedId = allocateId
-
-	err = s.waitForEipStatus(client, instance.RegionId, s.allocatedId, EipStatusAvailable)
-	if err != nil {
-		return halt(state, err, "Error wait eip available timeout")
+	if err = client.WaitForEip(common.Region(s.RegionId), allocateId,
+		ecs.EipStatusAvailable, ALICLOUD_DEFAULT_SHORT_TIMEOUT); err != nil {
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Error allocating eip: %s", err))
+		return multistep.ActionHalt
 	}
 
-	associateEipAddressRequest := ecs.CreateAssociateEipAddressRequest()
-	associateEipAddressRequest.AllocationId = allocateId
-	associateEipAddressRequest.InstanceId = instance.InstanceId
-	if _, err := client.AssociateEipAddress(associateEipAddressRequest); err != nil {
-		e, ok := err.(errors.Error)
-		if !ok || e.ErrorCode() != "TaskConflict" {
-			return halt(state, err, "Error associating eip")
-		}
-
-		ui.Error(fmt.Sprintf("Error associate eip: %s", err))
+	if err = client.AssociateEipAddress(allocateId, instance.InstanceId); err != nil {
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Error binding eip: %s", err))
+		return multistep.ActionHalt
 	}
 
-	err = s.waitForEipStatus(client, instance.RegionId, s.allocatedId, EipStatusInUse)
-	if err != nil {
-		return halt(state, err, "Error wait eip associated timeout")
+	if err = client.WaitForEip(common.Region(s.RegionId), allocateId,
+		ecs.EipStatusInUse, ALICLOUD_DEFAULT_SHORT_TIMEOUT); err != nil {
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Error associating eip: %s", err))
+		return multistep.ActionHalt
 	}
-
+	ui.Say(fmt.Sprintf("Allocated eip %s", ipaddress))
 	state.Put("ipaddress", ipaddress)
 	return multistep.ActionContinue
 }
 
-func (s *stepConfigAlicloudEIP) Cleanup(state multistep.StateBag) {
+func (s *setpConfigAlicloudEIP) Cleanup(state multistep.StateBag) {
 	if len(s.allocatedId) == 0 {
 		return
 	}
 
-	cleanUpMessage(state, "EIP")
+	client := state.Get("client").(*ecs.Client)
+	instance := state.Get("instance").(*ecs.InstanceAttributesType)
+	ui := state.Get("ui").(packer.Ui)
 
-	client := state.Get("client").(*ClientWrapper)
-	instance := state.Get("instance").(*ecs.Instance)
-	ui := state.Get("ui").(packersdk.Ui)
+	message(state, "EIP")
 
-	unassociateEipAddressRequest := ecs.CreateUnassociateEipAddressRequest()
-	unassociateEipAddressRequest.AllocationId = s.allocatedId
-	unassociateEipAddressRequest.InstanceId = instance.InstanceId
-	if _, err := client.UnassociateEipAddress(unassociateEipAddressRequest); err != nil {
-		ui.Say(fmt.Sprintf("Failed to unassociate eip: %s", err))
+	if err := client.UnassociateEipAddress(s.allocatedId, instance.InstanceId); err != nil {
+		ui.Say(fmt.Sprintf("Failed to unassociate eip."))
 	}
 
-	if err := s.waitForEipStatus(client, instance.RegionId, s.allocatedId, EipStatusAvailable); err != nil {
-		ui.Say(fmt.Sprintf("Timeout while unassociating eip: %s", err))
+	if err := client.WaitForEip(common.Region(s.RegionId), s.allocatedId, ecs.EipStatusAvailable, ALICLOUD_DEFAULT_SHORT_TIMEOUT); err != nil {
+		ui.Say(fmt.Sprintf("Timeout while unassociating eip."))
+	}
+	if err := client.ReleaseEipAddress(s.allocatedId); err != nil {
+		ui.Say(fmt.Sprintf("Failed to release eip."))
 	}
 
-	releaseEipAddressRequest := ecs.CreateReleaseEipAddressRequest()
-	releaseEipAddressRequest.AllocationId = s.allocatedId
-	if _, err := client.ReleaseEipAddress(releaseEipAddressRequest); err != nil {
-		ui.Say(fmt.Sprintf("Failed to release eip: %s", err))
-	}
-}
-
-func (s *stepConfigAlicloudEIP) waitForEipStatus(client *ClientWrapper, regionId string, allocationId string, expectedStatus string) error {
-	describeEipAddressesRequest := ecs.CreateDescribeEipAddressesRequest()
-	describeEipAddressesRequest.RegionId = regionId
-	describeEipAddressesRequest.AllocationId = s.allocatedId
-
-	_, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			response, err := client.DescribeEipAddresses(describeEipAddressesRequest)
-			if err == nil && len(response.EipAddresses.EipAddress) == 0 {
-				err = fmt.Errorf("eip allocated is not find")
-			}
-
-			return response, err
-		},
-		EvalFunc: func(response responses.AcsResponse, err error) WaitForExpectEvalResult {
-			if err != nil {
-				return WaitForExpectToRetry
-			}
-
-			eipAddressesResponse := response.(*ecs.DescribeEipAddressesResponse)
-			eipAddresses := eipAddressesResponse.EipAddresses.EipAddress
-
-			for _, eipAddress := range eipAddresses {
-				if eipAddress.Status == expectedStatus {
-					return WaitForExpectSuccess
-				}
-			}
-
-			return WaitForExpectToRetry
-		},
-		RetryTimes: shortRetryTimes,
-	})
-
-	return err
-}
-
-func (s *stepConfigAlicloudEIP) buildAllocateEipAddressRequest(state multistep.StateBag) *ecs.AllocateEipAddressRequest {
-	instance := state.Get("instance").(*ecs.Instance)
-
-	request := ecs.CreateAllocateEipAddressRequest()
-	request.ClientToken = uuid.TimeOrderedUUID()
-	request.RegionId = instance.RegionId
-	request.InternetChargeType = s.InternetChargeType
-	request.Bandwidth = string(convertNumber(s.InternetMaxBandwidthOut))
-
-	return request
 }

builder/alicloud/ecs/step_config_key_pair.go

@@ -3,72 +3,81 @@ package ecs
 import (
 	"context"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
-type stepConfigAlicloudKeyPair struct {
-	Debug        bool
-	Comm         *communicator.Config
-	DebugKeyPath string
-	RegionId     string
+type StepConfigAlicloudKeyPair struct {
+	Debug                bool
+	SSHAgentAuth         bool
+	DebugKeyPath         string
+	TemporaryKeyPairName string
+	KeyPairName          string
+	PrivateKeyFile       string
+	RegionId             string
 
 	keyName string
 }
 
-func (s *stepConfigAlicloudKeyPair) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ui := state.Get("ui").(packersdk.Ui)
+func (s *StepConfigAlicloudKeyPair) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	ui := state.Get("ui").(packer.Ui)
 
-	if s.Comm.SSHPrivateKeyFile != "" {
+	if s.PrivateKeyFile != "" {
 		ui.Say("Using existing SSH private key")
-		privateKeyBytes, err := s.Comm.ReadSSHPrivateKeyFile()
+		privateKeyBytes, err := ioutil.ReadFile(s.PrivateKeyFile)
 		if err != nil {
-			state.Put("error", err)
+			state.Put("error", fmt.Errorf(
+				"Error loading configured private key file: %s", err))
 			return multistep.ActionHalt
 		}
 
-		s.Comm.SSHPrivateKey = privateKeyBytes
+		state.Put("keyPair", s.KeyPairName)
+		state.Put("privateKey", string(privateKeyBytes))
+
 		return multistep.ActionContinue
 	}
 
-	if s.Comm.SSHAgentAuth && s.Comm.SSHKeyPairName == "" {
+	if s.SSHAgentAuth && s.KeyPairName == "" {
 		ui.Say("Using SSH Agent with key pair in source image")
 		return multistep.ActionContinue
 	}
 
-	if s.Comm.SSHAgentAuth && s.Comm.SSHKeyPairName != "" {
-		ui.Say(fmt.Sprintf("Using SSH Agent for existing key pair %s", s.Comm.SSHKeyPairName))
+	if s.SSHAgentAuth && s.KeyPairName != "" {
+		ui.Say(fmt.Sprintf("Using SSH Agent for existing key pair %s", s.KeyPairName))
+		state.Put("keyPair", s.KeyPairName)
 		return multistep.ActionContinue
 	}
 
-	if s.Comm.SSHTemporaryKeyPairName == "" {
+	if s.TemporaryKeyPairName == "" {
 		ui.Say("Not using temporary keypair")
-		s.Comm.SSHKeyPairName = ""
+		state.Put("keyPair", "")
 		return multistep.ActionContinue
 	}
 
-	client := state.Get("client").(*ClientWrapper)
-	ui.Say(fmt.Sprintf("Creating temporary keypair: %s", s.Comm.SSHTemporaryKeyPairName))
+	client := state.Get("client").(*ecs.Client)
 
-	createKeyPairRequest := ecs.CreateCreateKeyPairRequest()
-	createKeyPairRequest.RegionId = s.RegionId
-	createKeyPairRequest.KeyPairName = s.Comm.SSHTemporaryKeyPairName
-	keyResp, err := client.CreateKeyPair(createKeyPairRequest)
+	ui.Say(fmt.Sprintf("Creating temporary keypair: %s", s.TemporaryKeyPairName))
+	keyResp, err := client.CreateKeyPair(&ecs.CreateKeyPairArgs{
+		KeyPairName: s.TemporaryKeyPairName,
+		RegionId:    common.Region(s.RegionId),
+	})
 	if err != nil {
-		return halt(state, err, "Error creating temporary keypair")
+		state.Put("error", fmt.Errorf("Error creating temporary keypair: %s", err))
+		return multistep.ActionHalt
 	}
 
 	// Set the keyname so we know to delete it later
-	s.keyName = s.Comm.SSHTemporaryKeyPairName
+	s.keyName = s.TemporaryKeyPairName
 
 	// Set some state data for use in future steps
-	s.Comm.SSHKeyPairName = s.keyName
-	s.Comm.SSHPrivateKey = []byte(keyResp.PrivateKeyBody)
+	state.Put("keyPair", s.keyName)
+	state.Put("privateKey", keyResp.PrivateKeyBody)
 
 	// If we're in debug mode, output the private key to the working
 	// directory.
@@ -99,24 +108,23 @@ func (s *stepConfigAlicloudKeyPair) Run(ctx context.Context, state multistep.Sta
 	return multistep.ActionContinue
 }
 
-func (s *stepConfigAlicloudKeyPair) Cleanup(state multistep.StateBag) {
+func (s *StepConfigAlicloudKeyPair) Cleanup(state multistep.StateBag) {
 	// If no key name is set, then we never created it, so just return
 	// If we used an SSH private key file, do not go about deleting
 	// keypairs
-	if s.Comm.SSHPrivateKeyFile != "" || (s.Comm.SSHKeyPairName == "" && s.keyName == "") {
+	if s.PrivateKeyFile != "" || (s.KeyPairName == "" && s.keyName == "") {
 		return
 	}
 
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
 
 	// Remove the keypair
 	ui.Say("Deleting temporary keypair...")
-
-	deleteKeyPairsRequest := ecs.CreateDeleteKeyPairsRequest()
-	deleteKeyPairsRequest.RegionId = s.RegionId
-	deleteKeyPairsRequest.KeyPairNames = fmt.Sprintf("[\"%s\"]", s.keyName)
-	_, err := client.DeleteKeyPairs(deleteKeyPairsRequest)
+	err := client.DeleteKeyPairs(&ecs.DeleteKeyPairsArgs{
+		RegionId:     common.Region(s.RegionId),
+		KeyPairNames: "[\"" + s.keyName + "\"]",
+	})
 	if err != nil {
 		ui.Error(fmt.Sprintf(
 			"Error cleaning up keypair. Please delete the key manually: %s", s.keyName))

builder/alicloud/ecs/step_config_public_ip.go

@@ -4,42 +4,30 @@ import (
 	"context"
 	"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/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepConfigAlicloudPublicIP struct {
 	publicIPAddress string
 	RegionId        string
-	SSHPrivateIp    bool
 }
 
-func (s *stepConfigAlicloudPublicIP) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-	instance := state.Get("instance").(*ecs.Instance)
+func (s *stepConfigAlicloudPublicIP) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
+	instance := state.Get("instance").(*ecs.InstanceAttributesType)
 
-	if s.SSHPrivateIp {
-		ipaddress := instance.InnerIpAddress.IpAddress
-		if len(ipaddress) == 0 {
-			ui.Say("Failed to get private ip of instance")
-			return multistep.ActionHalt
-		}
-		state.Put("ipaddress", ipaddress[0])
-		return multistep.ActionContinue
-	}
-
-	allocatePublicIpAddressRequest := ecs.CreateAllocatePublicIpAddressRequest()
-	allocatePublicIpAddressRequest.InstanceId = instance.InstanceId
-	ipaddress, err := client.AllocatePublicIpAddress(allocatePublicIpAddressRequest)
+	ipaddress, err := client.AllocatePublicIpAddress(instance.InstanceId)
 	if err != nil {
-		return halt(state, err, "Error allocating public ip")
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Error allocating public ip: %s", err))
+		return multistep.ActionHalt
 	}
-
-	s.publicIPAddress = ipaddress.IpAddress
-	ui.Say(fmt.Sprintf("Allocated public ip address %s.", ipaddress.IpAddress))
-	state.Put("ipaddress", ipaddress.IpAddress)
+	s.publicIPAddress = ipaddress
+	ui.Say(fmt.Sprintf("Allocated public ip address %s.", ipaddress))
+	state.Put("ipaddress", ipaddress)
 	return multistep.ActionContinue
 }
 

builder/alicloud/ecs/step_config_security_group.go

@@ -2,13 +2,14 @@ package ecs
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"time"
 
-	"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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepConfigAlicloudSecurityGroup struct {
@@ -20,34 +21,31 @@ type stepConfigAlicloudSecurityGroup struct {
 	isCreate          bool
 }
 
-var createSecurityGroupRetryErrors = []string{
-	"IdempotentProcessing",
-}
-
-var deleteSecurityGroupRetryErrors = []string{
-	"DependencyViolation",
-}
-
-func (s *stepConfigAlicloudSecurityGroup) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+func (s *stepConfigAlicloudSecurityGroup) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
 	networkType := state.Get("networktype").(InstanceNetWork)
 
+	var securityGroupItems []ecs.SecurityGroupItemType
+	var err error
 	if len(s.SecurityGroupId) != 0 {
-		describeSecurityGroupsRequest := ecs.CreateDescribeSecurityGroupsRequest()
-		describeSecurityGroupsRequest.RegionId = s.RegionId
-		describeSecurityGroupsRequest.SecurityGroupId = s.SecurityGroupId
-		if networkType == InstanceNetworkVpc {
+		if networkType == VpcNet {
 			vpcId := state.Get("vpcid").(string)
-			describeSecurityGroupsRequest.VpcId = vpcId
+			securityGroupItems, _, err = client.DescribeSecurityGroups(&ecs.DescribeSecurityGroupsArgs{
+				VpcId:    vpcId,
+				RegionId: common.Region(s.RegionId),
+			})
+		} else {
+			securityGroupItems, _, err = client.DescribeSecurityGroups(&ecs.DescribeSecurityGroupsArgs{
+				RegionId: common.Region(s.RegionId),
+			})
 		}
 
-		securityGroupsResponse, err := client.DescribeSecurityGroups(describeSecurityGroupsRequest)
 		if err != nil {
-			return halt(state, err, "Failed querying security group")
+			ui.Say(fmt.Sprintf("Failed querying security group: %s", err))
+			state.Put("error", err)
+			return multistep.ActionHalt
 		}
-
-		securityGroupItems := securityGroupsResponse.SecurityGroups.SecurityGroup
 		for _, securityGroupItem := range securityGroupItems {
 			if securityGroupItem.SecurityGroupId == s.SecurityGroupId {
 				state.Put("securitygroupid", s.SecurityGroupId)
@@ -55,55 +53,61 @@ func (s *stepConfigAlicloudSecurityGroup) Run(ctx context.Context, state multist
 				return multistep.ActionContinue
 			}
 		}
-
 		s.isCreate = false
-		err = fmt.Errorf("The specified security group {%s} doesn't exist.", s.SecurityGroupId)
-		return halt(state, err, "")
+		message := fmt.Sprintf("The specified security group {%s} doesn't exist.", s.SecurityGroupId)
+		state.Put("error", errors.New(message))
+		ui.Say(message)
+		return multistep.ActionHalt
+
+	}
+	var securityGroupId string
+	ui.Say("Creating security groups...")
+	if networkType == VpcNet {
+		vpcId := state.Get("vpcid").(string)
+		securityGroupId, err = client.CreateSecurityGroup(&ecs.CreateSecurityGroupArgs{
+			RegionId:          common.Region(s.RegionId),
+			SecurityGroupName: s.SecurityGroupName,
+			VpcId:             vpcId,
+		})
+	} else {
+		securityGroupId, err = client.CreateSecurityGroup(&ecs.CreateSecurityGroupArgs{
+			RegionId:          common.Region(s.RegionId),
+			SecurityGroupName: s.SecurityGroupName,
+		})
 	}
-
-	ui.Say("Creating security group...")
-
-	createSecurityGroupRequest := s.buildCreateSecurityGroupRequest(state)
-	securityGroupResponse, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			return client.CreateSecurityGroup(createSecurityGroupRequest)
-		},
-		EvalFunc: client.EvalCouldRetryResponse(createSecurityGroupRetryErrors, EvalRetryErrorType),
-	})
-
 	if err != nil {
-		return halt(state, err, "Failed creating security group")
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Failed creating security group %s.", err))
+		return multistep.ActionHalt
 	}
-
-	securityGroupId := securityGroupResponse.(*ecs.CreateSecurityGroupResponse).SecurityGroupId
-
-	ui.Message(fmt.Sprintf("Created security group: %s", securityGroupId))
 	state.Put("securitygroupid", securityGroupId)
 	s.isCreate = true
 	s.SecurityGroupId = securityGroupId
-
-	authorizeSecurityGroupEgressRequest := ecs.CreateAuthorizeSecurityGroupEgressRequest()
-	authorizeSecurityGroupEgressRequest.SecurityGroupId = securityGroupId
-	authorizeSecurityGroupEgressRequest.RegionId = s.RegionId
-	authorizeSecurityGroupEgressRequest.IpProtocol = IpProtocolAll
-	authorizeSecurityGroupEgressRequest.PortRange = DefaultPortRange
-	authorizeSecurityGroupEgressRequest.NicType = NicTypeInternet
-	authorizeSecurityGroupEgressRequest.DestCidrIp = DefaultCidrIp
-
-	if _, err := client.AuthorizeSecurityGroupEgress(authorizeSecurityGroupEgressRequest); err != nil {
-		return halt(state, err, "Failed authorizing security group")
+	err = client.AuthorizeSecurityGroupEgress(&ecs.AuthorizeSecurityGroupEgressArgs{
+		SecurityGroupId: securityGroupId,
+		RegionId:        common.Region(s.RegionId),
+		IpProtocol:      ecs.IpProtocolAll,
+		PortRange:       "-1/-1",
+		NicType:         ecs.NicTypeInternet,
+		DestCidrIp:      "0.0.0.0/0", //The input parameter "DestGroupId" or "DestCidrIp" cannot be both blank.
+	})
+	if err != nil {
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Failed authorizing security group: %s", err))
+		return multistep.ActionHalt
 	}
-
-	authorizeSecurityGroupRequest := ecs.CreateAuthorizeSecurityGroupRequest()
-	authorizeSecurityGroupRequest.SecurityGroupId = securityGroupId
-	authorizeSecurityGroupRequest.RegionId = s.RegionId
-	authorizeSecurityGroupRequest.IpProtocol = IpProtocolAll
-	authorizeSecurityGroupRequest.PortRange = DefaultPortRange
-	authorizeSecurityGroupRequest.NicType = NicTypeInternet
-	authorizeSecurityGroupRequest.SourceCidrIp = DefaultCidrIp
-
-	if _, err := client.AuthorizeSecurityGroup(authorizeSecurityGroupRequest); err != nil {
-		return halt(state, err, "Failed authorizing security group")
+	err = client.AuthorizeSecurityGroup(&ecs.AuthorizeSecurityGroupArgs{
+		SecurityGroupId: securityGroupId,
+		RegionId:        common.Region(s.RegionId),
+		IpProtocol:      ecs.IpProtocolAll,
+		PortRange:       "-1/-1",
+		NicType:         ecs.NicTypeInternet,
+		SourceCidrIp:    "0.0.0.0/0", //The input parameter "SourceGroupId" or "SourceCidrIp" cannot be both blank.
+	})
+	if err != nil {
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Failed authorizing security group: %s", err))
+		return multistep.ActionHalt
 	}
 
 	return multistep.ActionContinue
@@ -114,39 +118,21 @@ func (s *stepConfigAlicloudSecurityGroup) Cleanup(state multistep.StateBag) {
 		return
 	}
 
-	cleanUpMessage(state, "security group")
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
 
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-
-	_, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			request := ecs.CreateDeleteSecurityGroupRequest()
-			request.RegionId = s.RegionId
-			request.SecurityGroupId = s.SecurityGroupId
-			return client.DeleteSecurityGroup(request)
-		},
-		EvalFunc:   client.EvalCouldRetryResponse(deleteSecurityGroupRetryErrors, EvalRetryErrorType),
-		RetryTimes: shortRetryTimes,
-	})
-
-	if err != nil {
-		ui.Error(fmt.Sprintf("Failed to delete security group, it may still be around: %s", err))
+	message(state, "security group")
+	timeoutPoint := time.Now().Add(120 * time.Second)
+	for {
+		if err := client.DeleteSecurityGroup(common.Region(s.RegionId), s.SecurityGroupId); err != nil {
+			e, _ := err.(*common.Error)
+			if e.Code == "DependencyViolation" && time.Now().Before(timeoutPoint) {
+				time.Sleep(5 * time.Second)
+				continue
+			}
+			ui.Error(fmt.Sprintf("Failed to delete security group, it may still be around: %s", err))
+			return
+		}
+		break
 	}
 }
-
-func (s *stepConfigAlicloudSecurityGroup) buildCreateSecurityGroupRequest(state multistep.StateBag) *ecs.CreateSecurityGroupRequest {
-	networkType := state.Get("networktype").(InstanceNetWork)
-
-	request := ecs.CreateCreateSecurityGroupRequest()
-	request.ClientToken = uuid.TimeOrderedUUID()
-	request.RegionId = s.RegionId
-	request.SecurityGroupName = s.SecurityGroupName
-
-	if networkType == InstanceNetworkVpc {
-		vpcId := state.Get("vpcid").(string)
-		request.VpcId = vpcId
-	}
-
-	return request
-}

builder/alicloud/ecs/step_config_vpc.go

@@ -2,14 +2,14 @@ package ecs
 
 import (
 	"context"
-	errorsNew "errors"
+	"errors"
 	"fmt"
+	"time"
 
-	"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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepConfigAlicloudVPC struct {
@@ -19,94 +19,54 @@ type stepConfigAlicloudVPC struct {
 	isCreate  bool
 }
 
-var createVpcRetryErrors = []string{
-	"TOKEN_PROCESSING",
-}
-
-var deleteVpcRetryErrors = []string{
-	"DependencyViolation.Instance",
-	"DependencyViolation.RouteEntry",
-	"DependencyViolation.VSwitch",
-	"DependencyViolation.SecurityGroup",
-	"Forbbiden",
-	"TaskConflict",
-}
-
-func (s *stepConfigAlicloudVPC) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	config := state.Get("config").(*Config)
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+func (s *stepConfigAlicloudVPC) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	config := state.Get("config").(Config)
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
 
 	if len(s.VpcId) != 0 {
-		describeVpcsRequest := ecs.CreateDescribeVpcsRequest()
-		describeVpcsRequest.VpcId = s.VpcId
-		describeVpcsRequest.RegionId = config.AlicloudRegion
-
-		vpcsResponse, err := client.DescribeVpcs(describeVpcsRequest)
+		vpcs, _, err := client.DescribeVpcs(&ecs.DescribeVpcsArgs{
+			VpcId:    s.VpcId,
+			RegionId: common.Region(config.AlicloudRegion),
+		})
 		if err != nil {
-			return halt(state, err, "Failed querying vpcs")
+			ui.Say(fmt.Sprintf("Failed querying vpcs: %s", err))
+			state.Put("error", err)
+			return multistep.ActionHalt
 		}
-
-		vpcs := vpcsResponse.Vpcs.Vpc
 		if len(vpcs) > 0 {
-			state.Put("vpcid", vpcs[0].VpcId)
+			vpc := vpcs[0]
+			state.Put("vpcid", vpc.VpcId)
 			s.isCreate = false
 			return multistep.ActionContinue
 		}
-
 		message := fmt.Sprintf("The specified vpc {%s} doesn't exist.", s.VpcId)
-		return halt(state, errorsNew.New(message), "")
+		state.Put("error", errors.New(message))
+		ui.Say(message)
+		return multistep.ActionHalt
+
 	}
-
-	ui.Say("Creating vpc...")
-
-	createVpcRequest := s.buildCreateVpcRequest(state)
-	createVpcResponse, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			return client.CreateVpc(createVpcRequest)
-		},
-		EvalFunc: client.EvalCouldRetryResponse(createVpcRetryErrors, EvalRetryErrorType),
+	ui.Say("Creating vpc")
+	vpc, err := client.CreateVpc(&ecs.CreateVpcArgs{
+		RegionId:  common.Region(config.AlicloudRegion),
+		CidrBlock: s.CidrBlock,
+		VpcName:   s.VpcName,
 	})
 	if err != nil {
-		return halt(state, err, "Failed creating vpc")
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Failed creating vpc: %s", err))
+		return multistep.ActionHalt
 	}
-
-	vpcId := createVpcResponse.(*ecs.CreateVpcResponse).VpcId
-	_, err = client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			request := ecs.CreateDescribeVpcsRequest()
-			request.RegionId = config.AlicloudRegion
-			request.VpcId = vpcId
-			return client.DescribeVpcs(request)
-		},
-		EvalFunc: func(response responses.AcsResponse, err error) WaitForExpectEvalResult {
-			if err != nil {
-				return WaitForExpectToRetry
-			}
-
-			vpcsResponse := response.(*ecs.DescribeVpcsResponse)
-			vpcs := vpcsResponse.Vpcs.Vpc
-			if len(vpcs) > 0 {
-				for _, vpc := range vpcs {
-					if vpc.Status == VpcStatusAvailable {
-						return WaitForExpectSuccess
-					}
-				}
-			}
-
-			return WaitForExpectToRetry
-		},
-		RetryTimes: shortRetryTimes,
-	})
-
+	err = client.WaitForVpcAvailable(common.Region(config.AlicloudRegion), vpc.VpcId, ALICLOUD_DEFAULT_SHORT_TIMEOUT)
 	if err != nil {
-		return halt(state, err, "Failed waiting for vpc to become available")
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Failed waiting for vpc to become available: %s", err))
+		return multistep.ActionHalt
 	}
 
-	ui.Message(fmt.Sprintf("Created vpc: %s", vpcId))
-	state.Put("vpcid", vpcId)
+	state.Put("vpcid", vpc.VpcId)
 	s.isCreate = true
-	s.VpcId = vpcId
+	s.VpcId = vpc.VpcId
 	return multistep.ActionContinue
 }
 
@@ -115,34 +75,23 @@ func (s *stepConfigAlicloudVPC) Cleanup(state multistep.StateBag) {
 		return
 	}
 
-	cleanUpMessage(state, "VPC")
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
 
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-
-	_, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			request := ecs.CreateDeleteVpcRequest()
-			request.VpcId = s.VpcId
-			return client.DeleteVpc(request)
-		},
-		EvalFunc:   client.EvalCouldRetryResponse(deleteVpcRetryErrors, EvalRetryErrorType),
-		RetryTimes: shortRetryTimes,
-	})
-
-	if err != nil {
-		ui.Error(fmt.Sprintf("Error deleting vpc, it may still be around: %s", err))
+	message(state, "VPC")
+	timeoutPoint := time.Now().Add(60 * time.Second)
+	for {
+		if err := client.DeleteVpc(s.VpcId); err != nil {
+			e, _ := err.(*common.Error)
+			if (e.Code == "DependencyViolation.Instance" || e.Code == "DependencyViolation.RouteEntry" ||
+				e.Code == "DependencyViolation.VSwitch" ||
+				e.Code == "DependencyViolation.SecurityGroup") && time.Now().Before(timeoutPoint) {
+				time.Sleep(1 * time.Second)
+				continue
+			}
+			ui.Error(fmt.Sprintf("Error deleting vpc, it may still be around: %s", err))
+			return
+		}
+		break
 	}
 }
-
-func (s *stepConfigAlicloudVPC) buildCreateVpcRequest(state multistep.StateBag) *ecs.CreateVpcRequest {
-	config := state.Get("config").(*Config)
-
-	request := ecs.CreateCreateVpcRequest()
-	request.ClientToken = uuid.TimeOrderedUUID()
-	request.RegionId = config.AlicloudRegion
-	request.CidrBlock = s.CidrBlock
-	request.VpcName = s.VpcName
-
-	return request
-}

builder/alicloud/ecs/step_config_vswitch.go

@@ -2,13 +2,14 @@ package ecs
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"time"
 
-	"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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepConfigAlicloudVSwitch struct {
@@ -19,65 +20,52 @@ type stepConfigAlicloudVSwitch struct {
 	VSwitchName string
 }
 
-var createVSwitchRetryErrors = []string{
-	"TOKEN_PROCESSING",
-}
-
-var deleteVSwitchRetryErrors = []string{
-	"IncorrectVSwitchStatus",
-	"DependencyViolation",
-	"DependencyViolation.HaVip",
-	"IncorrectRouteEntryStatus",
-	"TaskConflict",
-}
-
-func (s *stepConfigAlicloudVSwitch) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+func (s *stepConfigAlicloudVSwitch) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
 	vpcId := state.Get("vpcid").(string)
-	config := state.Get("config").(*Config)
+	config := state.Get("config").(Config)
 
 	if len(s.VSwitchId) != 0 {
-		describeVSwitchesRequest := ecs.CreateDescribeVSwitchesRequest()
-		describeVSwitchesRequest.VpcId = vpcId
-		describeVSwitchesRequest.VSwitchId = s.VSwitchId
-		describeVSwitchesRequest.ZoneId = s.ZoneId
-
-		vswitchesResponse, err := client.DescribeVSwitches(describeVSwitchesRequest)
+		vswitchs, _, err := client.DescribeVSwitches(&ecs.DescribeVSwitchesArgs{
+			VpcId:     vpcId,
+			VSwitchId: s.VSwitchId,
+			ZoneId:    s.ZoneId,
+		})
 		if err != nil {
-			return halt(state, err, "Failed querying vswitch")
+			ui.Say(fmt.Sprintf("Failed querying vswitch: %s", err))
+			state.Put("error", err)
+			return multistep.ActionHalt
 		}
-
-		vswitch := vswitchesResponse.VSwitches.VSwitch
-		if len(vswitch) > 0 {
-			state.Put("vswitchid", vswitch[0].VSwitchId)
+		if len(vswitchs) > 0 {
+			vswitch := vswitchs[0]
+			state.Put("vswitchid", vswitch.VSwitchId)
 			s.isCreate = false
 			return multistep.ActionContinue
 		}
-
 		s.isCreate = false
-		return halt(state, fmt.Errorf("The specified vswitch {%s} doesn't exist.", s.VSwitchId), "")
+		message := fmt.Sprintf("The specified vswitch {%s} doesn't exist.", s.VSwitchId)
+		state.Put("error", errors.New(message))
+		ui.Say(message)
+		return multistep.ActionHalt
+
 	}
-
 	if s.ZoneId == "" {
-		describeZonesRequest := ecs.CreateDescribeZonesRequest()
-		describeZonesRequest.RegionId = config.AlicloudRegion
 
-		zonesResponse, err := client.DescribeZones(describeZonesRequest)
+		zones, err := client.DescribeZones(common.Region(config.AlicloudRegion))
 		if err != nil {
-			return halt(state, err, "Query for available zones failed")
+			ui.Say(fmt.Sprintf("Query for available zones failed: %s", err))
+			state.Put("error", err)
+			return multistep.ActionHalt
 		}
-
 		var instanceTypes []string
-		zones := zonesResponse.Zones.Zone
 		for _, zone := range zones {
 			isVSwitchSupported := false
 			for _, resourceType := range zone.AvailableResourceCreation.ResourceTypes {
-				if resourceType == "VSwitch" {
+				if resourceType == ecs.ResourceTypeVSwitch {
 					isVSwitchSupported = true
 				}
 			}
-
 			if isVSwitchSupported {
 				for _, instanceType := range zone.AvailableInstanceTypes.InstanceTypes {
 					if instanceType == config.InstanceType {
@@ -109,62 +97,29 @@ func (s *stepConfigAlicloudVSwitch) Run(ctx context.Context, state multistep.Sta
 			}
 		}
 	}
-
 	if config.CidrBlock == "" {
-		s.CidrBlock = DefaultCidrBlock //use the default CirdBlock
+		s.CidrBlock = "172.16.0.0/24" //use the default CirdBlock
 	}
-
 	ui.Say("Creating vswitch...")
-
-	createVSwitchRequest := s.buildCreateVSwitchRequest(state)
-	createVSwitchResponse, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			return client.CreateVSwitch(createVSwitchRequest)
-		},
-		EvalFunc: client.EvalCouldRetryResponse(createVSwitchRetryErrors, EvalRetryErrorType),
+	vswitchId, err := client.CreateVSwitch(&ecs.CreateVSwitchArgs{
+		CidrBlock:   s.CidrBlock,
+		ZoneId:      s.ZoneId,
+		VpcId:       vpcId,
+		VSwitchName: s.VSwitchName,
 	})
 	if err != nil {
-		return halt(state, err, "Error Creating vswitch")
+		state.Put("error", err)
+		ui.Say(fmt.Sprintf("Create vswitch failed %v", err))
+		return multistep.ActionHalt
 	}
-
-	vSwitchId := createVSwitchResponse.(*ecs.CreateVSwitchResponse).VSwitchId
-
-	describeVSwitchesRequest := ecs.CreateDescribeVSwitchesRequest()
-	describeVSwitchesRequest.VpcId = vpcId
-	describeVSwitchesRequest.VSwitchId = vSwitchId
-
-	_, err = client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			return client.DescribeVSwitches(describeVSwitchesRequest)
-		},
-		EvalFunc: func(response responses.AcsResponse, err error) WaitForExpectEvalResult {
-			if err != nil {
-				return WaitForExpectToRetry
-			}
-
-			vSwitchesResponse := response.(*ecs.DescribeVSwitchesResponse)
-			vSwitches := vSwitchesResponse.VSwitches.VSwitch
-			if len(vSwitches) > 0 {
-				for _, vSwitch := range vSwitches {
-					if vSwitch.Status == VSwitchStatusAvailable {
-						return WaitForExpectSuccess
-					}
-				}
-			}
-
-			return WaitForExpectToRetry
-		},
-		RetryTimes: shortRetryTimes,
-	})
-
-	if err != nil {
-		return halt(state, err, "Timeout waiting for vswitch to become available")
+	if err := client.WaitForVSwitchAvailable(vpcId, s.VSwitchId, ALICLOUD_DEFAULT_TIMEOUT); err != nil {
+		state.Put("error", err)
+		ui.Error(fmt.Sprintf("Timeout waiting for vswitch to become available: %v", err))
+		return multistep.ActionHalt
 	}
-
-	ui.Message(fmt.Sprintf("Created vswitch: %s", vSwitchId))
-	state.Put("vswitchid", vSwitchId)
+	state.Put("vswitchid", vswitchId)
 	s.isCreate = true
-	s.VSwitchId = vSwitchId
+	s.VSwitchId = vswitchId
 	return multistep.ActionContinue
 }
 
@@ -173,35 +128,22 @@ func (s *stepConfigAlicloudVSwitch) Cleanup(state multistep.StateBag) {
 		return
 	}
 
-	cleanUpMessage(state, "vSwitch")
-
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-
-	_, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			request := ecs.CreateDeleteVSwitchRequest()
-			request.VSwitchId = s.VSwitchId
-			return client.DeleteVSwitch(request)
-		},
-		EvalFunc:   client.EvalCouldRetryResponse(deleteVSwitchRetryErrors, EvalRetryErrorType),
-		RetryTimes: shortRetryTimes,
-	})
-
-	if err != nil {
-		ui.Error(fmt.Sprintf("Error deleting vswitch, it may still be around: %s", err))
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
+	message(state, "vSwitch")
+	timeoutPoint := time.Now().Add(10 * time.Second)
+	for {
+		if err := client.DeleteVSwitch(s.VSwitchId); err != nil {
+			e, _ := err.(*common.Error)
+			if (e.Code == "IncorrectVSwitchStatus" || e.Code == "DependencyViolation" ||
+				e.Code == "DependencyViolation.HaVip" ||
+				e.Code == "IncorrectRouteEntryStatus") && time.Now().Before(timeoutPoint) {
+				time.Sleep(1 * time.Second)
+				continue
+			}
+			ui.Error(fmt.Sprintf("Error deleting vswitch, it may still be around: %s", err))
+			return
+		}
+		break
 	}
 }
-
-func (s *stepConfigAlicloudVSwitch) buildCreateVSwitchRequest(state multistep.StateBag) *ecs.CreateVSwitchRequest {
-	vpcId := state.Get("vpcid").(string)
-
-	request := ecs.CreateCreateVSwitchRequest()
-	request.ClientToken = uuid.TimeOrderedUUID()
-	request.CidrBlock = s.CidrBlock
-	request.ZoneId = s.ZoneId
-	request.VpcId = vpcId
-	request.VSwitchName = s.VSwitchName
-
-	return request
-}

builder/alicloud/ecs/step_create_image.go

@@ -3,75 +3,69 @@ package ecs
 import (
 	"context"
 	"fmt"
-	"time"
 
-	"github.com/hashicorp/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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCreateAlicloudImage struct {
-	AlicloudImageIgnoreDataDisks bool
-	WaitSnapshotReadyTimeout     int
-	image                        *ecs.Image
+	image *ecs.ImageType
 }
 
-var createImageRetryErrors = []string{
-	"IdempotentProcessing",
-}
+func (s *stepCreateAlicloudImage) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	config := state.Get("config").(Config)
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
 
-func (s *stepCreateAlicloudImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	config := state.Get("config").(*Config)
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	// Create the alicloud image
+	ui.Say(fmt.Sprintf("Creating image: %s", config.AlicloudImageName))
+	var imageId string
+	var err error
 
-	tempImageName := config.AlicloudImageName
-	if config.ImageEncrypted.True() {
-		tempImageName = fmt.Sprintf("packer_%s", random.AlphaNum(7))
-		ui.Say(fmt.Sprintf("Creating temporary image for encryption: %s", tempImageName))
-	} else {
-		ui.Say(fmt.Sprintf("Creating image: %s", tempImageName))
-	}
-
-	createImageRequest := s.buildCreateImageRequest(state, tempImageName)
-	createImageResponse, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			return client.CreateImage(createImageRequest)
-		},
-		EvalFunc: client.EvalCouldRetryResponse(createImageRetryErrors, EvalRetryErrorType),
-	})
+	instance := state.Get("instance").(*ecs.InstanceAttributesType)
+	imageId, err = client.CreateImage(&ecs.CreateImageArgs{
+		RegionId:     common.Region(config.AlicloudRegion),
+		InstanceId:   instance.InstanceId,
+		ImageName:    config.AlicloudImageName,
+		ImageVersion: config.AlicloudImageVersion,
+		Description:  config.AlicloudImageDescription})
 
 	if err != nil {
-		return halt(state, err, "Error creating image")
+		err := fmt.Errorf("Error creating image: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+	err = client.WaitForImageReady(common.Region(config.AlicloudRegion),
+		imageId, ALICLOUD_DEFAULT_LONG_TIMEOUT)
+	if err != nil {
+		err := fmt.Errorf("Timeout waiting for image to be created: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
 	}
 
-	imageId := createImageResponse.(*ecs.CreateImageResponse).ImageId
+	images, _, err := client.DescribeImages(&ecs.DescribeImagesArgs{
+		RegionId: common.Region(config.AlicloudRegion),
+		ImageId:  imageId})
+	if err != nil {
+		err := fmt.Errorf("Error querying created image: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
 
-	imagesResponse, err := client.WaitForImageStatus(config.AlicloudRegion, imageId, ImageStatusAvailable, time.Duration(s.WaitSnapshotReadyTimeout)*time.Second)
-
-	// save image first for cleaning up if timeout
-	images := imagesResponse.(*ecs.DescribeImagesResponse).Images.Image
 	if len(images) == 0 {
-		return halt(state, err, "Unable to find created image")
+		err := fmt.Errorf("Unable to find created image: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
 	}
 	s.image = &images[0]
 
-	if err != nil {
-		return halt(state, err, "Timeout waiting for image to be created")
-	}
-
-	var snapshotIds []string
-	for _, device := range images[0].DiskDeviceMappings.DiskDeviceMapping {
-		snapshotIds = append(snapshotIds, device.SnapshotId)
-	}
-
 	state.Put("alicloudimage", imageId)
-	state.Put("alicloudsnapshots", snapshotIds)
-
 	alicloudImages := make(map[string]string)
 	alicloudImages[config.AlicloudRegion] = images[0].ImageId
 	state.Put("alicloudimages", alicloudImages)
@@ -83,62 +77,19 @@ func (s *stepCreateAlicloudImage) Cleanup(state multistep.StateBag) {
 	if s.image == nil {
 		return
 	}
-
-	config := state.Get("config").(*Config)
-	encryptedSet := config.ImageEncrypted.True()
-
 	_, cancelled := state.GetOk(multistep.StateCancelled)
 	_, halted := state.GetOk(multistep.StateHalted)
-
-	if !cancelled && !halted && !encryptedSet {
+	if !cancelled && !halted {
 		return
 	}
 
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
+	config := state.Get("config").(Config)
 
-	if !cancelled && !halted && encryptedSet {
-		ui.Say(fmt.Sprintf("Deleting temporary image %s(%s) and related snapshots after finishing encryption...", s.image.ImageId, s.image.ImageName))
-	} else {
-		ui.Say("Deleting the image and related snapshots because of cancellation or error...")
-	}
-
-	deleteImageRequest := ecs.CreateDeleteImageRequest()
-	deleteImageRequest.RegionId = config.AlicloudRegion
-	deleteImageRequest.ImageId = s.image.ImageId
-	if _, err := client.DeleteImage(deleteImageRequest); err != nil {
+	ui.Say("Deleting the image because of cancellation or error...")
+	if err := client.DeleteImage(common.Region(config.AlicloudRegion), s.image.ImageId); err != nil {
 		ui.Error(fmt.Sprintf("Error deleting image, it may still be around: %s", err))
 		return
 	}
-
-	//Delete the snapshot of this image
-	for _, diskDevices := range s.image.DiskDeviceMappings.DiskDeviceMapping {
-		deleteSnapshotRequest := ecs.CreateDeleteSnapshotRequest()
-		deleteSnapshotRequest.SnapshotId = diskDevices.SnapshotId
-		if _, err := client.DeleteSnapshot(deleteSnapshotRequest); err != nil {
-			ui.Error(fmt.Sprintf("Error deleting snapshot, it may still be around: %s", err))
-			return
-		}
-	}
-}
-
-func (s *stepCreateAlicloudImage) buildCreateImageRequest(state multistep.StateBag, imageName string) *ecs.CreateImageRequest {
-	config := state.Get("config").(*Config)
-
-	request := ecs.CreateCreateImageRequest()
-	request.ClientToken = uuid.TimeOrderedUUID()
-	request.RegionId = config.AlicloudRegion
-	request.ImageName = imageName
-	request.ImageVersion = config.AlicloudImageVersion
-	request.Description = config.AlicloudImageDescription
-
-	if s.AlicloudImageIgnoreDataDisks {
-		snapshotId := state.Get("alicloudsnapshot").(string)
-		request.SnapshotId = snapshotId
-	} else {
-		instance := state.Get("instance").(*ecs.Instance)
-		request.InstanceId = instance.InstanceId
-	}
-
-	return request
 }

builder/alicloud/ecs/step_create_instance.go

@@ -2,23 +2,18 @@ package ecs
 
 import (
 	"context"
-	"encoding/base64"
 	"fmt"
 	"io/ioutil"
-	"strconv"
+	"log"
 
-	"github.com/hashicorp/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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepCreateAlicloudInstance struct {
-	IOOptimized             confighelper.Trilean
+	IOOptimized             bool
 	InstanceType            string
 	UserData                string
 	UserDataFile            string
@@ -28,58 +23,98 @@ type stepCreateAlicloudInstance struct {
 	InternetMaxBandwidthOut int
 	InstanceName            string
 	ZoneId                  string
-	instance                *ecs.Instance
+	instance                *ecs.InstanceAttributesType
 }
 
-var createInstanceRetryErrors = []string{
-	"IdempotentProcessing",
-}
+func (s *stepCreateAlicloudInstance) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	config := state.Get("config").(Config)
+	ui := state.Get("ui").(packer.Ui)
+	source_image := state.Get("source_image").(*ecs.ImageType)
+	network_type := state.Get("networktype").(InstanceNetWork)
+	securityGroupId := state.Get("securitygroupid").(string)
+	var instanceId string
+	var err error
 
-var deleteInstanceRetryErrors = []string{
-	"IncorrectInstanceStatus.Initializing",
-}
-
-func (s *stepCreateAlicloudInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-
-	ui.Say("Creating instance...")
-	createInstanceRequest, err := s.buildCreateInstanceRequest(state)
-	if err != nil {
-		return halt(state, err, "")
+	ioOptimized := ecs.IoOptimizedNone
+	if s.IOOptimized {
+		ioOptimized = ecs.IoOptimizedOptimized
 	}
-
-	createInstanceResponse, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			return client.CreateInstance(createInstanceRequest)
-		},
-		EvalFunc: client.EvalCouldRetryResponse(createInstanceRetryErrors, EvalRetryErrorType),
-	})
-
-	if err != nil {
-		return halt(state, err, "Error creating instance")
+	password := config.Comm.SSHPassword
+	if password == "" && config.Comm.WinRMPassword != "" {
+		password = config.Comm.WinRMPassword
 	}
-
-	instanceId := createInstanceResponse.(*ecs.CreateInstanceResponse).InstanceId
-
-	_, err = client.WaitForInstanceStatus(s.RegionId, instanceId, InstanceStatusStopped)
-	if err != nil {
-		return halt(state, err, "Error waiting create instance")
+	ui.Say("Creating instance.")
+	if network_type == VpcNet {
+		userData, err := s.getUserData(state)
+		if err != nil {
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+		vswitchId := state.Get("vswitchid").(string)
+		instanceId, err = client.CreateInstance(&ecs.CreateInstanceArgs{
+			RegionId:                common.Region(s.RegionId),
+			ImageId:                 source_image.ImageId,
+			InstanceType:            s.InstanceType,
+			InternetChargeType:      common.InternetChargeType(s.InternetChargeType), //"PayByTraffic",
+			InternetMaxBandwidthOut: s.InternetMaxBandwidthOut,
+			UserData:                userData,
+			IoOptimized:             ioOptimized,
+			VSwitchId:               vswitchId,
+			SecurityGroupId:         securityGroupId,
+			InstanceName:            s.InstanceName,
+			Password:                password,
+			ZoneId:                  s.ZoneId,
+			DataDisk:                diskDeviceToDiskType(config.AlicloudImageConfig.ECSImagesDiskMappings),
+		})
+		if err != nil {
+			err := fmt.Errorf("Error creating instance: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+	} else {
+		if s.InstanceType == "" {
+			s.InstanceType = "PayByTraffic"
+		}
+		if s.InternetMaxBandwidthOut == 0 {
+			s.InternetMaxBandwidthOut = 5
+		}
+		instanceId, err = client.CreateInstance(&ecs.CreateInstanceArgs{
+			RegionId:                common.Region(s.RegionId),
+			ImageId:                 source_image.ImageId,
+			InstanceType:            s.InstanceType,
+			InternetChargeType:      common.InternetChargeType(s.InternetChargeType), //"PayByTraffic",
+			InternetMaxBandwidthOut: s.InternetMaxBandwidthOut,
+			IoOptimized:             ioOptimized,
+			SecurityGroupId:         securityGroupId,
+			InstanceName:            s.InstanceName,
+			Password:                password,
+			ZoneId:                  s.ZoneId,
+			DataDisk:                diskDeviceToDiskType(config.AlicloudImageConfig.ECSImagesDiskMappings),
+		})
+		if err != nil {
+			err := fmt.Errorf("Error creating instance: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
 	}
-
-	describeInstancesRequest := ecs.CreateDescribeInstancesRequest()
-	describeInstancesRequest.InstanceIds = fmt.Sprintf("[\"%s\"]", instanceId)
-	instances, err := client.DescribeInstances(describeInstancesRequest)
+	err = client.WaitForInstance(instanceId, ecs.Stopped, ALICLOUD_DEFAULT_TIMEOUT)
 	if err != nil {
-		return halt(state, err, "")
+		err := fmt.Errorf("Error creating instance: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
 	}
-
-	ui.Message(fmt.Sprintf("Created instance: %s", instanceId))
-	s.instance = &instances.Instances.Instance[0]
-	state.Put("instance", s.instance)
-	// instance_id is the generic term used so that users can have access to the
-	// instance id inside of the provisioners, used in step_provision.
-	state.Put("instance_id", instanceId)
+	instance, err := client.DescribeInstanceAttribute(instanceId)
+	if err != nil {
+		ui.Say(err.Error())
+		return multistep.ActionHalt
+	}
+	s.instance = instance
+	state.Put("instance", instance)
 
 	return multistep.ActionContinue
 }
@@ -88,121 +123,42 @@ func (s *stepCreateAlicloudInstance) Cleanup(state multistep.StateBag) {
 	if s.instance == nil {
 		return
 	}
-	cleanUpMessage(state, "instance")
-
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-
-	_, err := client.WaitForExpected(&WaitForExpectArgs{
-		RequestFunc: func() (responses.AcsResponse, error) {
-			request := ecs.CreateDeleteInstanceRequest()
-			request.InstanceId = s.instance.InstanceId
-			request.Force = requests.NewBoolean(true)
-			return client.DeleteInstance(request)
-		},
-		EvalFunc:   client.EvalCouldRetryResponse(deleteInstanceRetryErrors, EvalRetryErrorType),
-		RetryTimes: shortRetryTimes,
-	})
-
+	message(state, "instance")
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
+	err := client.DeleteInstance(s.instance.InstanceId)
 	if err != nil {
-		ui.Say(fmt.Sprintf("Failed to clean up instance %s: %s", s.instance.InstanceId, err))
-	}
-}
-
-func (s *stepCreateAlicloudInstance) buildCreateInstanceRequest(state multistep.StateBag) (*ecs.CreateInstanceRequest, error) {
-	request := ecs.CreateCreateInstanceRequest()
-	request.ClientToken = uuid.TimeOrderedUUID()
-	request.RegionId = s.RegionId
-	request.InstanceType = s.InstanceType
-	request.InstanceName = s.InstanceName
-	request.ZoneId = s.ZoneId
-
-	sourceImage := state.Get("source_image").(*ecs.Image)
-	request.ImageId = sourceImage.ImageId
-
-	securityGroupId := state.Get("securitygroupid").(string)
-	request.SecurityGroupId = securityGroupId
-
-	networkType := state.Get("networktype").(InstanceNetWork)
-	if networkType == InstanceNetworkVpc {
-		vswitchId := state.Get("vswitchid").(string)
-		request.VSwitchId = vswitchId
-
-		userData, err := s.getUserData(state)
-		if err != nil {
-			return nil, err
-		}
-
-		request.UserData = userData
-	} else {
-		if s.InternetChargeType == "" {
-			s.InternetChargeType = "PayByTraffic"
-		}
-
-		if s.InternetMaxBandwidthOut == 0 {
-			s.InternetMaxBandwidthOut = 5
-		}
-	}
-	request.InternetChargeType = s.InternetChargeType
-	request.InternetMaxBandwidthOut = requests.Integer(convertNumber(s.InternetMaxBandwidthOut))
-
-	if s.IOOptimized.True() {
-		request.IoOptimized = IOOptimizedOptimized
-	} else if s.IOOptimized.False() {
-		request.IoOptimized = IOOptimizedNone
+		ui.Say(fmt.Sprintf("Failed to clean up instance %s: %v", s.instance.InstanceId, err.Error()))
 	}
 
-	config := state.Get("config").(*Config)
-	password := config.Comm.SSHPassword
-	if password == "" && config.Comm.WinRMPassword != "" {
-		password = config.Comm.WinRMPassword
-	}
-	request.Password = password
-
-	systemDisk := config.AlicloudImageConfig.ECSSystemDiskMapping
-	request.SystemDiskDiskName = systemDisk.DiskName
-	request.SystemDiskCategory = systemDisk.DiskCategory
-	request.SystemDiskSize = requests.Integer(convertNumber(systemDisk.DiskSize))
-	request.SystemDiskDescription = systemDisk.Description
-
-	imageDisks := config.AlicloudImageConfig.ECSImagesDiskMappings
-	var dataDisks []ecs.CreateInstanceDataDisk
-	for _, imageDisk := range imageDisks {
-		var dataDisk ecs.CreateInstanceDataDisk
-		dataDisk.DiskName = imageDisk.DiskName
-		dataDisk.Category = imageDisk.DiskCategory
-		dataDisk.Size = string(convertNumber(imageDisk.DiskSize))
-		dataDisk.SnapshotId = imageDisk.SnapshotId
-		dataDisk.Description = imageDisk.Description
-		dataDisk.DeleteWithInstance = strconv.FormatBool(imageDisk.DeleteWithInstance)
-		dataDisk.Device = imageDisk.Device
-		if imageDisk.Encrypted != confighelper.TriUnset {
-			dataDisk.Encrypted = strconv.FormatBool(imageDisk.Encrypted.True())
-		}
-
-		dataDisks = append(dataDisks, dataDisk)
-	}
-	request.DataDisk = &dataDisks
-
-	return request, nil
 }
 
 func (s *stepCreateAlicloudInstance) getUserData(state multistep.StateBag) (string, error) {
 	userData := s.UserData
-
 	if s.UserDataFile != "" {
 		data, err := ioutil.ReadFile(s.UserDataFile)
 		if err != nil {
 			return "", err
 		}
-
 		userData = string(data)
 	}
-
-	if userData != "" {
-		userData = base64.StdEncoding.EncodeToString([]byte(userData))
-	}
-
+	log.Printf(userData)
 	return userData, nil
 
 }
+
+func diskDeviceToDiskType(diskDevices []AlicloudDiskDevice) []ecs.DataDiskType {
+	result := make([]ecs.DataDiskType, len(diskDevices))
+	for _, diskDevice := range diskDevices {
+		result = append(result, ecs.DataDiskType{
+			DiskName:           diskDevice.DiskName,
+			Category:           ecs.DiskCategory(diskDevice.DiskCategory),
+			Size:               diskDevice.DiskSize,
+			SnapshotId:         diskDevice.SnapshotId,
+			Description:        diskDevice.Description,
+			DeleteWithInstance: diskDevice.DeleteWithInstance,
+			Device:             diskDevice.Device,
+		})
+	}
+	return result
+}

builder/alicloud/ecs/step_create_snapshot.go

@@ -1,90 +0,0 @@
-package ecs
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"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"
-)
-
-type stepCreateAlicloudSnapshot struct {
-	snapshot                 *ecs.Snapshot
-	WaitSnapshotReadyTimeout int
-}
-
-func (s *stepCreateAlicloudSnapshot) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	config := state.Get("config").(*Config)
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-	instance := state.Get("instance").(*ecs.Instance)
-
-	describeDisksRequest := ecs.CreateDescribeDisksRequest()
-	describeDisksRequest.RegionId = config.AlicloudRegion
-	describeDisksRequest.InstanceId = instance.InstanceId
-	describeDisksRequest.DiskType = DiskTypeSystem
-	disksResponse, err := client.DescribeDisks(describeDisksRequest)
-	if err != nil {
-		return halt(state, err, "Error describe disks")
-	}
-
-	disks := disksResponse.Disks.Disk
-	if len(disks) == 0 {
-		return halt(state, err, "Unable to find system disk of instance")
-	}
-
-	createSnapshotRequest := ecs.CreateCreateSnapshotRequest()
-	createSnapshotRequest.DiskId = disks[0].DiskId
-	snapshot, err := client.CreateSnapshot(createSnapshotRequest)
-	if err != nil {
-		return halt(state, err, "Error creating snapshot")
-	}
-
-	// Create the alicloud snapshot
-	ui.Say(fmt.Sprintf("Creating snapshot from system disk %s: %s", disks[0].DiskId, snapshot.SnapshotId))
-
-	snapshotsResponse, err := client.WaitForSnapshotStatus(config.AlicloudRegion, snapshot.SnapshotId, SnapshotStatusAccomplished, time.Duration(s.WaitSnapshotReadyTimeout)*time.Second)
-	if err != nil {
-		_, ok := err.(errors.Error)
-		if ok {
-			return halt(state, err, "Error querying created snapshot")
-		}
-
-		return halt(state, err, "Timeout waiting for snapshot to be created")
-	}
-
-	snapshots := snapshotsResponse.(*ecs.DescribeSnapshotsResponse).Snapshots.Snapshot
-	if len(snapshots) == 0 {
-		return halt(state, err, "Unable to find created snapshot")
-	}
-
-	s.snapshot = &snapshots[0]
-	state.Put("alicloudsnapshot", snapshot.SnapshotId)
-	return multistep.ActionContinue
-}
-
-func (s *stepCreateAlicloudSnapshot) Cleanup(state multistep.StateBag) {
-	if s.snapshot == nil {
-		return
-	}
-	_, cancelled := state.GetOk(multistep.StateCancelled)
-	_, halted := state.GetOk(multistep.StateHalted)
-	if !cancelled && !halted {
-		return
-	}
-
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-
-	ui.Say("Deleting the snapshot because of cancellation or error...")
-
-	deleteSnapshotRequest := ecs.CreateDeleteSnapshotRequest()
-	deleteSnapshotRequest.SnapshotId = s.snapshot.SnapshotId
-	if _, err := client.DeleteSnapshot(deleteSnapshotRequest); err != nil {
-		ui.Error(fmt.Sprintf("Error deleting snapshot, it may still be around: %s", err))
-		return
-	}
-}

builder/alicloud/ecs/step_create_tags.go

@@ -1,65 +0,0 @@
-package ecs
-
-import (
-	"context"
-	"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"
-)
-
-type stepCreateTags struct {
-	Tags map[string]string
-}
-
-func (s *stepCreateTags) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	config := state.Get("config").(*Config)
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-	imageId := state.Get("alicloudimage").(string)
-	snapshotIds := state.Get("alicloudsnapshots").([]string)
-
-	if len(s.Tags) == 0 {
-		return multistep.ActionContinue
-	}
-
-	ui.Say(fmt.Sprintf("Adding tags(%s) to image: %s", s.Tags, imageId))
-
-	var tags []ecs.AddTagsTag
-	for key, value := range s.Tags {
-		var tag ecs.AddTagsTag
-		tag.Key = key
-		tag.Value = value
-		tags = append(tags, tag)
-	}
-
-	addTagsRequest := ecs.CreateAddTagsRequest()
-	addTagsRequest.RegionId = config.AlicloudRegion
-	addTagsRequest.ResourceId = imageId
-	addTagsRequest.ResourceType = TagResourceImage
-	addTagsRequest.Tag = &tags
-
-	if _, err := client.AddTags(addTagsRequest); err != nil {
-		return halt(state, err, "Error Adding tags to image")
-	}
-
-	for _, snapshotId := range snapshotIds {
-		ui.Say(fmt.Sprintf("Adding tags(%s) to snapshot: %s", s.Tags, snapshotId))
-		addTagsRequest := ecs.CreateAddTagsRequest()
-
-		addTagsRequest.RegionId = config.AlicloudRegion
-		addTagsRequest.ResourceId = snapshotId
-		addTagsRequest.ResourceType = TagResourceSnapshot
-		addTagsRequest.Tag = &tags
-
-		if _, err := client.AddTags(addTagsRequest); err != nil {
-			return halt(state, err, "Error Adding tags to snapshot")
-		}
-	}
-
-	return multistep.ActionContinue
-}
-func (s *stepCreateTags) Cleanup(state multistep.StateBag) {
-	// Nothing need to do, tags will be cleaned when the resource is cleaned
-}

builder/alicloud/ecs/step_delete_images_snapshots.go

@@ -5,97 +5,60 @@ import (
 	"fmt"
 	"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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepDeleteAlicloudImageSnapshots struct {
 	AlicloudImageForceDelete          bool
 	AlicloudImageForceDeleteSnapshots bool
 	AlicloudImageName                 string
-	AlicloudImageDestinationRegions   []string
-	AlicloudImageDestinationNames     []string
 }
 
-func (s *stepDeleteAlicloudImageSnapshots) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	config := state.Get("config").(*Config)
-
+func (s *stepDeleteAlicloudImageSnapshots) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
+	config := state.Get("config").(Config)
+	ui.Say("Deleting image snapshots.")
 	// Check for force delete
 	if s.AlicloudImageForceDelete {
-		err := s.deleteImageAndSnapshots(state, s.AlicloudImageName, config.AlicloudRegion)
-		if err != nil {
-			return halt(state, err, "")
-		}
-
-		numberOfName := len(s.AlicloudImageDestinationNames)
-		if numberOfName == 0 {
+		images, _, err := client.DescribeImages(&ecs.DescribeImagesArgs{
+			RegionId:  common.Region(config.AlicloudRegion),
+			ImageName: s.AlicloudImageName,
+		})
+		if len(images) < 1 {
 			return multistep.ActionContinue
 		}
-
-		for index, destinationRegion := range s.AlicloudImageDestinationRegions {
-			if destinationRegion == config.AlicloudRegion {
+		for _, image := range images {
+			if image.ImageOwnerAlias != string(ecs.ImageOwnerSelf) {
+				log.Printf("You can only delete instances based on customized images %s ", image.ImageId)
 				continue
 			}
-
-			if index < numberOfName {
-				err = s.deleteImageAndSnapshots(state, s.AlicloudImageDestinationNames[index], destinationRegion)
-				if err != nil {
-					return halt(state, err, "")
+			err = client.DeleteImage(common.Region(config.AlicloudRegion), image.ImageId)
+			if err != nil {
+				err := fmt.Errorf("Failed to delete image: %s", err)
+				state.Put("error", err)
+				ui.Error(err.Error())
+				return multistep.ActionHalt
+			}
+			if s.AlicloudImageForceDeleteSnapshots {
+				for _, diskDevice := range image.DiskDeviceMappings.DiskDeviceMapping {
+					if err := client.DeleteSnapshot(diskDevice.SnapshotId); err != nil {
+						err := fmt.Errorf("Deleting ECS snapshot failed: %s", err)
+						state.Put("error", err)
+						ui.Error(err.Error())
+						return multistep.ActionHalt
+					}
 				}
-			} else {
-				break
 			}
 		}
+
 	}
 
 	return multistep.ActionContinue
 }
 
-func (s *stepDeleteAlicloudImageSnapshots) deleteImageAndSnapshots(state multistep.StateBag, imageName string, region string) error {
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-
-	describeImagesRequest := ecs.CreateDescribeImagesRequest()
-	describeImagesRequest.RegionId = region
-	describeImagesRequest.ImageName = imageName
-	describeImagesRequest.Status = ImageStatusQueried
-	imageResponse, _ := client.DescribeImages(describeImagesRequest)
-	images := imageResponse.Images.Image
-	if len(images) < 1 {
-		return nil
-	}
-
-	ui.Say(fmt.Sprintf("Deleting duplicated image and snapshot in %s: %s", region, imageName))
-
-	for _, image := range images {
-		if image.ImageOwnerAlias != ImageOwnerSelf {
-			log.Printf("You can not delete non-customized images: %s ", image.ImageId)
-			continue
-		}
-
-		deleteImageRequest := ecs.CreateDeleteImageRequest()
-		deleteImageRequest.RegionId = region
-		deleteImageRequest.ImageId = image.ImageId
-		if _, err := client.DeleteImage(deleteImageRequest); err != nil {
-			err := fmt.Errorf("Failed to delete image: %s", err)
-			return err
-		}
-
-		if s.AlicloudImageForceDeleteSnapshots {
-			for _, diskDevice := range image.DiskDeviceMappings.DiskDeviceMapping {
-				deleteSnapshotRequest := ecs.CreateDeleteSnapshotRequest()
-				deleteSnapshotRequest.SnapshotId = diskDevice.SnapshotId
-				if _, err := client.DeleteSnapshot(deleteSnapshotRequest); err != nil {
-					err := fmt.Errorf("Deleting ECS snapshot failed: %s", err)
-					return err
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
 func (s *stepDeleteAlicloudImageSnapshots) Cleanup(state multistep.StateBag) {
 }

builder/alicloud/ecs/step_mount_disk.go

@@ -0,0 +1,72 @@
+package ecs
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+type stepMountAlicloudDisk struct {
+}
+
+func (s *stepMountAlicloudDisk) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	config := state.Get("config").(Config)
+	ui := state.Get("ui").(packer.Ui)
+	instance := state.Get("instance").(*ecs.InstanceAttributesType)
+	alicloudDiskDevices := config.ECSImagesDiskMappings
+	if len(config.ECSImagesDiskMappings) == 0 {
+		return multistep.ActionContinue
+	}
+	ui.Say("Mounting disks.")
+	disks, _, err := client.DescribeDisks(&ecs.DescribeDisksArgs{InstanceId: instance.InstanceId,
+		RegionId: instance.RegionId})
+	if err != nil {
+		err := fmt.Errorf("Error querying disks: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+	for _, disk := range disks {
+		if disk.Status == ecs.DiskStatusAvailable {
+			if err := client.AttachDisk(&ecs.AttachDiskArgs{DiskId: disk.DiskId,
+				InstanceId: instance.InstanceId,
+				Device:     getDevice(&disk, alicloudDiskDevices),
+			}); err != nil {
+				err := fmt.Errorf("Error mounting disks: %s", err)
+				state.Put("error", err)
+				ui.Error(err.Error())
+				return multistep.ActionHalt
+			}
+		}
+	}
+	for _, disk := range disks {
+		if err := client.WaitForDisk(instance.RegionId, disk.DiskId, ecs.DiskStatusInUse, ALICLOUD_DEFAULT_SHORT_TIMEOUT); err != nil {
+			err := fmt.Errorf("Timeout waiting for mount: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+	}
+	ui.Say("Finished mounting disks.")
+	return multistep.ActionContinue
+}
+
+func (s *stepMountAlicloudDisk) Cleanup(state multistep.StateBag) {
+
+}
+
+func getDevice(disk *ecs.DiskItemType, diskDevices []AlicloudDiskDevice) string {
+	if disk.Device != "" {
+		return disk.Device
+	}
+	for _, alicloudDiskDevice := range diskDevices {
+		if alicloudDiskDevice.DiskName == disk.DiskName || alicloudDiskDevice.SnapshotId == disk.SourceSnapshotId {
+			return alicloudDiskDevice.Device
+		}
+	}
+	return ""
+}

builder/alicloud/ecs/step_pre_validate.go

@@ -4,9 +4,10 @@ import (
 	"context"
 	"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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepPreValidate struct {
@@ -14,74 +15,35 @@ type stepPreValidate struct {
 	ForceDelete           bool
 }
 
-func (s *stepPreValidate) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	if err := s.validateRegions(state); err != nil {
-		return halt(state, err, "")
+func (s *stepPreValidate) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	ui := state.Get("ui").(packer.Ui)
+	if s.ForceDelete {
+		ui.Say("Force delete flag found, skipping prevalidating image name.")
+		return multistep.ActionContinue
 	}
 
-	if err := s.validateDestImageName(state); err != nil {
-		return halt(state, err, "")
+	client := state.Get("client").(*ecs.Client)
+	config := state.Get("config").(Config)
+	ui.Say("Prevalidating image name...")
+	images, _, err := client.DescribeImages(&ecs.DescribeImagesArgs{
+		ImageName: s.AlicloudDestImageName,
+		RegionId:  common.Region(config.AlicloudRegion)})
+
+	if err != nil {
+		err := fmt.Errorf("Error querying alicloud image: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	if len(images) > 0 {
+		err := fmt.Errorf("Error: name conflicts with an existing alicloud image: %s", images[0].ImageId)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
 	}
 
 	return multistep.ActionContinue
 }
 
-func (s *stepPreValidate) validateRegions(state multistep.StateBag) error {
-	ui := state.Get("ui").(packersdk.Ui)
-	config := state.Get("config").(*Config)
-
-	if config.AlicloudSkipValidation {
-		ui.Say("Skip region validation flag found, skipping prevalidating source region and copied regions.")
-		return nil
-	}
-
-	ui.Say("Prevalidating source region and copied regions...")
-
-	var errs *packersdk.MultiError
-	if err := config.ValidateRegion(config.AlicloudRegion); err != nil {
-		errs = packersdk.MultiErrorAppend(errs, err)
-	}
-	for _, region := range config.AlicloudImageDestinationRegions {
-		if err := config.ValidateRegion(region); err != nil {
-			errs = packersdk.MultiErrorAppend(errs, err)
-		}
-	}
-
-	if errs != nil && len(errs.Errors) > 0 {
-		return errs
-	}
-
-	return nil
-}
-
-func (s *stepPreValidate) validateDestImageName(state multistep.StateBag) error {
-	ui := state.Get("ui").(packersdk.Ui)
-	client := state.Get("client").(*ClientWrapper)
-	config := state.Get("config").(*Config)
-
-	if s.ForceDelete {
-		ui.Say("Force delete flag found, skipping prevalidating image name.")
-		return nil
-	}
-
-	ui.Say("Prevalidating image name...")
-
-	describeImagesRequest := ecs.CreateDescribeImagesRequest()
-	describeImagesRequest.RegionId = config.AlicloudRegion
-	describeImagesRequest.ImageName = s.AlicloudDestImageName
-	describeImagesRequest.Status = ImageStatusQueried
-
-	imagesResponse, err := client.DescribeImages(describeImagesRequest)
-	if err != nil {
-		return fmt.Errorf("Error querying alicloud image: %s", err)
-	}
-
-	images := imagesResponse.Images.Image
-	if len(images) > 0 {
-		return fmt.Errorf("Error: Image Name: '%s' is used by an existing alicloud image: %s", images[0].ImageName, images[0].ImageId)
-	}
-
-	return nil
-}
-
 func (s *stepPreValidate) Cleanup(multistep.StateBag) {}

builder/alicloud/ecs/step_region_copy_image.go

@@ -3,104 +3,70 @@ package ecs
 import (
 	"context"
 	"fmt"
-	"time"
 
-	"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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
-type stepRegionCopyAlicloudImage struct {
+type setpRegionCopyAlicloudImage struct {
 	AlicloudImageDestinationRegions []string
 	AlicloudImageDestinationNames   []string
 	RegionId                        string
 }
 
-func (s *stepRegionCopyAlicloudImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	config := state.Get("config").(*Config)
-
-	if config.ImageEncrypted != confighelper.TriUnset {
-		s.AlicloudImageDestinationRegions = append(s.AlicloudImageDestinationRegions, s.RegionId)
-		s.AlicloudImageDestinationNames = append(s.AlicloudImageDestinationNames, config.AlicloudImageName)
-	}
-
+func (s *setpRegionCopyAlicloudImage) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
 	if len(s.AlicloudImageDestinationRegions) == 0 {
 		return multistep.ActionContinue
 	}
-
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-
-	srcImageId := state.Get("alicloudimage").(string)
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
+	imageId := state.Get("alicloudimage").(string)
 	alicloudImages := state.Get("alicloudimages").(map[string]string)
-	numberOfName := len(s.AlicloudImageDestinationNames)
+	region := common.Region(s.RegionId)
 
-	ui.Say(fmt.Sprintf("Coping image %s from %s...", srcImageId, s.RegionId))
+	numberOfName := len(s.AlicloudImageDestinationNames)
 	for index, destinationRegion := range s.AlicloudImageDestinationRegions {
-		if destinationRegion == s.RegionId && config.ImageEncrypted == confighelper.TriUnset {
+		if destinationRegion == s.RegionId {
 			continue
 		}
-
 		ecsImageName := ""
 		if numberOfName > 0 && index < numberOfName {
 			ecsImageName = s.AlicloudImageDestinationNames[index]
 		}
-
-		copyImageRequest := ecs.CreateCopyImageRequest()
-		copyImageRequest.RegionId = s.RegionId
-		copyImageRequest.ImageId = srcImageId
-		copyImageRequest.DestinationRegionId = destinationRegion
-		copyImageRequest.DestinationImageName = ecsImageName
-		if config.ImageEncrypted != confighelper.TriUnset {
-			copyImageRequest.Encrypted = requests.NewBoolean(config.ImageEncrypted.True())
-		}
-
-		imageResponse, err := client.CopyImage(copyImageRequest)
+		imageId, err := client.CopyImage(
+			&ecs.CopyImageArgs{
+				RegionId:             region,
+				ImageId:              imageId,
+				DestinationRegionId:  common.Region(destinationRegion),
+				DestinationImageName: ecsImageName,
+			})
 		if err != nil {
-			return halt(state, err, "Error copying images")
+			state.Put("error", err)
+			ui.Say(fmt.Sprintf("Error copying images: %s", err))
+			return multistep.ActionHalt
 		}
-
-		alicloudImages[destinationRegion] = imageResponse.ImageId
-		ui.Message(fmt.Sprintf("Copy image from %s(%s) to %s(%s)", s.RegionId, srcImageId, destinationRegion, imageResponse.ImageId))
+		alicloudImages[destinationRegion] = imageId
 	}
-
-	if config.ImageEncrypted != confighelper.TriUnset {
-		if _, err := client.WaitForImageStatus(s.RegionId, alicloudImages[s.RegionId], ImageStatusAvailable, time.Duration(ALICLOUD_DEFAULT_LONG_TIMEOUT)*time.Second); err != nil {
-			return halt(state, err, fmt.Sprintf("Timeout waiting image %s finish copying", alicloudImages[s.RegionId]))
-		}
-	}
-
 	return multistep.ActionContinue
 }
 
-func (s *stepRegionCopyAlicloudImage) Cleanup(state multistep.StateBag) {
+func (s *setpRegionCopyAlicloudImage) Cleanup(state multistep.StateBag) {
 	_, cancelled := state.GetOk(multistep.StateCancelled)
 	_, halted := state.GetOk(multistep.StateHalted)
-
-	if !cancelled && !halted {
-		return
-	}
-
-	ui := state.Get("ui").(packersdk.Ui)
-	ui.Say(fmt.Sprintf("Stopping copy image because cancellation or error..."))
-
-	client := state.Get("client").(*ClientWrapper)
-	alicloudImages := state.Get("alicloudimages").(map[string]string)
-	srcImageId := state.Get("alicloudimage").(string)
-
-	for copiedRegionId, copiedImageId := range alicloudImages {
-		if copiedImageId == srcImageId {
-			continue
-		}
-
-		cancelCopyImageRequest := ecs.CreateCancelCopyImageRequest()
-		cancelCopyImageRequest.RegionId = copiedRegionId
-		cancelCopyImageRequest.ImageId = copiedImageId
-		if _, err := client.CancelCopyImage(cancelCopyImageRequest); err != nil {
-
-			ui.Error(fmt.Sprintf("Error cancelling copy image: %v", err))
+	if cancelled || halted {
+		ui := state.Get("ui").(packer.Ui)
+		client := state.Get("client").(*ecs.Client)
+		alicloudImages := state.Get("alicloudimages").(map[string]string)
+		ui.Say(fmt.Sprintf("Stopping copy image because cancellation or error..."))
+		for copiedRegionId, copiedImageId := range alicloudImages {
+			if copiedRegionId == s.RegionId {
+				continue
+			}
+			if err := client.CancelCopyImage(common.Region(copiedRegionId), copiedImageId); err != nil {
+				ui.Say(fmt.Sprintf("Error cancelling copy image: %v", err))
+			}
 		}
 	}
 }

builder/alicloud/ecs/step_run_instance.go

@@ -4,31 +4,33 @@ import (
 	"context"
 	"fmt"
 
-	"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/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepRunAlicloudInstance struct {
 }
 
-func (s *stepRunAlicloudInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
-	ui := state.Get("ui").(packersdk.Ui)
-	instance := state.Get("instance").(*ecs.Instance)
+func (s *stepRunAlicloudInstance) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
+	instance := state.Get("instance").(*ecs.InstanceAttributesType)
 
-	startInstanceRequest := ecs.CreateStartInstanceRequest()
-	startInstanceRequest.InstanceId = instance.InstanceId
-	if _, err := client.StartInstance(startInstanceRequest); err != nil {
-		return halt(state, err, "Error starting instance")
-	}
-
-	ui.Say(fmt.Sprintf("Starting instance: %s", instance.InstanceId))
-
-	_, err := client.WaitForInstanceStatus(instance.RegionId, instance.InstanceId, InstanceStatusRunning)
+	err := client.StartInstance(instance.InstanceId)
 	if err != nil {
-		return halt(state, err, "Timeout waiting for instance to start")
+		err := fmt.Errorf("Error starting instance: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+	ui.Say("Starting instance.")
+	err = client.WaitForInstance(instance.InstanceId, ecs.Running, ALICLOUD_DEFAULT_TIMEOUT)
+	if err != nil {
+		err := fmt.Errorf("Timeout waiting for instance to start: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
 	}
 
 	return multistep.ActionContinue
@@ -37,36 +39,19 @@ func (s *stepRunAlicloudInstance) Run(ctx context.Context, state multistep.State
 func (s *stepRunAlicloudInstance) Cleanup(state multistep.StateBag) {
 	_, cancelled := state.GetOk(multistep.StateCancelled)
 	_, halted := state.GetOk(multistep.StateHalted)
-
-	if !cancelled && !halted {
-		return
-	}
-
-	ui := state.Get("ui").(packersdk.Ui)
-	client := state.Get("client").(*ClientWrapper)
-	instance := state.Get("instance").(*ecs.Instance)
-
-	describeInstancesRequest := ecs.CreateDescribeInstancesRequest()
-	describeInstancesRequest.InstanceIds = fmt.Sprintf("[\"%s\"]", instance.InstanceId)
-	instancesResponse, _ := client.DescribeInstances(describeInstancesRequest)
-
-	if len(instancesResponse.Instances.Instance) == 0 {
-		return
-	}
-
-	instanceAttribute := instancesResponse.Instances.Instance[0]
-	if instanceAttribute.Status == InstanceStatusStarting || instanceAttribute.Status == InstanceStatusRunning {
-		stopInstanceRequest := ecs.CreateStopInstanceRequest()
-		stopInstanceRequest.InstanceId = instance.InstanceId
-		stopInstanceRequest.ForceStop = requests.NewBoolean(true)
-		if _, err := client.StopInstance(stopInstanceRequest); err != nil {
-			ui.Say(fmt.Sprintf("Error stopping instance %s, it may still be around %s", instance.InstanceId, err))
-			return
-		}
-
-		_, err := client.WaitForInstanceStatus(instance.RegionId, instance.InstanceId, InstanceStatusStopped)
-		if err != nil {
-			ui.Say(fmt.Sprintf("Error stopping instance %s, it may still be around %s", instance.InstanceId, err))
+	if cancelled || halted {
+		ui := state.Get("ui").(packer.Ui)
+		client := state.Get("client").(*ecs.Client)
+		instance := state.Get("instance").(*ecs.InstanceAttributesType)
+		instanceAttribute, _ := client.DescribeInstanceAttribute(instance.InstanceId)
+		if instanceAttribute.Status == ecs.Starting || instanceAttribute.Status == ecs.Running {
+			if err := client.StopInstance(instance.InstanceId, true); err != nil {
+				ui.Say(fmt.Sprintf("Error stopping instance %s, it may still be around %s", instance.InstanceId, err))
+				return
+			}
+			if err := client.WaitForInstance(instance.InstanceId, ecs.Stopped, ALICLOUD_DEFAULT_TIMEOUT); err != nil {
+				ui.Say(fmt.Sprintf("Error stopping instance %s, it may still be around %s", instance.InstanceId, err))
+			}
 		}
 	}
 }

builder/alicloud/ecs/step_share_image.go

@@ -4,57 +4,58 @@ import (
 	"context"
 	"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/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
-type stepShareAlicloudImage struct {
+type setpShareAlicloudImage struct {
 	AlicloudImageShareAccounts   []string
 	AlicloudImageUNShareAccounts []string
 	RegionId                     string
 }
 
-func (s *stepShareAlicloudImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
+func (s *setpShareAlicloudImage) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	ui := state.Get("ui").(packer.Ui)
 	alicloudImages := state.Get("alicloudimages").(map[string]string)
-
-	for regionId, imageId := range alicloudImages {
-		modifyImageShareRequest := ecs.CreateModifyImageSharePermissionRequest()
-		modifyImageShareRequest.RegionId = regionId
-		modifyImageShareRequest.ImageId = imageId
-		modifyImageShareRequest.AddAccount = &s.AlicloudImageShareAccounts
-		modifyImageShareRequest.RemoveAccount = &s.AlicloudImageUNShareAccounts
-
-		if _, err := client.ModifyImageSharePermission(modifyImageShareRequest); err != nil {
-			return halt(state, err, "Failed modifying image share permissions")
+	for copiedRegion, copiedImageId := range alicloudImages {
+		err := client.ModifyImageSharePermission(
+			&ecs.ModifyImageSharePermissionArgs{
+				RegionId:      common.Region(copiedRegion),
+				ImageId:       copiedImageId,
+				AddAccount:    s.AlicloudImageShareAccounts,
+				RemoveAccount: s.AlicloudImageUNShareAccounts,
+			})
+		if err != nil {
+			state.Put("error", err)
+			ui.Say(fmt.Sprintf("Failed modifying image share permissions: %s", err))
+			return multistep.ActionHalt
 		}
 	}
 	return multistep.ActionContinue
 }
 
-func (s *stepShareAlicloudImage) Cleanup(state multistep.StateBag) {
+func (s *setpShareAlicloudImage) Cleanup(state multistep.StateBag) {
 	_, cancelled := state.GetOk(multistep.StateCancelled)
 	_, halted := state.GetOk(multistep.StateHalted)
-
-	if !cancelled && !halted {
-		return
-	}
-
-	ui := state.Get("ui").(packersdk.Ui)
-	client := state.Get("client").(*ClientWrapper)
-	alicloudImages := state.Get("alicloudimages").(map[string]string)
-
-	ui.Say("Restoring image share permission because cancellations or error...")
-
-	for regionId, imageId := range alicloudImages {
-		modifyImageShareRequest := ecs.CreateModifyImageSharePermissionRequest()
-		modifyImageShareRequest.RegionId = regionId
-		modifyImageShareRequest.ImageId = imageId
-		modifyImageShareRequest.AddAccount = &s.AlicloudImageUNShareAccounts
-		modifyImageShareRequest.RemoveAccount = &s.AlicloudImageShareAccounts
-		if _, err := client.ModifyImageSharePermission(modifyImageShareRequest); err != nil {
-			ui.Say(fmt.Sprintf("Restoring image share permission failed: %s", err))
+	if cancelled || halted {
+		ui := state.Get("ui").(packer.Ui)
+		client := state.Get("client").(*ecs.Client)
+		alicloudImages := state.Get("alicloudimages").(map[string]string)
+		ui.Say("Restoring image share permission because cancellations or error...")
+		for copiedRegion, copiedImageId := range alicloudImages {
+			err := client.ModifyImageSharePermission(
+				&ecs.ModifyImageSharePermissionArgs{
+					RegionId:      common.Region(copiedRegion),
+					ImageId:       copiedImageId,
+					AddAccount:    s.AlicloudImageUNShareAccounts,
+					RemoveAccount: s.AlicloudImageShareAccounts,
+				})
+			if err != nil {
+				ui.Say(fmt.Sprintf("Restoring image share permission failed: %s", err))
+			}
 		}
 	}
 }

builder/alicloud/ecs/step_stop_instance.go

@@ -3,41 +3,37 @@ package ecs
 import (
 	"context"
 	"fmt"
-	"strconv"
 
-	"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/denverdino/aliyungo/ecs"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
 )
 
 type stepStopAlicloudInstance struct {
-	ForceStop   bool
-	DisableStop bool
+	ForceStop bool
 }
 
-func (s *stepStopAlicloudInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
-	instance := state.Get("instance").(*ecs.Instance)
-	ui := state.Get("ui").(packersdk.Ui)
+func (s *stepStopAlicloudInstance) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*ecs.Client)
+	instance := state.Get("instance").(*ecs.InstanceAttributesType)
+	ui := state.Get("ui").(packer.Ui)
 
-	if !s.DisableStop {
-		ui.Say(fmt.Sprintf("Stopping instance: %s", instance.InstanceId))
-
-		stopInstanceRequest := ecs.CreateStopInstanceRequest()
-		stopInstanceRequest.InstanceId = instance.InstanceId
-		stopInstanceRequest.ForceStop = requests.Boolean(strconv.FormatBool(s.ForceStop))
-		if _, err := client.StopInstance(stopInstanceRequest); err != nil {
-			return halt(state, err, "Error stopping alicloud instance")
+	err := client.StopInstance(instance.InstanceId, s.ForceStop)
+	if err != nil {
+		if err != nil {
+			err := fmt.Errorf("Error stopping alicloud instance: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
 		}
 	}
 
-	ui.Say(fmt.Sprintf("Waiting instance stopped: %s", instance.InstanceId))
-
-	_, err := client.WaitForInstanceStatus(instance.RegionId, instance.InstanceId, InstanceStatusStopped)
+	err = client.WaitForInstance(instance.InstanceId, ecs.Stopped, ALICLOUD_DEFAULT_TIMEOUT)
 	if err != nil {
-		return halt(state, err, "Error waiting for alicloud instance to stop")
+		err := fmt.Errorf("Error waiting for alicloud instance to stop: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
 	}
 
 	return multistep.ActionContinue

builder/alicloud/examples/basic/alicloud_windows.json

@@ -1,27 +0,0 @@
-{
-  "variables": {
-    "access_key": "{{env `ALICLOUD_ACCESS_KEY`}}",
-    "secret_key": "{{env `ALICLOUD_SECRET_KEY`}}"
-  },
-  "builders": [{
-    "type":"alicloud-ecs",
-    "access_key":"{{user `access_key`}}",
-    "secret_key":"{{user `secret_key`}}",
-    "region":"cn-beijing",
-    "image_name":"packer_test",
-    "source_image":"winsvr_64_dtcC_1809_en-us_40G_alibase_20190318.vhd",
-    "instance_type":"ecs.n1.tiny",
-    "io_optimized":"true",
-    "internet_charge_type":"PayByTraffic",
-    "image_force_delete":"true",
-    "communicator": "winrm",
-    "winrm_port": 5985,
-    "winrm_username": "Administrator",
-    "winrm_password": "Test1234",
-    "user_data_file": "examples/alicloud/basic/winrm_enable_userdata.ps1"
-  }],
-  "provisioners": [{
-    "type": "powershell",
-    "inline": ["dir c:\\"]
-  }]
-}

builder/alicloud/examples/basic/alicloud_with_data_disk.json

@@ -1,37 +0,0 @@
-{
-  "variables": {
-    "access_key": "{{env `ALICLOUD_ACCESS_KEY`}}",
-    "secret_key": "{{env `ALICLOUD_SECRET_KEY`}}"
-  },
-  "builders": [{
-    "type":"alicloud-ecs",
-    "access_key":"{{user `access_key`}}",
-    "secret_key":"{{user `secret_key`}}",
-    "region":"cn-beijing",
-    "image_name":"packer_with_data_disk",
-    "source_image":"centos_7_03_64_20G_alibase_20170818.vhd",
-    "ssh_username":"root",
-    "instance_type":"ecs.n1.tiny",
-    "internet_charge_type":"PayByTraffic",
-    "io_optimized":"true",
-    "image_disk_mappings":[
-      {
-        "disk_name":"data1",
-        "disk_size":20,
-        "disk_delete_with_instance": true
-      },{
-        "disk_name":"data2",
-        "disk_size":20,
-        "disk_device":"/dev/xvdz",
-        "disk_delete_with_instance": true
-      }
-    ]
-  }],
-  "provisioners": [{
-    "type": "shell",
-    "inline": [
-      "sleep 30",
-      "yum install redis.x86_64 -y"
-    ]
-  }]
-}

builder/alicloud/examples/basic/winrm_enable_userdata.ps1

@@ -1,26 +0,0 @@
-#powershell
-write-output "Running User Data Script"
-write-host "(host) Running User Data Script"
-Set-ExecutionPolicy Unrestricted -Scope LocalMachine -Force -ErrorAction Ignore
-# Don't set this before Set-ExecutionPolicy as it throws an error
-$ErrorActionPreference = "stop"
-# Remove HTTP listener
-Remove-Item -Path WSMan:\Localhost\listener\listener* -Recurse
-# WinRM
-write-output "Setting up WinRM"
-write-host "(host) setting up WinRM"
-cmd.exe /c winrm quickconfig -q
-cmd.exe /c winrm quickconfig '-transport:http'
-cmd.exe /c winrm set "winrm/config" '@{MaxTimeoutms="1800000"}'
-cmd.exe /c winrm set "winrm/config/winrs" '@{MaxMemoryPerShellMB="10240"}'
-cmd.exe /c winrm set "winrm/config/service" '@{AllowUnencrypted="true"}'
-cmd.exe /c winrm set "winrm/config/client" '@{AllowUnencrypted="true"}'
-cmd.exe /c winrm set "winrm/config/service/auth" '@{Basic="true"}'
-cmd.exe /c winrm set "winrm/config/client/auth" '@{Basic="true"}'
-cmd.exe /c winrm set "winrm/config/service/auth" '@{CredSSP="true"}'
-cmd.exe /c winrm set "winrm/config/listener?Address=*+Transport=HTTP" '@{Port="5985"}'
-cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes
-cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985"
-cmd.exe /c net stop winrm
-cmd.exe /c sc config winrm start= auto
-cmd.exe /c net start winrm

builder/alicloud/examples/chef/alicloud.json

@@ -1,34 +0,0 @@
-{
-  "variables": {
-    "access_key": "{{env `ALICLOUD_ACCESS_KEY`}}",
-    "secret_key": "{{env `ALICLOUD_SECRET_KEY`}}"
-  },
-  "builders": [{
-    "type":"alicloud-ecs",
-    "access_key":"{{user `access_key`}}",
-    "secret_key":"{{user `secret_key`}}",
-    "region":"cn-beijing",
-    "image_name":"packer_chef2",
-    "source_image":"ubuntu_18_04_64_20G_alibase_20190223.vhd",
-    "ssh_username":"root",
-    "instance_type":"ecs.n1.medium",
-    "io_optimized":"true",
-    "image_force_delete":"true",
-    "internet_charge_type":"PayByTraffic",
-    "ssh_password":"Test1234",
-    "user_data_file":"examples/alicloud/chef/user_data.sh"
-  }],
-  "provisioners": [{
-    "type": "file",
-    "source": "examples/alicloud/chef/chef.sh",
-    "destination": "/root/"	
-   },{
-    "type": "shell",
-    "inline": [
-	"cd /root/",
-    "chmod 755 chef.sh",
-	"./chef.sh",
-    "chef-server-ctl  reconfigure"
-    ]
-  }]
-}

builder/alicloud/examples/jenkins/alicloud.json

@@ -1,32 +0,0 @@
-{
-  "variables": {
-    "access_key": "{{env `ALICLOUD_ACCESS_KEY`}}",
-    "secret_key": "{{env `ALICLOUD_SECRET_KEY`}}"
-  },
-  "builders": [{
-    "type":"alicloud-ecs",
-    "access_key":"{{user `access_key`}}",
-    "secret_key":"{{user `secret_key`}}",
-    "region":"cn-beijing",
-    "image_name":"packer_jenkins",
-    "source_image":"ubuntu_18_04_64_20G_alibase_20190223.vhd",
-    "ssh_username":"root",
-    "instance_type":"ecs.n1.medium",
-    "io_optimized":"true",
-    "internet_charge_type":"PayByTraffic",
-    "image_force_delete":"true",
-    "ssh_password":"Test12345"
-  }],
-  "provisioners": [{
-    "type": "file",
-    "source": "examples/alicloud/jenkins/jenkins.sh",
-    "destination": "/root/"	
-   },{
-    "type": "shell",
-    "inline": [
-	"cd /root/",
-    "chmod 755 jenkins.sh",
-	"./jenkins.sh"
-    ]
-  }]
-}

builder/alicloud/examples/local/centos.json

@@ -1,59 +0,0 @@
-{"variables": {
-    "box_basename": "centos-6.8",
-    "build_timestamp": "{{isotime \"20060102150405\"}}",
-    "cpus": "1",
-    "disk_size": "4096",
-    "git_revision": "__unknown_git_revision__",
-    "headless": "",
-    "http_proxy": "{{env `http_proxy`}}",
-    "https_proxy": "{{env `https_proxy`}}",
-    "iso_checksum": "md5:0ca12fe5f28c2ceed4f4084b41ff8a0b",
-    "iso_name": "CentOS-6.8-x86_64-minimal.iso",
-    "ks_path": "centos-6.8/ks.cfg",
-    "memory": "512",
-    "metadata": "floppy/dummy_metadata.json",
-    "mirror": "http://mirrors.aliyun.com/centos",
-    "mirror_directory": "6.8/isos/x86_64",
-    "name": "centos-6.8",
-    "no_proxy": "{{env `no_proxy`}}",
-    "template": "centos-6.8-x86_64",
-    "version": "2.1.TIMESTAMP"
-  },
-  "builders":[
-    {
-      "boot_command": [
-        "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `ks_path`}}<enter><wait>"
-      ],
-      "boot_wait": "10s",
-      "disk_size": "{{user `disk_size`}}",
-      "headless": "{{ user `headless` }}",
-      "http_directory": "http",
-      "iso_checksum": "{{user `iso_checksum`}}",
-      "iso_checksum_type": "{{user `iso_checksum_type`}}",
-      "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
-      "output_directory": "packer-{{user `template`}}-qemu",
-      "shutdown_command": "echo 'vagrant'|sudo -S /sbin/halt -h -p",
-      "ssh_password": "vagrant",
-      "ssh_port": 22,
-      "ssh_username": "root",
-      "ssh_timeout": "10000s",
-      "type": "qemu",
-      "vm_name": "{{ user `template` }}.raw",      
-      "net_device": "virtio-net",
-      "disk_interface": "virtio",
-      "format": "raw"
-    }
-  ],
-"post-processors":[
-    {
-      "type":"alicloud-import",
-      "oss_bucket_name": "packer",
-      "image_name": "packer_import",
-      "image_os_type": "linux",
-      "image_platform": "CentOS",
-      "image_architecture": "x86_64",
-      "image_system_size": "40",
-      "region":"cn-beijing"
-    }
-  ]
-}

builder/alicloud/version/version.go

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

builder/amazon/chroot/builder.go

@@ -0,0 +1,320 @@
+// The chroot package is able to create an Amazon AMI without requiring
+// the launch of a new instance for every build. It does this by attaching
+// and mounting the root volume of another AMI and chrooting into that
+// directory. It then creates an AMI from that attached drive.
+package chroot
+
+import (
+	"errors"
+	"log"
+	"runtime"
+
+	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
+)
+
+// The unique ID for this builder
+const BuilderId = "mitchellh.amazon.chroot"
+
+// Config is the configuration that is chained through the steps and
+// settable from the template.
+type Config struct {
+	common.PackerConfig       `mapstructure:",squash"`
+	awscommon.AMIBlockDevices `mapstructure:",squash"`
+	awscommon.AMIConfig       `mapstructure:",squash"`
+	awscommon.AccessConfig    `mapstructure:",squash"`
+
+	ChrootMounts      [][]string                 `mapstructure:"chroot_mounts"`
+	CommandWrapper    string                     `mapstructure:"command_wrapper"`
+	CopyFiles         []string                   `mapstructure:"copy_files"`
+	DevicePath        string                     `mapstructure:"device_path"`
+	FromScratch       bool                       `mapstructure:"from_scratch"`
+	MountOptions      []string                   `mapstructure:"mount_options"`
+	MountPartition    int                        `mapstructure:"mount_partition"`
+	MountPath         string                     `mapstructure:"mount_path"`
+	PostMountCommands []string                   `mapstructure:"post_mount_commands"`
+	PreMountCommands  []string                   `mapstructure:"pre_mount_commands"`
+	RootDeviceName    string                     `mapstructure:"root_device_name"`
+	RootVolumeSize    int64                      `mapstructure:"root_volume_size"`
+	SourceAmi         string                     `mapstructure:"source_ami"`
+	SourceAmiFilter   awscommon.AmiFilterOptions `mapstructure:"source_ami_filter"`
+
+	ctx interpolate.Context
+}
+
+type wrappedCommandTemplate struct {
+	Command string
+}
+
+type Builder struct {
+	config Config
+	runner multistep.Runner
+}
+
+func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
+	b.config.ctx.Funcs = awscommon.TemplateFuncs
+	err := config.Decode(&b.config, &config.DecodeOpts{
+		Interpolate:        true,
+		InterpolateContext: &b.config.ctx,
+		InterpolateFilter: &interpolate.RenderFilter{
+			Exclude: []string{
+				"ami_description",
+				"snapshot_tags",
+				"tags",
+				"command_wrapper",
+				"post_mount_commands",
+				"pre_mount_commands",
+				"mount_path",
+			},
+		},
+	}, raws...)
+	if err != nil {
+		return nil, err
+	}
+
+	if b.config.PackerConfig.PackerForce {
+		b.config.AMIForceDeregister = true
+	}
+
+	// Defaults
+	if b.config.ChrootMounts == nil {
+		b.config.ChrootMounts = make([][]string, 0)
+	}
+
+	if len(b.config.ChrootMounts) == 0 {
+		b.config.ChrootMounts = [][]string{
+			{"proc", "proc", "/proc"},
+			{"sysfs", "sysfs", "/sys"},
+			{"bind", "/dev", "/dev"},
+			{"devpts", "devpts", "/dev/pts"},
+			{"binfmt_misc", "binfmt_misc", "/proc/sys/fs/binfmt_misc"},
+		}
+	}
+
+	// set default copy file if we're not giving our own
+	if b.config.CopyFiles == nil {
+		b.config.CopyFiles = make([]string, 0)
+		if !b.config.FromScratch {
+			b.config.CopyFiles = []string{"/etc/resolv.conf"}
+		}
+	}
+
+	if b.config.CommandWrapper == "" {
+		b.config.CommandWrapper = "{{.Command}}"
+	}
+
+	if b.config.MountPath == "" {
+		b.config.MountPath = "/mnt/packer-amazon-chroot-volumes/{{.Device}}"
+	}
+
+	if b.config.MountPartition == 0 {
+		b.config.MountPartition = 1
+	}
+
+	// Accumulate any errors or warnings
+	var errs *packer.MultiError
+	var warns []string
+
+	errs = packer.MultiErrorAppend(errs, b.config.AccessConfig.Prepare(&b.config.ctx)...)
+	errs = packer.MultiErrorAppend(errs,
+		b.config.AMIConfig.Prepare(&b.config.AccessConfig, &b.config.ctx)...)
+
+	for _, mounts := range b.config.ChrootMounts {
+		if len(mounts) != 3 {
+			errs = packer.MultiErrorAppend(
+				errs, errors.New("Each chroot_mounts entry should be three elements."))
+			break
+		}
+	}
+
+	if b.config.FromScratch {
+		if b.config.SourceAmi != "" || !b.config.SourceAmiFilter.Empty() {
+			warns = append(warns, "source_ami and source_ami_filter are unused when from_scratch is true")
+		}
+		if b.config.RootVolumeSize == 0 {
+			errs = packer.MultiErrorAppend(
+				errs, errors.New("root_volume_size is required with from_scratch."))
+		}
+		if len(b.config.PreMountCommands) == 0 {
+			errs = packer.MultiErrorAppend(
+				errs, errors.New("pre_mount_commands is required with from_scratch."))
+		}
+		if b.config.AMIVirtType == "" {
+			errs = packer.MultiErrorAppend(
+				errs, errors.New("ami_virtualization_type is required with from_scratch."))
+		}
+		if b.config.RootDeviceName == "" {
+			errs = packer.MultiErrorAppend(
+				errs, errors.New("root_device_name is required with from_scratch."))
+		}
+		if len(b.config.AMIMappings) == 0 {
+			errs = packer.MultiErrorAppend(
+				errs, errors.New("ami_block_device_mappings is required with from_scratch."))
+		}
+	} else {
+		if b.config.SourceAmi == "" && b.config.SourceAmiFilter.Empty() {
+			errs = packer.MultiErrorAppend(
+				errs, errors.New("source_ami or source_ami_filter is required."))
+		}
+		if len(b.config.AMIMappings) != 0 {
+			warns = append(warns, "ami_block_device_mappings are unused when from_scratch is false")
+		}
+		if b.config.RootDeviceName != "" {
+			warns = append(warns, "root_device_name is unused when from_scratch is false")
+		}
+	}
+
+	if errs != nil && len(errs.Errors) > 0 {
+		return warns, errs
+	}
+
+	log.Println(common.ScrubConfig(b.config, b.config.AccessKey, b.config.SecretKey, b.config.Token))
+	return warns, nil
+}
+
+func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) {
+	if runtime.GOOS != "linux" {
+		return nil, errors.New("The amazon-chroot builder only works on Linux environments.")
+	}
+
+	session, err := b.config.Session()
+	if err != nil {
+		return nil, err
+	}
+	ec2conn := ec2.New(session)
+
+	wrappedCommand := func(command string) (string, error) {
+		ctx := b.config.ctx
+		ctx.Data = &wrappedCommandTemplate{Command: command}
+		return interpolate.Render(b.config.CommandWrapper, &ctx)
+	}
+
+	// Setup the state bag and initial state for the steps
+	state := new(multistep.BasicStateBag)
+	state.Put("config", &b.config)
+	state.Put("ec2", ec2conn)
+	state.Put("awsSession", session)
+	state.Put("hook", hook)
+	state.Put("ui", ui)
+	state.Put("wrappedCommand", CommandWrapper(wrappedCommand))
+
+	// Build the steps
+	steps := []multistep.Step{
+		&awscommon.StepPreValidate{
+			DestAmiName:     b.config.AMIName,
+			ForceDeregister: b.config.AMIForceDeregister,
+		},
+		&StepInstanceInfo{},
+	}
+
+	if !b.config.FromScratch {
+		steps = append(steps,
+			&awscommon.StepSourceAMIInfo{
+				SourceAmi:                b.config.SourceAmi,
+				EnableAMISriovNetSupport: b.config.AMISriovNetSupport,
+				EnableAMIENASupport:      b.config.AMIENASupport,
+				AmiFilters:               b.config.SourceAmiFilter,
+			},
+			&StepCheckRootDevice{},
+		)
+	}
+
+	steps = append(steps,
+		&StepFlock{},
+		&StepPrepareDevice{},
+		&StepCreateVolume{
+			RootVolumeSize: b.config.RootVolumeSize,
+		},
+		&StepAttachVolume{},
+		&StepEarlyUnflock{},
+		&StepPreMountCommands{
+			Commands: b.config.PreMountCommands,
+		},
+		&StepMountDevice{
+			MountOptions:   b.config.MountOptions,
+			MountPartition: b.config.MountPartition,
+		},
+		&StepPostMountCommands{
+			Commands: b.config.PostMountCommands,
+		},
+		&StepMountExtra{},
+		&StepCopyFiles{},
+		&StepChrootProvision{},
+		&StepEarlyCleanup{},
+		&StepSnapshot{},
+		&awscommon.StepDeregisterAMI{
+			AccessConfig:        &b.config.AccessConfig,
+			ForceDeregister:     b.config.AMIForceDeregister,
+			ForceDeleteSnapshot: b.config.AMIForceDeleteSnapshot,
+			AMIName:             b.config.AMIName,
+			Regions:             b.config.AMIRegions,
+		},
+		&StepRegisterAMI{
+			RootVolumeSize:           b.config.RootVolumeSize,
+			EnableAMISriovNetSupport: b.config.AMISriovNetSupport,
+			EnableAMIENASupport:      b.config.AMIENASupport,
+		},
+		&awscommon.StepCreateEncryptedAMICopy{
+			KeyID:             b.config.AMIKmsKeyId,
+			EncryptBootVolume: b.config.AMIEncryptBootVolume,
+			Name:              b.config.AMIName,
+			AMIMappings:       b.config.AMIBlockDevices.AMIMappings,
+		},
+		&awscommon.StepAMIRegionCopy{
+			AccessConfig:      &b.config.AccessConfig,
+			Regions:           b.config.AMIRegions,
+			RegionKeyIds:      b.config.AMIRegionKMSKeyIDs,
+			EncryptBootVolume: b.config.AMIEncryptBootVolume,
+			Name:              b.config.AMIName,
+		},
+		&awscommon.StepModifyAMIAttributes{
+			Description:    b.config.AMIDescription,
+			Users:          b.config.AMIUsers,
+			Groups:         b.config.AMIGroups,
+			ProductCodes:   b.config.AMIProductCodes,
+			SnapshotUsers:  b.config.SnapshotUsers,
+			SnapshotGroups: b.config.SnapshotGroups,
+			Ctx:            b.config.ctx,
+		},
+		&awscommon.StepCreateTags{
+			Tags:         b.config.AMITags,
+			SnapshotTags: b.config.SnapshotTags,
+			Ctx:          b.config.ctx,
+		},
+	)
+
+	// Run!
+	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner.Run(state)
+
+	// If there was an error, return that
+	if rawErr, ok := state.GetOk("error"); ok {
+		return nil, rawErr.(error)
+	}
+
+	// If there are no AMIs, then just return
+	if _, ok := state.GetOk("amis"); !ok {
+		return nil, nil
+	}
+
+	// Build the artifact and return it
+	artifact := &awscommon.Artifact{
+		Amis:           state.Get("amis").(map[string]string),
+		BuilderIdValue: BuilderId,
+		Session:        session,
+	}
+
+	return artifact, nil
+}
+
+func (b *Builder) Cancel() {
+	if b.runner != nil {
+		log.Println("Cancelling the step runner...")
+		b.runner.Cancel()
+	}
+}

builder/amazon/chroot/builder_test.go

@@ -0,0 +1,161 @@
+package chroot
+
+import (
+	"testing"
+
+	"github.com/hashicorp/packer/packer"
+)
+
+func testConfig() map[string]interface{} {
+	return map[string]interface{}{
+		"ami_name":   "foo",
+		"source_ami": "foo",
+		"region":     "us-east-1",
+	}
+}
+
+func TestBuilder_ImplementsBuilder(t *testing.T) {
+	var raw interface{}
+	raw = &Builder{}
+	if _, ok := raw.(packer.Builder); !ok {
+		t.Fatalf("Builder should be a builder")
+	}
+}
+
+func TestBuilderPrepare_AMIName(t *testing.T) {
+	var b Builder
+	config := testConfig()
+
+	// Test good
+	config["ami_name"] = "foo"
+	warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Fatalf("should not have error: %s", err)
+	}
+
+	// Test bad
+	config["ami_name"] = "foo {{"
+	b = Builder{}
+	warnings, err = b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatal("should have error")
+	}
+
+	// Test bad
+	delete(config, "ami_name")
+	b = Builder{}
+	warnings, err = b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatal("should have error")
+	}
+}
+
+func TestBuilderPrepare_ChrootMounts(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	config["chroot_mounts"] = nil
+	warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Errorf("err: %s", err)
+	}
+}
+
+func TestBuilderPrepare_ChrootMountsBadDefaults(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	config["chroot_mounts"] = [][]string{
+		{"bad"},
+	}
+	warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatal("should have error")
+	}
+}
+func TestBuilderPrepare_SourceAmi(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	config["source_ami"] = ""
+	warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatal("should have error")
+	}
+
+	config["source_ami"] = "foo"
+	warnings, err = b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Errorf("err: %s", err)
+	}
+}
+
+func TestBuilderPrepare_CommandWrapper(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	config["command_wrapper"] = "echo hi; {{.Command}}"
+	warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Errorf("err: %s", err)
+	}
+}
+
+func TestBuilderPrepare_CopyFiles(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Errorf("err: %s", err)
+	}
+
+	if len(b.config.CopyFiles) != 1 && b.config.CopyFiles[0] != "/etc/resolv.conf" {
+		t.Errorf("Was expecting default value for copy_files.")
+	}
+}
+
+func TestBuilderPrepare_CopyFilesNoDefault(t *testing.T) {
+	b := &Builder{}
+	config := testConfig()
+
+	config["copy_files"] = []string{}
+	warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Errorf("err: %s", err)
+	}
+
+	if len(b.config.CopyFiles) > 0 {
+		t.Errorf("Was expecting no default value for copy_files.")
+	}
+}

builder/amazon/chroot/cleanup.go

@@ -0,0 +1,10 @@
+package chroot
+
+import (
+	"github.com/hashicorp/packer/helper/multistep"
+)
+
+// Cleanup is an interface that some steps implement for early cleanup.
+type Cleanup interface {
+	CleanupFunc(multistep.StateBag) error
+}

builder/amazon/chroot/communicator.go

@@ -0,0 +1,139 @@
+package chroot
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"syscall"
+
+	"github.com/hashicorp/packer/packer"
+)
+
+// Communicator is a special communicator that works by executing
+// commands locally but within a chroot.
+type Communicator struct {
+	Chroot     string
+	CmdWrapper CommandWrapper
+}
+
+func (c *Communicator) Start(cmd *packer.RemoteCmd) error {
+	command, err := c.CmdWrapper(
+		fmt.Sprintf("chroot %s /bin/sh -c \"%s\"", c.Chroot, cmd.Command))
+	if err != nil {
+		return err
+	}
+
+	localCmd := ShellCommand(command)
+	localCmd.Stdin = cmd.Stdin
+	localCmd.Stdout = cmd.Stdout
+	localCmd.Stderr = cmd.Stderr
+	log.Printf("Executing: %s %#v", localCmd.Path, localCmd.Args)
+	if err := localCmd.Start(); err != nil {
+		return err
+	}
+
+	go func() {
+		exitStatus := 0
+		if err := localCmd.Wait(); err != nil {
+			if exitErr, ok := err.(*exec.ExitError); ok {
+				exitStatus = 1
+
+				// There is no process-independent way to get the REAL
+				// exit status so we just try to go deeper.
+				if status, ok := exitErr.Sys().(syscall.WaitStatus); ok {
+					exitStatus = status.ExitStatus()
+				}
+			}
+		}
+
+		log.Printf(
+			"Chroot execution exited with '%d': '%s'",
+			exitStatus, cmd.Command)
+		cmd.SetExited(exitStatus)
+	}()
+
+	return nil
+}
+
+func (c *Communicator) Upload(dst string, r io.Reader, fi *os.FileInfo) error {
+	dst = filepath.Join(c.Chroot, dst)
+	log.Printf("Uploading to chroot dir: %s", dst)
+	tf, err := ioutil.TempFile("", "packer-amazon-chroot")
+	if err != nil {
+		return fmt.Errorf("Error preparing shell script: %s", err)
+	}
+	defer os.Remove(tf.Name())
+
+	if _, err := io.Copy(tf, r); err != nil {
+		return err
+	}
+
+	cpCmd, err := c.CmdWrapper(fmt.Sprintf("cp %s %s", tf.Name(), dst))
+	if err != nil {
+		return err
+	}
+
+	return ShellCommand(cpCmd).Run()
+}
+
+func (c *Communicator) UploadDir(dst string, src string, exclude []string) error {
+	// If src ends with a trailing "/", copy from "src/." so that
+	// directory contents (including hidden files) are copied, but the
+	// directory "src" is omitted.  BSD does this automatically when
+	// the source contains a trailing slash, but linux does not.
+	if src[len(src)-1] == '/' {
+		src = src + "."
+	}
+
+	// TODO: remove any file copied if it appears in `exclude`
+	chrootDest := filepath.Join(c.Chroot, dst)
+
+	log.Printf("Uploading directory '%s' to '%s'", src, chrootDest)
+	cpCmd, err := c.CmdWrapper(fmt.Sprintf("cp -R '%s' %s", src, chrootDest))
+	if err != nil {
+		return err
+	}
+
+	var stderr bytes.Buffer
+	cmd := ShellCommand(cpCmd)
+	cmd.Env = append(cmd.Env, "LANG=C")
+	cmd.Env = append(cmd.Env, os.Environ()...)
+	cmd.Stderr = &stderr
+	err = cmd.Run()
+	if err == nil {
+		return err
+	}
+
+	if strings.Contains(stderr.String(), "No such file") {
+		// This just means that the directory was empty. Just ignore it.
+		return nil
+	}
+
+	return err
+}
+
+func (c *Communicator) DownloadDir(src string, dst string, exclude []string) error {
+	return fmt.Errorf("DownloadDir is not implemented for amazon-chroot")
+}
+
+func (c *Communicator) Download(src string, w io.Writer) error {
+	src = filepath.Join(c.Chroot, src)
+	log.Printf("Downloading from chroot dir: %s", src)
+	f, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	if _, err := io.Copy(w, f); err != nil {
+		return err
+	}
+
+	return nil
+}

builder/amazon/chroot/communicator_test.go

@@ -0,0 +1,15 @@
+package chroot
+
+import (
+	"testing"
+
+	"github.com/hashicorp/packer/packer"
+)
+
+func TestCommunicator_ImplementsCommunicator(t *testing.T) {
+	var raw interface{}
+	raw = &Communicator{}
+	if _, ok := raw.(packer.Communicator); !ok {
+		t.Fatalf("Communicator should be a communicator")
+	}
+}

builder/amazon/chroot/copy_files_test.go

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

builder/amazon/chroot/device_test.go

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

builder/amazon/chroot/run_local_commands.go

@@ -0,0 +1,37 @@
+package chroot
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/post-processor/shell-local"
+	"github.com/hashicorp/packer/template/interpolate"
+)
+
+func RunLocalCommands(commands []string, wrappedCommand CommandWrapper, ctx interpolate.Context, ui packer.Ui) error {
+	for _, rawCmd := range commands {
+		intCmd, err := interpolate.Render(rawCmd, &ctx)
+		if err != nil {
+			return fmt.Errorf("Error interpolating: %s", err)
+		}
+
+		command, err := wrappedCommand(intCmd)
+		if err != nil {
+			return fmt.Errorf("Error wrapping command: %s", err)
+		}
+
+		ui.Say(fmt.Sprintf("Executing command: %s", command))
+		comm := &shell_local.Communicator{}
+		cmd := &packer.RemoteCmd{Command: command}
+		if err := cmd.StartWithUi(comm, ui); err != nil {
+			return fmt.Errorf("Error executing command: %s", err)
+		}
+		if cmd.ExitStatus != 0 {
+			return fmt.Errorf(
+				"Received non-zero exit code %d from command: %s",
+				cmd.ExitStatus,
+				command)
+		}
+	}
+	return nil
+}

builder/amazon/chroot/step_attach_volume.go

@@ -0,0 +1,144 @@
+package chroot
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// StepAttachVolume attaches the previously created volume to an
+// available device location.
+//
+// Produces:
+//   device string - The location where the volume was attached.
+//   attach_cleanup CleanupFunc
+type StepAttachVolume struct {
+	attached bool
+	volumeId string
+}
+
+func (s *StepAttachVolume) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	ec2conn := state.Get("ec2").(*ec2.EC2)
+	device := state.Get("device").(string)
+	instance := state.Get("instance").(*ec2.Instance)
+	ui := state.Get("ui").(packer.Ui)
+	volumeId := state.Get("volume_id").(string)
+
+	// For the API call, it expects "sd" prefixed devices.
+	attachVolume := strings.Replace(device, "/xvd", "/sd", 1)
+
+	ui.Say(fmt.Sprintf("Attaching the root volume to %s", attachVolume))
+	_, err := ec2conn.AttachVolume(&ec2.AttachVolumeInput{
+		InstanceId: instance.InstanceId,
+		VolumeId:   &volumeId,
+		Device:     &attachVolume,
+	})
+	if err != nil {
+		err := fmt.Errorf("Error attaching volume: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	// Mark that we attached it so we can detach it later
+	s.attached = true
+	s.volumeId = volumeId
+
+	// Wait for the volume to become attached
+	stateChange := awscommon.StateChangeConf{
+		Pending:   []string{"attaching"},
+		StepState: state,
+		Target:    "attached",
+		Refresh: func() (interface{}, string, error) {
+			attempts := 0
+			for attempts < 30 {
+				resp, err := ec2conn.DescribeVolumes(&ec2.DescribeVolumesInput{VolumeIds: []*string{&volumeId}})
+				if err != nil {
+					return nil, "", err
+				}
+				if len(resp.Volumes[0].Attachments) > 0 {
+					a := resp.Volumes[0].Attachments[0]
+					return a, *a.State, nil
+				}
+				// When Attachment on volume is not present sleep for 2s and retry
+				attempts += 1
+				ui.Say(fmt.Sprintf(
+					"Volume %s show no attachments. Attempt %d/30. Sleeping for 2s and will retry.",
+					volumeId, attempts))
+				time.Sleep(2 * time.Second)
+			}
+
+			// Attachment on volume is not present after all attempts
+			return nil, "", errors.New("No attachments on volume.")
+		},
+	}
+
+	_, err = awscommon.WaitForState(&stateChange)
+	if err != nil {
+		err := fmt.Errorf("Error waiting for volume: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	state.Put("attach_cleanup", s)
+	return multistep.ActionContinue
+}
+
+func (s *StepAttachVolume) Cleanup(state multistep.StateBag) {
+	ui := state.Get("ui").(packer.Ui)
+	if err := s.CleanupFunc(state); err != nil {
+		ui.Error(err.Error())
+	}
+}
+
+func (s *StepAttachVolume) CleanupFunc(state multistep.StateBag) error {
+	if !s.attached {
+		return nil
+	}
+
+	ec2conn := state.Get("ec2").(*ec2.EC2)
+	ui := state.Get("ui").(packer.Ui)
+
+	ui.Say("Detaching EBS volume...")
+	_, err := ec2conn.DetachVolume(&ec2.DetachVolumeInput{VolumeId: &s.volumeId})
+	if err != nil {
+		return fmt.Errorf("Error detaching EBS volume: %s", err)
+	}
+
+	s.attached = false
+
+	// Wait for the volume to detach
+	stateChange := awscommon.StateChangeConf{
+		Pending:   []string{"attaching", "attached", "detaching"},
+		StepState: state,
+		Target:    "detached",
+		Refresh: func() (interface{}, string, error) {
+			resp, err := ec2conn.DescribeVolumes(&ec2.DescribeVolumesInput{VolumeIds: []*string{&s.volumeId}})
+			if err != nil {
+				return nil, "", err
+			}
+
+			v := resp.Volumes[0]
+			if len(v.Attachments) > 0 {
+				return v, *v.Attachments[0].State, nil
+			} else {
+				return v, "detached", nil
+			}
+		},
+	}
+
+	_, err = awscommon.WaitForState(&stateChange)
+	if err != nil {
+		return fmt.Errorf("Error waiting for volume: %s", err)
+	}
+
+	return nil
+}

builder/amazon/chroot/step_attach_volume_test.go

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

builder/amazon/chroot/step_check_root_device.go

@@ -0,0 +1,32 @@
+package chroot
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// StepCheckRootDevice makes sure the root device on the AMI is EBS-backed.
+type StepCheckRootDevice struct{}
+
+func (s *StepCheckRootDevice) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	image := state.Get("source_image").(*ec2.Image)
+	ui := state.Get("ui").(packer.Ui)
+
+	ui.Say("Checking the root device on source AMI...")
+
+	// It must be EBS-backed otherwise the build won't work
+	if *image.RootDeviceType != "ebs" {
+		err := fmt.Errorf("The root device of the source AMI must be EBS-backed.")
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	return multistep.ActionContinue
+}
+
+func (s *StepCheckRootDevice) Cleanup(multistep.StateBag) {}

builder/amazon/chroot/step_chroot_provision.go

@@ -0,0 +1,37 @@
+package chroot
+
+import (
+	"context"
+	"log"
+
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// StepChrootProvision provisions the instance within a chroot.
+type StepChrootProvision struct {
+}
+
+func (s *StepChrootProvision) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	hook := state.Get("hook").(packer.Hook)
+	mountPath := state.Get("mount_path").(string)
+	ui := state.Get("ui").(packer.Ui)
+	wrappedCommand := state.Get("wrappedCommand").(CommandWrapper)
+
+	// Create our communicator
+	comm := &Communicator{
+		Chroot:     mountPath,
+		CmdWrapper: wrappedCommand,
+	}
+
+	// Provision
+	log.Println("Running the provision hook")
+	if err := hook.Run(packer.HookProvision, ui, comm, nil); err != nil {
+		state.Put("error", err)
+		return multistep.ActionHalt
+	}
+
+	return multistep.ActionContinue
+}
+
+func (s *StepChrootProvision) Cleanup(state multistep.StateBag) {}

builder/amazon/chroot/step_copy_files.go

@@ -0,0 +1,91 @@
+package chroot
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"log"
+	"path/filepath"
+
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// StepCopyFiles copies some files from the host into the chroot environment.
+//
+// Produces:
+//   copy_files_cleanup CleanupFunc - A function to clean up the copied files
+//   early.
+type StepCopyFiles struct {
+	files []string
+}
+
+func (s *StepCopyFiles) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	config := state.Get("config").(*Config)
+	mountPath := state.Get("mount_path").(string)
+	ui := state.Get("ui").(packer.Ui)
+	wrappedCommand := state.Get("wrappedCommand").(CommandWrapper)
+	stderr := new(bytes.Buffer)
+
+	s.files = make([]string, 0, len(config.CopyFiles))
+	if len(config.CopyFiles) > 0 {
+		ui.Say("Copying files from host to chroot...")
+		for _, path := range config.CopyFiles {
+			ui.Message(path)
+			chrootPath := filepath.Join(mountPath, path)
+			log.Printf("Copying '%s' to '%s'", path, chrootPath)
+
+			cmdText, err := wrappedCommand(fmt.Sprintf("cp --remove-destination %s %s", path, chrootPath))
+			if err != nil {
+				err := fmt.Errorf("Error building copy command: %s", err)
+				state.Put("error", err)
+				ui.Error(err.Error())
+				return multistep.ActionHalt
+			}
+
+			stderr.Reset()
+			cmd := ShellCommand(cmdText)
+			cmd.Stderr = stderr
+			if err := cmd.Run(); err != nil {
+				err := fmt.Errorf(
+					"Error copying file: %s\nnStderr: %s", err, stderr.String())
+				state.Put("error", err)
+				ui.Error(err.Error())
+				return multistep.ActionHalt
+			}
+
+			s.files = append(s.files, chrootPath)
+		}
+	}
+
+	state.Put("copy_files_cleanup", s)
+	return multistep.ActionContinue
+}
+
+func (s *StepCopyFiles) Cleanup(state multistep.StateBag) {
+	ui := state.Get("ui").(packer.Ui)
+	if err := s.CleanupFunc(state); err != nil {
+		ui.Error(err.Error())
+	}
+}
+
+func (s *StepCopyFiles) CleanupFunc(state multistep.StateBag) error {
+	wrappedCommand := state.Get("wrappedCommand").(CommandWrapper)
+	if s.files != nil {
+		for _, file := range s.files {
+			log.Printf("Removing: %s", file)
+			localCmdText, err := wrappedCommand(fmt.Sprintf("rm -f %s", file))
+			if err != nil {
+				return err
+			}
+
+			localCmd := ShellCommand(localCmdText)
+			if err := localCmd.Run(); err != nil {
+				return err
+			}
+		}
+	}
+
+	s.files = nil
+	return nil
+}

builder/amazon/chroot/step_create_volume.go

@@ -0,0 +1,127 @@
+package chroot
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	awscommon "github.com/hashicorp/packer/builder/amazon/common"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// StepCreateVolume creates a new volume from the snapshot of the root
+// device of the AMI.
+//
+// Produces:
+//   volume_id string - The ID of the created volume
+type StepCreateVolume struct {
+	volumeId       string
+	RootVolumeSize int64
+}
+
+func (s *StepCreateVolume) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	config := state.Get("config").(*Config)
+	ec2conn := state.Get("ec2").(*ec2.EC2)
+	instance := state.Get("instance").(*ec2.Instance)
+	ui := state.Get("ui").(packer.Ui)
+
+	var createVolume *ec2.CreateVolumeInput
+	if config.FromScratch {
+		createVolume = &ec2.CreateVolumeInput{
+			AvailabilityZone: instance.Placement.AvailabilityZone,
+			Size:             aws.Int64(s.RootVolumeSize),
+			VolumeType:       aws.String(ec2.VolumeTypeGp2),
+		}
+	} else {
+		// Determine the root device snapshot
+		image := state.Get("source_image").(*ec2.Image)
+		log.Printf("Searching for root device of the image (%s)", *image.RootDeviceName)
+		var rootDevice *ec2.BlockDeviceMapping
+		for _, device := range image.BlockDeviceMappings {
+			if *device.DeviceName == *image.RootDeviceName {
+				rootDevice = device
+				break
+			}
+		}
+
+		if rootDevice == nil {
+			err := fmt.Errorf("Couldn't find root device!")
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+
+		ui.Say("Creating the root volume...")
+		vs := *rootDevice.Ebs.VolumeSize
+		if s.RootVolumeSize > *rootDevice.Ebs.VolumeSize {
+			vs = s.RootVolumeSize
+		}
+
+		createVolume = &ec2.CreateVolumeInput{
+			AvailabilityZone: instance.Placement.AvailabilityZone,
+			Size:             aws.Int64(vs),
+			SnapshotId:       rootDevice.Ebs.SnapshotId,
+			VolumeType:       rootDevice.Ebs.VolumeType,
+			Iops:             rootDevice.Ebs.Iops,
+		}
+	}
+
+	log.Printf("Create args: %+v", createVolume)
+
+	createVolumeResp, err := ec2conn.CreateVolume(createVolume)
+	if err != nil {
+		err := fmt.Errorf("Error creating root volume: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	// Set the volume ID so we remember to delete it later
+	s.volumeId = *createVolumeResp.VolumeId
+	log.Printf("Volume ID: %s", s.volumeId)
+
+	// Wait for the volume to become ready
+	stateChange := awscommon.StateChangeConf{
+		Pending:   []string{"creating"},
+		StepState: state,
+		Target:    "available",
+		Refresh: func() (interface{}, string, error) {
+			resp, err := ec2conn.DescribeVolumes(&ec2.DescribeVolumesInput{VolumeIds: []*string{&s.volumeId}})
+			if err != nil {
+				return nil, "", err
+			}
+
+			v := resp.Volumes[0]
+			return v, *v.State, nil
+		},
+	}
+
+	_, err = awscommon.WaitForState(&stateChange)
+	if err != nil {
+		err := fmt.Errorf("Error waiting for volume: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	state.Put("volume_id", s.volumeId)
+	return multistep.ActionContinue
+}
+
+func (s *StepCreateVolume) Cleanup(state multistep.StateBag) {
+	if s.volumeId == "" {
+		return
+	}
+
+	ec2conn := state.Get("ec2").(*ec2.EC2)
+	ui := state.Get("ui").(packer.Ui)
+
+	ui.Say("Deleting the created EBS volume...")
+	_, err := ec2conn.DeleteVolume(&ec2.DeleteVolumeInput{VolumeId: &s.volumeId})
+	if err != nil {
+		ui.Error(fmt.Sprintf("Error deleting EBS volume: %s", err))
+	}
+}

builder/amazon/chroot/step_early_cleanup.go

@@ -0,0 +1,39 @@
+package chroot
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// StepEarlyCleanup performs some of the cleanup steps early in order to
+// prepare for snapshotting and creating an AMI.
+type StepEarlyCleanup struct{}
+
+func (s *StepEarlyCleanup) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	ui := state.Get("ui").(packer.Ui)
+	cleanupKeys := []string{
+		"copy_files_cleanup",
+		"mount_extra_cleanup",
+		"mount_device_cleanup",
+		"attach_cleanup",
+	}
+
+	for _, key := range cleanupKeys {
+		c := state.Get(key).(Cleanup)
+		log.Printf("Running cleanup func: %s", key)
+		if err := c.CleanupFunc(state); err != nil {
+			err := fmt.Errorf("Error cleaning up: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+	}
+
+	return multistep.ActionContinue
+}
+
+func (s *StepEarlyCleanup) Cleanup(state multistep.StateBag) {}

builder/amazon/chroot/step_early_unflock.go

@@ -0,0 +1,30 @@
+package chroot
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// StepEarlyUnflock unlocks the flock.
+type StepEarlyUnflock struct{}
+
+func (s *StepEarlyUnflock) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	cleanup := state.Get("flock_cleanup").(Cleanup)
+	ui := state.Get("ui").(packer.Ui)
+
+	log.Println("Unlocking file lock...")
+	if err := cleanup.CleanupFunc(state); err != nil {
+		err := fmt.Errorf("Error unlocking file lock: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	return multistep.ActionContinue
+}
+
+func (s *StepEarlyUnflock) Cleanup(state multistep.StateBag) {}

builder/amazon/chroot/step_flock.go

@@ -0,0 +1,74 @@
+package chroot
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// StepFlock provisions the instance within a chroot.
+//
+// Produces:
+//   flock_cleanup Cleanup - To perform early cleanup
+type StepFlock struct {
+	fh *os.File
+}
+
+func (s *StepFlock) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	ui := state.Get("ui").(packer.Ui)
+
+	lockfile := "/var/lock/packer-chroot/lock"
+	if err := os.MkdirAll(filepath.Dir(lockfile), 0755); err != nil {
+		err := fmt.Errorf("Error creating lock: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	log.Printf("Obtaining lock: %s", lockfile)
+	f, err := os.Create(lockfile)
+	if err != nil {
+		err := fmt.Errorf("Error creating lock: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	// LOCK!
+	if err := lockFile(f); err != nil {
+		err := fmt.Errorf("Error obtaining lock: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	// Set the file handle, we can't close it because we need to hold
+	// the lock.
+	s.fh = f
+
+	state.Put("flock_cleanup", s)
+	return multistep.ActionContinue
+}
+
+func (s *StepFlock) Cleanup(state multistep.StateBag) {
+	s.CleanupFunc(state)
+}
+
+func (s *StepFlock) CleanupFunc(state multistep.StateBag) error {
+	if s.fh == nil {
+		return nil
+	}
+
+	log.Printf("Unlocking: %s", s.fh.Name())
+	if err := unlockFile(s.fh); err != nil {
+		return err
+	}
+
+	s.fh = nil
+	return nil
+}

builder/amazon/chroot/step_flock_test.go

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

builder/amazon/chroot/step_instance_info.go

@@ -0,0 +1,60 @@
+package chroot
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"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/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// StepInstanceInfo verifies that this builder is running on an EC2 instance.
+type StepInstanceInfo struct{}
+
+func (s *StepInstanceInfo) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	ec2conn := state.Get("ec2").(*ec2.EC2)
+	session := state.Get("awsSession").(*session.Session)
+	ui := state.Get("ui").(packer.Ui)
+
+	// Get our own instance ID
+	ui.Say("Gathering information about this EC2 instance...")
+
+	ec2meta := ec2metadata.New(session)
+	identity, err := ec2meta.GetInstanceIdentityDocument()
+	if err != nil {
+		err := fmt.Errorf(
+			"Error retrieving the ID of the instance Packer is running on.\n" +
+				"Please verify Packer is running on a proper AWS EC2 instance.")
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+	log.Printf("Instance ID: %s", identity.InstanceID)
+
+	// Query the entire instance metadata
+	instancesResp, err := ec2conn.DescribeInstances(&ec2.DescribeInstancesInput{InstanceIds: []*string{&identity.InstanceID}})
+	if err != nil {
+		err := fmt.Errorf("Error getting instance data: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	if len(instancesResp.Reservations) == 0 {
+		err := fmt.Errorf("Error getting instance data: no instance found.")
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	instance := instancesResp.Reservations[0].Instances[0]
+	state.Put("instance", instance)
+
+	return multistep.ActionContinue
+}
+
+func (s *StepInstanceInfo) Cleanup(multistep.StateBag) {}

builder/amazon/chroot/step_mount_device.go

@@ -0,0 +1,147 @@
+package chroot
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/template/interpolate"
+)
+
+type mountPathData struct {
+	Device string
+}
+
+// StepMountDevice mounts the attached device.
+//
+// Produces:
+//   mount_path string - The location where the volume was mounted.
+//   mount_device_cleanup CleanupFunc - To perform early cleanup
+type StepMountDevice struct {
+	MountOptions   []string
+	MountPartition int
+
+	mountPath string
+}
+
+func (s *StepMountDevice) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	config := state.Get("config").(*Config)
+	ui := state.Get("ui").(packer.Ui)
+	device := state.Get("device").(string)
+	wrappedCommand := state.Get("wrappedCommand").(CommandWrapper)
+
+	var virtualizationType string
+	if config.FromScratch {
+		virtualizationType = config.AMIVirtType
+	} else {
+		image := state.Get("source_image").(*ec2.Image)
+		virtualizationType = *image.VirtualizationType
+		log.Printf("Source image virtualization type is: %s", virtualizationType)
+	}
+
+	ctx := config.ctx
+	ctx.Data = &mountPathData{Device: filepath.Base(device)}
+	mountPath, err := interpolate.Render(config.MountPath, &ctx)
+
+	if err != nil {
+		err := fmt.Errorf("Error preparing mount directory: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	mountPath, err = filepath.Abs(mountPath)
+	if err != nil {
+		err := fmt.Errorf("Error preparing mount directory: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	log.Printf("Mount path: %s", mountPath)
+
+	if err := os.MkdirAll(mountPath, 0755); err != nil {
+		err := fmt.Errorf("Error creating mount directory: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	deviceMount := device
+	if virtualizationType == "hvm" {
+		deviceMount = fmt.Sprintf("%s%d", device, s.MountPartition)
+	}
+	state.Put("deviceMount", deviceMount)
+
+	ui.Say("Mounting the root device...")
+	stderr := new(bytes.Buffer)
+
+	// build mount options from mount_options config, useful for nouuid options
+	// or other specific device type settings for mount
+	opts := ""
+	if len(s.MountOptions) > 0 {
+		opts = "-o " + strings.Join(s.MountOptions, " -o ")
+	}
+	mountCommand, err := wrappedCommand(
+		fmt.Sprintf("mount %s %s %s", opts, deviceMount, mountPath))
+	if err != nil {
+		err := fmt.Errorf("Error creating mount command: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	cmd := ShellCommand(mountCommand)
+	cmd.Stderr = stderr
+	if err := cmd.Run(); err != nil {
+		err := fmt.Errorf(
+			"Error mounting root volume: %s\nStderr: %s", err, stderr.String())
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	// Set the mount path so we remember to unmount it later
+	s.mountPath = mountPath
+	state.Put("mount_path", s.mountPath)
+	state.Put("mount_device_cleanup", s)
+
+	return multistep.ActionContinue
+}
+
+func (s *StepMountDevice) Cleanup(state multistep.StateBag) {
+	ui := state.Get("ui").(packer.Ui)
+	if err := s.CleanupFunc(state); err != nil {
+		ui.Error(err.Error())
+	}
+}
+
+func (s *StepMountDevice) CleanupFunc(state multistep.StateBag) error {
+	if s.mountPath == "" {
+		return nil
+	}
+
+	ui := state.Get("ui").(packer.Ui)
+	wrappedCommand := state.Get("wrappedCommand").(CommandWrapper)
+
+	ui.Say("Unmounting the root device...")
+	unmountCommand, err := wrappedCommand(fmt.Sprintf("umount %s", s.mountPath))
+	if err != nil {
+		return fmt.Errorf("Error creating unmount command: %s", err)
+	}
+
+	cmd := ShellCommand(unmountCommand)
+	if err := cmd.Run(); err != nil {
+		return fmt.Errorf("Error unmounting root device: %s", err)
+	}
+
+	s.mountPath = ""
+	return nil
+}

builder/amazon/chroot/step_mount_device_test.go

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

builder/amazon/chroot/step_mount_extra.go

@@ -0,0 +1,137 @@
+package chroot
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"os"
+	"os/exec"
+	"syscall"
+
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+// StepMountExtra mounts the attached device.
+//
+// Produces:
+//   mount_extra_cleanup CleanupFunc - To perform early cleanup
+type StepMountExtra struct {
+	mounts []string
+}
+
+func (s *StepMountExtra) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	config := state.Get("config").(*Config)
+	mountPath := state.Get("mount_path").(string)
+	ui := state.Get("ui").(packer.Ui)
+	wrappedCommand := state.Get("wrappedCommand").(CommandWrapper)
+
+	s.mounts = make([]string, 0, len(config.ChrootMounts))
+
+	ui.Say("Mounting additional paths within the chroot...")
+	for _, mountInfo := range config.ChrootMounts {
+		innerPath := mountPath + mountInfo[2]
+
+		if err := os.MkdirAll(innerPath, 0755); err != nil {
+			err := fmt.Errorf("Error creating mount directory: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+
+		flags := "-t " + mountInfo[0]
+		if mountInfo[0] == "bind" {
+			flags = "--bind"
+		}
+
+		ui.Message(fmt.Sprintf("Mounting: %s", mountInfo[2]))
+		stderr := new(bytes.Buffer)
+		mountCommand, err := wrappedCommand(fmt.Sprintf(
+			"mount %s %s %s",
+			flags,
+			mountInfo[1],
+			innerPath))
+		if err != nil {
+			err := fmt.Errorf("Error creating mount command: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+
+		cmd := ShellCommand(mountCommand)
+		cmd.Stderr = stderr
+		if err := cmd.Run(); err != nil {
+			err := fmt.Errorf(
+				"Error mounting: %s\nStderr: %s", err, stderr.String())
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+
+		s.mounts = append(s.mounts, innerPath)
+	}
+
+	state.Put("mount_extra_cleanup", s)
+	return multistep.ActionContinue
+}
+
+func (s *StepMountExtra) Cleanup(state multistep.StateBag) {
+	ui := state.Get("ui").(packer.Ui)
+
+	if err := s.CleanupFunc(state); err != nil {
+		ui.Error(err.Error())
+		return
+	}
+}
+
+func (s *StepMountExtra) CleanupFunc(state multistep.StateBag) error {
+	if s.mounts == nil {
+		return nil
+	}
+
+	wrappedCommand := state.Get("wrappedCommand").(CommandWrapper)
+	for len(s.mounts) > 0 {
+		var path string
+		lastIndex := len(s.mounts) - 1
+		path, s.mounts = s.mounts[lastIndex], s.mounts[:lastIndex]
+
+		grepCommand, err := wrappedCommand(fmt.Sprintf("grep %s /proc/mounts", path))
+		if err != nil {
+			return fmt.Errorf("Error creating grep command: %s", err)
+		}
+
+		// Before attempting to unmount,
+		// check to see if path is already unmounted
+		stderr := new(bytes.Buffer)
+		cmd := ShellCommand(grepCommand)
+		cmd.Stderr = stderr
+		if err := cmd.Run(); err != nil {
+			if exitError, ok := err.(*exec.ExitError); ok {
+				if status, ok := exitError.Sys().(syscall.WaitStatus); ok {
+					exitStatus := status.ExitStatus()
+					if exitStatus == 1 {
+						// path has already been unmounted
+						// just skip this path
+						continue
+					}
+				}
+			}
+		}
+
+		unmountCommand, err := wrappedCommand(fmt.Sprintf("umount %s", path))
+		if err != nil {
+			return fmt.Errorf("Error creating unmount command: %s", err)
+		}
+
+		stderr = new(bytes.Buffer)
+		cmd = ShellCommand(unmountCommand)
+		cmd.Stderr = stderr
+		if err := cmd.Run(); err != nil {
+			return fmt.Errorf(
+				"Error unmounting device: %s\nStderr: %s", err, stderr.String())
+		}
+	}
+
+	s.mounts = nil
+	return nil
+}

builder/amazon/chroot/step_mount_extra_test.go

@@ -0,0 +1,11 @@
+package chroot
+
+import "testing"
+
+func TestMountExtraCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
+	var raw interface{}
+	raw = new(StepMountExtra)
+	if _, ok := raw.(Cleanup); !ok {
+		t.Fatalf("cleanup func should be a CleanupFunc")
+	}
+}

builder/amazon/chroot/step_post_mount_commands.go

@@ -0,0 +1,47 @@
+package chroot
+
+import (
+	"context"
+
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+type postMountCommandsData struct {
+	Device    string
+	MountPath string
+}
+
+// StepPostMountCommands allows running arbitrary commands after mounting the
+// device, but prior to the bind mount and copy steps.
+type StepPostMountCommands struct {
+	Commands []string
+}
+
+func (s *StepPostMountCommands) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	config := state.Get("config").(*Config)
+	device := state.Get("device").(string)
+	mountPath := state.Get("mount_path").(string)
+	ui := state.Get("ui").(packer.Ui)
+	wrappedCommand := state.Get("wrappedCommand").(CommandWrapper)
+
+	if len(s.Commands) == 0 {
+		return multistep.ActionContinue
+	}
+
+	ctx := config.ctx
+	ctx.Data = &postMountCommandsData{
+		Device:    device,
+		MountPath: mountPath,
+	}
+
+	ui.Say("Running post-mount commands...")
+	if err := RunLocalCommands(s.Commands, wrappedCommand, ctx, ui); err != nil {
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+	return multistep.ActionContinue
+}
+
+func (s *StepPostMountCommands) Cleanup(state multistep.StateBag) {}