update ssh library

.circleci/config.yml

@@ -1,202 +0,0 @@
-orbs:
-  win: circleci/windows@1.0.0
-version: 2.1
-
-executors:
-  golang:
-    docker:
-      - image: circleci/golang:1.13
-  darwin:
-    macos:
-      xcode: "9.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 ./...
-  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 ./...
-  build-and-persist-packer-binary:
-    parameters:
-      GOOS:
-        type: string
-    steps:
-      - checkout
-      - run: GOOS=<< parameters.GOOS >> go build -ldflags="-s -w" -o ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH) .
-      - run: zip ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH).zip ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH)
-      - run: rm ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH)
-      - persist_to_workspace:
-          root: .
-          paths:
-            - ./pkg/
-# Golang CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-go/ for more details
-jobs:
-  test-linux:
-    executor: golang
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - checkout
-      - run: make ci
-  test-darwin:
-    executor: darwin
-    working_directory: ~/go/src/github.com/hashicorp/packer
-    environment:
-      GO111MODULE: "off"
-    steps:
-      - install-go-run-tests-unix:
-          GOOS: darwin
-          GOVERSION: "1.13"
-  test-windows:
-    executor:
-      name: win/vs2019
-      shell: bash.exe
-    steps:
-      - install-go-run-tests-windows:
-          GOVERSION: "1.13"
-  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_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: /
-  publish-github-tag-release:
-    docker:
-      - image: cibuilds/github:0.10
-    working_directory: /go/src/github.com/hashicorp/packer
-    steps:
-      - attach_workspace:
-          at: .
-      - run: |
-          ghr -prerelease -t ${GITHUB_TOKEN_AZR} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${CIRCLE_TAG} ./pkg/
-workflows:
-  version: 2
-  test:
-    jobs:
-      - test-linux
-      - test-darwin
-      - test-windows
-  check-code:
-    jobs:
-      - check-vendor-vs-mod
-      - check-fmt
-      - check-generate
-  build_packer_binaries:
-    jobs:
-      - build_linux:
-          filters:
-            tags:
-              only: /.*/
-      - build_darwin:
-          filters:
-            tags:
-              only: /.*/
-      - build_windows:
-          filters:
-            tags:
-              only: /.*/
-      - build_freebsd:
-          filters:
-            tags:
-              only: /.*/
-      - build_openbsd:
-          filters:
-            tags:
-              only: /.*/
-      - build_solaris:
-          filters:
-            tags:
-              only: /.*/
-      - store_artifacts:
-          requires:
-            - build_linux
-            - build_darwin
-            - build_windows
-            - build_freebsd
-            - build_openbsd
-            - build_solaris
-      - publish-github-tag-release:
-          requires:
-            - build_linux
-            - build_darwin
-            - build_windows
-            - build_freebsd
-            - build_openbsd
-            - build_solaris
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: nightly

.gitattributes

@@ -1,7 +1,2 @@
-* text=auto
-*.go text eol=lf
-*.sh text eol=lf
-*.json text eol=lf
-*.md text eol=lf
-*.ps1 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.
@@ -37,7 +37,7 @@ can quickly merge or address your contributions.
 
 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.
@@ -48,61 +48,47 @@ can quickly merge or address your contributions.
 
 5. The issue is closed.
 
-## Setting up Go
+## Setting up Go to work on Packer
 
-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)
-
-## 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.
-The instructions below are for go 1.7. or later.
 
-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.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
@@ -124,10 +110,6 @@ 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
@@ -135,129 +117,57 @@ to use `git push ...`.
   "[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.
-
-5. Once all outstanding comments and checklist items have been addressed, your
+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.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.
+  Packer release. The core team takes care of updating the CHANGELOG as they
+  merge.
 
+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/common/bootcommand/boot_command.go),
-[docs](https://github.com/hashicorp/packer/blob/master/website/source/partials/builder/amazon/chroot/_Config-not-required.html.md)
-and HCL2's bridging code. Packer's testing suite will run `make check-generate`
-to check that all the generated files Packer needs are what they should be.
-`make generate` re-generates all these file and can take a while depending on
-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`.
+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
 
@@ -273,7 +183,7 @@ 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
+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.
 
@@ -305,12 +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.
-
-#### Debugging Plugins
-
-Each packer plugin runs in a separate process and communicates with RCP 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,18 +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.
-
-#### Feature Description
-
-A written overview of the feature.
-
-#### Use Case(s)
-
-Any relevant use-cases that you see.

.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/index.html
-- Discussion List: https://groups.google.com/group/packer-tool
-- Any other questions can be sent to the packer section of the HashiCorp
-  forum: https://discuss.hashicorp.com/c/packer
-- Packer community links: https://www.packer.io/community.html

.github/ISSUE_TEMPLATE/ssh_or_winrm_times_out.md

@@ -1,24 +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.html
-
-* `Waiting for SSH to become available` ?
-
-  - See our basic SSH Packer guide: https://www.packer.io/guides/automatic-operating-system-installs/preseed_ubuntu.html
-
-
-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/index.html
-- Discussion List: https://groups.google.com/group/packer-tool
-- Any other questions can be sent to the packer section of the HashiCorp
-  forum: https://discuss.hashicorp.com/c/packer
-- Packer community links: https://www.packer.io/community.html

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,5 @@
 **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:

.gitignore

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

.travis.yml

@@ -1,19 +1,20 @@
 env:
-  - USER=travis GO111MODULE=off
-
-os:
-  - osx
+    - USER=travis
 
 sudo: false
 
 language: go
 
 go:
-  - 1.12.x
+  - 1.8.x
+  - 1.9.x
+  - 1.x
+
+install:
+  - make deps
 
 script:
-  - df -h
-  - travis_wait make ci
+  - GOMAXPROCS=2 make ci
 
 branches:
   only:

CODEOWNERS

@@ -2,63 +2,19 @@
 
 # builders
 
-/builder/alicloud/                      @chhaj5236
-/website/source/docs/builders/alicloud* @chhaj5236
-
-/builder/azure/                      @paulmey
-/website/source/docs/builders/azure* @paulmey
-
-/builder/hyperv/                      @taliesins
-/website/source/docs/builders/hyperv* @taliesins
-
-/builder/jdcloud/                      @XiaohanLiang @remrain
-/website/source/docs/builders/jdcloud* @XiaohanLiang @remrain
-
-/builder/linode/                      @displague @ctreatma @stvnjacobs
-/website/source/docs/builders/linode* @displague @ctreatma @stvnjacobs
-
-/builder/lxc/                      @ChrisLundquist
-/website/source/docs/builders/lxc* @ChrisLundquist
-
-/builder/lxd/                      @ChrisLundquist
-/website/source/docs/builders/lxd* @ChrisLundquist
-
-/builder/oneandone/                      @jasmingacic
-/website/source/docs/builders/oneandone* @jasmingacic
-
-/builder/oracle/                      @prydie @owainlewis
-/website/source/docs/builders/oracle* @prydie @owainlewis
-
-/builder/profitbricks/                      @jasmingacic
-/website/source/docs/builders/profitbricks* @jasmingacic
-
-/builder/triton/                      @sean-
-/website/source/docs/builders/triton* @sean-
-
-/builder/ncloud/                      @YuSungDuk
-/website/source/docs/builders/ncloud* @YuSungDuk
-
-/builder/proxmox/                      @carlpett
-/website/source/docs/builders/proxmox* @carlpett
-
-/builder/scaleway/                      @sieben @mvaude @jqueuniet @fflorens @brmzkw
-/website/source/docs/builders/scaleway* @sieben @mvaude @jqueuniet @fflorens @brmzkw
-
-/builder/hcloud/                      @LKaemmerling
-/website/source/docs/builders/hcloud* @LKaemmerling
-
-/builder/hyperone/                      @m110 @gregorybrzeski @ad-m
-/website/source/docs/builders/hyperone* @m110 @gregorybrzeski @ad-m
-
-/builder/ucloud/                      @shawnmssu
-/website/source/docs/builders/ucloud* @shawnmssu
-
-/builder/yandex/                      @GennadySpb @alexanderKhaustov @seukyaso
-/website/source/docs/builders/yandex* @GennadySpb @alexanderKhaustov @seukyaso
-
-/builder/osc/                      @marinsalinas
-/website/source/docs/builders/osc* @marinsalinas
-
+/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
 
@@ -66,10 +22,7 @@
 /provisioner/converge/                  @stevendborrelli
 
 # post-processors
-
 /post-processor/alicloud-import/        dongxiao.zzh@alibaba-inc.com
 /post-processor/checksum/               v.tolstov@selfip.ru
-/post-processor/exoscale-import/        @falzm @mcorbin
 /post-processor/googlecompute-export/   crunkleton@google.com
 /post-processor/vsphere-template/       nelson@bennu.cl
-/post-processor/ucloud-import/          @shawnmssu

Dockerfile

@@ -1,30 +0,0 @@
-FROM 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,15 +1,14 @@
-TEST?=$(shell go list ./...)
-VET?=$(shell go list ./...)
+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)
@@ -18,44 +17,36 @@ GOLDFLAGS=-X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY)
 
 export GOLDFLAGS
 
-.PHONY: bin checkversion ci default install-build-deps install-gen-deps fmt fmt-docs fmt-examples generate releasebin test testacc testrace
+default: deps generate test dev
 
-default: install-build-deps install-gen-deps generate testrace dev releasebin package dev fmt fmt-check mode-check fmt-docs fmt-examples
+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 get github.com/mitchellh/gox
+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/mna/pigeon@master)
-	@(cd $(TEMPDIR) && GO111MODULE=on go get github.com/alvaroloes/enumer@master)
-	@go install ./cmd/struct-markdown
-	@go install ./cmd/mapstructure-to-hcl2
-
-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; \
@@ -67,25 +58,11 @@ dev: ## Build and install a development build
 	@cp $(GOPATH)/bin/packer pkg/$(GOOS)_$(GOARCH)
 
 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/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 {} \;
 
@@ -95,46 +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..."
-	@find website/source/ -type f | xargs grep -l '^<!-- Code generated' | xargs rm
-	@echo "==> removing autogenerated code..."
-	@find post-processor common helper template builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm
-	go generate ./...
-	go fmt common/bootcommand/boot_command.go
-	go fmt command/plugin.go
+generate: 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 $(TEST) $(TESTARGS) -timeout=3m
-
-# 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 -v $(TEST) $(TESTARGS) -timeout=45m
-
-testrace: mode-check vet ## Test with race detection enabled
-	@GO111MODULE=off go test -race $(TEST) $(TESTARGS) -timeout=3m -p=8
-
-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

@@ -24,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/index.html.
+be found at https://www.packer.io/docs/builders/index.html. 
 
 Support for other platforms can be added via plugins.
 
@@ -32,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)
@@ -80,7 +84,7 @@ 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
 

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

@@ -16,18 +16,21 @@ environment:
 clone_folder: c:\gopath\src\github.com\hashicorp\packer
 
 install:
-  - set GO111MODULE=off
+  - 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 -timeout=2m (go.exe list ./... `
+      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

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,64 +1,39 @@
-//go:generate struct-markdown
-
 package ecs
 
 import (
 	"fmt"
 	"os"
-	"time"
 
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/template/interpolate"
-	"github.com/hashicorp/packer/version"
 )
 
 // Config of alicloud
 type AlicloudAccessConfig struct {
-	// This is the Alicloud access key. It must be provided, but it can also be
-	// sourced from the ALICLOUD_ACCESS_KEY environment variable.
-	AlicloudAccessKey string `mapstructure:"access_key" required:"true"`
-	// This is the Alicloud secret key. It must be provided, but it can also be
-	// sourced from the ALICLOUD_SECRET_KEY environment variable.
-	AlicloudSecretKey string `mapstructure:"secret_key" required:"true"`
-	// This is the Alicloud region. It must be provided, but it can also be
-	// sourced from the ALICLOUD_REGION environment variables.
-	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"`
-	// 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))
 
-	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.FormattedVersion())
-	client.SetReadTimeout(DefaultRequestReadTimeout)
-	c.client = &ClientWrapper{client}
-
-	return c.client, nil
+	return client, nil
 }
 
 func (c *AlicloudAccessConfig) Prepare(ctx *interpolate.Context) []error {
@@ -67,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 {
@@ -96,38 +69,21 @@ func (c *AlicloudAccessConfig) Config() error {
 
 }
 
-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
+	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,11 +29,16 @@ func TestAlicloudAccessConfigPrepareRegion(t *testing.T) {
 		t.Fatalf("shouldn't have err: %s", err)
 	}
 
-	os.Setenv("ALICLOUD_REGION", "cn-hangzhou")
-	c.AlicloudRegion = ""
+	c.AlicloudRegion = "unknown"
+	if err := c.Prepare(nil); err == nil {
+		t.Fatalf("should have err")
+	}
+
+	c.AlicloudRegion = "unknown"
+	c.AlicloudSkipValidation = true
 	if err := c.Prepare(nil); err != nil {
 		t.Fatalf("shouldn't have err: %s", err)
 	}
-
 	c.AlicloudSkipValidation = false
+
 }

builder/alicloud/ecs/artifact.go

@@ -6,7 +6,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/packer"
 )
 
@@ -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,73 +64,53 @@ 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 {
@@ -143,38 +124,6 @@ func (a *Artifact) Destroy() error {
 	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/builder.go

@@ -1,14 +1,12 @@
-//go:generate mapstructure-to-hcl2 -type Config,AlicloudDiskDevice
-
 // 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/common"
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/helper/config"
@@ -37,14 +35,14 @@ 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{
 		Interpolate:        true,
 		InterpolateContext: &b.config.ctx,
@@ -56,12 +54,7 @@ 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
@@ -71,21 +64,21 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	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
 	}
 
-	packer.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 packer.Ui, hook packer.Hook) (packer.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)
@@ -101,14 +94,17 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&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,
@@ -139,66 +135,47 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			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(),
+			SSHConfig: SSHConfig(
+				b.config.RunConfig.Comm.SSHAgentAuth,
+				b.config.RunConfig.Comm.SSHUsername,
+				b.config.RunConfig.Comm.SSHPassword),
 		},
 		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
-			Comm: &b.config.RunConfig.Comm,
-		},
 		&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,
@@ -206,7 +183,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 
 	// Run!
 	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
-	b.runner.Run(ctx, state)
+	b.runner.Run(state)
 
 	// If there was an error, return that
 	if rawErr, ok := state.GetOk("error"); ok {
@@ -228,11 +205,18 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	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
 	}
 }
 
@@ -247,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
 	}
 
@@ -255,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,245 +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/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"`
-	DiskCategory       *string `mapstructure:"disk_category" required:"false" cty:"disk_category"`
-	DiskSize           *int    `mapstructure:"disk_size" required:"false" cty:"disk_size"`
-	SnapshotId         *string `mapstructure:"disk_snapshot_id" required:"false" cty:"disk_snapshot_id"`
-	Description        *string `mapstructure:"disk_description" required:"false" cty:"disk_description"`
-	DeleteWithInstance *bool   `mapstructure:"disk_delete_with_instance" required:"false" cty:"disk_delete_with_instance"`
-	Device             *string `mapstructure:"disk_device" required:"false" cty:"disk_device"`
-	Encrypted          *bool   `mapstructure:"disk_encrypted" required:"false" cty:"disk_encrypted"`
-}
-
-// FlatMapstructure returns a new FlatAlicloudDiskDevice.
-// 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"`
-	PackerBuilderType                 *string                  `mapstructure:"packer_builder_type" cty:"packer_builder_type"`
-	PackerDebug                       *bool                    `mapstructure:"packer_debug" cty:"packer_debug"`
-	PackerForce                       *bool                    `mapstructure:"packer_force" cty:"packer_force"`
-	PackerOnError                     *string                  `mapstructure:"packer_on_error" cty:"packer_on_error"`
-	PackerUserVars                    map[string]string        `mapstructure:"packer_user_variables" cty:"packer_user_variables"`
-	PackerSensitiveVars               []string                 `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables"`
-	AlicloudAccessKey                 *string                  `mapstructure:"access_key" required:"true" cty:"access_key"`
-	AlicloudSecretKey                 *string                  `mapstructure:"secret_key" required:"true" cty:"secret_key"`
-	AlicloudRegion                    *string                  `mapstructure:"region" required:"true" cty:"region"`
-	AlicloudSkipValidation            *bool                    `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
-	AlicloudSkipImageValidation       *bool                    `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation"`
-	SecurityToken                     *string                  `mapstructure:"security_token" required:"false" cty:"security_token"`
-	AlicloudImageName                 *string                  `mapstructure:"image_name" required:"true" cty:"image_name"`
-	AlicloudImageVersion              *string                  `mapstructure:"image_version" required:"false" cty:"image_version"`
-	AlicloudImageDescription          *string                  `mapstructure:"image_description" required:"false" cty:"image_description"`
-	AlicloudImageShareAccounts        []string                 `mapstructure:"image_share_account" required:"false" cty:"image_share_account"`
-	AlicloudImageUNShareAccounts      []string                 `mapstructure:"image_unshare_account" cty:"image_unshare_account"`
-	AlicloudImageDestinationRegions   []string                 `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions"`
-	AlicloudImageDestinationNames     []string                 `mapstructure:"image_copy_names" required:"false" cty:"image_copy_names"`
-	ImageEncrypted                    *bool                    `mapstructure:"image_encrypted" required:"false" cty:"image_encrypted"`
-	AlicloudImageForceDelete          *bool                    `mapstructure:"image_force_delete" required:"false" cty:"image_force_delete"`
-	AlicloudImageForceDeleteSnapshots *bool                    `mapstructure:"image_force_delete_snapshots" required:"false" cty:"image_force_delete_snapshots"`
-	AlicloudImageForceDeleteInstances *bool                    `mapstructure:"image_force_delete_instances" cty:"image_force_delete_instances"`
-	AlicloudImageIgnoreDataDisks      *bool                    `mapstructure:"image_ignore_data_disks" required:"false" cty:"image_ignore_data_disks"`
-	AlicloudImageTags                 map[string]string        `mapstructure:"tags" required:"false" cty:"tags"`
-	ECSSystemDiskMapping              *FlatAlicloudDiskDevice  `mapstructure:"system_disk_mapping" required:"false" cty:"system_disk_mapping"`
-	ECSImagesDiskMappings             []FlatAlicloudDiskDevice `mapstructure:"image_disk_mappings" required:"false" cty:"image_disk_mappings"`
-	AssociatePublicIpAddress          *bool                    `mapstructure:"associate_public_ip_address" cty:"associate_public_ip_address"`
-	ZoneId                            *string                  `mapstructure:"zone_id" required:"false" cty:"zone_id"`
-	IOOptimized                       *bool                    `mapstructure:"io_optimized" required:"false" cty:"io_optimized"`
-	InstanceType                      *string                  `mapstructure:"instance_type" required:"true" cty:"instance_type"`
-	Description                       *string                  `mapstructure:"description" cty:"description"`
-	AlicloudSourceImage               *string                  `mapstructure:"source_image" required:"true" cty:"source_image"`
-	ForceStopInstance                 *bool                    `mapstructure:"force_stop_instance" required:"false" cty:"force_stop_instance"`
-	DisableStopInstance               *bool                    `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance"`
-	SecurityGroupId                   *string                  `mapstructure:"security_group_id" required:"false" cty:"security_group_id"`
-	SecurityGroupName                 *string                  `mapstructure:"security_group_name" required:"false" cty:"security_group_name"`
-	UserData                          *string                  `mapstructure:"user_data" required:"false" cty:"user_data"`
-	UserDataFile                      *string                  `mapstructure:"user_data_file" required:"false" cty:"user_data_file"`
-	VpcId                             *string                  `mapstructure:"vpc_id" required:"false" cty:"vpc_id"`
-	VpcName                           *string                  `mapstructure:"vpc_name" required:"false" cty:"vpc_name"`
-	CidrBlock                         *string                  `mapstructure:"vpc_cidr_block" required:"false" cty:"vpc_cidr_block"`
-	VSwitchId                         *string                  `mapstructure:"vswitch_id" required:"false" cty:"vswitch_id"`
-	VSwitchName                       *string                  `mapstructure:"vswitch_name" required:"false" cty:"vswitch_name"`
-	InstanceName                      *string                  `mapstructure:"instance_name" required:"false" cty:"instance_name"`
-	InternetChargeType                *string                  `mapstructure:"internet_charge_type" required:"false" cty:"internet_charge_type"`
-	InternetMaxBandwidthOut           *int                     `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out"`
-	WaitSnapshotReadyTimeout          *int                     `mapstructure:"wait_snapshot_ready_timeout" required:"false" cty:"wait_snapshot_ready_timeout"`
-	Type                              *string                  `mapstructure:"communicator" cty:"communicator"`
-	PauseBeforeConnect                *string                  `mapstructure:"pause_before_connecting" cty:"pause_before_connecting"`
-	SSHHost                           *string                  `mapstructure:"ssh_host" cty:"ssh_host"`
-	SSHPort                           *int                     `mapstructure:"ssh_port" cty:"ssh_port"`
-	SSHUsername                       *string                  `mapstructure:"ssh_username" cty:"ssh_username"`
-	SSHPassword                       *string                  `mapstructure:"ssh_password" cty:"ssh_password"`
-	SSHKeyPairName                    *string                  `mapstructure:"ssh_keypair_name" cty:"ssh_keypair_name"`
-	SSHTemporaryKeyPairName           *string                  `mapstructure:"temporary_key_pair_name" cty:"temporary_key_pair_name"`
-	SSHClearAuthorizedKeys            *bool                    `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys"`
-	SSHPrivateKeyFile                 *string                  `mapstructure:"ssh_private_key_file" cty:"ssh_private_key_file"`
-	SSHPty                            *bool                    `mapstructure:"ssh_pty" cty:"ssh_pty"`
-	SSHTimeout                        *string                  `mapstructure:"ssh_timeout" cty:"ssh_timeout"`
-	SSHAgentAuth                      *bool                    `mapstructure:"ssh_agent_auth" cty:"ssh_agent_auth"`
-	SSHDisableAgentForwarding         *bool                    `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts              *int                     `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts"`
-	SSHBastionHost                    *string                  `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host"`
-	SSHBastionPort                    *int                     `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port"`
-	SSHBastionAgentAuth               *bool                    `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth"`
-	SSHBastionUsername                *string                  `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username"`
-	SSHBastionPassword                *string                  `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password"`
-	SSHBastionPrivateKeyFile          *string                  `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file"`
-	SSHFileTransferMethod             *string                  `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method"`
-	SSHProxyHost                      *string                  `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host"`
-	SSHProxyPort                      *int                     `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port"`
-	SSHProxyUsername                  *string                  `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username"`
-	SSHProxyPassword                  *string                  `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password"`
-	SSHKeepAliveInterval              *string                  `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout               *string                  `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout"`
-	SSHRemoteTunnels                  []string                 `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels"`
-	SSHLocalTunnels                   []string                 `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels"`
-	SSHPublicKey                      []byte                   `mapstructure:"ssh_public_key" cty:"ssh_public_key"`
-	SSHPrivateKey                     []byte                   `mapstructure:"ssh_private_key" cty:"ssh_private_key"`
-	WinRMUser                         *string                  `mapstructure:"winrm_username" cty:"winrm_username"`
-	WinRMPassword                     *string                  `mapstructure:"winrm_password" cty:"winrm_password"`
-	WinRMHost                         *string                  `mapstructure:"winrm_host" cty:"winrm_host"`
-	WinRMPort                         *int                     `mapstructure:"winrm_port" cty:"winrm_port"`
-	WinRMTimeout                      *string                  `mapstructure:"winrm_timeout" cty:"winrm_timeout"`
-	WinRMUseSSL                       *bool                    `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl"`
-	WinRMInsecure                     *bool                    `mapstructure:"winrm_insecure" cty:"winrm_insecure"`
-	WinRMUseNTLM                      *bool                    `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm"`
-	SSHPrivateIp                      *bool                    `mapstructure:"ssh_private_ip" required:"false" cty:"ssh_private_ip"`
-}
-
-// FlatMapstructure returns a new FlatConfig.
-// 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_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
-		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
-		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":        &hcldec.BlockAttrsSpec{TypeName: "packer_user_variables", ElementType: cty.String, Required: false},
-		"packer_sensitive_variables":   &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
-		"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},
-		"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.BlockAttrsSpec{TypeName: "tags", ElementType: cty.String, Required: false},
-		"system_disk_mapping":          &hcldec.BlockSpec{TypeName: "system_disk_mapping", Nested: hcldec.ObjectSpec((*FlatAlicloudDiskDevice)(nil).HCL2Spec())},
-		"image_disk_mappings":          &hcldec.BlockListSpec{TypeName: "image_disk_mappings", Nested: hcldec.ObjectSpec((*FlatAlicloudDiskDevice)(nil).HCL2Spec())},
-		"associate_public_ip_address":  &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
-		"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},
-		"ssh_clear_authorized_keys":    &hcldec.AttrSpec{Name: "ssh_clear_authorized_keys", Type: cty.Bool, Required: false},
-		"ssh_private_key_file":         &hcldec.AttrSpec{Name: "ssh_private_key_file", Type: cty.String, Required: false},
-		"ssh_pty":                      &hcldec.AttrSpec{Name: "ssh_pty", Type: cty.Bool, Required: false},
-		"ssh_timeout":                  &hcldec.AttrSpec{Name: "ssh_timeout", Type: cty.String, Required: false},
-		"ssh_agent_auth":               &hcldec.AttrSpec{Name: "ssh_agent_auth", Type: cty.Bool, Required: false},
-		"ssh_disable_agent_forwarding": &hcldec.AttrSpec{Name: "ssh_disable_agent_forwarding", Type: cty.Bool, Required: false},
-		"ssh_handshake_attempts":       &hcldec.AttrSpec{Name: "ssh_handshake_attempts", Type: cty.Number, Required: false},
-		"ssh_bastion_host":             &hcldec.AttrSpec{Name: "ssh_bastion_host", Type: cty.String, Required: false},
-		"ssh_bastion_port":             &hcldec.AttrSpec{Name: "ssh_bastion_port", Type: cty.Number, Required: false},
-		"ssh_bastion_agent_auth":       &hcldec.AttrSpec{Name: "ssh_bastion_agent_auth", Type: cty.Bool, Required: false},
-		"ssh_bastion_username":         &hcldec.AttrSpec{Name: "ssh_bastion_username", Type: cty.String, Required: false},
-		"ssh_bastion_password":         &hcldec.AttrSpec{Name: "ssh_bastion_password", Type: cty.String, Required: false},
-		"ssh_bastion_private_key_file": &hcldec.AttrSpec{Name: "ssh_bastion_private_key_file", Type: cty.String, Required: false},
-		"ssh_file_transfer_method":     &hcldec.AttrSpec{Name: "ssh_file_transfer_method", Type: cty.String, Required: false},
-		"ssh_proxy_host":               &hcldec.AttrSpec{Name: "ssh_proxy_host", Type: cty.String, Required: false},
-		"ssh_proxy_port":               &hcldec.AttrSpec{Name: "ssh_proxy_port", Type: cty.Number, Required: false},
-		"ssh_proxy_username":           &hcldec.AttrSpec{Name: "ssh_proxy_username", Type: cty.String, Required: false},
-		"ssh_proxy_password":           &hcldec.AttrSpec{Name: "ssh_proxy_password", Type: cty.String, Required: false},
-		"ssh_keep_alive_interval":      &hcldec.AttrSpec{Name: "ssh_keep_alive_interval", Type: cty.String, Required: false},
-		"ssh_read_write_timeout":       &hcldec.AttrSpec{Name: "ssh_read_write_timeout", Type: cty.String, Required: false},
-		"ssh_remote_tunnels":           &hcldec.AttrSpec{Name: "ssh_remote_tunnels", Type: cty.List(cty.String), Required: false},
-		"ssh_local_tunnels":            &hcldec.AttrSpec{Name: "ssh_local_tunnels", Type: cty.List(cty.String), Required: false},
-		"ssh_public_key":               &hcldec.AttrSpec{Name: "ssh_public_key", Type: cty.List(cty.Number), Required: false},
-		"ssh_private_key":              &hcldec.AttrSpec{Name: "ssh_private_key", Type: cty.List(cty.Number), Required: false},
-		"winrm_username":               &hcldec.AttrSpec{Name: "winrm_username", Type: cty.String, Required: false},
-		"winrm_password":               &hcldec.AttrSpec{Name: "winrm_password", Type: cty.String, Required: false},
-		"winrm_host":                   &hcldec.AttrSpec{Name: "winrm_host", Type: cty.String, Required: false},
-		"winrm_port":                   &hcldec.AttrSpec{Name: "winrm_port", Type: cty.Number, Required: false},
-		"winrm_timeout":                &hcldec.AttrSpec{Name: "winrm_timeout", Type: cty.String, Required: false},
-		"winrm_use_ssl":                &hcldec.AttrSpec{Name: "winrm_use_ssl", Type: cty.Bool, Required: false},
-		"winrm_insecure":               &hcldec.AttrSpec{Name: "winrm_insecure", Type: cty.Bool, Required: false},
-		"winrm_use_ntlm":               &hcldec.AttrSpec{Name: "winrm_use_ntlm", Type: cty.Bool, Required: false},
-		"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"
+	"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 []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()
-
-		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 []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()
-
-		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 []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)
-		}
-
-		// 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,58 +74,7 @@ func TestBuilderAcc_ECSImageSharing(t *testing.T) {
 	})
 }
 
-// share with catsby
-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 []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)
-		}
-
-		// 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
@@ -488,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{}
@@ -514,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 []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`")
 		}
@@ -559,164 +131,43 @@ 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 {
+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 {
+func checkRegionCopy(regions []string) builderT.TestCheckFunc {
 	return func(artifacts []packer.Artifact) error {
 		if len(artifacts) > 1 {
 			return fmt.Errorf("more than 1 artifact")
@@ -728,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 []packer.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
 	}
 }
@@ -877,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 {
@@ -890,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,10 +1,8 @@
 package ecs
 
 import (
-	"reflect"
 	"testing"
 
-	helperconfig "github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
 )
 
@@ -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,198 +1,42 @@
-//go:generate struct-markdown
-
 package ecs
 
 import (
 	"fmt"
+
 	"regexp"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/config"
+	"github.com/denverdino/aliyungo/common"
 	"github.com/hashicorp/packer/template/interpolate"
 )
 
 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.
-	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"`
 }
 
 type AlicloudDiskDevices struct {
-	// Image disk mapping for system
-	// disk.
-	// -   `disk_category` (string) - Category of the system disk. Optional values
-	//     are:
-	//         -   `cloud` - general cloud disk
-	//         -   `cloud_efficiency` - efficiency cloud disk
-	//         -   `cloud_ssd` - cloud SSD
-	//
-	//         For phased-out instance types and non-I/O optimized instances, the
-	//         default value is cloud. Otherwise, the default value is
-	//         cloud\_efficiency.
-	//
-	// -   `disk_description` (string) - The value of disk description is blank by
-	//     default. \[2, 256\] characters. The disk description will appear on the
-	//     console. It cannot begin with `http://` or `https://`.
-	//
-	// -   `disk_name` (string) - The value of disk name is blank by default. \[2,
-	//     128\] English or Chinese characters, must begin with an
-	//     uppercase/lowercase letter or Chinese character. Can contain numbers,
-	//     `.`, `_` and `-`. The disk name will appear on the console. It cannot
-	//     begin with `http://` or `https://`.
-	//
-	// -   `disk_size` (number) - Size of the system disk, measured in GiB. Value
-	//     range: \[20, 500\]. The specified value must be equal to or greater
-	//     than max{20, ImageSize}. Default value: max{40, ImageSize}.
-	//
-	ECSSystemDiskMapping AlicloudDiskDevice `mapstructure:"system_disk_mapping" required:"false"`
-	// Add one or more data
-	// disks to the image.
-	//
-	// -   `disk_category` (string) - Category of the data disk. Optional values
-	//     are:
-	//     -   `cloud` - general cloud disk
-	//     -   `cloud_efficiency` - efficiency cloud disk
-	//     -   `cloud_ssd` - cloud SSD
-	//
-	//     Default value: cloud.
-	//
-	// -   `disk_delete_with_instance` (boolean) - Whether or not the disk is
-	//     released along with the instance:
-	//     -   True indicates that when the instance is released, this disk will
-	//         be released with it
-	//     -   False indicates that when the instance is released, this disk will
-	//         be retained.
-	// -   `disk_description` (string) - The value of disk description is blank by
-	//     default. \[2, 256\] characters. The disk description will appear on the
-	//     console. It cannot begin with `http://` or `https://`.
-	//
-	// -   `disk_device` (string) - Device information of the related instance:
-	//     such as `/dev/xvdb` It is null unless the Status is In\_use.
-	//
-	// -   `disk_name` (string) - The value of disk name is blank by default. \[2,
-	//     128\] English or Chinese characters, must begin with an
-	//     uppercase/lowercase letter or Chinese character. Can contain numbers,
-	//     `.`, `_` and `-`. The disk name will appear on the console. It cannot
-	//     begin with `http://` or `https://`.
-	//
-	// -   `disk_size` (number) - Size of the data disk, in GB, values range:
-	//     -   `cloud` - 5 \~ 2000
-	//     -   `cloud_efficiency` - 20 \~ 2048
-	//     -   `cloud_ssd` - 20 \~ 2048
-	//
-	//     The value should be equal to or greater than the size of the specific
-	//     SnapshotId.
-	//
-	// -   `disk_snapshot_id` (string) - Snapshots are used to create the data
-	//     disk After this parameter is specified, Size is ignored. The actual
-	//     size of the created disk is the size of the specified snapshot.
-	//
-	//     Snapshots from on or before July 15, 2013 cannot be used to create a
-	//     disk.
-	//
-	// -   `disk_encrypted` (boolean) - Whether or not to encrypt the data disk.
-	//     If this option is set to true, the data disk will be encryped and corresponding snapshot in the target image will also be encrypted. By
-	//     default, if this is an extra data disk, Packer will not encrypt the
-	//     data disk. Otherwise, Packer will keep the encryption setting to what
-	//     it was in the source image. Please refer to Introduction of [ECS disk encryption](https://www.alibabacloud.com/help/doc-detail/59643.htm)
-	//     for more details.
-	//
-	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](https://packer.io/docs/commands/build.html#force) option is
-	// provided in `build` command, this option can be omitted and taken as
-	// true.
-	AlicloudImageForceDelete bool `mapstructure:"image_force_delete" required:"false"`
-	// If this value is true, when delete the duplicated existing images, the
-	// source snapshots of those images will be delete either. If
-	// [-force](https://packer.io/docs/commands/build.html#force) option is
-	// provided in `build` command, this option can be omitted and taken as
-	// true.
-	AlicloudImageForceDeleteSnapshots bool `mapstructure:"image_force_delete_snapshots" required:"false"`
-	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"`
-	// Tags applied to the destination
-	// image and relevant snapshots.
-	AlicloudImageTags   map[string]string `mapstructure:"tags" 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 {
@@ -222,6 +66,15 @@ 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)
 		}
 
@@ -234,3 +87,14 @@ func (c *AlicloudImageConfig) Prepare(ctx *interpolate.Context) []error {
 
 	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,13 +2,12 @@ package ecs
 
 import (
 	"fmt"
-	"strconv"
 
 	"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)
 
@@ -19,34 +18,5 @@ func cleanUpMessage(state multistep.StateBag, module string) {
 	} else {
 		ui.Say(fmt.Sprintf("Cleaning up '%s'", module))
 	}
-}
-
-func halt(state multistep.StateBag, err error, prefix string) multistep.StepAction {
-	ui := state.Get("ui").(packer.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 (
@@ -10,122 +8,42 @@ import (
 
 	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type RunConfig struct {
-	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,7 +2,6 @@ package ecs
 
 import (
 	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/hashicorp/packer/helper/communicator"
@@ -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"
 
+	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"
+	"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").(packer.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").(packer.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,7 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -13,39 +14,24 @@ 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)
+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)
-
-	describeImagesRequest := ecs.CreateDescribeImagesRequest()
-	describeImagesRequest.RegionId = config.AlicloudRegion
-	describeImagesRequest.ImageId = config.AlicloudSourceImage
-	if config.AlicloudSkipImageValidation {
-		describeImagesRequest.ShowExpired = "true"
-	}
-	imagesResponse, err := client.DescribeImages(describeImagesRequest)
+	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/common/uuid"
-
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
+	"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)
+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.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),
+	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").(*ClientWrapper)
-	instance := state.Get("instance").(*ecs.Instance)
+	client := state.Get("client").(*ecs.Client)
+	instance := state.Get("instance").(*ecs.InstanceAttributesType)
 	ui := state.Get("ui").(packer.Ui)
 
-	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))
+	message(state, "EIP")
+
+	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/helper/communicator"
+	"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 {
+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)
+	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,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
+	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -12,34 +12,22 @@ import (
 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)
+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.Instance)
+	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,11 +2,12 @@ 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/common/uuid"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -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)
+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
-
-		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").(*ClientWrapper)
+	client := state.Get("client").(*ecs.Client)
 	ui := state.Get("ui").(packer.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,12 +2,12 @@ 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/common/uuid"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -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)
+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").(*ClientWrapper)
+	client := state.Get("client").(*ecs.Client)
 	ui := state.Get("ui").(packer.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,11 +2,12 @@ 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/common/uuid"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -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)
+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)
+	client := state.Get("client").(*ecs.Client)
 	ui := state.Get("ui").(packer.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))
+	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/common/random"
-
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/common/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(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	config := state.Get("config").(*Config)
-	client := state.Get("client").(*ClientWrapper)
+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)
 
-	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))
-	}
+	// Create the alicloud image
+	ui.Say(fmt.Sprintf("Creating image: %s", config.AlicloudImageName))
+	var imageId string
+	var err error
 
-	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)
+	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/common/uuid"
-
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	confighelper "github.com/hashicorp/packer/helper/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",
-}
-
-var deleteInstanceRetryErrors = []string{
-	"IncorrectInstanceStatus.Initializing",
-}
-
-func (s *stepCreateAlicloudInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
+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
 
-	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)
+	message(state, "instance")
+	client := state.Get("client").(*ecs.Client)
 	ui := state.Get("ui").(packer.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,
-	})
-
+	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/helper/multistep"
-	"github.com/hashicorp/packer/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").(packer.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").(packer.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/helper/multistep"
-	"github.com/hashicorp/packer/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").(packer.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,7 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -14,88 +15,50 @@ 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").(packer.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,7 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
+	"github.com/denverdino/aliyungo/common"
+	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -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").(packer.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 *packer.MultiError
-	if err := config.ValidateRegion(config.AlicloudRegion); err != nil {
-		errs = packer.MultiErrorAppend(errs, err)
-	}
-	for _, region := range config.AlicloudImageDestinationRegions {
-		if err := config.ValidateRegion(region); err != nil {
-			errs = packer.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").(packer.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"
-	confighelper "github.com/hashicorp/packer/helper/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)
+	client := state.Get("client").(*ecs.Client)
 	ui := state.Get("ui").(packer.Ui)
-
-	srcImageId := state.Get("alicloudimage").(string)
+	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").(packer.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,8 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
-	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
+	"github.com/denverdino/aliyungo/ecs"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -13,22 +12,25 @@ import (
 type stepRunAlicloudInstance struct {
 }
 
-func (s *stepRunAlicloudInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	client := state.Get("client").(*ClientWrapper)
+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.Instance)
+	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").(packer.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/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").(packer.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/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)
+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/amazon/chroot/builder.go

@@ -1,22 +1,17 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type Config,BlockDevices,BlockDevice
-
-// 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.
+// 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 (
-	"context"
 	"errors"
+	"log"
 	"runtime"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/hcl/v2/hcldec"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/chroot"
 	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
@@ -26,154 +21,32 @@ import (
 // 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.
+// Config is the configuration that is chained through the steps and
+// settable from the template.
 type Config struct {
-	common.PackerConfig    `mapstructure:",squash"`
-	awscommon.AMIConfig    `mapstructure:",squash"`
-	awscommon.AccessConfig `mapstructure:",squash"`
-	// Add one or more [block device
-	// mappings](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html)
-	// to the AMI. If this field is populated, and you are building from an
-	// existing source image, the block device mappings in the source image
-	// will be overwritten. This means you must have a block device mapping
-	// entry for your root volume, `root_volume_size` and `root_device_name`.
-	// See the [BlockDevices](#block-devices-configuration) documentation for
-	// fields.
-	AMIMappings awscommon.BlockDevices `mapstructure:"ami_block_device_mappings" hcl2-schema-generator:"ami_block_device_mappings,direct" required:"false"`
-	// This is a list of devices to mount into the chroot environment. This
-	// configuration parameter requires some additional documentation which is
-	// in the Chroot Mounts section. Please read that section for more
-	// information on how to use this.
-	ChrootMounts [][]string `mapstructure:"chroot_mounts" required:"false"`
-	// How to run shell commands. This defaults to {{.Command}}. This may be
-	// useful to set if you want to set environmental variables or perhaps run
-	// it with sudo or so on. This is a configuration template where the
-	// .Command variable is replaced with the command to be run. Defaults to
-	// {{.Command}}.
-	CommandWrapper string `mapstructure:"command_wrapper" required:"false"`
-	// Paths to files on the running EC2 instance that will be copied into the
-	// chroot environment prior to provisioning. Defaults to /etc/resolv.conf
-	// so that DNS lookups work. Pass an empty list to skip copying
-	// /etc/resolv.conf. You may need to do this if you're building an image
-	// that uses systemd.
-	CopyFiles []string `mapstructure:"copy_files" required:"false"`
-	// The path to the device where the root volume of the source AMI will be
-	// attached. This defaults to "" (empty string), which forces Packer to
-	// find an open device automatically.
-	DevicePath string `mapstructure:"device_path" required:"false"`
-	// When we call the mount command (by default mount -o device dir), the
-	// string provided in nvme_mount_path will replace device in that command.
-	// When this option is not set, device in that command will be something
-	// like /dev/sdf1, mirroring the attached device name. This assumption
-	// works for most instances but will fail with c5 and m5 instances. In
-	// order to use the chroot builder with c5 and m5 instances, you must
-	// manually set nvme_device_path and device_path.
-	NVMEDevicePath string `mapstructure:"nvme_device_path" required:"false"`
-	// Build a new volume instead of starting from an existing AMI root volume
-	// snapshot. Default false. If true, source_ami/source_ami_filter are no
-	// longer used and the following options become required:
-	// ami_virtualization_type, pre_mount_commands and root_volume_size.
-	FromScratch bool `mapstructure:"from_scratch" required:"false"`
-	// Options to supply the mount command when mounting devices. Each option
-	// will be prefixed with -o and supplied to the mount command ran by
-	// Packer. Because this command is ran in a shell, user discretion is
-	// advised. See this manual page for the mount command for valid file
-	// system specific options.
-	MountOptions []string `mapstructure:"mount_options" required:"false"`
-	// The partition number containing the / partition. By default this is the
-	// first partition of the volume, (for example, xvda1) but you can
-	// designate the entire block device by setting "mount_partition": "0" in
-	// your config, which will mount xvda instead.
-	MountPartition string `mapstructure:"mount_partition" required:"false"`
-	// The path where the volume will be mounted. This is where the chroot
-	// environment will be. This defaults to
-	// /mnt/packer-amazon-chroot-volumes/{{.Device}}. This is a configuration
-	// template where the .Device variable is replaced with the name of the
-	// device where the volume is attached.
-	MountPath string `mapstructure:"mount_path" required:"false"`
-	// As pre_mount_commands, but the commands are executed after mounting the
-	// root device and before the extra mount and copy steps. The device and
-	// mount path are provided by {{.Device}} and {{.MountPath}}.
-	PostMountCommands []string `mapstructure:"post_mount_commands" required:"false"`
-	// A series of commands to execute after attaching the root volume and
-	// before mounting the chroot. This is not required unless using
-	// from_scratch. If so, this should include any partitioning and filesystem
-	// creation commands. The path to the device is provided by {{.Device}}.
-	PreMountCommands []string `mapstructure:"pre_mount_commands" required:"false"`
-	// The root device name. For example, xvda.
-	RootDeviceName string `mapstructure:"root_device_name" required:"false"`
-	// The size of the root volume in GB for the chroot environment and the
-	// resulting AMI. Default size is the snapshot size of the source_ami
-	// unless from_scratch is true, in which case this field must be defined.
-	RootVolumeSize int64 `mapstructure:"root_volume_size" required:"false"`
-	// The type of EBS volume for the chroot environment and resulting AMI. The
-	// default value is the type of the source_ami, unless from_scratch is
-	// true, in which case the default value is gp2. You can only specify io1
-	// if building based on top of a source_ami which is also io1.
-	RootVolumeType string `mapstructure:"root_volume_type" required:"false"`
-	// The source AMI whose root volume will be copied and provisioned on the
-	// currently running instance. This must be an EBS-backed AMI with a root
-	// volume snapshot that you have access to. Note: this is not used when
-	// from_scratch is set to true.
-	SourceAmi string `mapstructure:"source_ami" required:"true"`
-	// Filters used to populate the source_ami field. Example:
-	//
-	//
-	//     ``` json
-	//     {
-	//       "source_ami_filter": {
-	//       "filters": {
-	//        "virtualization-type": "hvm",
-	//        "name": "ubuntu/images/*ubuntu-xenial-16.04-amd64-server-*",
-	//        "root-device-type": "ebs"
-	//      },
-	//      "owners": ["099720109477"],
-	//      "most_recent": true
-	//       }
-	//     }
-	//     ```
-	//
-	//     This selects the most recent Ubuntu 16.04 HVM EBS AMI from Canonical. NOTE:
-	//     This will fail unless *exactly* one AMI is returned. In the above example,
-	//     `most_recent` will cause this to succeed by selecting the newest image.
-	//
-	//     -   `filters` (map of strings) - filters used to select a `source_ami`.
-	//         NOTE: This will fail unless *exactly* one AMI is returned. Any filter
-	//         described in the docs for
-	//         [DescribeImages](http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeImages.html)
-	//         is valid.
-	//
-	//     -   `owners` (array of strings) - Filters the images by their owner. You
-	//         may specify one or more AWS account IDs, "self" (which will use the
-	//         account whose credentials you are using to run Packer), or an AWS owner
-	//         alias: for example, "amazon", "aws-marketplace", or "microsoft". This
-	//         option is required for security reasons.
-	//
-	//     -   `most_recent` (boolean) - Selects the newest created image when true.
-	//         This is most useful for selecting a daily distro build.
-	//
-	//     You may set this in place of `source_ami` or in conjunction with it. If you
-	//     set this in conjunction with `source_ami`, the `source_ami` will be added
-	//     to the filter. The provided `source_ami` must meet all of the filtering
-	//     criteria provided in `source_ami_filter`; this pins the AMI returned by the
-	//     filter, but will cause Packer to fail if the `source_ami` does not exist.
-	SourceAmiFilter awscommon.AmiFilterOptions `mapstructure:"source_ami_filter" required:"false"`
-	// Tags to apply to the volumes that are *launched*. This is a [template
-	// engine](/docs/templates/engine.html), see [Build template
-	// data](#build-template-data) for more information.
-	RootVolumeTags awscommon.TagMap `mapstructure:"root_volume_tags" required:"false"`
-	// what architecture to use when registering the final AMI; valid options
-	// are "x86_64" or "arm64". Defaults to "x86_64".
-	Architecture string `mapstructure:"ami_architecture" required:"false"`
+	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
 }
 
-func (c *Config) GetContext() interpolate.Context {
-	return c.ctx
-}
-
 type wrappedCommandTemplate struct {
 	Command string
 }
@@ -183,9 +56,7 @@ type Builder struct {
 	runner multistep.Runner
 }
 
-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) {
 	b.config.ctx.Funcs = awscommon.TemplateFuncs
 	err := config.Decode(&b.config, &config.DecodeOpts{
 		Interpolate:        true,
@@ -195,7 +66,6 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 				"ami_description",
 				"snapshot_tags",
 				"tags",
-				"root_volume_tags",
 				"command_wrapper",
 				"post_mount_commands",
 				"pre_mount_commands",
@@ -204,11 +74,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 		},
 	}, raws...)
 	if err != nil {
-		return nil, nil, err
-	}
-
-	if b.config.Architecture == "" {
-		b.config.Architecture = "x86_64"
+		return nil, err
 	}
 
 	if b.config.PackerConfig.PackerForce {
@@ -232,6 +98,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 
 	// 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"}
 		}
@@ -245,8 +112,8 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 		b.config.MountPath = "/mnt/packer-amazon-chroot-volumes/{{.Device}}"
 	}
 
-	if b.config.MountPartition == "" {
-		b.config.MountPartition = "1"
+	if b.config.MountPartition == 0 {
+		b.config.MountPartition = 1
 	}
 
 	// Accumulate any errors or warnings
@@ -294,42 +161,23 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 			errs = packer.MultiErrorAppend(
 				errs, errors.New("source_ami or source_ami_filter is required."))
 		}
-		if len(b.config.AMIMappings) > 0 && b.config.RootDeviceName != "" {
-			if b.config.RootVolumeSize == 0 {
-				// Although, they can specify the device size in the block
-				// device mapping, it's easier to be specific here.
-				errs = packer.MultiErrorAppend(
-					errs, errors.New("root_volume_size is required if ami_block_device_mappings is specified"))
-			}
-			warns = append(warns, "ami_block_device_mappings from source image will be completely overwritten")
-		} else if len(b.config.AMIMappings) > 0 {
-			errs = packer.MultiErrorAppend(
-				errs, errors.New("If ami_block_device_mappings is specified, root_device_name must be specified"))
-		} else if b.config.RootDeviceName != "" {
-			errs = packer.MultiErrorAppend(
-				errs, errors.New("If root_device_name is specified, ami_block_device_mappings must be specified"))
+		if len(b.config.AMIMappings) != 0 {
+			warns = append(warns, "ami_block_device_mappings are unused when from_scratch is false")
 		}
-	}
-	valid := false
-	for _, validArch := range []string{"x86_64", "arm64"} {
-		if validArch == b.config.Architecture {
-			valid = true
-			break
+		if b.config.RootDeviceName != "" {
+			warns = append(warns, "root_device_name is unused when from_scratch is false")
 		}
 	}
-	if !valid {
-		errs = packer.MultiErrorAppend(errs, errors.New(`The only valid ami_architecture values are "x86_64" and "arm64"`))
-	}
 
 	if errs != nil && len(errs.Errors) > 0 {
-		return nil, warns, errs
+		return warns, errs
 	}
 
-	packer.LogSecretFilter.Set(b.config.AccessKey, b.config.SecretKey, b.config.Token)
-	return nil, warns, nil
+	log.Println(common.ScrubConfig(b.config, b.config.AccessKey, b.config.SecretKey, b.config.Token))
+	return warns, nil
 }
 
-func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) {
+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.")
 	}
@@ -341,21 +189,19 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	ec2conn := ec2.New(session)
 
 	wrappedCommand := func(command string) (string, error) {
-		ictx := b.config.ctx
-		ictx.Data = &wrappedCommandTemplate{Command: command}
-		return interpolate.Render(b.config.CommandWrapper, &ictx)
+		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("access_config", &b.config.AccessConfig)
-	state.Put("ami_config", &b.config.AMIConfig)
 	state.Put("ec2", ec2conn)
 	state.Put("awsSession", session)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	state.Put("wrappedCommand", common.CommandWrapper(wrappedCommand))
+	state.Put("wrappedCommand", CommandWrapper(wrappedCommand))
 
 	// Build the steps
 	steps := []multistep.Step{
@@ -373,7 +219,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				EnableAMISriovNetSupport: b.config.AMISriovNetSupport,
 				EnableAMIENASupport:      b.config.AMIENASupport,
 				AmiFilters:               b.config.SourceAmiFilter,
-				AMIVirtType:              b.config.AMIVirtType,
 			},
 			&StepCheckRootDevice{},
 		)
@@ -383,31 +228,24 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&StepFlock{},
 		&StepPrepareDevice{},
 		&StepCreateVolume{
-			RootVolumeType: b.config.RootVolumeType,
 			RootVolumeSize: b.config.RootVolumeSize,
-			RootVolumeTags: b.config.RootVolumeTags,
-			Ctx:            b.config.ctx,
 		},
 		&StepAttachVolume{},
 		&StepEarlyUnflock{},
-		&chroot.StepPreMountCommands{
+		&StepPreMountCommands{
 			Commands: b.config.PreMountCommands,
 		},
 		&StepMountDevice{
 			MountOptions:   b.config.MountOptions,
 			MountPartition: b.config.MountPartition,
 		},
-		&chroot.StepPostMountCommands{
+		&StepPostMountCommands{
 			Commands: b.config.PostMountCommands,
 		},
-		&chroot.StepMountExtra{
-			ChrootMounts: b.config.ChrootMounts,
-		},
-		&chroot.StepCopyFiles{
-			Files: b.config.CopyFiles,
-		},
-		&chroot.StepChrootProvision{},
-		&chroot.StepEarlyCleanup{},
+		&StepMountExtra{},
+		&StepCopyFiles{},
+		&StepChrootProvision{},
+		&StepEarlyCleanup{},
 		&StepSnapshot{},
 		&awscommon.StepDeregisterAMI{
 			AccessConfig:        &b.config.AccessConfig,
@@ -420,16 +258,19 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			RootVolumeSize:           b.config.RootVolumeSize,
 			EnableAMISriovNetSupport: b.config.AMISriovNetSupport,
 			EnableAMIENASupport:      b.config.AMIENASupport,
-			AMISkipBuildRegion:       b.config.AMISkipBuildRegion,
+		},
+		&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,
-			AMIKmsKeyId:       b.config.AMIKmsKeyId,
 			RegionKeyIds:      b.config.AMIRegionKMSKeyIDs,
 			EncryptBootVolume: b.config.AMIEncryptBootVolume,
 			Name:              b.config.AMIName,
-			OriginalRegion:    *ec2conn.Config.Region,
 		},
 		&awscommon.StepModifyAMIAttributes{
 			Description:    b.config.AMIDescription,
@@ -449,7 +290,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 
 	// Run!
 	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
-	b.runner.Run(ctx, state)
+	b.runner.Run(state)
 
 	// If there was an error, return that
 	if rawErr, ok := state.GetOk("error"); ok {
@@ -470,3 +311,10 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 
 	return artifact, nil
 }
+
+func (b *Builder) Cancel() {
+	if b.runner != nil {
+		log.Println("Cancelling the step runner...")
+		b.runner.Cancel()
+	}
+}

builder/amazon/chroot/builder.hcl2spec.go

@@ -1,143 +0,0 @@
-// Code generated by "mapstructure-to-hcl2 -type Config,BlockDevices,BlockDevice"; DO NOT EDIT.
-package chroot
-
-import (
-	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/zclconf/go-cty/cty"
-)
-
-// FlatConfig is an auto-generated flat version of Config.
-// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
-type FlatConfig struct {
-	PackerBuildName         *string                           `mapstructure:"packer_build_name" cty:"packer_build_name"`
-	PackerBuilderType       *string                           `mapstructure:"packer_builder_type" cty:"packer_builder_type"`
-	PackerDebug             *bool                             `mapstructure:"packer_debug" cty:"packer_debug"`
-	PackerForce             *bool                             `mapstructure:"packer_force" cty:"packer_force"`
-	PackerOnError           *string                           `mapstructure:"packer_on_error" cty:"packer_on_error"`
-	PackerUserVars          map[string]string                 `mapstructure:"packer_user_variables" cty:"packer_user_variables"`
-	PackerSensitiveVars     []string                          `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables"`
-	AMIName                 *string                           `mapstructure:"ami_name" required:"true" cty:"ami_name"`
-	AMIDescription          *string                           `mapstructure:"ami_description" required:"false" cty:"ami_description"`
-	AMIVirtType             *string                           `mapstructure:"ami_virtualization_type" required:"false" cty:"ami_virtualization_type"`
-	AMIUsers                []string                          `mapstructure:"ami_users" required:"false" cty:"ami_users"`
-	AMIGroups               []string                          `mapstructure:"ami_groups" required:"false" cty:"ami_groups"`
-	AMIProductCodes         []string                          `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes"`
-	AMIRegions              []string                          `mapstructure:"ami_regions" required:"false" cty:"ami_regions"`
-	AMISkipRegionValidation *bool                             `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation"`
-	AMITags                 common.TagMap                     `mapstructure:"tags" required:"false" cty:"tags"`
-	AMIENASupport           *bool                             `mapstructure:"ena_support" required:"false" cty:"ena_support"`
-	AMISriovNetSupport      *bool                             `mapstructure:"sriov_support" required:"false" cty:"sriov_support"`
-	AMIForceDeregister      *bool                             `mapstructure:"force_deregister" required:"false" cty:"force_deregister"`
-	AMIForceDeleteSnapshot  *bool                             `mapstructure:"force_delete_snapshot" required:"false" cty:"force_delete_snapshot"`
-	AMIEncryptBootVolume    *bool                             `mapstructure:"encrypt_boot" required:"false" cty:"encrypt_boot"`
-	AMIKmsKeyId             *string                           `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id"`
-	AMIRegionKMSKeyIDs      map[string]string                 `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids"`
-	AMISkipBuildRegion      *bool                             `mapstructure:"skip_save_build_region" cty:"skip_save_build_region"`
-	SnapshotTags            common.TagMap                     `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags"`
-	SnapshotUsers           []string                          `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users"`
-	SnapshotGroups          []string                          `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups"`
-	AccessKey               *string                           `mapstructure:"access_key" required:"true" cty:"access_key"`
-	CustomEndpointEc2       *string                           `mapstructure:"custom_endpoint_ec2" required:"false" cty:"custom_endpoint_ec2"`
-	DecodeAuthZMessages     *bool                             `mapstructure:"decode_authorization_messages" required:"false" cty:"decode_authorization_messages"`
-	InsecureSkipTLSVerify   *bool                             `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify"`
-	MFACode                 *string                           `mapstructure:"mfa_code" required:"false" cty:"mfa_code"`
-	ProfileName             *string                           `mapstructure:"profile" required:"false" cty:"profile"`
-	RawRegion               *string                           `mapstructure:"region" required:"true" cty:"region"`
-	SecretKey               *string                           `mapstructure:"secret_key" required:"true" cty:"secret_key"`
-	SkipMetadataApiCheck    *bool                             `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check"`
-	Token                   *string                           `mapstructure:"token" required:"false" cty:"token"`
-	VaultAWSEngine          *common.FlatVaultAWSEngineOptions `mapstructure:"vault_aws_engine" required:"false" cty:"vault_aws_engine"`
-	AMIMappings             []common.FlatBlockDevice          `mapstructure:"ami_block_device_mappings" hcl2-schema-generator:"ami_block_device_mappings,direct" required:"false" cty:"ami_block_device_mappings"`
-	ChrootMounts            [][]string                        `mapstructure:"chroot_mounts" required:"false" cty:"chroot_mounts"`
-	CommandWrapper          *string                           `mapstructure:"command_wrapper" required:"false" cty:"command_wrapper"`
-	CopyFiles               []string                          `mapstructure:"copy_files" required:"false" cty:"copy_files"`
-	DevicePath              *string                           `mapstructure:"device_path" required:"false" cty:"device_path"`
-	NVMEDevicePath          *string                           `mapstructure:"nvme_device_path" required:"false" cty:"nvme_device_path"`
-	FromScratch             *bool                             `mapstructure:"from_scratch" required:"false" cty:"from_scratch"`
-	MountOptions            []string                          `mapstructure:"mount_options" required:"false" cty:"mount_options"`
-	MountPartition          *string                           `mapstructure:"mount_partition" required:"false" cty:"mount_partition"`
-	MountPath               *string                           `mapstructure:"mount_path" required:"false" cty:"mount_path"`
-	PostMountCommands       []string                          `mapstructure:"post_mount_commands" required:"false" cty:"post_mount_commands"`
-	PreMountCommands        []string                          `mapstructure:"pre_mount_commands" required:"false" cty:"pre_mount_commands"`
-	RootDeviceName          *string                           `mapstructure:"root_device_name" required:"false" cty:"root_device_name"`
-	RootVolumeSize          *int64                            `mapstructure:"root_volume_size" required:"false" cty:"root_volume_size"`
-	RootVolumeType          *string                           `mapstructure:"root_volume_type" required:"false" cty:"root_volume_type"`
-	SourceAmi               *string                           `mapstructure:"source_ami" required:"true" cty:"source_ami"`
-	SourceAmiFilter         *common.FlatAmiFilterOptions      `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter"`
-	RootVolumeTags          common.TagMap                     `mapstructure:"root_volume_tags" required:"false" cty:"root_volume_tags"`
-	Architecture            *string                           `mapstructure:"ami_architecture" required:"false" cty:"ami_architecture"`
-}
-
-// 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_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
-		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
-		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":         &hcldec.BlockAttrsSpec{TypeName: "packer_user_variables", ElementType: cty.String, Required: false},
-		"packer_sensitive_variables":    &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
-		"ami_name":                      &hcldec.AttrSpec{Name: "ami_name", Type: cty.String, Required: false},
-		"ami_description":               &hcldec.AttrSpec{Name: "ami_description", Type: cty.String, Required: false},
-		"ami_virtualization_type":       &hcldec.AttrSpec{Name: "ami_virtualization_type", Type: cty.String, Required: false},
-		"ami_users":                     &hcldec.AttrSpec{Name: "ami_users", Type: cty.List(cty.String), Required: false},
-		"ami_groups":                    &hcldec.AttrSpec{Name: "ami_groups", Type: cty.List(cty.String), Required: false},
-		"ami_product_codes":             &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false},
-		"ami_regions":                   &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false},
-		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
-		"tags":                          &hcldec.BlockAttrsSpec{TypeName: "common.TagMap", ElementType: cty.String, Required: false},
-		"ena_support":                   &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false},
-		"sriov_support":                 &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
-		"force_deregister":              &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false},
-		"force_delete_snapshot":         &hcldec.AttrSpec{Name: "force_delete_snapshot", Type: cty.Bool, Required: false},
-		"encrypt_boot":                  &hcldec.AttrSpec{Name: "encrypt_boot", Type: cty.Bool, Required: false},
-		"kms_key_id":                    &hcldec.AttrSpec{Name: "kms_key_id", Type: cty.String, Required: false},
-		"region_kms_key_ids":            &hcldec.BlockAttrsSpec{TypeName: "region_kms_key_ids", ElementType: cty.String, Required: false},
-		"skip_save_build_region":        &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false},
-		"snapshot_tags":                 &hcldec.BlockAttrsSpec{TypeName: "common.TagMap", ElementType: cty.String, Required: false},
-		"snapshot_users":                &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false},
-		"snapshot_groups":               &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false},
-		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
-		"custom_endpoint_ec2":           &hcldec.AttrSpec{Name: "custom_endpoint_ec2", Type: cty.String, Required: false},
-		"decode_authorization_messages": &hcldec.AttrSpec{Name: "decode_authorization_messages", Type: cty.Bool, Required: false},
-		"insecure_skip_tls_verify":      &hcldec.AttrSpec{Name: "insecure_skip_tls_verify", Type: cty.Bool, Required: false},
-		"mfa_code":                      &hcldec.AttrSpec{Name: "mfa_code", Type: cty.String, Required: false},
-		"profile":                       &hcldec.AttrSpec{Name: "profile", Type: cty.String, Required: false},
-		"region":                        &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
-		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
-		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
-		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
-		"vault_aws_engine":              &hcldec.BlockSpec{TypeName: "vault_aws_engine", Nested: hcldec.ObjectSpec((*common.FlatVaultAWSEngineOptions)(nil).HCL2Spec())},
-		"ami_block_device_mappings":     &hcldec.BlockListSpec{TypeName: "ami_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())},
-		"chroot_mounts":                 &hcldec.BlockListSpec{TypeName: "chroot_mounts", Nested: &hcldec.AttrSpec{Name: "chroot_mounts", Type: cty.List(cty.String), Required: false}},
-		"command_wrapper":               &hcldec.AttrSpec{Name: "command_wrapper", Type: cty.String, Required: false},
-		"copy_files":                    &hcldec.AttrSpec{Name: "copy_files", Type: cty.List(cty.String), Required: false},
-		"device_path":                   &hcldec.AttrSpec{Name: "device_path", Type: cty.String, Required: false},
-		"nvme_device_path":              &hcldec.AttrSpec{Name: "nvme_device_path", Type: cty.String, Required: false},
-		"from_scratch":                  &hcldec.AttrSpec{Name: "from_scratch", Type: cty.Bool, Required: false},
-		"mount_options":                 &hcldec.AttrSpec{Name: "mount_options", Type: cty.List(cty.String), Required: false},
-		"mount_partition":               &hcldec.AttrSpec{Name: "mount_partition", Type: cty.String, Required: false},
-		"mount_path":                    &hcldec.AttrSpec{Name: "mount_path", Type: cty.String, Required: false},
-		"post_mount_commands":           &hcldec.AttrSpec{Name: "post_mount_commands", Type: cty.List(cty.String), Required: false},
-		"pre_mount_commands":            &hcldec.AttrSpec{Name: "pre_mount_commands", Type: cty.List(cty.String), Required: false},
-		"root_device_name":              &hcldec.AttrSpec{Name: "root_device_name", Type: cty.String, Required: false},
-		"root_volume_size":              &hcldec.AttrSpec{Name: "root_volume_size", Type: cty.Number, Required: false},
-		"root_volume_type":              &hcldec.AttrSpec{Name: "root_volume_type", Type: cty.String, Required: false},
-		"source_ami":                    &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
-		"source_ami_filter":             &hcldec.BlockSpec{TypeName: "source_ami_filter", Nested: hcldec.ObjectSpec((*common.FlatAmiFilterOptions)(nil).HCL2Spec())},
-		"root_volume_tags":              &hcldec.BlockAttrsSpec{TypeName: "common.TagMap", ElementType: cty.String, Required: false},
-		"ami_architecture":              &hcldec.AttrSpec{Name: "ami_architecture", Type: cty.String, Required: false},
-	}
-	return s
-}

builder/amazon/chroot/builder_test.go

@@ -11,8 +11,6 @@ func testConfig() map[string]interface{} {
 		"ami_name":   "foo",
 		"source_ami": "foo",
 		"region":     "us-east-1",
-		// region validation logic is checked in ami_config_test
-		"skip_region_validation": true,
 	}
 }
 
@@ -30,8 +28,7 @@ func TestBuilderPrepare_AMIName(t *testing.T) {
 
 	// Test good
 	config["ami_name"] = "foo"
-	config["skip_region_validation"] = true
-	_, warnings, err := b.Prepare(config)
+	warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -42,7 +39,7 @@ func TestBuilderPrepare_AMIName(t *testing.T) {
 	// Test bad
 	config["ami_name"] = "foo {{"
 	b = Builder{}
-	_, warnings, err = b.Prepare(config)
+	warnings, err = b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -53,7 +50,7 @@ func TestBuilderPrepare_AMIName(t *testing.T) {
 	// Test bad
 	delete(config, "ami_name")
 	b = Builder{}
-	_, warnings, err = b.Prepare(config)
+	warnings, err = b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -67,7 +64,7 @@ func TestBuilderPrepare_ChrootMounts(t *testing.T) {
 	config := testConfig()
 
 	config["chroot_mounts"] = nil
-	_, warnings, err := b.Prepare(config)
+	warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -83,7 +80,7 @@ func TestBuilderPrepare_ChrootMountsBadDefaults(t *testing.T) {
 	config["chroot_mounts"] = [][]string{
 		{"bad"},
 	}
-	_, warnings, err := b.Prepare(config)
+	warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -96,7 +93,7 @@ func TestBuilderPrepare_SourceAmi(t *testing.T) {
 	config := testConfig()
 
 	config["source_ami"] = ""
-	_, warnings, err := b.Prepare(config)
+	warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -105,7 +102,7 @@ func TestBuilderPrepare_SourceAmi(t *testing.T) {
 	}
 
 	config["source_ami"] = "foo"
-	_, warnings, err = b.Prepare(config)
+	warnings, err = b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -119,7 +116,7 @@ func TestBuilderPrepare_CommandWrapper(t *testing.T) {
 	config := testConfig()
 
 	config["command_wrapper"] = "echo hi; {{.Command}}"
-	_, warnings, err := b.Prepare(config)
+	warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -132,7 +129,7 @@ func TestBuilderPrepare_CopyFiles(t *testing.T) {
 	b := &Builder{}
 	config := testConfig()
 
-	_, warnings, err := b.Prepare(config)
+	warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -150,7 +147,7 @@ func TestBuilderPrepare_CopyFilesNoDefault(t *testing.T) {
 	config := testConfig()
 
 	config["copy_files"] = []string{}
-	_, warnings, err := b.Prepare(config)
+	warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
 	}
@@ -159,53 +156,6 @@ func TestBuilderPrepare_CopyFilesNoDefault(t *testing.T) {
 	}
 
 	if len(b.config.CopyFiles) > 0 {
-		t.Errorf("Was expecting no default value for copy_files. Found %v",
-			b.config.CopyFiles)
-	}
-}
-
-func TestBuilderPrepare_RootDeviceNameAndAMIMappings(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	config["root_device_name"] = "/dev/sda"
-	config["ami_block_device_mappings"] = []interface{}{map[string]string{}}
-	config["root_volume_size"] = 15
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) == 0 {
-		t.Fatal("Missing warning, stating block device mappings will be overwritten")
-	} else if len(warnings) > 1 {
-		t.Fatalf("excessive warnings: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-}
-
-func TestBuilderPrepare_AMIMappingsNoRootDeviceName(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	config["ami_block_device_mappings"] = []interface{}{map[string]string{}}
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatalf("should have error")
-	}
-}
-
-func TestBuilderPrepare_RootDeviceNameNoAMIMappings(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	config["root_device_name"] = "/dev/sda"
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatalf("should have error")
+		t.Errorf("Was expecting no default value for copy_files.")
 	}
 }

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/copy_files_test.go

@@ -6,8 +6,6 @@ import (
 	"os"
 	"runtime"
 	"testing"
-
-	"github.com/hashicorp/packer/common"
 )
 
 func TestCopyFile(t *testing.T) {
@@ -28,7 +26,7 @@ func TestCopyFile(t *testing.T) {
 	}
 	first.Sync()
 
-	cmd := common.ShellCommand(fmt.Sprintf("cp %s %s", first.Name(), newName))
+	cmd := ShellCommand(fmt.Sprintf("cp %s %s", first.Name(), newName))
 	if err := cmd.Run(); err != nil {
 		t.Fatalf("Couldn't copy file")
 	}

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

@@ -2,10 +2,11 @@ package chroot
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
+	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/helper/multistep"
@@ -23,7 +24,7 @@ type StepAttachVolume struct {
 	volumeId string
 }
 
-func (s *StepAttachVolume) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+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)
@@ -51,7 +52,35 @@ func (s *StepAttachVolume) Run(ctx context.Context, state multistep.StateBag) mu
 	s.volumeId = volumeId
 
 	// Wait for the volume to become attached
-	err = awscommon.WaitUntilVolumeAttached(ctx, ec2conn, s.volumeId)
+	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)
@@ -87,7 +116,26 @@ func (s *StepAttachVolume) CleanupFunc(state multistep.StateBag) error {
 	s.attached = false
 
 	// Wait for the volume to detach
-	err = awscommon.WaitUntilVolumeDetached(aws.BackgroundContext(), ec2conn, s.volumeId)
+	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)
 	}

builder/amazon/chroot/step_attach_volume_test.go

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

builder/amazon/chroot/step_check_root_device.go

@@ -12,7 +12,7 @@ import (
 // StepCheckRootDevice makes sure the root device on the AMI is EBS-backed.
 type StepCheckRootDevice struct{}
 
-func (s *StepCheckRootDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+func (s *StepCheckRootDevice) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
 	image := state.Get("source_image").(*ec2.Image)
 	ui := state.Get("ui").(packer.Ui)
 

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

@@ -2,7 +2,6 @@ package chroot
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"log"
 
@@ -11,7 +10,6 @@ import (
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // StepCreateVolume creates a new volume from the snapshot of the root
@@ -22,54 +20,21 @@ import (
 type StepCreateVolume struct {
 	volumeId       string
 	RootVolumeSize int64
-	RootVolumeType string
-	RootVolumeTags awscommon.TagMap
-	Ctx            interpolate.Context
 }
 
-func (s *StepCreateVolume) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+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)
 
-	volTags, err := s.RootVolumeTags.EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
-	if err != nil {
-		err := fmt.Errorf("Error tagging volumes: %s", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-
-	// Collect tags for tagging on resource creation
-	var tagSpecs []*ec2.TagSpecification
-
-	if len(volTags) > 0 {
-		runVolTags := &ec2.TagSpecification{
-			ResourceType: aws.String("volume"),
-			Tags:         volTags,
-		}
-
-		tagSpecs = append(tagSpecs, runVolTags)
-	}
-
 	var createVolume *ec2.CreateVolumeInput
 	if config.FromScratch {
-		rootVolumeType := ec2.VolumeTypeGp2
-		if s.RootVolumeType == "io1" {
-			err := errors.New("Cannot use io1 volume when building from scratch")
-			state.Put("error", err)
-			ui.Error(err.Error())
-			return multistep.ActionHalt
-		} else if s.RootVolumeType != "" {
-			rootVolumeType = s.RootVolumeType
-		}
 		createVolume = &ec2.CreateVolumeInput{
 			AvailabilityZone: instance.Placement.AvailabilityZone,
 			Size:             aws.Int64(s.RootVolumeSize),
-			VolumeType:       aws.String(rootVolumeType),
+			VolumeType:       aws.String(ec2.VolumeTypeGp2),
 		}
-
 	} else {
 		// Determine the root device snapshot
 		image := state.Get("source_image").(*ec2.Image)
@@ -82,19 +47,28 @@ func (s *StepCreateVolume) Run(ctx context.Context, state multistep.StateBag) mu
 			}
 		}
 
-		ui.Say("Creating the root volume...")
-		createVolume, err = s.buildCreateVolumeInput(*instance.Placement.AvailabilityZone, rootDevice)
-		if err != nil {
+		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,
+		}
 	}
 
-	if len(tagSpecs) > 0 {
-		createVolume.SetTagSpecifications(tagSpecs)
-		volTags.Report(ui)
-	}
 	log.Printf("Create args: %+v", createVolume)
 
 	createVolumeResp, err := ec2conn.CreateVolume(createVolume)
@@ -110,7 +84,22 @@ func (s *StepCreateVolume) Run(ctx context.Context, state multistep.StateBag) mu
 	log.Printf("Volume ID: %s", s.volumeId)
 
 	// Wait for the volume to become ready
-	err = awscommon.WaitUntilVolumeAvailable(ctx, ec2conn, s.volumeId)
+	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)
@@ -136,33 +125,3 @@ func (s *StepCreateVolume) Cleanup(state multistep.StateBag) {
 		ui.Error(fmt.Sprintf("Error deleting EBS volume: %s", err))
 	}
 }
-
-func (s *StepCreateVolume) buildCreateVolumeInput(az string, rootDevice *ec2.BlockDeviceMapping) (*ec2.CreateVolumeInput, error) {
-	if rootDevice == nil {
-		return nil, fmt.Errorf("Couldn't find root device!")
-	}
-	createVolumeInput := &ec2.CreateVolumeInput{
-		AvailabilityZone: aws.String(az),
-		Size:             rootDevice.Ebs.VolumeSize,
-		SnapshotId:       rootDevice.Ebs.SnapshotId,
-		VolumeType:       rootDevice.Ebs.VolumeType,
-		Iops:             rootDevice.Ebs.Iops,
-	}
-	if s.RootVolumeSize > *rootDevice.Ebs.VolumeSize {
-		createVolumeInput.Size = aws.Int64(s.RootVolumeSize)
-	}
-
-	if s.RootVolumeType == "" || s.RootVolumeType == *rootDevice.Ebs.VolumeType {
-		return createVolumeInput, nil
-	}
-
-	if s.RootVolumeType == "io1" {
-		return nil, fmt.Errorf("Root volume type cannot be io1, because existing root volume type was %s", *rootDevice.Ebs.VolumeType)
-	}
-
-	createVolumeInput.VolumeType = aws.String(s.RootVolumeType)
-	// non io1 cannot set iops
-	createVolumeInput.Iops = nil
-
-	return createVolumeInput, nil
-}

builder/amazon/chroot/step_create_volume_test.go

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

builder/amazon/chroot/step_early_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

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/common/chroot"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -13,8 +12,8 @@ import (
 // StepEarlyUnflock unlocks the flock.
 type StepEarlyUnflock struct{}
 
-func (s *StepEarlyUnflock) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	cleanup := state.Get("flock_cleanup").(chroot.Cleanup)
+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...")

builder/amazon/chroot/step_flock.go

@@ -19,7 +19,7 @@ type StepFlock struct {
 	fh *os.File
 }
 
-func (s *StepFlock) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+func (s *StepFlock) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
 	ui := state.Get("ui").(packer.Ui)
 
 	lockfile := "/var/lock/packer-chroot/lock"

builder/amazon/chroot/step_flock_test.go

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

builder/amazon/chroot/step_instance_info.go

@@ -15,7 +15,7 @@ import (
 // StepInstanceInfo verifies that this builder is running on an EC2 instance.
 type StepInstanceInfo struct{}
 
-func (s *StepInstanceInfo) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+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)

builder/amazon/chroot/step_mount_device.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 	"github.com/hashicorp/packer/template/interpolate"
@@ -27,23 +26,19 @@ type mountPathData struct {
 //   mount_device_cleanup CleanupFunc - To perform early cleanup
 type StepMountDevice struct {
 	MountOptions   []string
-	MountPartition string
+	MountPartition int
 
 	mountPath string
 }
 
-func (s *StepMountDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+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)
-	if config.NVMEDevicePath != "" {
-		// customizable device path for mounting NVME block devices on c5 and m5 HVM
-		device = config.NVMEDevicePath
-	}
-	wrappedCommand := state.Get("wrappedCommand").(common.CommandWrapper)
+	wrappedCommand := state.Get("wrappedCommand").(CommandWrapper)
 
 	var virtualizationType string
-	if config.FromScratch || config.AMIVirtType != "" {
+	if config.FromScratch {
 		virtualizationType = config.AMIVirtType
 	} else {
 		image := state.Get("source_image").(*ec2.Image)
@@ -51,10 +46,9 @@ func (s *StepMountDevice) Run(ctx context.Context, state multistep.StateBag) mul
 		log.Printf("Source image virtualization type is: %s", virtualizationType)
 	}
 
-	ictx := config.ctx
-
-	ictx.Data = &mountPathData{Device: filepath.Base(device)}
-	mountPath, err := interpolate.Render(config.MountPath, &ictx)
+	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)
@@ -81,9 +75,8 @@ func (s *StepMountDevice) Run(ctx context.Context, state multistep.StateBag) mul
 	}
 
 	deviceMount := device
-
-	if virtualizationType == "hvm" && s.MountPartition != "0" {
-		deviceMount = fmt.Sprintf("%s%s", device, s.MountPartition)
+	if virtualizationType == "hvm" {
+		deviceMount = fmt.Sprintf("%s%d", device, s.MountPartition)
 	}
 	state.Put("deviceMount", deviceMount)
 
@@ -104,8 +97,8 @@ func (s *StepMountDevice) Run(ctx context.Context, state multistep.StateBag) mul
 		ui.Error(err.Error())
 		return multistep.ActionHalt
 	}
-	log.Printf("[DEBUG] (step mount) mount command is %s", mountCommand)
-	cmd := common.ShellCommand(mountCommand)
+
+	cmd := ShellCommand(mountCommand)
 	cmd.Stderr = stderr
 	if err := cmd.Run(); err != nil {
 		err := fmt.Errorf(
@@ -136,7 +129,7 @@ func (s *StepMountDevice) CleanupFunc(state multistep.StateBag) error {
 	}
 
 	ui := state.Get("ui").(packer.Ui)
-	wrappedCommand := state.Get("wrappedCommand").(common.CommandWrapper)
+	wrappedCommand := state.Get("wrappedCommand").(CommandWrapper)
 
 	ui.Say("Unmounting the root device...")
 	unmountCommand, err := wrappedCommand(fmt.Sprintf("umount %s", s.mountPath))
@@ -144,7 +137,7 @@ func (s *StepMountDevice) CleanupFunc(state multistep.StateBag) error {
 		return fmt.Errorf("Error creating unmount command: %s", err)
 	}
 
-	cmd := common.ShellCommand(unmountCommand)
+	cmd := ShellCommand(unmountCommand)
 	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("Error unmounting root device: %s", err)
 	}

builder/amazon/chroot/step_mount_device_test.go

@@ -1,15 +1,11 @@
 package chroot
 
-import (
-	"testing"
-
-	"github.com/hashicorp/packer/common/chroot"
-)
+import "testing"
 
 func TestMountDeviceCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
 	var raw interface{}
 	raw = new(StepMountDevice)
-	if _, ok := raw.(chroot.Cleanup); !ok {
+	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_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) {}

builder/amazon/chroot/step_pre_mount_commands.go

@@ -0,0 +1,41 @@
+package chroot
+
+import (
+	"context"
+
+	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer"
+)
+
+type preMountCommandsData struct {
+	Device string
+}
+
+// StepPreMountCommands sets up the a new block device when building from scratch
+type StepPreMountCommands struct {
+	Commands []string
+}
+
+func (s *StepPreMountCommands) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+	config := state.Get("config").(*Config)
+	device := state.Get("device").(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 = &preMountCommandsData{Device: device}
+
+	ui.Say("Running device setup 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 *StepPreMountCommands) Cleanup(state multistep.StateBag) {}

builder/amazon/chroot/step_prepare_device.go

@@ -14,7 +14,7 @@ import (
 type StepPrepareDevice struct {
 }
 
-func (s *StepPrepareDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+func (s *StepPrepareDevice) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
 	ui := state.Get("ui").(packer.Ui)
 

builder/amazon/chroot/step_register_ami.go

@@ -7,8 +7,6 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common/random"
-	confighelper "github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
 )
@@ -16,44 +14,68 @@ import (
 // StepRegisterAMI creates the AMI.
 type StepRegisterAMI struct {
 	RootVolumeSize           int64
-	EnableAMIENASupport      confighelper.Trilean
+	EnableAMIENASupport      bool
 	EnableAMISriovNetSupport bool
-	AMISkipBuildRegion       bool
 }
 
-func (s *StepRegisterAMI) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+func (s *StepRegisterAMI) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
 	ec2conn := state.Get("ec2").(*ec2.EC2)
-	snapshotID := state.Get("snapshot_id").(string)
+	snapshotId := state.Get("snapshot_id").(string)
 	ui := state.Get("ui").(packer.Ui)
 
 	ui.Say("Registering the AMI...")
 
-	var registerOpts *ec2.RegisterImageInput
+	var (
+		registerOpts   *ec2.RegisterImageInput
+		mappings       []*ec2.BlockDeviceMapping
+		image          *ec2.Image
+		rootDeviceName string
+	)
 
-	// Create the image
-	amiName := config.AMIName
-	state.Put("intermediary_image", false)
-	if config.AMIEncryptBootVolume.True() || s.AMISkipBuildRegion {
-		state.Put("intermediary_image", true)
-
-		// From AWS SDK docs: You can encrypt a copy of an unencrypted snapshot,
-		// but you cannot use it to create an unencrypted copy of an encrypted
-		// snapshot. Your default CMK for EBS is used unless you specify a
-		// non-default key using KmsKeyId.
-
-		// If encrypt_boot is nil or true, we need to create a temporary image
-		// so that in step_region_copy, we can copy it with the correct
-		// encryption
-		amiName = random.AlphaNum(7)
+	if config.FromScratch {
+		mappings = config.AMIBlockDevices.BuildAMIDevices()
+		rootDeviceName = config.RootDeviceName
+	} else {
+		image = state.Get("source_image").(*ec2.Image)
+		mappings = image.BlockDeviceMappings
+		rootDeviceName = *image.RootDeviceName
+	}
+
+	newMappings := make([]*ec2.BlockDeviceMapping, len(mappings))
+	for i, device := range mappings {
+		newDevice := device
+		if *newDevice.DeviceName == rootDeviceName {
+			if newDevice.Ebs != nil {
+				newDevice.Ebs.SnapshotId = aws.String(snapshotId)
+			} else {
+				newDevice.Ebs = &ec2.EbsBlockDevice{SnapshotId: aws.String(snapshotId)}
+			}
+
+			if config.FromScratch || s.RootVolumeSize > *newDevice.Ebs.VolumeSize {
+				newDevice.Ebs.VolumeSize = aws.Int64(s.RootVolumeSize)
+			}
+		}
+
+		// assume working from a snapshot, so we unset the Encrypted field if set,
+		// otherwise AWS API will return InvalidParameter
+		if newDevice.Ebs != nil && newDevice.Ebs.Encrypted != nil {
+			newDevice.Ebs.Encrypted = nil
+		}
+
+		newMappings[i] = newDevice
 	}
 
-	// Source Image is only required to be passed if the image is not from scratch
 	if config.FromScratch {
-		registerOpts = buildBaseRegisterOpts(config, nil, s.RootVolumeSize, snapshotID, amiName)
+		registerOpts = &ec2.RegisterImageInput{
+			Name:                &config.AMIName,
+			Architecture:        aws.String(ec2.ArchitectureValuesX8664),
+			RootDeviceName:      aws.String(rootDeviceName),
+			VirtualizationType:  aws.String(config.AMIVirtType),
+			BlockDeviceMappings: newMappings,
+		}
 	} else {
-		image := state.Get("source_image").(*ec2.Image)
-		registerOpts = buildBaseRegisterOpts(config, image, s.RootVolumeSize, snapshotID, amiName)
+		registerOpts = buildRegisterOpts(config, image, newMappings)
 	}
 
 	if s.EnableAMISriovNetSupport {
@@ -61,7 +83,7 @@ func (s *StepRegisterAMI) Run(ctx context.Context, state multistep.StateBag) mul
 		// As of February 2017, this applies to C3, C4, D2, I2, R3, and M4 (excluding m4.16xlarge)
 		registerOpts.SriovNetSupport = aws.String("simple")
 	}
-	if s.EnableAMIENASupport.True() {
+	if s.EnableAMIENASupport {
 		// Set EnaSupport to true
 		// As of February 2017, this applies to C5, I3, P2, R4, X1, and m4.16xlarge
 		registerOpts.EnaSupport = aws.Bool(true)
@@ -80,8 +102,16 @@ func (s *StepRegisterAMI) Run(ctx context.Context, state multistep.StateBag) mul
 	amis[*ec2conn.Config.Region] = *registerResp.ImageId
 	state.Put("amis", amis)
 
+	// Wait for the image to become ready
+	stateChange := awscommon.StateChangeConf{
+		Pending:   []string{"pending"},
+		Target:    "available",
+		Refresh:   awscommon.AMIStateRefreshFunc(ec2conn, *registerResp.ImageId),
+		StepState: state,
+	}
+
 	ui.Say("Waiting for AMI to become ready...")
-	if err := awscommon.WaitUntilAMIAvailable(ctx, ec2conn, *registerResp.ImageId); err != nil {
+	if _, err := awscommon.WaitForState(&stateChange); err != nil {
 		err := fmt.Errorf("Error waiting for AMI: %s", err)
 		state.Put("error", err)
 		ui.Error(err.Error())
@@ -93,65 +123,11 @@ func (s *StepRegisterAMI) Run(ctx context.Context, state multistep.StateBag) mul
 
 func (s *StepRegisterAMI) Cleanup(state multistep.StateBag) {}
 
-// Builds the base register opts with architecture, name, root block device, mappings, virtualizationtype
-func buildBaseRegisterOpts(config *Config, sourceImage *ec2.Image, rootVolumeSize int64, snapshotID string, amiName string) *ec2.RegisterImageInput {
-	var (
-		mappings       []*ec2.BlockDeviceMapping
-		rootDeviceName string
-	)
-
-	generatingNewBlockDeviceMappings := config.FromScratch || len(config.AMIMappings) > 0
-	if generatingNewBlockDeviceMappings {
-		mappings = config.AMIMappings.BuildEC2BlockDeviceMappings()
-		rootDeviceName = config.RootDeviceName
-	} else {
-		// If config.FromScratch is false, source image must be set
-		mappings = sourceImage.BlockDeviceMappings
-		rootDeviceName = *sourceImage.RootDeviceName
-	}
-
-	newMappings := make([]*ec2.BlockDeviceMapping, len(mappings))
-	for i, device := range mappings {
-		newDevice := device
-		if *newDevice.DeviceName == rootDeviceName {
-			if newDevice.Ebs != nil {
-				newDevice.Ebs.SnapshotId = aws.String(snapshotID)
-			} else {
-				newDevice.Ebs = &ec2.EbsBlockDevice{SnapshotId: aws.String(snapshotID)}
-			}
-
-			if generatingNewBlockDeviceMappings || rootVolumeSize > *newDevice.Ebs.VolumeSize {
-				newDevice.Ebs.VolumeSize = aws.Int64(rootVolumeSize)
-			}
-		}
-
-		// assume working from a snapshot, so we unset the Encrypted field if set,
-		// otherwise AWS API will return InvalidParameter
-		if newDevice.Ebs != nil && newDevice.Ebs.Encrypted != nil {
-			newDevice.Ebs.Encrypted = nil
-		}
-
-		newMappings[i] = newDevice
-	}
-
-	if config.FromScratch {
-		return &ec2.RegisterImageInput{
-			Name:                &amiName,
-			Architecture:        aws.String(config.Architecture),
-			RootDeviceName:      aws.String(rootDeviceName),
-			VirtualizationType:  aws.String(config.AMIVirtType),
-			BlockDeviceMappings: newMappings,
-		}
-	}
-
-	return buildRegisterOptsFromExistingImage(config, sourceImage, newMappings, rootDeviceName, amiName)
-}
-
-func buildRegisterOptsFromExistingImage(config *Config, image *ec2.Image, mappings []*ec2.BlockDeviceMapping, rootDeviceName string, amiName string) *ec2.RegisterImageInput {
+func buildRegisterOpts(config *Config, image *ec2.Image, mappings []*ec2.BlockDeviceMapping) *ec2.RegisterImageInput {
 	registerOpts := &ec2.RegisterImageInput{
-		Name:                &amiName,
+		Name:                &config.AMIName,
 		Architecture:        image.Architecture,
-		RootDeviceName:      &rootDeviceName,
+		RootDeviceName:      image.RootDeviceName,
 		BlockDeviceMappings: mappings,
 		VirtualizationType:  image.VirtualizationType,
 	}

builder/amazon/chroot/step_register_ami_test.go

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

builder/amazon/chroot/step_snapshot.go

@@ -2,6 +2,7 @@ package chroot
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -19,7 +20,7 @@ type StepSnapshot struct {
 	snapshotId string
 }
 
-func (s *StepSnapshot) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+func (s *StepSnapshot) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
 	ec2conn := state.Get("ec2").(*ec2.EC2)
 	ui := state.Get("ui").(packer.Ui)
 	volumeId := state.Get("volume_id").(string)
@@ -43,7 +44,26 @@ func (s *StepSnapshot) Run(ctx context.Context, state multistep.StateBag) multis
 	ui.Message(fmt.Sprintf("Snapshot ID: %s", s.snapshotId))
 
 	// Wait for the snapshot to be ready
-	err = awscommon.WaitUntilSnapshotDone(ctx, ec2conn, s.snapshotId)
+	stateChange := awscommon.StateChangeConf{
+		Pending:   []string{"pending"},
+		StepState: state,
+		Target:    "completed",
+		Refresh: func() (interface{}, string, error) {
+			resp, err := ec2conn.DescribeSnapshots(&ec2.DescribeSnapshotsInput{SnapshotIds: []*string{&s.snapshotId}})
+			if err != nil {
+				return nil, "", err
+			}
+
+			if len(resp.Snapshots) == 0 {
+				return nil, "", errors.New("No snapshots found.")
+			}
+
+			s := resp.Snapshots[0]
+			return s, *s.State, nil
+		},
+	}
+
+	_, err = awscommon.WaitForState(&stateChange)
 	if err != nil {
 		err := fmt.Errorf("Error waiting for snapshot: %s", err)
 		state.Put("error", err)

builder/amazon/common/access_config.go

@@ -1,129 +1,32 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type VaultAWSEngineOptions
-
 package common
 
 import (
-	"crypto/tls"
 	"fmt"
 	"log"
-	"net/http"
 	"strings"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials"
+	"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/aws/aws-sdk-go/service/ec2/ec2iface"
-	cleanhttp "github.com/hashicorp/go-cleanhttp"
+	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/packer/template/interpolate"
-	vaultapi "github.com/hashicorp/vault/api"
 )
 
-type VaultAWSEngineOptions struct {
-	Name    string `mapstructure:"name"`
-	RoleARN string `mapstructure:"role_arn"`
-	// Specifies the TTL for the use of the STS token. This
-	// is specified as a string with a duration suffix. Valid only when
-	// credential_type is assumed_role or federation_token. When not
-	// specified, the default_sts_ttl set for the role will be used. If that
-	// is also not set, then the default value of 3600s will be used. AWS
-	// places limits on the maximum TTL allowed. See the AWS documentation on
-	// the DurationSeconds parameter for AssumeRole (for assumed_role
-	// credential types) and GetFederationToken (for federation_token
-	// credential types) for more details.
-	TTL        string `mapstructure:"ttl" required:"false"`
-	EngineName string `mapstructure:"engine_name"`
-}
-
-func (v *VaultAWSEngineOptions) Empty() bool {
-	return len(v.Name) == 0 && len(v.RoleARN) == 0 &&
-		len(v.EngineName) == 0 && len(v.TTL) == 0
-}
-
 // AccessConfig is for common configuration related to AWS access
 type AccessConfig struct {
-	// The access key used to communicate with AWS. [Learn how  to set this]
-	// (/docs/builders/amazon.html#specifying-amazon-credentials). On EBS, this
-	// is not required if you are using `use_vault_aws_engine` for
-	// authentication instead.
-	AccessKey string `mapstructure:"access_key" required:"true"`
-	// This option is useful if you use a cloud
-	// provider whose API is compatible with aws EC2. Specify another endpoint
-	// like this https://ec2.custom.endpoint.com.
-	CustomEndpointEc2 string `mapstructure:"custom_endpoint_ec2" required:"false"`
-	// Enable automatic decoding of any encoded authorization (error) messages
-	// using the `sts:DecodeAuthorizationMessage` API. Note: requires that the
-	// effective user/role have permissions to `sts:DecodeAuthorizationMessage`
-	// on resource `*`. Default `false`.
-	DecodeAuthZMessages bool `mapstructure:"decode_authorization_messages" required:"false"`
-	// This allows skipping TLS
-	// verification of the AWS EC2 endpoint. The default is false.
-	InsecureSkipTLSVerify bool `mapstructure:"insecure_skip_tls_verify" required:"false"`
-	// The MFA
-	// [TOTP](https://en.wikipedia.org/wiki/Time-based_One-time_Password_Algorithm)
-	// code. This should probably be a user variable since it changes all the
-	// time.
-	MFACode string `mapstructure:"mfa_code" required:"false"`
-	// The profile to use in the shared credentials file for
-	// AWS. See Amazon's documentation on [specifying
-	// profiles](https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-profiles)
-	// for more details.
-	ProfileName string `mapstructure:"profile" required:"false"`
-	// The name of the region, such as `us-east-1`, in which
-	// to launch the EC2 instance to create the AMI.
-	// When chroot building, this value is guessed from environment.
-	RawRegion string `mapstructure:"region" required:"true"`
-	// The secret key used to communicate with AWS. [Learn how to set
-	// this](amazon.html#specifying-amazon-credentials). This is not required
-	// if you are using `use_vault_aws_engine` for authentication instead.
-	SecretKey string `mapstructure:"secret_key" required:"true"`
-	// Set to true if you want to skip
-	// validation of the ami_regions configuration option. Default false.
-	SkipValidation       bool `mapstructure:"skip_region_validation" required:"false"`
-	SkipMetadataApiCheck bool `mapstructure:"skip_metadata_api_check"`
-	// The access token to use. This is different from the
-	// access key and secret key. If you're not sure what this is, then you
-	// probably don't need it. This will also be read from the AWS_SESSION_TOKEN
-	// environmental variable.
-	Token   string `mapstructure:"token" required:"false"`
-	session *session.Session
-	// Get credentials from Hashicorp Vault's aws secrets engine. You must
-	// already have created a role to use. For more information about
-	// generating credentials via the Vault engine, see the [Vault
-	// docs.](https://www.vaultproject.io/api/secret/aws/index.html#generate-credentials)
-	// If you set this flag, you must also set the below options:
-	// -   `name` (string) - Required. Specifies the name of the role to generate
-	//     credentials against. This is part of the request URL.
-	// -   `engine_name` (string) - The name of the aws secrets engine. In the
-	//     Vault docs, this is normally referred to as "aws", and Packer will
-	//     default to "aws" if `engine_name` is not set.
-	// -   `role_arn` (string)- The ARN of the role to assume if credential\_type
-	//     on the Vault role is assumed\_role. Must match one of the allowed role
-	//     ARNs in the Vault role. Optional if the Vault role only allows a single
-	//     AWS role ARN; required otherwise.
-	// -   `ttl` (string) - Specifies the TTL for the use of the STS token. This
-	//     is specified as a string with a duration suffix. Valid only when
-	//     credential\_type is assumed\_role or federation\_token. When not
-	//     specified, the default\_sts\_ttl set for the role will be used. If that
-	//     is also not set, then the default value of 3600s will be used. AWS
-	//     places limits on the maximum TTL allowed. See the AWS documentation on
-	//     the DurationSeconds parameter for AssumeRole (for assumed\_role
-	//     credential types) and GetFederationToken (for federation\_token
-	//     credential types) for more details.
-	//
-	// ``` json
-	// {
-	//     "vault_aws_engine": {
-	//         "name": "myrole",
-	//         "role_arn": "myarn",
-	//         "ttl": "3600s"
-	//     }
-	// }
-	// ```
-	VaultAWSEngine VaultAWSEngineOptions `mapstructure:"vault_aws_engine" required:"false"`
-
-	getEC2Connection func() ec2iface.EC2API
+	AccessKey            string `mapstructure:"access_key"`
+	CustomEndpointEc2    string `mapstructure:"custom_endpoint_ec2"`
+	MFACode              string `mapstructure:"mfa_code"`
+	ProfileName          string `mapstructure:"profile"`
+	RawRegion            string `mapstructure:"region"`
+	SecretKey            string `mapstructure:"secret_key"`
+	SkipValidation       bool   `mapstructure:"skip_region_validation"`
+	SkipMetadataApiCheck bool   `mapstructure:"skip_metadata_api_check"`
+	Token                string `mapstructure:"token"`
+	session              *session.Session
 }
 
 // Config returns a valid aws.Config object for access to AWS services, or
@@ -142,21 +45,14 @@ func (c *AccessConfig) Session() (*session.Session, error) {
 
 	if c.RawRegion != "" {
 		config = config.WithRegion(c.RawRegion)
+	} else if region := c.metadataRegion(); region != "" {
+		config = config.WithRegion(region)
 	}
 
 	if c.CustomEndpointEc2 != "" {
 		config = config.WithEndpoint(c.CustomEndpointEc2)
 	}
 
-	config = config.WithHTTPClient(cleanhttp.DefaultClient())
-	transport := config.HTTPClient.Transport.(*http.Transport)
-	if c.InsecureSkipTLSVerify {
-		transport.TLSClientConfig = &tls.Config{
-			InsecureSkipVerify: true,
-		}
-	}
-	transport.Proxy = http.ProxyFromEnvironment
-
 	opts := session.Options{
 		SharedConfigState: session.SharedConfigEnable,
 		Config:            *config,
@@ -172,32 +68,26 @@ func (c *AccessConfig) Session() (*session.Session, error) {
 		}
 	}
 
-	sess, err := session.NewSessionWithOptions(opts)
-	if err != nil {
+	if sess, err := session.NewSessionWithOptions(opts); err != nil {
 		return nil, err
+	} else if *sess.Config.Region == "" {
+		return nil, fmt.Errorf("Could not find AWS region, make sure it's set.")
+	} else {
+		log.Printf("Found region %s", *sess.Config.Region)
+		c.session = sess
+
+		cp, err := c.session.Config.Credentials.Get()
+		if err != nil {
+			if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "NoCredentialProviders" {
+				return nil, fmt.Errorf("No valid credential sources found for AWS Builder. " +
+					"Please see https://www.packer.io/docs/builders/amazon.html#specifying-amazon-credentials " +
+					"for more information on providing credentials for the AWS Builder.")
+			} else {
+				return nil, fmt.Errorf("Error loading credentials for AWS Provider: %s", err)
+			}
+		}
+		log.Printf("[INFO] AWS Auth provider used: %q", cp.ProviderName)
 	}
-	log.Printf("Found region %s", *sess.Config.Region)
-	c.session = sess
-
-	cp, err := c.session.Config.Credentials.Get()
-
-	if isAWSErr(err, "NoCredentialProviders", "") {
-		return nil, fmt.Errorf("No valid credential sources found for AWS Builder. " +
-			"Please see https://www.packer.io/docs/builders/amazon.html#specifying-amazon-credentials " +
-			"for more information on providing credentials for the AWS Builder.")
-	}
-
-	if err != nil {
-		return nil, fmt.Errorf("Error loading credentials for AWS Provider: %s", err)
-	}
-
-	log.Printf("[INFO] AWS Auth provider used: %q", cp.ProviderName)
-
-	if c.DecodeAuthZMessages {
-		DecodeAuthZMessages(c.session)
-	}
-	LogEnvOverrideWarnings()
-
 	return c.session, nil
 }
 
@@ -216,37 +106,23 @@ func (c *AccessConfig) IsChinaCloud() bool {
 	return strings.HasPrefix(c.SessionRegion(), "cn-")
 }
 
-func (c *AccessConfig) GetCredsFromVault() error {
-	// const EnvVaultAddress = "VAULT_ADDR"
-	// const EnvVaultToken = "VAULT_TOKEN"
-	vaultConfig := vaultapi.DefaultConfig()
-	cli, err := vaultapi.NewClient(vaultConfig)
-	if err != nil {
-		return fmt.Errorf("Error getting Vault client: %s", err)
-	}
-	if c.VaultAWSEngine.EngineName == "" {
-		c.VaultAWSEngine.EngineName = "aws"
-	}
-	path := fmt.Sprintf("/%s/creds/%s", c.VaultAWSEngine.EngineName,
-		c.VaultAWSEngine.Name)
-	secret, err := cli.Logical().Read(path)
-	if err != nil {
-		return fmt.Errorf("Error reading vault secret: %s", err)
-	}
-	if secret == nil {
-		return fmt.Errorf("Vault Secret does not exist at the given path.")
-	}
+// metadataRegion returns the region from the metadata service
+func (c *AccessConfig) metadataRegion() string {
 
-	c.AccessKey = secret.Data["access_key"].(string)
-	c.SecretKey = secret.Data["secret_key"].(string)
-	token := secret.Data["security_token"]
-	if token != nil {
-		c.Token = token.(string)
-	} else {
-		c.Token = ""
-	}
+	client := cleanhttp.DefaultClient()
 
-	return nil
+	// Keep the default timeout (100ms) low as we don't want to wait in non-EC2 environments
+	client.Timeout = 100 * time.Millisecond
+	ec2meta := ec2metadata.New(session.New(), &aws.Config{
+		HTTPClient: client,
+	})
+	region, err := ec2meta.Region()
+	if err != nil {
+		log.Println("Error getting region from metadata service, "+
+			"probably because we're not running on AWS.", err)
+		return ""
+	}
+	return region
 }
 
 func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
@@ -255,41 +131,18 @@ func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
 	if c.SkipMetadataApiCheck {
 		log.Println("(WARN) skip_metadata_api_check ignored.")
 	}
-
-	// Make sure it's obvious from the config how we're getting credentials:
-	// Vault, Packer config, or environment.
-	if !c.VaultAWSEngine.Empty() {
-		if len(c.AccessKey) > 0 {
-			errs = append(errs,
-				fmt.Errorf("If you have set vault_aws_engine, you must not set"+
-					" the access_key or secret_key."))
-		}
-		// Go ahead and grab those credentials from Vault now, so we can set
-		// the keys and token now.
-		err := c.GetCredsFromVault()
-		if err != nil {
-			errs = append(errs, err)
-		}
-	}
-
+	// Either both access and secret key must be set or neither of them should
+	// be.
 	if (len(c.AccessKey) > 0) != (len(c.SecretKey) > 0) {
 		errs = append(errs,
 			fmt.Errorf("`access_key` and `secret_key` must both be either set or not set."))
 	}
 
+	if c.RawRegion != "" && !c.SkipValidation {
+		if valid := ValidateRegion(c.RawRegion); !valid {
+			errs = append(errs, fmt.Errorf("Unknown region: %s", c.RawRegion))
+		}
+	}
+
 	return errs
 }
-
-func (c *AccessConfig) NewEC2Connection() (ec2iface.EC2API, error) {
-	if c.getEC2Connection != nil {
-		return c.getEC2Connection(), nil
-	}
-	sess, err := c.Session()
-	if err != nil {
-		return nil, err
-	}
-
-	ec2conn := ec2.New(sess)
-
-	return ec2conn, nil
-}

builder/amazon/common/access_config.hcl2spec.go

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

builder/amazon/common/access_config_test.go

@@ -5,51 +5,41 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 )
 
 func testAccessConfig() *AccessConfig {
-	return &AccessConfig{
-		getEC2Connection: func() ec2iface.EC2API {
-			return &mockEC2Client{}
-		},
-	}
+	return &AccessConfig{}
 }
 
 func TestAccessConfigPrepare_Region(t *testing.T) {
 	c := testAccessConfig()
-
-	c.RawRegion = "us-east-12"
-	err := c.ValidateRegion(c.RawRegion)
-	if err == nil {
-		t.Fatalf("should have region validation err: %s", c.RawRegion)
-	}
-
-	c.RawRegion = "us-east-1"
-	err = c.ValidateRegion(c.RawRegion)
-	if err != nil {
-		t.Fatalf("shouldn't have region validation err: %s", c.RawRegion)
-	}
-
-	c.RawRegion = "custom"
-	err = c.ValidateRegion(c.RawRegion)
-	if err == nil {
-		t.Fatalf("should have region validation err: %s", c.RawRegion)
-	}
-
-	c.RawRegion = "custom"
-	c.SkipValidation = true
-	// testing whole prepare func here; this is checking that validation is
-	// skipped, so we don't need a mock connection
-	if err := c.Prepare(nil); err != nil {
-		t.Fatalf("shouldn't have err: %s", err)
-	}
-
-	c.SkipValidation = false
 	c.RawRegion = ""
 	if err := c.Prepare(nil); err != nil {
 		t.Fatalf("shouldn't have err: %s", err)
 	}
+
+	c.RawRegion = "us-east-12"
+	if err := c.Prepare(nil); err == nil {
+		t.Fatal("should have error")
+	}
+
+	c.RawRegion = "us-east-1"
+	if err := c.Prepare(nil); err != nil {
+		t.Fatalf("shouldn't have err: %s", err)
+	}
+
+	c.RawRegion = "custom"
+	if err := c.Prepare(nil); err == nil {
+		t.Fatalf("should have err")
+	}
+
+	c.RawRegion = "custom"
+	c.SkipValidation = true
+	if err := c.Prepare(nil); err != nil {
+		t.Fatalf("shouldn't have err: %s", err)
+	}
+	c.SkipValidation = false
+
 }
 
 func TestAccessConfigPrepare_RegionRestricted(t *testing.T) {

builder/amazon/common/ami_config.go

@@ -1,131 +1,33 @@
-//go:generate struct-markdown
-
 package common
 
 import (
 	"fmt"
 	"log"
-	"regexp"
 
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // AMIConfig is for common configuration related to creating AMIs.
 type AMIConfig struct {
-	// The name of the resulting AMI that will appear when managing AMIs in the
-	// AWS console or via APIs. This must be unique. To help make this unique,
-	// use a function like timestamp (see [template
-	// engine](../templates/engine.html) for more info).
-	AMIName string `mapstructure:"ami_name" required:"true"`
-	// The description to set for the resulting
-	// AMI(s). By default this description is empty. This is a template
-	// engine, see Build template
-	// data for more information.
-	AMIDescription string `mapstructure:"ami_description" required:"false"`
-	// The type of virtualization for the AMI
-	// you are building. This option is required to register HVM images. Can be
-	// paravirtual (default) or hvm.
-	AMIVirtType string `mapstructure:"ami_virtualization_type" required:"false"`
-	// A list of account IDs that have access to
-	// launch the resulting AMI(s). By default no additional users other than the
-	// user creating the AMI has permissions to launch it.
-	AMIUsers []string `mapstructure:"ami_users" required:"false"`
-	// A list of groups that have access to
-	// launch the resulting AMI(s). By default no groups have permission to launch
-	// the AMI. all will make the AMI publicly accessible.
-	AMIGroups []string `mapstructure:"ami_groups" required:"false"`
-	// A list of product codes to
-	// associate with the AMI. By default no product codes are associated with the
-	// AMI.
-	AMIProductCodes []string `mapstructure:"ami_product_codes" required:"false"`
-	// A list of regions to copy the AMI to.
-	// Tags and attributes are copied along with the AMI. AMI copying takes time
-	// depending on the size of the AMI, but will generally take many minutes.
-	AMIRegions []string `mapstructure:"ami_regions" required:"false"`
-	// Set to true if you want to skip
-	// validation of the ami_regions configuration option. Default false.
-	AMISkipRegionValidation bool `mapstructure:"skip_region_validation" required:"false"`
-	// Tags applied to the AMI. This is a
-	// [template engine](/docs/templates/engine.html), see [Build template
-	// data](#build-template-data) for more information.
-	AMITags TagMap `mapstructure:"tags" required:"false"`
-	// Enable enhanced networking (ENA but not SriovNetSupport) on
-	// HVM-compatible AMIs. If set, add `ec2:ModifyInstanceAttribute` to your
-	// AWS IAM policy.
-	//
-	// Note: you must make sure enhanced networking is enabled on your
-	// instance. See [Amazon's documentation on enabling enhanced
-	// networking](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking.html#enabling_enhanced_networking).
-	AMIENASupport config.Trilean `mapstructure:"ena_support" required:"false"`
-	// Enable enhanced networking (SriovNetSupport but not ENA) on
-	// HVM-compatible AMIs. If true, add `ec2:ModifyInstanceAttribute` to your
-	// AWS IAM policy. Note: you must make sure enhanced networking is enabled
-	// on your instance. See [Amazon's documentation on enabling enhanced
-	// networking](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking.html#enabling_enhanced_networking).
-	// Default `false`.
-	AMISriovNetSupport bool `mapstructure:"sriov_support" required:"false"`
-	// Force Packer to first deregister an existing
-	// AMI if one with the same name already exists. Default false.
-	AMIForceDeregister bool `mapstructure:"force_deregister" required:"false"`
-	// Force Packer to delete snapshots
-	// associated with AMIs, which have been deregistered by force_deregister.
-	// Default false.
-	AMIForceDeleteSnapshot bool `mapstructure:"force_delete_snapshot" required:"false"`
-	// Whether or not to encrypt the resulting AMI when
-	// copying a provisioned instance to an AMI. By default, Packer will keep the
-	// encryption setting to what it was in the source image. Setting false will
-	// result in an unencrypted image, and true will result in an encrypted one.
-	// If you have used the `launch_block_device_mappings` to set an encryption
-	// key and that key is the same as the one you want the image encrypted with
-	// at the end, then you don't need to set this field; leaving it empty will
-	// prevent an unnecessary extra copy step and save you some time.
-	AMIEncryptBootVolume config.Trilean `mapstructure:"encrypt_boot" required:"false"`
-	// ID, alias or ARN of the KMS key to use for boot volume encryption. This
-	// only applies to the main `region`, other regions where the AMI will be
-	// copied will be encrypted by the default EBS KMS key. For valid formats
-	// see *KmsKeyId* in the [AWS API docs -
-	// CopyImage](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CopyImage.html).
-	// This field is validated by Packer, when using an alias, you will have to
-	// prefix `kms_key_id` with `alias/`.
-	AMIKmsKeyId string `mapstructure:"kms_key_id" required:"false"`
-	// regions to copy the ami to, along with the custom kms key id (alias or
-	// arn) to use for encryption for that region. Keys must match the regions
-	// provided in `ami_regions`. If you just want to encrypt using a default
-	// ID, you can stick with `kms_key_id` and `ami_regions`. If you want a
-	// region to be encrypted with that region's default key ID, you can use an
-	// empty string `""` instead of a key id in this map. (e.g. `"us-east-1":
-	// ""`) However, you cannot use default key IDs if you are using this in
-	// conjunction with `snapshot_users` -- in that situation you must use
-	// custom keys. For valid formats see *KmsKeyId* in the [AWS API docs -
-	// CopyImage](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CopyImage.html).
-	//
-	// This option supercedes the `kms_key_id` option -- if you set both, and
-	// they are different, Packer will respect the value in
-	// `region_kms_key_ids` for your build region and silently disregard the
-	// value provided in `kms_key_id`.
-	AMIRegionKMSKeyIDs map[string]string `mapstructure:"region_kms_key_ids" required:"false"`
-	// If true, Packer will not check whether an AMI with the `ami_name` exists
-	// in the region it is building in. It will use an intermediary AMI name,
-	// which it will not convert to an AMI in the build region. It will copy
-	// the intermediary AMI into any regions provided in `ami_regions`, then
-	// delete the intermediary AMI. Default `false`.
-	AMISkipBuildRegion bool `mapstructure:"skip_save_build_region"`
-	// Tags to apply to snapshot.
-	// They will override AMI tags if already applied to snapshot. This is a
-	// [template engine](../templates/engine.html), see [Build template
-	// data](#build-template-data) for more information.
-	SnapshotTags TagMap `mapstructure:"snapshot_tags" required:"false"`
-	// A list of account IDs that have
-	// access to create volumes from the snapshot(s). By default no additional
-	// users other than the user creating the AMI has permissions to create
-	// volumes from the backing snapshot(s).
-	SnapshotUsers []string `mapstructure:"snapshot_users" required:"false"`
-	// A list of groups that have access to
-	// create volumes from the snapshot(s). By default no groups have permission
-	// to create volumes from the snapshot(s). all will make the snapshot
-	// publicly accessible.
-	SnapshotGroups []string `mapstructure:"snapshot_groups" required:"false"`
+	AMIName                 string            `mapstructure:"ami_name"`
+	AMIDescription          string            `mapstructure:"ami_description"`
+	AMIVirtType             string            `mapstructure:"ami_virtualization_type"`
+	AMIUsers                []string          `mapstructure:"ami_users"`
+	AMIGroups               []string          `mapstructure:"ami_groups"`
+	AMIProductCodes         []string          `mapstructure:"ami_product_codes"`
+	AMIRegions              []string          `mapstructure:"ami_regions"`
+	AMISkipRegionValidation bool              `mapstructure:"skip_region_validation"`
+	AMITags                 TagMap            `mapstructure:"tags"`
+	AMIENASupport           bool              `mapstructure:"ena_support"`
+	AMISriovNetSupport      bool              `mapstructure:"sriov_support"`
+	AMIForceDeregister      bool              `mapstructure:"force_deregister"`
+	AMIForceDeleteSnapshot  bool              `mapstructure:"force_delete_snapshot"`
+	AMIEncryptBootVolume    bool              `mapstructure:"encrypt_boot"`
+	AMIKmsKeyId             string            `mapstructure:"kms_key_id"`
+	AMIRegionKMSKeyIDs      map[string]string `mapstructure:"region_kms_key_ids"`
+	SnapshotTags            TagMap            `mapstructure:"snapshot_tags"`
+	SnapshotUsers           []string          `mapstructure:"snapshot_users"`
+	SnapshotGroups          []string          `mapstructure:"snapshot_groups"`
 }
 
 func stringInSlice(s []string, searchstr string) bool {
@@ -154,79 +56,6 @@ func (c *AMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context
 		}
 	}
 
-	errs = append(errs, c.prepareRegions(accessConfig)...)
-
-	// Prevent sharing of default KMS key encrypted volumes with other aws users
-	if len(c.AMIUsers) > 0 {
-		if len(c.AMIKmsKeyId) == 0 && c.AMIEncryptBootVolume.True() {
-			errs = append(errs, fmt.Errorf("Cannot share AMI encrypted with default KMS key"))
-		}
-		if len(c.AMIRegionKMSKeyIDs) > 0 {
-			for _, kmsKey := range c.AMIRegionKMSKeyIDs {
-				if len(kmsKey) == 0 {
-					errs = append(errs, fmt.Errorf("Cannot share AMI encrypted with default KMS key for other regions"))
-				}
-			}
-		}
-	}
-
-	kmsKeys := make([]string, 0)
-	if len(c.AMIKmsKeyId) > 0 {
-		kmsKeys = append(kmsKeys, c.AMIKmsKeyId)
-	}
-	if len(c.AMIRegionKMSKeyIDs) > 0 {
-		for _, kmsKey := range c.AMIRegionKMSKeyIDs {
-			if len(kmsKey) > 0 {
-				kmsKeys = append(kmsKeys, kmsKey)
-			}
-		}
-	}
-
-	if len(kmsKeys) > 0 && !c.AMIEncryptBootVolume.True() {
-		errs = append(errs, fmt.Errorf("If you have set either "+
-			"region_kms_key_ids or kms_key_id, encrypt_boot must also be true."))
-
-	}
-	for _, kmsKey := range kmsKeys {
-		if !validateKmsKey(kmsKey) {
-			errs = append(errs, fmt.Errorf("%s is not a valid KMS Key Id.", kmsKey))
-		}
-	}
-
-	if len(c.SnapshotUsers) > 0 {
-		if len(c.AMIKmsKeyId) == 0 && len(c.AMIRegionKMSKeyIDs) == 0 && c.AMIEncryptBootVolume.True() {
-			errs = append(errs, fmt.Errorf("Cannot share snapshot encrypted "+
-				"with default KMS key, see https://www.packer.io/docs/builders/amazon-ebs.html#region_kms_key_ids for more information"))
-		}
-		if len(c.AMIRegionKMSKeyIDs) > 0 {
-			for _, kmsKey := range c.AMIRegionKMSKeyIDs {
-				if len(kmsKey) == 0 {
-					errs = append(errs, fmt.Errorf("Cannot share snapshot encrypted with default KMS key"))
-				}
-			}
-		}
-	}
-
-	if len(c.AMIName) < 3 || len(c.AMIName) > 128 {
-		errs = append(errs, fmt.Errorf("ami_name must be between 3 and 128 characters long"))
-	}
-
-	if c.AMIName != templateCleanAMIName(c.AMIName) {
-		errs = append(errs, fmt.Errorf("AMIName should only contain "+
-			"alphanumeric characters, parentheses (()), square brackets ([]), spaces "+
-			"( ), periods (.), slashes (/), dashes (-), single quotes ('), at-signs "+
-			"(@), or underscores(_). You can use the `clean_resource_name` template "+
-			"filter to automatically clean your ami name."))
-	}
-
-	if len(errs) > 0 {
-		return errs
-	}
-
-	return nil
-}
-
-func (c *AMIConfig) prepareRegions(accessConfig *AccessConfig) (errs []error) {
 	if len(c.AMIRegions) > 0 {
 		regionSet := make(map[string]struct{})
 		regions := make([]string, 0, len(c.AMIRegions))
@@ -240,6 +69,13 @@ func (c *AMIConfig) prepareRegions(accessConfig *AccessConfig) (errs []error) {
 			// Mark that we saw the region
 			regionSet[region] = struct{}{}
 
+			if !c.AMISkipRegionValidation {
+				// Verify the region is real
+				if valid := ValidateRegion(region); !valid {
+					errs = append(errs, fmt.Errorf("Unknown region: %s", region))
+				}
+			}
+
 			// Make sure that if we have region_kms_key_ids defined,
 			// the regions in ami_regions are also in region_kms_key_ids
 			if len(c.AMIRegionKMSKeyIDs) > 0 {
@@ -258,25 +94,39 @@ func (c *AMIConfig) prepareRegions(accessConfig *AccessConfig) (errs []error) {
 
 		c.AMIRegions = regions
 	}
-	return errs
-}
 
-// See https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CopyImage.html
-func validateKmsKey(kmsKey string) (valid bool) {
-	kmsKeyIdPattern := `[a-f0-9-]+$`
-	aliasPattern := `alias/[a-zA-Z0-9:/_-]+$`
-	kmsArnStartPattern := `^arn:aws(-us-gov)?:kms:([a-z]{2}-(gov-)?[a-z]+-\d{1})?:(\d{12}):`
-	if regexp.MustCompile(fmt.Sprintf("^%s", kmsKeyIdPattern)).MatchString(kmsKey) {
-		return true
+	if len(c.AMIUsers) > 0 && c.AMIEncryptBootVolume {
+		errs = append(errs, fmt.Errorf("Cannot share AMI with encrypted boot volume"))
 	}
-	if regexp.MustCompile(fmt.Sprintf("^%s", aliasPattern)).MatchString(kmsKey) {
-		return true
+
+	if len(c.SnapshotUsers) > 0 {
+		if len(c.AMIKmsKeyId) == 0 && c.AMIEncryptBootVolume {
+			errs = append(errs, fmt.Errorf("Cannot share snapshot encrypted with default KMS key"))
+		}
+		if len(c.AMIRegionKMSKeyIDs) > 0 {
+			for _, kmsKey := range c.AMIRegionKMSKeyIDs {
+				if len(kmsKey) == 0 {
+					errs = append(errs, fmt.Errorf("Cannot share snapshot encrypted with default KMS key"))
+				}
+			}
+		}
 	}
-	if regexp.MustCompile(fmt.Sprintf("%skey/%s", kmsArnStartPattern, kmsKeyIdPattern)).MatchString(kmsKey) {
-		return true
+
+	if len(c.AMIName) < 3 || len(c.AMIName) > 128 {
+		errs = append(errs, fmt.Errorf("ami_name must be between 3 and 128 characters long"))
 	}
-	if regexp.MustCompile(fmt.Sprintf("%s%s", kmsArnStartPattern, aliasPattern)).MatchString(kmsKey) {
-		return true
+
+	if c.AMIName != templateCleanAMIName(c.AMIName) {
+		errs = append(errs, fmt.Errorf("AMIName should only contain "+
+			"alphanumeric characters, parentheses (()), square brackets ([]), spaces "+
+			"( ), periods (.), slashes (/), dashes (-), single quotes ('), at-signs "+
+			"(@), or underscores(_). You can use the `clean_ami_name` template "+
+			"filter to automatically clean your ami name."))
 	}
-	return false
+
+	if len(errs) > 0 {
+		return errs
+	}
+
+	return nil
 }

builder/amazon/common/ami_config_test.go

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

builder/amazon/common/artifact.go

@@ -85,10 +85,15 @@ func (a *Artifact) Destroy() error {
 			errors = append(errors, err)
 		}
 
-		err = DestroyAMIs([]*string{&imageId}, regionConn)
-		if err != nil {
+		// Deregister ami
+		input := &ec2.DeregisterImageInput{
+			ImageId: &imageId,
+		}
+		if _, err := regionConn.DeregisterImage(input); err != nil {
 			errors = append(errors, err)
 		}
+
+		// TODO(mitchellh): Delete the snapshots associated with an AMI too
 	}
 
 	if len(errors) > 0 {

builder/amazon/common/block_device.go

@@ -1,6 +1,3 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type BlockDevice
-
 package common
 
 import (
@@ -9,153 +6,114 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/template/interpolate"
 )
 
-// These will be attached when booting a new instance from your AMI. Your
-// options here may vary depending on the type of VM you use.
-//
-// Example use case:
-//
-// The following mapping will tell Packer to encrypt the root volume of the
-// build instance at launch using a specific non-default kms key:
-//
-// ``` json
-// "[{
-//		"device_name": "/dev/sda1",
-//		"encrypted": true,
-//		"kms_key_id": "1a2b3c4d-5e6f-1a2b-3c4d-5e6f1a2b3c4d"
-// }]
-// ```
-//
-// Documentation for Block Devices Mappings can be found here:
-// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html
-//
+// BlockDevice
 type BlockDevice struct {
-	// Indicates whether the EBS volume is deleted on instance termination.
-	// Default false. NOTE: If this value is not explicitly set to true and
-	// volumes are not cleaned up by an alternative method, additional volumes
-	// will accumulate after every build.
-	DeleteOnTermination bool `mapstructure:"delete_on_termination" required:"false"`
-	// The device name exposed to the instance (for example, /dev/sdh or xvdh).
-	// Required for every device in the block device mapping.
-	DeviceName string `mapstructure:"device_name" required:"false"`
-	// Indicates whether or not to encrypt the volume. By default, Packer will
-	// keep the encryption setting to what it was in the source image. Setting
-	// false will result in an unencrypted device, and true will result in an
-	// encrypted one.
-	Encrypted config.Trilean `mapstructure:"encrypted" required:"false"`
-	// The number of I/O operations per second (IOPS) that the volume supports.
-	// See the documentation on
-	// [IOPs](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EbsBlockDevice.html)
-	// for more information
-	IOPS int64 `mapstructure:"iops" required:"false"`
-	// Suppresses the specified device included in the block device mapping of
-	// the AMI.
-	NoDevice bool `mapstructure:"no_device" required:"false"`
-	// The ID of the snapshot.
-	SnapshotId string `mapstructure:"snapshot_id" required:"false"`
-	// The virtual device name. See the documentation on Block Device Mapping
-	// for more information.
-	VirtualName string `mapstructure:"virtual_name" required:"false"`
-	// The volume type. gp2 for General Purpose (SSD) volumes, io1 for
-	// Provisioned IOPS (SSD) volumes, st1 for Throughput Optimized HDD, sc1
-	// for Cold HDD, and standard for Magnetic volumes.
-	VolumeType string `mapstructure:"volume_type" required:"false"`
-	// The size of the volume, in GiB. Required if not specifying a
-	// snapshot_id.
-	VolumeSize int64 `mapstructure:"volume_size" required:"false"`
-	// ID, alias or ARN of the KMS key to use for boot volume encryption. This
-	// only applies to the main region, other regions where the AMI will be
-	// copied will be encrypted by the default EBS KMS key. For valid formats
-	// see KmsKeyId in the [AWS API docs -
-	// CopyImage](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CopyImage.html)
-	// This field is validated by Packer, when using an alias, you will have to
-	// prefix kms_key_id with alias/.
-	KmsKeyId string `mapstructure:"kms_key_id" required:"false"`
+	DeleteOnTermination bool   `mapstructure:"delete_on_termination"`
+	DeviceName          string `mapstructure:"device_name"`
+	Encrypted           bool   `mapstructure:"encrypted"`
+	IOPS                int64  `mapstructure:"iops"`
+	NoDevice            bool   `mapstructure:"no_device"`
+	SnapshotId          string `mapstructure:"snapshot_id"`
+	VirtualName         string `mapstructure:"virtual_name"`
+	VolumeType          string `mapstructure:"volume_type"`
+	VolumeSize          int64  `mapstructure:"volume_size"`
+	KmsKeyId            string `mapstructure:"kms_key_id"`
 }
 
-type BlockDevices []BlockDevice
+type BlockDevices struct {
+	AMIBlockDevices    `mapstructure:",squash"`
+	LaunchBlockDevices `mapstructure:",squash"`
+}
 
-func (bds BlockDevices) BuildEC2BlockDeviceMappings() []*ec2.BlockDeviceMapping {
+type AMIBlockDevices struct {
+	AMIMappings []BlockDevice `mapstructure:"ami_block_device_mappings"`
+}
+
+type LaunchBlockDevices struct {
+	LaunchMappings []BlockDevice `mapstructure:"launch_block_device_mappings"`
+}
+
+func buildBlockDevices(b []BlockDevice) []*ec2.BlockDeviceMapping {
 	var blockDevices []*ec2.BlockDeviceMapping
 
-	for _, blockDevice := range bds {
-		blockDevices = append(blockDevices, blockDevice.BuildEC2BlockDeviceMapping())
+	for _, blockDevice := range b {
+		mapping := &ec2.BlockDeviceMapping{
+			DeviceName: aws.String(blockDevice.DeviceName),
+		}
+
+		if blockDevice.NoDevice {
+			mapping.NoDevice = aws.String("")
+		} else if blockDevice.VirtualName != "" {
+			if strings.HasPrefix(blockDevice.VirtualName, "ephemeral") {
+				mapping.VirtualName = aws.String(blockDevice.VirtualName)
+			}
+		} else {
+			ebsBlockDevice := &ec2.EbsBlockDevice{
+				DeleteOnTermination: aws.Bool(blockDevice.DeleteOnTermination),
+			}
+
+			if blockDevice.VolumeType != "" {
+				ebsBlockDevice.VolumeType = aws.String(blockDevice.VolumeType)
+			}
+
+			if blockDevice.VolumeSize > 0 {
+				ebsBlockDevice.VolumeSize = aws.Int64(blockDevice.VolumeSize)
+			}
+
+			// IOPS is only valid for io1 type
+			if blockDevice.VolumeType == "io1" {
+				ebsBlockDevice.Iops = aws.Int64(blockDevice.IOPS)
+			}
+
+			// You cannot specify Encrypted if you specify a Snapshot ID
+			if blockDevice.SnapshotId != "" {
+				ebsBlockDevice.SnapshotId = aws.String(blockDevice.SnapshotId)
+			} else if blockDevice.Encrypted {
+				ebsBlockDevice.Encrypted = aws.Bool(blockDevice.Encrypted)
+			}
+
+			if blockDevice.KmsKeyId != "" {
+				ebsBlockDevice.KmsKeyId = aws.String(blockDevice.KmsKeyId)
+			}
+
+			mapping.Ebs = ebsBlockDevice
+		}
+
+		blockDevices = append(blockDevices, mapping)
 	}
 	return blockDevices
 }
 
-func (blockDevice BlockDevice) BuildEC2BlockDeviceMapping() *ec2.BlockDeviceMapping {
-
-	mapping := &ec2.BlockDeviceMapping{
-		DeviceName: aws.String(blockDevice.DeviceName),
-	}
-
-	if blockDevice.NoDevice {
-		mapping.NoDevice = aws.String("")
-		return mapping
-	} else if blockDevice.VirtualName != "" {
-		if strings.HasPrefix(blockDevice.VirtualName, "ephemeral") {
-			mapping.VirtualName = aws.String(blockDevice.VirtualName)
-		}
-		return mapping
-	}
-
-	ebsBlockDevice := &ec2.EbsBlockDevice{
-		DeleteOnTermination: aws.Bool(blockDevice.DeleteOnTermination),
-	}
-
-	if blockDevice.VolumeType != "" {
-		ebsBlockDevice.VolumeType = aws.String(blockDevice.VolumeType)
-	}
-
-	if blockDevice.VolumeSize > 0 {
-		ebsBlockDevice.VolumeSize = aws.Int64(blockDevice.VolumeSize)
-	}
-
-	// IOPS is only valid for io1 type
-	if blockDevice.VolumeType == "io1" {
-		ebsBlockDevice.Iops = aws.Int64(blockDevice.IOPS)
-	}
-
-	// You cannot specify Encrypted if you specify a Snapshot ID
-	if blockDevice.SnapshotId != "" {
-		ebsBlockDevice.SnapshotId = aws.String(blockDevice.SnapshotId)
-	}
-	ebsBlockDevice.Encrypted = blockDevice.Encrypted.ToBoolPointer()
-
-	if blockDevice.KmsKeyId != "" {
-		ebsBlockDevice.KmsKeyId = aws.String(blockDevice.KmsKeyId)
-	}
-
-	mapping.Ebs = ebsBlockDevice
-
-	return mapping
-}
-
 func (b *BlockDevice) Prepare(ctx *interpolate.Context) error {
-	if b.DeviceName == "" {
-		return fmt.Errorf("The `device_name` must be specified " +
-			"for every device in the block device mapping.")
-	}
-
-	// Warn that encrypted must be true or nil when setting kms_key_id
-	if b.KmsKeyId != "" && b.Encrypted.False() {
+	// Warn that encrypted must be true when setting kms_key_id
+	if b.KmsKeyId != "" && b.Encrypted == false {
 		return fmt.Errorf("The device %v, must also have `encrypted: "+
 			"true` when setting a kms_key_id.", b.DeviceName)
 	}
-
-	_, err := interpolate.RenderInterface(&b, ctx)
-	return err
+	return nil
 }
 
-func (bds BlockDevices) Prepare(ctx *interpolate.Context) (errs []error) {
-	for _, block := range bds {
-		if err := block.Prepare(ctx); err != nil {
-			errs = append(errs, err)
+func (b *BlockDevices) Prepare(ctx *interpolate.Context) (errs []error) {
+	for _, d := range b.AMIMappings {
+		if err := d.Prepare(ctx); err != nil {
+			errs = append(errs, fmt.Errorf("AMIMapping: %s", err.Error()))
+		}
+	}
+	for _, d := range b.LaunchMappings {
+		if err := d.Prepare(ctx); err != nil {
+			errs = append(errs, fmt.Errorf("LaunchMapping: %s", err.Error()))
 		}
 	}
 	return errs
 }
+
+func (b *AMIBlockDevices) BuildAMIDevices() []*ec2.BlockDeviceMapping {
+	return buildBlockDevices(b.AMIMappings)
+}
+
+func (b *LaunchBlockDevices) BuildLaunchDevices() []*ec2.BlockDeviceMapping {
+	return buildBlockDevices(b.LaunchMappings)
+}

builder/amazon/common/block_device.hcl2spec.go

@@ -1,48 +0,0 @@
-// Code generated by "mapstructure-to-hcl2 -type BlockDevice"; DO NOT EDIT.
-package common
-
-import (
-	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/zclconf/go-cty/cty"
-)
-
-// FlatBlockDevice is an auto-generated flat version of BlockDevice.
-// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
-type FlatBlockDevice struct {
-	DeleteOnTermination *bool   `mapstructure:"delete_on_termination" required:"false" cty:"delete_on_termination"`
-	DeviceName          *string `mapstructure:"device_name" required:"false" cty:"device_name"`
-	Encrypted           *bool   `mapstructure:"encrypted" required:"false" cty:"encrypted"`
-	IOPS                *int64  `mapstructure:"iops" required:"false" cty:"iops"`
-	NoDevice            *bool   `mapstructure:"no_device" required:"false" cty:"no_device"`
-	SnapshotId          *string `mapstructure:"snapshot_id" required:"false" cty:"snapshot_id"`
-	VirtualName         *string `mapstructure:"virtual_name" required:"false" cty:"virtual_name"`
-	VolumeType          *string `mapstructure:"volume_type" required:"false" cty:"volume_type"`
-	VolumeSize          *int64  `mapstructure:"volume_size" required:"false" cty:"volume_size"`
-	KmsKeyId            *string `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id"`
-}
-
-// FlatMapstructure returns a new FlatBlockDevice.
-// FlatBlockDevice is an auto-generated flat version of BlockDevice.
-// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
-func (*BlockDevice) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
-	return new(FlatBlockDevice)
-}
-
-// HCL2Spec returns the hcl spec of a BlockDevice.
-// This spec is used by HCL to read the fields of BlockDevice.
-// The decoded values from this spec will then be applied to a FlatBlockDevice.
-func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec {
-	s := map[string]hcldec.Spec{
-		"delete_on_termination": &hcldec.AttrSpec{Name: "delete_on_termination", Type: cty.Bool, Required: false},
-		"device_name":           &hcldec.AttrSpec{Name: "device_name", Type: cty.String, Required: false},
-		"encrypted":             &hcldec.AttrSpec{Name: "encrypted", Type: cty.Bool, Required: false},
-		"iops":                  &hcldec.AttrSpec{Name: "iops", Type: cty.Number, Required: false},
-		"no_device":             &hcldec.AttrSpec{Name: "no_device", Type: cty.Bool, Required: false},
-		"snapshot_id":           &hcldec.AttrSpec{Name: "snapshot_id", Type: cty.String, Required: false},
-		"virtual_name":          &hcldec.AttrSpec{Name: "virtual_name", Type: cty.String, Required: false},
-		"volume_type":           &hcldec.AttrSpec{Name: "volume_type", Type: cty.String, Required: false},
-		"volume_size":           &hcldec.AttrSpec{Name: "volume_size", Type: cty.Number, Required: false},
-		"kms_key_id":            &hcldec.AttrSpec{Name: "kms_key_id", Type: cty.String, Required: false},
-	}
-	return s
-}

builder/amazon/common/block_device_test.go

@@ -1,12 +1,11 @@
 package common
 
 import (
+	"reflect"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/packer/helper/config"
 )
 
 func TestBlockDevice(t *testing.T) {
@@ -72,7 +71,7 @@ func TestBlockDevice(t *testing.T) {
 				VolumeType:          "gp2",
 				VolumeSize:          8,
 				DeleteOnTermination: true,
-				Encrypted:           config.TriTrue,
+				Encrypted:           true,
 			},
 
 			Result: &ec2.BlockDeviceMapping{
@@ -91,7 +90,7 @@ func TestBlockDevice(t *testing.T) {
 				VolumeType:          "gp2",
 				VolumeSize:          8,
 				DeleteOnTermination: true,
-				Encrypted:           config.TriTrue,
+				Encrypted:           true,
 				KmsKeyId:            "2Fa48a521f-3aff-4b34-a159-376ac5d37812",
 			},
 
@@ -146,20 +145,26 @@ func TestBlockDevice(t *testing.T) {
 	}
 
 	for _, tc := range cases {
-		var amiBlockDevices BlockDevices = []BlockDevice{*tc.Config}
+		amiBlockDevices := AMIBlockDevices{
+			AMIMappings: []BlockDevice{*tc.Config},
+		}
 
-		var launchBlockDevices BlockDevices = []BlockDevice{*tc.Config}
+		launchBlockDevices := LaunchBlockDevices{
+			LaunchMappings: []BlockDevice{*tc.Config},
+		}
 
 		expected := []*ec2.BlockDeviceMapping{tc.Result}
 
-		amiResults := amiBlockDevices.BuildEC2BlockDeviceMappings()
-		if diff := cmp.Diff(expected, amiResults); diff != "" {
-			t.Fatalf("Bad block device: %s", diff)
+		amiResults := amiBlockDevices.BuildAMIDevices()
+		if !reflect.DeepEqual(expected, amiResults) {
+			t.Fatalf("Bad block device, \nexpected: %#v\n\ngot: %#v",
+				expected, amiResults)
 		}
 
-		launchResults := launchBlockDevices.BuildEC2BlockDeviceMappings()
-		if diff := cmp.Diff(expected, launchResults); diff != "" {
-			t.Fatalf("Bad block device: %s", diff)
+		launchResults := launchBlockDevices.BuildLaunchDevices()
+		if !reflect.DeepEqual(expected, launchResults) {
+			t.Fatalf("Bad block device, \nexpected: %#v\n\ngot: %#v",
+				expected, launchResults)
 		}
 	}
 }

builder/amazon/common/build_filter.go

@@ -1,19 +0,0 @@
-package common
-
-import (
-	"github.com/aws/aws-sdk-go/service/ec2"
-)
-
-// Build a slice of EC2 (AMI/Subnet/VPC) filter options from the filters provided.
-func buildEc2Filters(input map[string]string) []*ec2.Filter {
-	var filters []*ec2.Filter
-	for k, v := range input {
-		a := k
-		b := v
-		filters = append(filters, &ec2.Filter{
-			Name:   &a,
-			Values: []*string{&b},
-		})
-	}
-	return filters
-}

builder/amazon/common/build_filter_test.go

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

builder/amazon/common/errors.go

@@ -1,58 +0,0 @@
-package common
-
-import (
-	"fmt"
-	"log"
-	"regexp"
-
-	"github.com/aws/aws-sdk-go/aws/awserr"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/sts"
-)
-
-var encodedFailureMessagePattern = regexp.MustCompile(`(?i)(.*) Encoded authorization failure message: ([\w-]+) ?( .*)?`)
-
-type stsDecoder interface {
-	DecodeAuthorizationMessage(input *sts.DecodeAuthorizationMessageInput) (*sts.DecodeAuthorizationMessageOutput, error)
-}
-
-// decodeError replaces encoded authorization messages with the
-// decoded results
-func decodeAWSError(decoder stsDecoder, err error) error {
-
-	groups := encodedFailureMessagePattern.FindStringSubmatch(err.Error())
-	if len(groups) > 1 {
-		result, decodeErr := decoder.DecodeAuthorizationMessage(&sts.DecodeAuthorizationMessageInput{
-			EncodedMessage: aws.String(groups[2]),
-		})
-		if decodeErr == nil {
-			msg := aws.StringValue(result.DecodedMessage)
-			return fmt.Errorf("%s Authorization failure message: '%s'%s", groups[1], msg, groups[3])
-		}
-		log.Printf("[WARN] Attempted to decode authorization message, but received: %v", decodeErr)
-	}
-	return err
-}
-
-// DecodeAuthZMessages enables automatic decoding of any
-// encoded authorization messages
-func DecodeAuthZMessages(sess *session.Session) {
-	azd := &authZMessageDecoder{
-		Decoder: sts.New(sess),
-	}
-	sess.Handlers.UnmarshalError.AfterEachFn = azd.afterEachFn
-}
-
-type authZMessageDecoder struct {
-	Decoder stsDecoder
-}
-
-func (a *authZMessageDecoder) afterEachFn(item request.HandlerListRunItem) bool {
-	if err, ok := item.Request.Error.(awserr.Error); ok && err.Code() == "UnauthorizedOperation" {
-		item.Request.Error = decodeAWSError(a.Decoder, err)
-	}
-	return true
-}

builder/amazon/common/errors_test.go

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

builder/amazon/common/helper_funcs.go

@@ -1,63 +0,0 @@
-package common
-
-import (
-	"fmt"
-	"log"
-	"strings"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/service/ec2"
-)
-
-// DestroyAMIs deregisters the AWS machine images in imageids from an active AWS account
-func DestroyAMIs(imageids []*string, ec2conn *ec2.EC2) error {
-	resp, err := ec2conn.DescribeImages(&ec2.DescribeImagesInput{
-		ImageIds: imageids,
-	})
-
-	if err != nil {
-		err := fmt.Errorf("Error describing AMI: %s", err)
-		return err
-	}
-
-	// Deregister image by name.
-	for _, i := range resp.Images {
-		_, err := ec2conn.DeregisterImage(&ec2.DeregisterImageInput{
-			ImageId: i.ImageId,
-		})
-
-		if err != nil {
-			err := fmt.Errorf("Error deregistering existing AMI: %s", err)
-			return err
-		}
-		log.Printf("Deregistered AMI id: %s", *i.ImageId)
-
-		// Delete snapshot(s) by image
-		for _, b := range i.BlockDeviceMappings {
-			if b.Ebs != nil && aws.StringValue(b.Ebs.SnapshotId) != "" {
-				_, err := ec2conn.DeleteSnapshot(&ec2.DeleteSnapshotInput{
-					SnapshotId: b.Ebs.SnapshotId,
-				})
-
-				if err != nil {
-					err := fmt.Errorf("Error deleting existing snapshot: %s", err)
-					return err
-				}
-				log.Printf("Deleted snapshot: %s", *b.Ebs.SnapshotId)
-			}
-		}
-	}
-	return nil
-}
-
-// Returns true if the error matches all these conditions:
-//  * err is of type awserr.Error
-//  * Error.Code() matches code
-//  * Error.Message() contains message
-func isAWSErr(err error, code string, message string) bool {
-	if err, ok := err.(awserr.Error); ok {
-		return err.Code() == code && strings.Contains(err.Message(), message)
-	}
-	return false
-}