fix TEMPATE to TEMPLATE in fmt cmd

* Remove ansible components and docs

* Vendored packer-plugin-ansible

* Add remote ansible docs

.circleci/config.yml

@@ -37,15 +37,19 @@ commands:
     parameters:
       GOOS:
         type: string
+      GOARCH:
+        default: "amd64"
+        type: string
     steps:
       - checkout
-      - run: GOOS=<< parameters.GOOS >> go build -ldflags="-s -w -X github.com/hashicorp/packer/version.GitCommit=${CIRCLE_SHA1}" -o ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH) .
-      - run: zip ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH).zip ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH)
-      - run: rm ./pkg/packer_<< parameters.GOOS >>_$(go env GOARCH)
+      - run: GOOS=<< parameters.GOOS >> GOARCH=<<parameters.GOARCH>> go build -ldflags="-s -w -X github.com/hashicorp/packer/version.GitCommit=${CIRCLE_SHA1}" -o ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >> .
+      - run: zip ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >>.zip ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >>
+      - run: rm ./pkg/packer_<< parameters.GOOS >>_<< parameters.GOARCH >>
       - persist_to_workspace:
           root: .
           paths:
             - ./pkg/
+
 # Golang CircleCI 2.0 configuration file
 #
 # Check https://circleci.com/docs/2.0/language-go/ for more details
@@ -123,6 +127,13 @@ jobs:
     steps:
       - build-and-persist-packer-binary:
           GOOS: darwin
+  build_darwin_arm64:
+    executor: golang
+    working_directory: /go/src/github.com/hashicorp/packer
+    steps:
+      - build-and-persist-packer-binary:
+          GOOS: darwin
+          GOARCH: arm64
   build_freebsd:
     executor: golang
     working_directory: /go/src/github.com/hashicorp/packer
@@ -203,6 +214,7 @@ workflows:
     jobs:
       - build_linux
       - build_darwin
+      - build_darwin_arm64
       - build_windows
       - build_freebsd
       - build_openbsd
@@ -211,6 +223,7 @@ workflows:
           requires:
             - build_linux
             - build_darwin
+            - build_darwin_arm64
             - build_windows
             - build_freebsd
             - build_openbsd

CHANGELOG.md

@@ -1,21 +1,46 @@
-## 1.7.1 (Upcoming)
+## 1.7.3 (Upcoming)
+
+## 1.7.2 (April 05, 2021)
+
+### IMPROVEMENTS:
+
+* builder/alicloud: Add `ramrole` configuration to ECS instance. [GH-10845]
+
+### BUG FIXES:
+
+* builder/proxmox: Update Proxmox Go API to ensure only the first non-loopback
+    IPv4 address gets returned. [GH-10858]
+* builder/vsphere: Fix primary disk resize on clone. [GH-10848]
+* core: Fix bug where call to "packer version" sent output to stderr instead of
+    stdout. [GH-10850]
+
+## 1.7.1 (March 31, 2021)
 
 ### NOTES:
 
+* builder/amazon: Has been vendored in this release and will no longer be
+    updated with Packer core. In Packer v1.8.0 the plugin will be removed
+    entirely. The `amazon` components will continue to work as expected until
+    then, but for the latest offerings of the Amazon plugin, users are
+    encourage to use the `packer init` command to install the latest release
+    version. For more details see [Installing Packer
+    Plugins](https://www.packer.io/docs/plugins#installing-plugins)
 * builder/docker: Has been vendored in this release and will no longer be
     updated with Packer core. In Packer v1.8.0 the plugin will be removed
     entirely. The `docker` builder will continue to work as expected until
     then, but for the latest offerings of the Docker plugin, users are
     encourage to use the `packer init` command to install the latest release
     version. For more details see [Installing Packer
-    Plugins](https://www.packer.io/docs/plugins#installing- plugins)
+    Plugins](https://www.packer.io/docs/plugins#installing-plugins)
+* darwin/arm64: Packer now includes the darwin/arm64 binary to its releases to
+    supports the new OSX M1. [GH-10804]
 * post-processor/docker-\*: Have been vendored in this release and will no
     longer be updated with Packer core. In Packer v1.8.0 the plugin will be
     removed entirely. The `docker` builder will continue to work as expected
     until then, but for the latest offerings of the Docker plugin, users are
     encourage to use the `packer init` command to install the latest release
     version. For more details see [Installing Packer
-    Plugins](https://www.packer.io/docs/plugins#installing- plugins)
+    Plugins](https://www.packer.io/docs/plugins#installing-plugins)
 * post-processor/exoscale-import: Has been vendored in this release and will no
     longer be updated with Packer core. In Packer v1.8.0 the plugin will be
     removed entirely. The `exoscale-import` post-processor will continue to
@@ -25,13 +50,17 @@
     Repostiroy](https://github.com/exoscale/packer-plugin-exoscale). [GH-10709]
 
 ### IMPROVEMENTS
-* builder/amazon: allow creation of ebs snapshots wihtout volumes. [GH-9591]
+* builder/amazon: allow creation of ebs snapshots without volumes. [GH-9591]
 * builder/amazon: Fix issue for multi-region AMI build that fail when
     encrypting with KMS and sharing across accounts. [GH-10754]
 * builder/azure: Add client_cert_token_timeout option. [GH-10528]
 * builder/google: Make Windows password timeout configurable. [GH-10727]
 * builder/google: Update public GCP image project as gce-uefi-images are
     deprecated. [GH-10724]
+* builder/oracle-oci: Update Oracle Go SDK to add support for OCI flexible
+    shapes.  [GH-10833]
+* builder/proxmox: Allow using API tokens for Proxmox authentication.
+    [GH-10797]
 * builder/qemu: Added firmware option. [GH-10683]
 * builder/scaleway: add support for timeout in shutdown step. [GH-10503]
 * builder/vagrant: Fix logging to be clearer when Vagrant builder overrides
@@ -47,11 +76,21 @@
     [GH-10651]
 * command/fmt: Adding recursive flag to formatter to format subdirectories.
     [GH-10457]
+* core/hcl2: Add legacy_isotime function. [GH-10780]
+* core/hcl2: Add support for generating `dynamic` blocks within a `build`
+    block. [GH-10825]
+* core/hcl2: Add templatefile function. [GH-10776]
+* core/hcl2_upgrade: hcl2_upgrade command can now upgrade json var-files.
+    [GH-10676]
+* core/init: Add implicit required_plugin blocks feature. [GH-10732]
+* core: Add http_content option to serve variables from HTTP at preseed.
+    [GH-10801]
 * core: Change template parsing error to include warning about file extensions.
     [GH-10652]
 * core: Update to gopsutil v3.21.1 to allow builds to work for darwin arm64.
     [GH-10697]
-* hcl2_upgrade: hcl2_upgrade command can now upgrade json var-files [GH-10676]
+* provisioner/inspec: Allow non-zero exit codes for inspec provisioner.
+    [GH-10723]
 
 ### BUG FIXES
 * buider/azure: Update builder to ensure a proper clean up Azure temporary
@@ -68,6 +107,8 @@
     [GH-10748]
 * builder/oracle-oci: Update Oracle Go SDK to fix issue with reading key file.
     [GH-10560] [GH-10774]
+* builder/outscale: Fix omi_description that was ignored in Osc builder
+    [GH-10792]
 * builder/parallels: Make Packer respect winrm_host flag in winrm connect func.
     [GH-10748]
 * builder/proxmox: Fixes issue when using `additional_iso_files` in HCL enabled
@@ -78,11 +119,14 @@
     func. [GH-10748]
 * builder/vmware: Added a fallback file check when trying to determine the
     network-mapping configuration. [GH-10543]
+* builder/vsphere: Fix invalid device configuration issue when creating a
+    vm with multiple disk on the same controller. [GH-10844]
 * builder/vsphere: Fix issue where boot command would fail the build do to a
     key typing error. This change will now retry to type the key on error
     before giving up. [GH-10541]
 * core/hcl2_upgrade: Check for nil config map when provisioner/post-processor
     doesn't have config. [GH-10730]
+* core/hcl2_upgrade: Fix escaped quotes in template functions [GH-10794]
 * core/hcl2_upgrade: Make hcl2_upgrade command correctly translate
     pause_before. [GH-10654]
 * core/hcl2_upgrade: Make json variables using template engines get stored as
@@ -94,6 +138,8 @@
 * core: Pin Packer to Golang 1.16 to fix code generation issues. [GH-10702]
 * core: Templates previously could not interpolate the environment variable
     PACKER_LOG_PATH. [GH-10660]
+* post-processor/vagrant-cloud: Override direct upload based on box size
+    [GH-10820]
 * provisioner/chef-solo: HCL2 templates can support the json_string option.
     [GH-10655]
 * provisioner/inspec: Add new configuration field `valid_exit_codes` to allow

CODEOWNERS

@@ -68,8 +68,8 @@
 /builder/yandex/                      @GennadySpb @alexanderKhaustov @seukyaso
 /website/pages/docs/builders/yandex* @GennadySpb @alexanderKhaustov @seukyaso
 
-/builder/osc/                      @marinsalinas @Hakujou
-/website/pages/docs/builders/osc* @marinsalinas @Hakujou
+/builder/osc/                      @marinsalinas @Hakujou @outscale-mgo
+/website/pages/docs/builders/osc* @marinsalinas @Hakujou @outscale-mgo
 
 /examples/tencentcloud/                      @likexian
 /builder/tencentcloud/                      @likexian

Makefile

@@ -49,7 +49,7 @@ package:
 	@sh -c "$(CURDIR)/scripts/dist.sh $(VERSION)"
 
 install-build-deps: ## Install dependencies for bin build
-	@go get github.com/mitchellh/gox
+	@go install github.com/mitchellh/gox@v1.0.1
 
 install-gen-deps: ## Install dependencies for code generation
 	# to avoid having to tidy our go deps, we `go get` our binaries from a temp
@@ -58,8 +58,7 @@ install-gen-deps: ## Install dependencies for code generation
 	# install` seems to install the last tagged version and we want to install
 	# master.
 	@(cd $(TEMPDIR) && GO111MODULE=on go get github.com/alvaroloes/enumer@master)
-	@go install ./cmd/struct-markdown
-	@go install ./cmd/mapstructure-to-hcl2
+	@go install github.com/hashicorp/packer-plugin-sdk/cmd/packer-sdc@latest
 
 install-lint-deps: ## Install linter dependencies
 	# Pinning golangci-lint at v1.23.8 as --new-from-rev seems to work properly; the latest 1.24.0 has caused issues with memory consumption

acctest/plugin/component_acc_test.go

@@ -0,0 +1,71 @@
+// component_acc_test.go should contain acceptance tests for plugin components
+// to make sure all component types can be discovered and started.
+package plugin
+
+import (
+	_ "embed"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"testing"
+
+	amazonacc "github.com/hashicorp/packer-plugin-amazon/builder/ebs/acceptance"
+	"github.com/hashicorp/packer-plugin-sdk/acctest"
+	"github.com/hashicorp/packer/hcl2template/addrs"
+)
+
+//go:embed test-fixtures/basic-amazon-ami-datasource.pkr.hcl
+var basicAmazonAmiDatasourceHCL2Template string
+
+func TestAccInitAndBuildBasicAmazonAmiDatasource(t *testing.T) {
+	plugin := addrs.Plugin{
+		Hostname:  "github.com",
+		Namespace: "hashicorp",
+		Type:      "amazon",
+	}
+	testCase := &acctest.PluginTestCase{
+		Name: "amazon-ami_basic_datasource_test",
+		Setup: func() error {
+			return cleanupPluginInstallation(plugin)
+		},
+		Teardown: func() error {
+			helper := amazonacc.AWSHelper{
+				Region:  "us-west-2",
+				AMIName: "packer-amazon-ami-test",
+			}
+			return helper.CleanUpAmi()
+		},
+		Template: basicAmazonAmiDatasourceHCL2Template,
+		Type:     "amazon-ami",
+		Init:     true,
+		CheckInit: func(initCommand *exec.Cmd, logfile string) error {
+			if initCommand.ProcessState != nil {
+				if initCommand.ProcessState.ExitCode() != 0 {
+					return fmt.Errorf("Bad exit code. Logfile: %s", logfile)
+				}
+			}
+			logs, err := os.Open(logfile)
+			if err != nil {
+				return fmt.Errorf("Unable find %s", logfile)
+			}
+			defer logs.Close()
+
+			logsBytes, err := ioutil.ReadAll(logs)
+			if err != nil {
+				return fmt.Errorf("Unable to read %s", logfile)
+			}
+			initOutput := string(logsBytes)
+			return checkPluginInstallation(initOutput, plugin)
+		},
+		Check: func(buildCommand *exec.Cmd, logfile string) error {
+			if buildCommand.ProcessState != nil {
+				if buildCommand.ProcessState.ExitCode() != 0 {
+					return fmt.Errorf("Bad exit code. Logfile: %s", logfile)
+				}
+			}
+			return nil
+		},
+	}
+	acctest.TestPlugin(t, testCase)
+}

acctest/plugin/plugin_acc_test.go

@@ -0,0 +1,112 @@
+// plugin_acc_test.go should contain acceptance tests for features related to
+// installing, discovering and running plugins.
+package plugin
+
+import (
+	_ "embed"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"testing"
+
+	amazonacc "github.com/hashicorp/packer-plugin-amazon/builder/ebs/acceptance"
+	"github.com/hashicorp/packer-plugin-sdk/acctest"
+	"github.com/hashicorp/packer-plugin-sdk/acctest/testutils"
+	"github.com/hashicorp/packer/hcl2template/addrs"
+	"github.com/mitchellh/go-homedir"
+)
+
+//go:embed test-fixtures/basic-amazon-ebs.pkr.hcl
+var basicAmazonEbsHCL2Template string
+
+func TestAccInitAndBuildBasicAmazonEbs(t *testing.T) {
+	plugin := addrs.Plugin{
+		Hostname:  "github.com",
+		Namespace: "hashicorp",
+		Type:      "amazon",
+	}
+	testCase := &acctest.PluginTestCase{
+		Name: "amazon-ebs_basic_plugin_init_and_build_test",
+		Setup: func() error {
+			return cleanupPluginInstallation(plugin)
+		},
+		Teardown: func() error {
+			helper := amazonacc.AWSHelper{
+				Region:  "us-east-1",
+				AMIName: "packer-plugin-amazon-ebs-test",
+			}
+			return helper.CleanUpAmi()
+		},
+		Template: basicAmazonEbsHCL2Template,
+		Type:     "amazon-ebs",
+		Init:     true,
+		CheckInit: func(initCommand *exec.Cmd, logfile string) error {
+			if initCommand.ProcessState != nil {
+				if initCommand.ProcessState.ExitCode() != 0 {
+					return fmt.Errorf("Bad exit code. Logfile: %s", logfile)
+				}
+			}
+			logs, err := os.Open(logfile)
+			if err != nil {
+				return fmt.Errorf("Unable find %s", logfile)
+			}
+			defer logs.Close()
+
+			logsBytes, err := ioutil.ReadAll(logs)
+			if err != nil {
+				return fmt.Errorf("Unable to read %s", logfile)
+			}
+			initOutput := string(logsBytes)
+			return checkPluginInstallation(initOutput, plugin)
+		},
+		Check: func(buildCommand *exec.Cmd, logfile string) error {
+			if buildCommand.ProcessState != nil {
+				if buildCommand.ProcessState.ExitCode() != 0 {
+					return fmt.Errorf("Bad exit code. Logfile: %s", logfile)
+				}
+			}
+			return nil
+		},
+	}
+	acctest.TestPlugin(t, testCase)
+}
+
+func cleanupPluginInstallation(plugin addrs.Plugin) error {
+	home, err := homedir.Dir()
+	if err != nil {
+		return err
+	}
+	pluginPath := filepath.Join(home,
+		".packer.d",
+		"plugins",
+		plugin.Hostname,
+		plugin.Namespace,
+		plugin.Type)
+	testutils.CleanupFiles(pluginPath)
+	return nil
+}
+
+func checkPluginInstallation(initOutput string, plugin addrs.Plugin) error {
+	expectedInitLog := "Installed plugin " + plugin.String()
+	if matched, _ := regexp.MatchString(expectedInitLog+".*", initOutput); !matched {
+		return fmt.Errorf("logs doesn't contain expected foo value %q", initOutput)
+	}
+
+	home, err := homedir.Dir()
+	if err != nil {
+		return err
+	}
+	pluginPath := filepath.Join(home,
+		".packer.d",
+		"plugins",
+		plugin.Hostname,
+		plugin.Namespace,
+		plugin.Type)
+	if !testutils.FileExists(pluginPath) {
+		return fmt.Errorf("%s plugin installation not found", plugin.String())
+	}
+	return nil
+}

acctest/plugin/test-fixtures/basic-amazon-ami-datasource.pkr.hcl

@@ -0,0 +1,33 @@
+packer {
+  required_plugins {
+    amazon = {
+      version = ">= 0.0.1"
+      source = "github.com/hashicorp/amazon"
+    }
+  }
+}
+
+data "amazon-ami" "test" {
+  filters = {
+    name                = "ubuntu/images/*ubuntu-xenial-16.04-amd64-server-*"
+    root-device-type    = "ebs"
+    virtualization-type = "hvm"
+  }
+  most_recent = true
+  owners      = ["099720109477"]
+}
+
+source "amazon-ebs" "basic-example" {
+  region = "us-west-2"
+  source_ami = data.amazon-ami.test.id
+  ami_name =  "packer-amazon-ami-test"
+  communicator  = "ssh"
+  instance_type = "t2.micro"
+  ssh_username  = "ubuntu"
+}
+
+build {
+  sources = [
+    "source.amazon-ebs.basic-example"
+  ]
+}

acctest/plugin/test-fixtures/basic-amazon-ebs.pkr.hcl

@@ -0,0 +1,20 @@
+packer {
+  required_plugins {
+    amazon = {
+      version = ">= 0.0.1"
+      source = "github.com/hashicorp/amazon"
+    }
+  }
+}
+
+source "amazon-ebs" "basic-test" {
+  region = "us-east-1"
+  instance_type = "m3.medium"
+  source_ami = "ami-76b2a71e"
+  ssh_username = "ubuntu"
+  ami_name = "packer-plugin-amazon-ebs-test"
+}
+
+build {
+  sources = ["source.amazon-ebs.basic-test"]
+}

acctest/testing_test.go

@@ -0,0 +1,72 @@
+package acctest
+
+import (
+	"os"
+	"testing"
+)
+
+func init() {
+	testTesting = true
+
+	if err := os.Setenv(TestEnvVar, "1"); err != nil {
+		panic(err)
+	}
+}
+
+func TestTest_noEnv(t *testing.T) {
+	// Unset the variable
+	if err := os.Setenv(TestEnvVar, ""); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	defer os.Setenv(TestEnvVar, "1")
+
+	mt := new(mockT)
+	Test(mt, TestCase{})
+
+	if !mt.SkipCalled {
+		t.Fatal("skip not called")
+	}
+}
+
+func TestTest_preCheck(t *testing.T) {
+	called := false
+
+	mt := new(mockT)
+	Test(mt, TestCase{
+		PreCheck: func() { called = true },
+	})
+
+	if !called {
+		t.Fatal("precheck should be called")
+	}
+}
+
+// mockT implements TestT for testing
+type mockT struct {
+	ErrorCalled bool
+	ErrorArgs   []interface{}
+	FatalCalled bool
+	FatalArgs   []interface{}
+	SkipCalled  bool
+	SkipArgs    []interface{}
+
+	f bool
+}
+
+func (t *mockT) Error(args ...interface{}) {
+	t.ErrorCalled = true
+	t.ErrorArgs = args
+	t.f = true
+}
+
+func (t *mockT) Fatal(args ...interface{}) {
+	t.FatalCalled = true
+	t.FatalArgs = args
+	t.f = true
+}
+
+func (t *mockT) Skip(args ...interface{}) {
+	t.SkipCalled = true
+	t.SkipArgs = args
+	t.f = true
+}

builder/alicloud/ecs/access_config.go

@@ -1,4 +1,4 @@
-//go:generate struct-markdown
+//go:generate packer-sdc struct-markdown
 
 package ecs
 

builder/alicloud/ecs/builder.go

@@ -1,4 +1,4 @@
-//go:generate mapstructure-to-hcl2 -type Config,AlicloudDiskDevice
+//go:generate packer-sdc mapstructure-to-hcl2 -type Config,AlicloudDiskDevice
 
 // The alicloud  contains a packersdk.Builder implementation that
 // builds ecs images for alicloud.
@@ -135,6 +135,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 			InstanceType:            b.config.InstanceType,
 			UserData:                b.config.UserData,
 			UserDataFile:            b.config.UserDataFile,
+			RamRoleName:             b.config.RamRoleName,
 			RegionId:                b.config.AlicloudRegion,
 			InternetChargeType:      b.config.InternetChargeType,
 			InternetMaxBandwidthOut: b.config.InternetMaxBandwidthOut,

builder/alicloud/ecs/builder.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type Config,AlicloudDiskDevice"; DO NOT EDIT.
+// Code generated by "packer-sdc mapstructure-to-hcl2"; DO NOT EDIT.
 
 package ecs
 
@@ -88,6 +88,7 @@ type FlatConfig struct {
 	AlicloudSourceImage               *string                  `mapstructure:"source_image" required:"true" cty:"source_image" hcl:"source_image"`
 	ForceStopInstance                 *bool                    `mapstructure:"force_stop_instance" required:"false" cty:"force_stop_instance" hcl:"force_stop_instance"`
 	DisableStopInstance               *bool                    `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance" hcl:"disable_stop_instance"`
+	RamRoleName                       *string                  `mapstructure:"ram_role_name" required:"false" cty:"ram_role_name" hcl:"ram_role_name"`
 	SecurityGroupId                   *string                  `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
 	SecurityGroupName                 *string                  `mapstructure:"security_group_name" required:"false" cty:"security_group_name" hcl:"security_group_name"`
 	UserData                          *string                  `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
@@ -205,6 +206,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"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},
+		"ram_role_name":                &hcldec.AttrSpec{Name: "ram_role_name", Type: cty.String, 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},

builder/alicloud/ecs/builder_acc_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	builderT "github.com/hashicorp/packer-plugin-sdk/acctest"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	builderT "github.com/hashicorp/packer/acctest"
 )
 
 const defaultTestRegion = "cn-beijing"

builder/alicloud/ecs/image_config.go

@@ -1,4 +1,4 @@
-//go:generate struct-markdown
+//go:generate packer-sdc struct-markdown
 
 package ecs
 

builder/alicloud/ecs/run_config.go

@@ -1,4 +1,4 @@
-//go:generate struct-markdown
+//go:generate packer-sdc struct-markdown
 
 package ecs
 
@@ -47,6 +47,8 @@ type RunConfig struct {
 	// 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"`
+	// Ram Role to apply when launching the instance.
+	RamRoleName string `mapstructure:"ram_role_name" 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

builder/alicloud/ecs/step_create_instance.go

@@ -23,6 +23,7 @@ type stepCreateAlicloudInstance struct {
 	UserData                string
 	UserDataFile            string
 	instanceId              string
+	RamRoleName             string
 	RegionId                string
 	InternetChargeType      string
 	InternetMaxBandwidthOut int
@@ -115,6 +116,7 @@ func (s *stepCreateAlicloudInstance) buildCreateInstanceRequest(state multistep.
 	request.RegionId = s.RegionId
 	request.InstanceType = s.InstanceType
 	request.InstanceName = s.InstanceName
+	request.RamRoleName = s.RamRoleName
 	request.ZoneId = s.ZoneId
 
 	sourceImage := state.Get("source_image").(*ecs.Image)

builder/amazon/chroot/builder_test.go

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

builder/amazon/chroot/copy_files_test.go

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

builder/amazon/chroot/device_test.go

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

builder/amazon/chroot/step_attach_volume_test.go

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

builder/amazon/chroot/step_create_volume_test.go

@@ -1,97 +0,0 @@
-package chroot
-
-import (
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	confighelper "github.com/hashicorp/packer-plugin-sdk/template/config"
-	"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"),
-			Encrypted:  aws.Bool(false),
-		},
-	}
-}
-
-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)
-}
-
-func TestCreateVolume_Encrypted(t *testing.T) {
-	stepCreateVolume := StepCreateVolume{RootVolumeEncryptBoot: confighelper.TrileanFromBool(true)}
-	testRootDevice := buildTestRootDevice()
-	ret, err := stepCreateVolume.buildCreateVolumeInput("test-az", testRootDevice)
-	assert.NoError(t, err)
-	// Ensure that the new value is equal to the the value passed in
-	assert.Equal(t, confighelper.TrileanFromBool(*ret.Encrypted), stepCreateVolume.RootVolumeEncryptBoot)
-}
-
-func TestCreateVolume_Custom_KMS_Key_Encrypted(t *testing.T) {
-	stepCreateVolume := StepCreateVolume{
-		RootVolumeEncryptBoot: confighelper.TrileanFromBool(true),
-		RootVolumeKmsKeyId:    "alias/1234",
-	}
-	testRootDevice := buildTestRootDevice()
-	ret, err := stepCreateVolume.buildCreateVolumeInput("test-az", testRootDevice)
-	assert.NoError(t, err)
-	// Ensure that the new value is equal to the value passed in
-	assert.Equal(t, *ret.KmsKeyId, stepCreateVolume.RootVolumeKmsKeyId)
-}

builder/amazon/chroot/step_flock_test.go

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

builder/amazon/chroot/step_mount_device_test.go

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

builder/amazon/chroot/step_register_ami_test.go

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

builder/amazon/common/access_config_test.go

@@ -1,47 +0,0 @@
-package common
-
-import (
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-)
-
-func TestAccessConfigPrepare_Region(t *testing.T) {
-	c := FakeAccessConfig()
-
-	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)
-	}
-}
-
-func TestAccessConfigPrepare_RegionRestricted(t *testing.T) {
-	c := FakeAccessConfig()
-
-	// Create a Session with a custom region
-	c.session = session.Must(session.NewSession(&aws.Config{
-		Region: aws.String("us-gov-west-1"),
-	}))
-
-	if err := c.Prepare(); err != nil {
-		t.Fatalf("shouldn't have err: %s", err)
-	}
-
-	if !c.IsGovCloud() {
-		t.Fatal("We should be in gov region.")
-	}
-}

builder/amazon/common/ami_config_test.go

@@ -1,244 +0,0 @@
-package common
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-)
-
-func testAMIConfig() *AMIConfig {
-	return &AMIConfig{
-		AMIName: "foo",
-	}
-}
-
-func getFakeAccessConfig(region string) *AccessConfig {
-	c := FakeAccessConfig()
-	c.RawRegion = region
-	return c
-}
-
-func TestAMIConfigPrepare_name(t *testing.T) {
-	c := testAMIConfig()
-	accessConf := FakeAccessConfig()
-	if err := c.Prepare(accessConf, nil); err != nil {
-		t.Fatalf("shouldn't have err: %s", err)
-	}
-
-	c.AMIName = ""
-	if err := c.Prepare(accessConf, nil); err == nil {
-		t.Fatal("should have error")
-	}
-}
-
-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 := FakeAccessConfig()
-	mockConn := &mockEC2Client{}
-	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
-		t.Fatalf("shouldn't have err: %#v", errs)
-	}
-
-	c.AMIRegions, err = listEC2Regions(mockConn)
-	if err != nil {
-		t.Fatalf("shouldn't have err: %s", err.Error())
-	}
-	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
-		t.Fatalf("shouldn't have err: %#v", errs)
-	}
-
-	c.AMIRegions = []string{"us-east-1", "us-west-1", "us-east-1"}
-	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
-		t.Fatalf("bad: %s", errs[0])
-	}
-
-	expected := []string{"us-east-1", "us-west-1"}
-	if !reflect.DeepEqual(c.AMIRegions, expected) {
-		t.Fatalf("bad: %#v", c.AMIRegions)
-	}
-
-	c.AMIRegions = []string{"custom"}
-	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
-		t.Fatal("shouldn't have error")
-	}
-
-	c.AMIRegions = []string{"us-east-1", "us-east-2", "us-west-1"}
-	c.AMIRegionKMSKeyIDs = map[string]string{
-		"us-east-1": "123-456-7890",
-		"us-west-1": "789-012-3456",
-		"us-east-2": "456-789-0123",
-	}
-	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
-		t.Fatal(fmt.Sprintf("shouldn't have error: %s", errs[0]))
-	}
-
-	c.AMIRegions = []string{"us-east-1", "us-east-2", "us-west-1"}
-	c.AMIRegionKMSKeyIDs = map[string]string{
-		"us-east-1": "123-456-7890",
-		"us-west-1": "789-012-3456",
-		"us-east-2": "",
-	}
-	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
-		t.Fatal("should have passed; we are able to use default KMS key if not sharing")
-	}
-
-	c.SnapshotUsers = []string{"user-foo", "user-bar"}
-	c.AMIRegions = []string{"us-east-1", "us-east-2", "us-west-1"}
-	c.AMIRegionKMSKeyIDs = map[string]string{
-		"us-east-1": "123-456-7890",
-		"us-west-1": "789-012-3456",
-		"us-east-2": "",
-	}
-	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
-		t.Fatal("should have an error b/c can't use default KMS key if sharing")
-	}
-
-	c.AMIRegions = []string{"us-east-1", "us-west-1"}
-	c.AMIRegionKMSKeyIDs = map[string]string{
-		"us-east-1": "123-456-7890",
-		"us-west-1": "789-012-3456",
-		"us-east-2": "456-789-0123",
-	}
-	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
-		t.Fatal("should have error b/c theres a region in the key map that isn't in ami_regions")
-	}
-
-	c.AMIRegions = []string{"us-east-1", "us-west-1", "us-east-2"}
-	c.AMIRegionKMSKeyIDs = map[string]string{
-		"us-east-1": "123-456-7890",
-		"us-west-1": "789-012-3456",
-	}
-
-	if err := c.Prepare(accessConf, nil); err == nil {
-		t.Fatal("should have error b/c theres a region in in ami_regions that isn't in the key map")
-	}
-
-	c.SnapshotUsers = []string{"foo", "bar"}
-	c.AMIKmsKeyId = "123-abc-456"
-	c.AMIEncryptBootVolume = config.TriTrue
-	c.AMIRegions = []string{"us-east-1", "us-west-1"}
-	c.AMIRegionKMSKeyIDs = map[string]string{
-		"us-east-1": "123-456-7890",
-		"us-west-1": "",
-	}
-	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
-		t.Fatal("should have error b/c theres a region in in ami_regions that isn't in the key map")
-	}
-
-	// allow rawregion to exist in ami_regions list.
-	accessConf = getFakeAccessConfig("us-east-1")
-	c.AMIRegions = []string{"us-east-1", "us-west-1", "us-east-2"}
-	c.AMIRegionKMSKeyIDs = nil
-	if errs = c.prepareRegions(accessConf); len(errs) > 0 {
-		t.Fatal("should allow user to have the raw region in ami_regions")
-	}
-
-}
-
-func TestAMIConfigPrepare_Share_EncryptedBoot(t *testing.T) {
-	c := testAMIConfig()
-	c.AMIUsers = []string{"testAccountID"}
-	c.AMIEncryptBootVolume = config.TriTrue
-
-	accessConf := FakeAccessConfig()
-
-	c.AMIKmsKeyId = ""
-	if err := c.Prepare(accessConf, nil); err == nil {
-		t.Fatal("shouldn't be able to share ami with encrypted boot volume")
-	}
-	c.AMIKmsKeyId = "89c3fb9a-de87-4f2a-aedc-fddc5138193c"
-	if err := c.Prepare(accessConf, nil); err != nil {
-		t.Fatal("should be able to share ami with encrypted boot volume")
-	}
-}
-
-func TestAMIConfigPrepare_ValidateKmsKey(t *testing.T) {
-	c := testAMIConfig()
-	c.AMIEncryptBootVolume = config.TriTrue
-
-	accessConf := FakeAccessConfig()
-
-	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 := FakeAccessConfig()
-
-	c.AMIName = "aa"
-	if err := c.Prepare(accessConf, nil); err == nil {
-		t.Fatal("shouldn't be able to have an ami name with less than 3 characters")
-	}
-
-	var longAmiName string
-	for i := 0; i < 129; i++ {
-		longAmiName += "a"
-	}
-	c.AMIName = longAmiName
-	if err := c.Prepare(accessConf, nil); err == nil {
-		t.Fatal("shouldn't be able to have an ami name with great than 128 characters")
-	}
-
-	c.AMIName = "+aaa"
-	if err := c.Prepare(accessConf, nil); err == nil {
-		t.Fatal("shouldn't be able to have an ami name with invalid characters")
-	}
-
-	c.AMIName = "fooBAR1()[] ./-'@_"
-	if err := c.Prepare(accessConf, nil); err != nil {
-		t.Fatal("should be able to use all of the allowed AMI characters")
-	}
-
-	c.AMIName = `xyz-base-2017-04-05-1934`
-	if err := c.Prepare(accessConf, nil); err != nil {
-		t.Fatalf("expected `xyz-base-2017-04-05-1934` to pass validation.")
-	}
-
-}

builder/amazon/common/artifact_test.go

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

builder/amazon/common/block_device_test.go

@@ -1,401 +0,0 @@
-package common
-
-import (
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-)
-
-func TestBlockDevice(t *testing.T) {
-	cases := []struct {
-		Config *BlockDevice
-		Result *ec2.BlockDeviceMapping
-	}{
-		{
-			Config: &BlockDevice{
-				DeviceName:          "/dev/sdb",
-				SnapshotId:          "snap-1234",
-				VolumeType:          "standard",
-				VolumeSize:          8,
-				DeleteOnTermination: true,
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName: aws.String("/dev/sdb"),
-				Ebs: &ec2.EbsBlockDevice{
-					SnapshotId:          aws.String("snap-1234"),
-					VolumeType:          aws.String("standard"),
-					VolumeSize:          aws.Int64(8),
-					DeleteOnTermination: aws.Bool(true),
-				},
-			},
-		},
-		{
-			Config: &BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeSize: 8,
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName: aws.String("/dev/sdb"),
-				Ebs: &ec2.EbsBlockDevice{
-					VolumeSize:          aws.Int64(8),
-					DeleteOnTermination: aws.Bool(false),
-				},
-			},
-		},
-		{
-			Config: &BlockDevice{
-				DeviceName:          "/dev/sdb",
-				VolumeType:          "io1",
-				VolumeSize:          8,
-				DeleteOnTermination: true,
-				IOPS:                aws.Int64(1000),
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName: aws.String("/dev/sdb"),
-				Ebs: &ec2.EbsBlockDevice{
-					VolumeType:          aws.String("io1"),
-					VolumeSize:          aws.Int64(8),
-					DeleteOnTermination: aws.Bool(true),
-					Iops:                aws.Int64(1000),
-				},
-			},
-		},
-		{
-			Config: &BlockDevice{
-				DeviceName:          "/dev/sdb",
-				VolumeType:          "io2",
-				VolumeSize:          8,
-				DeleteOnTermination: true,
-				IOPS:                aws.Int64(1000),
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName: aws.String("/dev/sdb"),
-				Ebs: &ec2.EbsBlockDevice{
-					VolumeType:          aws.String("io2"),
-					VolumeSize:          aws.Int64(8),
-					DeleteOnTermination: aws.Bool(true),
-					Iops:                aws.Int64(1000),
-				},
-			},
-		},
-		{
-			Config: &BlockDevice{
-				DeviceName:          "/dev/sdb",
-				VolumeType:          "gp2",
-				VolumeSize:          8,
-				DeleteOnTermination: true,
-				Encrypted:           config.TriTrue,
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName: aws.String("/dev/sdb"),
-				Ebs: &ec2.EbsBlockDevice{
-					VolumeType:          aws.String("gp2"),
-					VolumeSize:          aws.Int64(8),
-					DeleteOnTermination: aws.Bool(true),
-					Encrypted:           aws.Bool(true),
-				},
-			},
-		},
-		{
-			Config: &BlockDevice{
-				DeviceName:          "/dev/sdb",
-				VolumeType:          "gp2",
-				VolumeSize:          8,
-				DeleteOnTermination: true,
-				Encrypted:           config.TriTrue,
-				KmsKeyId:            "2Fa48a521f-3aff-4b34-a159-376ac5d37812",
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName: aws.String("/dev/sdb"),
-				Ebs: &ec2.EbsBlockDevice{
-					VolumeType:          aws.String("gp2"),
-					VolumeSize:          aws.Int64(8),
-					DeleteOnTermination: aws.Bool(true),
-					Encrypted:           aws.Bool(true),
-					KmsKeyId:            aws.String("2Fa48a521f-3aff-4b34-a159-376ac5d37812"),
-				},
-			},
-		},
-		{
-			Config: &BlockDevice{
-				DeviceName:          "/dev/sdb",
-				VolumeType:          "standard",
-				DeleteOnTermination: true,
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName: aws.String("/dev/sdb"),
-				Ebs: &ec2.EbsBlockDevice{
-					VolumeType:          aws.String("standard"),
-					DeleteOnTermination: aws.Bool(true),
-				},
-			},
-		},
-		{
-			Config: &BlockDevice{
-				DeviceName:  "/dev/sdb",
-				VirtualName: "ephemeral0",
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName:  aws.String("/dev/sdb"),
-				VirtualName: aws.String("ephemeral0"),
-			},
-		},
-		{
-			Config: &BlockDevice{
-				DeviceName: "/dev/sdb",
-				NoDevice:   true,
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName: aws.String("/dev/sdb"),
-				NoDevice:   aws.String(""),
-			},
-		},
-		{
-			Config: &BlockDevice{
-				DeviceName:          "/dev/sdb",
-				VolumeType:          "gp3",
-				VolumeSize:          8,
-				Throughput:          aws.Int64(125),
-				IOPS:                aws.Int64(3000),
-				DeleteOnTermination: true,
-				Encrypted:           config.TriTrue,
-			},
-
-			Result: &ec2.BlockDeviceMapping{
-				DeviceName: aws.String("/dev/sdb"),
-				Ebs: &ec2.EbsBlockDevice{
-					VolumeType:          aws.String("gp3"),
-					VolumeSize:          aws.Int64(8),
-					Throughput:          aws.Int64(125),
-					Iops:                aws.Int64(3000),
-					DeleteOnTermination: aws.Bool(true),
-					Encrypted:           aws.Bool(true),
-				},
-			},
-		},
-	}
-
-	for _, tc := range cases {
-		var amiBlockDevices BlockDevices = []BlockDevice{*tc.Config}
-
-		var launchBlockDevices BlockDevices = []BlockDevice{*tc.Config}
-
-		expected := []*ec2.BlockDeviceMapping{tc.Result}
-
-		amiResults := amiBlockDevices.BuildEC2BlockDeviceMappings()
-		if diff := cmp.Diff(expected, amiResults); diff != "" {
-			t.Fatalf("Bad block device: %s", diff)
-		}
-
-		launchResults := launchBlockDevices.BuildEC2BlockDeviceMappings()
-		if diff := cmp.Diff(expected, launchResults); diff != "" {
-			t.Fatalf("Bad block device: %s", diff)
-		}
-	}
-}
-
-func TestIOPSValidation(t *testing.T) {
-
-	cases := []struct {
-		device BlockDevice
-		ok     bool
-		msg    string
-	}{
-		// volume size unknown
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "io1",
-				IOPS:       aws.Int64(1000),
-			},
-			ok: true,
-		},
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "io2",
-				IOPS:       aws.Int64(1000),
-			},
-			ok: true,
-		},
-		// ratio requirement satisfied
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "io1",
-				VolumeSize: 50,
-				IOPS:       aws.Int64(1000),
-			},
-			ok: true,
-		},
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "io2",
-				VolumeSize: 100,
-				IOPS:       aws.Int64(1000),
-			},
-			ok: true,
-		},
-		// ratio requirement not satisfied
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "io1",
-				VolumeSize: 10,
-				IOPS:       aws.Int64(2000),
-			},
-			ok:  false,
-			msg: "/dev/sdb: the maximum ratio of provisioned IOPS to requested volume size (in GiB) is 50:1 for io1 volumes",
-		},
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "io2",
-				VolumeSize: 50,
-				IOPS:       aws.Int64(30000),
-			},
-			ok:  false,
-			msg: "/dev/sdb: the maximum ratio of provisioned IOPS to requested volume size (in GiB) is 500:1 for io2 volumes",
-		},
-		// exceed max iops
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "io2",
-				VolumeSize: 500,
-				IOPS:       aws.Int64(99999),
-			},
-			ok:  false,
-			msg: "IOPS must be between 100 and 64000 for device /dev/sdb",
-		},
-		// lower than min iops
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "io2",
-				VolumeSize: 50,
-				IOPS:       aws.Int64(10),
-			},
-			ok:  false,
-			msg: "IOPS must be between 100 and 64000 for device /dev/sdb",
-		},
-		// exceed max iops
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "gp3",
-				VolumeSize: 50,
-				Throughput: aws.Int64(125),
-				IOPS:       aws.Int64(99999),
-			},
-			ok:  false,
-			msg: "IOPS must be between 3000 and 16000 for device /dev/sdb",
-		},
-		// lower than min iops
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "gp3",
-				VolumeSize: 50,
-				Throughput: aws.Int64(125),
-				IOPS:       aws.Int64(10),
-			},
-			ok:  false,
-			msg: "IOPS must be between 3000 and 16000 for device /dev/sdb",
-		},
-	}
-
-	ctx := interpolate.Context{}
-	for _, testCase := range cases {
-		err := testCase.device.Prepare(&ctx)
-		if testCase.ok && err != nil {
-			t.Fatalf("should not error, but: %v", err)
-		}
-		if !testCase.ok {
-			if err == nil {
-				t.Fatalf("should error")
-			} else if err.Error() != testCase.msg {
-				t.Fatalf("wrong error: expected %s, found: %v", testCase.msg, err)
-			}
-		}
-	}
-}
-
-func TestThroughputValidation(t *testing.T) {
-
-	cases := []struct {
-		device BlockDevice
-		ok     bool
-		msg    string
-	}{
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "gp3",
-				Throughput: aws.Int64(125),
-				IOPS:       aws.Int64(3000),
-			},
-			ok: true,
-		},
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "gp3",
-				Throughput: aws.Int64(1000),
-				IOPS:       aws.Int64(3000),
-			},
-			ok: true,
-		},
-		// exceed max Throughput
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "gp3",
-				Throughput: aws.Int64(1001),
-				IOPS:       aws.Int64(3000),
-			},
-			ok:  false,
-			msg: "Throughput must be between 125 and 1000 for device /dev/sdb",
-		},
-		// lower than min Throughput
-		{
-			device: BlockDevice{
-				DeviceName: "/dev/sdb",
-				VolumeType: "gp3",
-				Throughput: aws.Int64(124),
-				IOPS:       aws.Int64(3000),
-			},
-			ok:  false,
-			msg: "Throughput must be between 125 and 1000 for device /dev/sdb",
-		},
-	}
-
-	ctx := interpolate.Context{}
-	for _, testCase := range cases {
-		err := testCase.device.Prepare(&ctx)
-		if testCase.ok && err != nil {
-			t.Fatalf("should not error, but: %v", err)
-		}
-		if !testCase.ok {
-			if err == nil {
-				t.Fatalf("should error")
-			} else if err.Error() != testCase.msg {
-				t.Fatalf("wrong error: expected %s, found: %v", testCase.msg, err)
-			}
-		}
-	}
-}

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_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/interpolate_build_info_test.go

@@ -1,91 +0,0 @@
-package common
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"github.com/hashicorp/packer-plugin-sdk/packerbuilderdata"
-)
-
-func testImage() *ec2.Image {
-	return &ec2.Image{
-		ImageId:         aws.String("ami-abcd1234"),
-		CreationDate:    aws.String("ami_test_creation_date"),
-		Name:            aws.String("ami_test_name"),
-		OwnerId:         aws.String("ami_test_owner_id"),
-		ImageOwnerAlias: aws.String("ami_test_owner_alias"),
-		RootDeviceType:  aws.String("ebs"),
-		Tags: []*ec2.Tag{
-			{
-				Key:   aws.String("key-1"),
-				Value: aws.String("value-1"),
-			},
-			{
-				Key:   aws.String("key-2"),
-				Value: aws.String("value-2"),
-			},
-		},
-	}
-}
-
-func testState() multistep.StateBag {
-	state := new(multistep.BasicStateBag)
-	return state
-}
-
-func testGeneratedData(state multistep.StateBag) packerbuilderdata.GeneratedData {
-	generatedData := packerbuilderdata.GeneratedData{State: state}
-	return generatedData
-}
-
-func TestInterpolateBuildInfo_extractBuildInfo_noSourceImage(t *testing.T) {
-	state := testState()
-	generatedData := testGeneratedData(state)
-	buildInfo := extractBuildInfo("foo", state, &generatedData)
-
-	expected := BuildInfoTemplate{
-		BuildRegion: "foo",
-	}
-	if !reflect.DeepEqual(*buildInfo, expected) {
-		t.Fatalf("Unexpected BuildInfoTemplate: expected %#v got %#v\n", expected, *buildInfo)
-	}
-}
-
-func TestInterpolateBuildInfo_extractBuildInfo_withSourceImage(t *testing.T) {
-	state := testState()
-	state.Put("source_image", testImage())
-	generatedData := testGeneratedData(state)
-	buildInfo := extractBuildInfo("foo", state, &generatedData)
-
-	expected := BuildInfoTemplate{
-		BuildRegion:           "foo",
-		SourceAMI:             "ami-abcd1234",
-		SourceAMICreationDate: "ami_test_creation_date",
-		SourceAMIName:         "ami_test_name",
-		SourceAMIOwner:        "ami_test_owner_id",
-		SourceAMIOwnerName:    "ami_test_owner_alias",
-		SourceAMITags: map[string]string{
-			"key-1": "value-1",
-			"key-2": "value-2",
-		},
-	}
-	if !reflect.DeepEqual(*buildInfo, expected) {
-		t.Fatalf("Unexpected BuildInfoTemplate: expected %#v got %#v\n", expected, *buildInfo)
-	}
-}
-
-func TestInterpolateBuildInfo_extractBuildInfo_GeneratedDataWithSourceImageName(t *testing.T) {
-	state := testState()
-	state.Put("source_image", testImage())
-	generatedData := testGeneratedData(state)
-	extractBuildInfo("foo", state, &generatedData)
-
-	generatedDataState := state.Get("generated_data").(map[string]interface{})
-
-	if generatedDataState["SourceAMIName"] != "ami_test_name" {
-		t.Fatalf("Unexpected state SourceAMIName: expected %#v got %#v\n", "ami_test_name", generatedDataState["SourceAMIName"])
-	}
-}

builder/amazon/common/run_config_test.go

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

builder/amazon/common/ssh_test.go

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

builder/amazon/common/state_test.go

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

builder/amazon/common/step_ami_region_copy_test.go

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

builder/amazon/common/step_pre_validate_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/ec2"
-)
-
-//DescribeVpcs mocks an ec2.DescribeVpcsOutput for a given input
-func (m *mockEC2Conn) DescribeVpcs(input *ec2.DescribeVpcsInput) (*ec2.DescribeVpcsOutput, error) {
-
-	if input == nil || aws.StringValue(input.VpcIds[0]) == "" {
-		return nil, fmt.Errorf("oops looks like we need more input")
-	}
-
-	var isDefault bool
-	vpcID := aws.StringValue(input.VpcIds[0])
-
-	//only one default VPC per region
-	if strings.Contains("vpc-default-id", vpcID) {
-		isDefault = true
-	}
-
-	output := &ec2.DescribeVpcsOutput{
-		Vpcs: []*ec2.Vpc{
-			{IsDefault: aws.Bool(isDefault),
-				VpcId: aws.String(vpcID),
-			},
-		},
-	}
-	return output, nil
-}
-
-func TestStepPreValidate_checkVpc(t *testing.T) {
-	tt := []struct {
-		name          string
-		step          StepPreValidate
-		errorExpected bool
-	}{
-		{"DefaultVpc", StepPreValidate{VpcId: "vpc-default-id"}, false},
-		{"NonDefaultVpcNoSubnet", StepPreValidate{VpcId: "vpc-1234567890"}, true},
-		{"NonDefaultVpcWithSubnet", StepPreValidate{VpcId: "vpc-1234567890", SubnetId: "subnet-1234567890"}, false},
-		{"SubnetWithNoVpc", StepPreValidate{SubnetId: "subnet-1234567890"}, false},
-		{"NoVpcInformation", StepPreValidate{}, false},
-		{"NonDefaultVpcWithSubnetFilter", StepPreValidate{VpcId: "vpc-1234567890", HasSubnetFilter: true}, false},
-	}
-
-	mockConn, err := getMockConn(nil, "")
-	if err != nil {
-		t.Fatal("unable to get a mock connection")
-	}
-
-	for _, tc := range tt {
-		t.Run(tc.name, func(t *testing.T) {
-			err := tc.step.checkVpc(mockConn)
-
-			if tc.errorExpected && err == nil {
-				t.Errorf("expected a validation error for %q but got %q", tc.name, err)
-			}
-
-			if !tc.errorExpected && err != nil {
-				t.Errorf("expected a validation to pass for %q but got %q", tc.name, err)
-			}
-		})
-	}
-
-}

builder/amazon/common/step_run_spot_instance_test.go

@@ -1,366 +0,0 @@
-package common
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-)
-
-// Create statebag for running test
-func tStateSpot() multistep.StateBag {
-	state := new(multistep.BasicStateBag)
-	state.Put("ui", &packersdk.BasicUi{
-		Reader: new(bytes.Buffer),
-		Writer: new(bytes.Buffer),
-	})
-	state.Put("availability_zone", "us-east-1c")
-	state.Put("securityGroupIds", []string{"sg-0b8984db72f213dc3"})
-	state.Put("iamInstanceProfile", "packer-123")
-	state.Put("subnet_id", "subnet-077fde4e")
-	state.Put("source_image", "")
-	return state
-}
-
-func getBasicStep() *StepRunSpotInstance {
-	stepRunSpotInstance := StepRunSpotInstance{
-		PollingConfig:            new(AWSPollingConfig),
-		AssociatePublicIpAddress: false,
-		LaunchMappings:           BlockDevices{},
-		BlockDurationMinutes:     0,
-		Debug:                    false,
-		Comm: &communicator.Config{
-			SSH: communicator.SSH{
-				SSHKeyPairName: "foo",
-			},
-		},
-		EbsOptimized:                      false,
-		ExpectedRootDevice:                "ebs",
-		InstanceInitiatedShutdownBehavior: "stop",
-		InstanceType:                      "t2.micro",
-		Region:                            "us-east-1",
-		SourceAMI:                         "",
-		SpotPrice:                         "auto",
-		SpotTags:                          nil,
-		Tags:                              map[string]string{},
-		VolumeTags:                        nil,
-		UserData:                          "",
-		UserDataFile:                      "",
-	}
-
-	return &stepRunSpotInstance
-}
-
-func TestCreateTemplateData(t *testing.T) {
-	state := tStateSpot()
-	stepRunSpotInstance := getBasicStep()
-	template := stepRunSpotInstance.CreateTemplateData(aws.String("userdata"), "az", state,
-		&ec2.LaunchTemplateInstanceMarketOptionsRequest{})
-
-	// expected := []*ec2.LaunchTemplateInstanceNetworkInterfaceSpecificationRequest{
-	// 	&ec2.LaunchTemplateInstanceNetworkInterfaceSpecificationRequest{
-	// 		DeleteOnTermination: aws.Bool(true),
-	// 		DeviceIndex:         aws.Int64(0),
-	// 		Groups:              aws.StringSlice([]string{"sg-0b8984db72f213dc3"}),
-	// 		SubnetId:            aws.String("subnet-077fde4e"),
-	// 	},
-	// }
-	// if expected != template.NetworkInterfaces {
-	if template.NetworkInterfaces == nil {
-		t.Fatalf("Template should have contained a networkInterface object: recieved %#v", template.NetworkInterfaces)
-	}
-
-	if *template.IamInstanceProfile.Name != state.Get("iamInstanceProfile") {
-		t.Fatalf("Template should have contained a InstanceProfile name: recieved %#v", template.IamInstanceProfile.Name)
-	}
-
-	// Rerun, this time testing that we set security group IDs
-	state.Put("subnet_id", "")
-	template = stepRunSpotInstance.CreateTemplateData(aws.String("userdata"), "az", state,
-		&ec2.LaunchTemplateInstanceMarketOptionsRequest{})
-	if template.NetworkInterfaces != nil {
-		t.Fatalf("Template shouldn't contain network interfaces object if subnet_id is unset.")
-	}
-
-	// Rerun, this time testing that instance doesn't have instance profile is iamInstanceProfile is unset
-	state.Put("iamInstanceProfile", "")
-	template = stepRunSpotInstance.CreateTemplateData(aws.String("userdata"), "az", state,
-		&ec2.LaunchTemplateInstanceMarketOptionsRequest{})
-	fmt.Println(template.IamInstanceProfile)
-	if *template.IamInstanceProfile.Name != "" {
-		t.Fatalf("Template shouldn't contain instance profile if iamInstanceProfile is unset.")
-	}
-}
-
-func TestCreateTemplateData_NoEphemeral(t *testing.T) {
-	state := tStateSpot()
-	stepRunSpotInstance := getBasicStep()
-	stepRunSpotInstance.NoEphemeral = true
-	template := stepRunSpotInstance.CreateTemplateData(aws.String("userdata"), "az", state,
-		&ec2.LaunchTemplateInstanceMarketOptionsRequest{})
-	if len(template.BlockDeviceMappings) != 26 {
-		t.Fatalf("Should have created 26 mappings to keep ephemeral drives from appearing.")
-	}
-
-	// Now check that noEphemeral doesn't mess with the mappings in real life.
-	// state = tStateSpot()
-	// stepRunSpotInstance = getBasicStep()
-	// stepRunSpotInstance.NoEphemeral = true
-	// mappings := []*ec2.InstanceBlockDeviceMapping{
-	// 	&ec2.InstanceBlockDeviceMapping{
-	// 		DeviceName: "xvda",
-	// 		Ebs: {
-	// 			DeleteOnTermination: true,
-	// 			Status:              "attaching",
-	// 			VolumeId:            "vol-044cd49c330f21c05",
-	// 		},
-	// 	},
-	// 	&ec2.InstanceBlockDeviceMapping{
-	// 		DeviceName: "/dev/xvdf",
-	// 		Ebs: {
-	// 			DeleteOnTermination: false,
-	// 			Status:              "attaching",
-	// 			VolumeId:            "vol-0eefaf2d6ae35827e",
-	// 		},
-	// 	},
-	// }
-	// template = stepRunSpotInstance.CreateTemplateData(aws.String("userdata"), "az", state,
-	// 	&ec2.LaunchTemplateInstanceMarketOptionsRequest{})
-	// if len(*template.BlockDeviceMappings) != 26 {
-	// 	t.Fatalf("Should have created 26 mappings to keep ephemeral drives from appearing.")
-	// }
-}
-
-type runSpotEC2ConnMock struct {
-	ec2iface.EC2API
-
-	CreateLaunchTemplateParams []*ec2.CreateLaunchTemplateInput
-	CreateLaunchTemplateFn     func(*ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error)
-
-	CreateFleetParams []*ec2.CreateFleetInput
-	CreateFleetFn     func(*ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error)
-
-	CreateTagsParams []*ec2.CreateTagsInput
-	CreateTagsFn     func(*ec2.CreateTagsInput) (*ec2.CreateTagsOutput, error)
-
-	DescribeInstancesParams []*ec2.DescribeInstancesInput
-	DescribeInstancesFn     func(input *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error)
-}
-
-func (m *runSpotEC2ConnMock) CreateLaunchTemplate(req *ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) {
-	m.CreateLaunchTemplateParams = append(m.CreateLaunchTemplateParams, req)
-	resp, err := m.CreateLaunchTemplateFn(req)
-	return resp, err
-}
-
-func (m *runSpotEC2ConnMock) CreateFleet(req *ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error) {
-	m.CreateFleetParams = append(m.CreateFleetParams, req)
-	if m.CreateFleetFn != nil {
-		resp, err := m.CreateFleetFn(req)
-		return resp, err
-	} else {
-		return nil, nil
-	}
-}
-
-func (m *runSpotEC2ConnMock) DescribeInstances(req *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) {
-	m.DescribeInstancesParams = append(m.DescribeInstancesParams, req)
-	if m.DescribeInstancesFn != nil {
-		resp, err := m.DescribeInstancesFn(req)
-		return resp, err
-	} else {
-		return nil, nil
-	}
-}
-
-func (m *runSpotEC2ConnMock) CreateTags(req *ec2.CreateTagsInput) (*ec2.CreateTagsOutput, error) {
-	m.CreateTagsParams = append(m.CreateTagsParams, req)
-	if m.CreateTagsFn != nil {
-		resp, err := m.CreateTagsFn(req)
-		return resp, err
-	} else {
-		return nil, nil
-	}
-}
-
-func defaultEc2Mock(instanceId, spotRequestId, volumeId, launchTemplateId *string) *runSpotEC2ConnMock {
-	instance := &ec2.Instance{
-		InstanceId:            instanceId,
-		SpotInstanceRequestId: spotRequestId,
-		BlockDeviceMappings: []*ec2.InstanceBlockDeviceMapping{
-			{
-				Ebs: &ec2.EbsInstanceBlockDevice{
-					VolumeId: volumeId,
-				},
-			},
-		},
-	}
-	return &runSpotEC2ConnMock{
-		CreateLaunchTemplateFn: func(in *ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) {
-			return &ec2.CreateLaunchTemplateOutput{
-				LaunchTemplate: &ec2.LaunchTemplate{
-					LaunchTemplateId: launchTemplateId,
-				},
-				Warning: nil,
-			}, nil
-		},
-		CreateFleetFn: func(*ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error) {
-			return &ec2.CreateFleetOutput{
-				Errors:  nil,
-				FleetId: nil,
-				Instances: []*ec2.CreateFleetInstance{
-					{
-						InstanceIds: []*string{instanceId},
-					},
-				},
-			}, nil
-		},
-		DescribeInstancesFn: func(input *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) {
-			return &ec2.DescribeInstancesOutput{
-				NextToken: nil,
-				Reservations: []*ec2.Reservation{
-					{
-						Instances: []*ec2.Instance{instance},
-					},
-				},
-			}, nil
-		},
-	}
-}
-
-func TestRun(t *testing.T) {
-	instanceId := aws.String("test-instance-id")
-	spotRequestId := aws.String("spot-id")
-	volumeId := aws.String("volume-id")
-	launchTemplateId := aws.String("launchTemplateId")
-	ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId, launchTemplateId)
-
-	uiMock := packersdk.TestUi(t)
-
-	state := tStateSpot()
-	state.Put("ec2", ec2Mock)
-	state.Put("ui", uiMock)
-	state.Put("source_image", testImage())
-
-	stepRunSpotInstance := getBasicStep()
-	stepRunSpotInstance.Tags["Name"] = "Packer Builder"
-	stepRunSpotInstance.Tags["test-tag"] = "test-value"
-	stepRunSpotInstance.SpotTags = map[string]string{
-		"spot-tag": "spot-tag-value",
-	}
-	stepRunSpotInstance.VolumeTags = map[string]string{
-		"volume-tag": "volume-tag-value",
-	}
-
-	ctx := context.TODO()
-	action := stepRunSpotInstance.Run(ctx, state)
-
-	if err := state.Get("error"); err != nil {
-		t.Fatalf("should not error, but: %v", err)
-	}
-
-	if action != multistep.ActionContinue {
-		t.Fatalf("shoul continue, but: %v", action)
-	}
-
-	if len(ec2Mock.CreateLaunchTemplateParams) != 1 {
-		t.Fatalf("createLaunchTemplate should be invoked once, but invoked %v", len(ec2Mock.CreateLaunchTemplateParams))
-	}
-	launchTemplateName := ec2Mock.CreateLaunchTemplateParams[0].LaunchTemplateName
-
-	if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications) != 1 {
-		t.Fatalf("exactly one launch template tag specification expected")
-	}
-	if *ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].ResourceType != "launch-template" {
-		t.Fatalf("resource type 'launch-template' expected")
-	}
-	if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags) != 1 {
-		t.Fatalf("1 launch template tag expected")
-	}
-
-	nameTag := ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags[0]
-	if *nameTag.Key != "spot-tag" || *nameTag.Value != "spot-tag-value" {
-		t.Fatalf("expected spot-tag: spot-tag-value")
-	}
-
-	if len(ec2Mock.CreateFleetParams) != 1 {
-		t.Fatalf("createFleet should be invoked once, but invoked %v", len(ec2Mock.CreateLaunchTemplateParams))
-	}
-	if *ec2Mock.CreateFleetParams[0].TargetCapacitySpecification.DefaultTargetCapacityType != "spot" {
-		t.Fatalf("capacity type should be spot")
-	}
-	if *ec2Mock.CreateFleetParams[0].TargetCapacitySpecification.TotalTargetCapacity != 1 {
-		t.Fatalf("target capacity should be 1")
-	}
-	if len(ec2Mock.CreateFleetParams[0].LaunchTemplateConfigs) != 1 {
-		t.Fatalf("exactly one launch config template expected")
-	}
-	if *ec2Mock.CreateFleetParams[0].LaunchTemplateConfigs[0].LaunchTemplateSpecification.LaunchTemplateName != *launchTemplateName {
-		t.Fatalf("launchTemplateName should match in createLaunchTemplate and createFleet requests")
-	}
-
-	if len(ec2Mock.DescribeInstancesParams) != 1 {
-		t.Fatalf("describeInstancesParams should be invoked once, but invoked %v", len(ec2Mock.DescribeInstancesParams))
-	}
-	if *ec2Mock.DescribeInstancesParams[0].InstanceIds[0] != *instanceId {
-		t.Fatalf("instanceId should match from createFleet response")
-	}
-
-	uiMock.Say(fmt.Sprintf("%v", ec2Mock.CreateTagsParams))
-	if len(ec2Mock.CreateTagsParams) != 3 {
-		t.Fatalf("createTags should be invoked 3 times")
-	}
-	if len(ec2Mock.CreateTagsParams[0].Resources) != 1 || *ec2Mock.CreateTagsParams[0].Resources[0] != *spotRequestId {
-		t.Fatalf("should create tags for spot request")
-	}
-	if len(ec2Mock.CreateTagsParams[1].Resources) != 1 || *ec2Mock.CreateTagsParams[1].Resources[0] != *instanceId {
-		t.Fatalf("should create tags for instance")
-	}
-	if len(ec2Mock.CreateTagsParams[2].Resources) != 1 || ec2Mock.CreateTagsParams[2].Resources[0] != volumeId {
-		t.Fatalf("should create tags for volume")
-	}
-}
-
-func TestRun_NoSpotTags(t *testing.T) {
-	instanceId := aws.String("test-instance-id")
-	spotRequestId := aws.String("spot-id")
-	volumeId := aws.String("volume-id")
-	launchTemplateId := aws.String("lt-id")
-	ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId, launchTemplateId)
-
-	uiMock := packersdk.TestUi(t)
-
-	state := tStateSpot()
-	state.Put("ec2", ec2Mock)
-	state.Put("ui", uiMock)
-	state.Put("source_image", testImage())
-
-	stepRunSpotInstance := getBasicStep()
-	stepRunSpotInstance.Tags["Name"] = "Packer Builder"
-	stepRunSpotInstance.Tags["test-tag"] = "test-value"
-	stepRunSpotInstance.VolumeTags = map[string]string{
-		"volume-tag": "volume-tag-value",
-	}
-
-	ctx := context.TODO()
-	action := stepRunSpotInstance.Run(ctx, state)
-
-	if err := state.Get("error"); err != nil {
-		t.Fatalf("should not error, but: %v", err)
-	}
-
-	if action != multistep.ActionContinue {
-		t.Fatalf("shoul continue, but: %v", action)
-	}
-
-	if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications) != 0 {
-		t.Fatalf("0 launch template tags expected")
-	}
-}

builder/amazon/common/step_source_ami_info_test.go

@@ -1,43 +0,0 @@
-package common
-
-import (
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestStepSourceAmiInfo_PVImage(t *testing.T) {
-	err := new(StepSourceAMIInfo).canEnableEnhancedNetworking(&ec2.Image{
-		VirtualizationType: aws.String("paravirtual"),
-	})
-	assert.Error(t, err)
-}
-
-func TestStepSourceAmiInfo_HVMImage(t *testing.T) {
-	err := new(StepSourceAMIInfo).canEnableEnhancedNetworking(&ec2.Image{
-		VirtualizationType: aws.String("hvm"),
-	})
-	assert.NoError(t, err)
-}
-
-func TestStepSourceAmiInfo_PVImageWithAMIVirtPV(t *testing.T) {
-	stepSourceAMIInfo := StepSourceAMIInfo{
-		AMIVirtType: "paravirtual",
-	}
-	err := stepSourceAMIInfo.canEnableEnhancedNetworking(&ec2.Image{
-		VirtualizationType: aws.String("paravirtual"),
-	})
-	assert.Error(t, err)
-}
-
-func TestStepSourceAmiInfo_PVImageWithAMIVirtHVM(t *testing.T) {
-	stepSourceAMIInfo := StepSourceAMIInfo{
-		AMIVirtType: "hvm",
-	}
-	err := stepSourceAMIInfo.canEnableEnhancedNetworking(&ec2.Image{
-		VirtualizationType: aws.String("paravirtual"),
-	})
-	assert.NoError(t, err)
-}

builder/amazon/common/template_funcs_test.go

@@ -1,16 +0,0 @@
-package common
-
-import (
-	"testing"
-)
-
-func TestAMITemplatePrepare_clean(t *testing.T) {
-	origName := "AMZamz09()./-_:&^ $%[]#'@"
-	expected := "AMZamz09()./-_--- --[]-'@"
-
-	name := templateCleanAMIName(origName)
-
-	if name != expected {
-		t.Fatalf("template names do not match: expected %s got %s\n", expected, name)
-	}
-}

builder/amazon/ebs/acceptance/test-fixtures/amazon-ebs.txt

@@ -1,12 +0,0 @@
-{
-  "type": "amazon-ebs",
-  "ami_name": "packer-acc-test",
-  "instance_type": "m1.small",
-  "region": "us-east-1",
-  "ssh_username": "ubuntu",
-  "source_ami": "ami-0568456c",
-  "force_deregister" : true,
-  "tags": {
-    "packer-test": "true"
-  }
-}

builder/amazon/ebs/acceptance/test-fixtures/amazon-ebs_windows.txt

@@ -1,23 +0,0 @@
-{
- "type": "amazon-ebs",
- "region": "us-east-1",
-  "instance_type": "t2.micro",
-  "source_ami_filter": {
-    "filters": {
-      "virtualization-type": "hvm",
-      "name": "*Windows_Server-2012-R2*English-64Bit-Base*",
-      "root-device-type": "ebs"
-    },
-    "most_recent": true,
-    "owners": "amazon"
-  },
-  "ami_name": "packer-acc-test",
-  "user_data_file": "../../builder/amazon/ebs/acceptance/test-fixtures/scripts/bootstrap_win.txt",
-  "communicator": "winrm",
-  "winrm_username": "Administrator",
-  "winrm_password": "SuperS3cr3t!!!!",
-  "force_deregister" : true,
-  "tags": {
-    "packer-test": "true"
-  }
-}

builder/amazon/ebs/acceptance/test-fixtures/scripts/bootstrap_win.txt

@@ -1,40 +0,0 @@
-<powershell>
-# Set administrator password
-net user Administrator SuperS3cr3t!!!!
-wmic useraccount where "name='Administrator'" set PasswordExpires=FALSE
-
-# First, make sure WinRM can't be connected to
-netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" new enable=yes action=block
-
-# Delete any existing WinRM listeners
-winrm delete winrm/config/listener?Address=*+Transport=HTTP  2>$Null
-winrm delete winrm/config/listener?Address=*+Transport=HTTPS 2>$Null
-
-# Disable group policies which block basic authentication and unencrypted login
-
-Set-ItemProperty -Path HKLM:\Software\Policies\Microsoft\Windows\WinRM\Client -Name AllowBasic -Value 1
-Set-ItemProperty -Path HKLM:\Software\Policies\Microsoft\Windows\WinRM\Client -Name AllowUnencryptedTraffic -Value 1
-Set-ItemProperty -Path HKLM:\Software\Policies\Microsoft\Windows\WinRM\Service -Name AllowBasic -Value 1
-Set-ItemProperty -Path HKLM:\Software\Policies\Microsoft\Windows\WinRM\Service -Name AllowUnencryptedTraffic -Value 1
-
-
-# Create a new WinRM listener and configure
-winrm create winrm/config/listener?Address=*+Transport=HTTP
-winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="0"}'
-winrm set winrm/config '@{MaxTimeoutms="7200000"}'
-winrm set winrm/config/service '@{AllowUnencrypted="true"}'
-winrm set winrm/config/service '@{MaxConcurrentOperationsPerUser="12000"}'
-winrm set winrm/config/service/auth '@{Basic="true"}'
-winrm set winrm/config/client/auth '@{Basic="true"}'
-
-# Configure UAC to allow privilege elevation in remote shells
-$Key = 'HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System'
-$Setting = 'LocalAccountTokenFilterPolicy'
-Set-ItemProperty -Path $Key -Name $Setting -Value 1 -Force
-
-# Configure and restart the WinRM Service; Enable the required firewall exception
-Stop-Service -Name WinRM
-Set-Service -Name WinRM -StartupType Automatic
-netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" new action=allow localip=any remoteip=any
-Start-Service -Name WinRM
-</powershell>

builder/amazon/ebs/builder_acc_test.go

@@ -1,396 +0,0 @@
-/*
-Deregister the test image with
-aws ec2 deregister-image --image-id $(aws ec2 describe-images --output text --filters "Name=name,Values=packer-test-packer-test-dereg" --query 'Images[*].{ID:ImageId}')
-*/
-package ebs
-
-import (
-	"fmt"
-	"os"
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	builderT "github.com/hashicorp/packer-plugin-sdk/acctest"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer/builder/amazon/common"
-)
-
-func TestBuilderAcc_basic(t *testing.T) {
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: testBuilderAccBasic,
-	})
-}
-
-func TestBuilderAcc_regionCopy(t *testing.T) {
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: testBuilderAccRegionCopy,
-		Check:    checkRegionCopy([]string{"us-east-1", "us-west-2"}),
-	})
-}
-
-func TestBuilderAcc_forceDeregister(t *testing.T) {
-	// Build the same AMI name twice, with force_deregister on the second run
-	builderT.Test(t, builderT.TestCase{
-		PreCheck:             func() { testAccPreCheck(t) },
-		Builder:              &Builder{},
-		Template:             buildForceDeregisterConfig("false", "dereg"),
-		SkipArtifactTeardown: true,
-	})
-
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: buildForceDeregisterConfig("true", "dereg"),
-	})
-}
-
-func TestBuilderAcc_forceDeleteSnapshot(t *testing.T) {
-	amiName := "packer-test-dereg"
-
-	// Build the same AMI name twice, with force_delete_snapshot on the second run
-	builderT.Test(t, builderT.TestCase{
-		PreCheck:             func() { testAccPreCheck(t) },
-		Builder:              &Builder{},
-		Template:             buildForceDeleteSnapshotConfig("false", amiName),
-		SkipArtifactTeardown: true,
-	})
-
-	// Get image data by AMI name
-	ec2conn, _ := testEC2Conn()
-	describeInput := &ec2.DescribeImagesInput{Filters: []*ec2.Filter{
-		{
-			Name:   aws.String("name"),
-			Values: []*string{aws.String(amiName)},
-		},
-	}}
-	ec2conn.WaitUntilImageExists(describeInput)
-	imageResp, _ := ec2conn.DescribeImages(describeInput)
-	image := imageResp.Images[0]
-
-	// Get snapshot ids for image
-	snapshotIds := []*string{}
-	for _, device := range image.BlockDeviceMappings {
-		if device.Ebs != nil && device.Ebs.SnapshotId != nil {
-			snapshotIds = append(snapshotIds, device.Ebs.SnapshotId)
-		}
-	}
-
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: buildForceDeleteSnapshotConfig("true", amiName),
-		Check:    checkSnapshotsDeleted(snapshotIds),
-	})
-}
-
-func checkSnapshotsDeleted(snapshotIds []*string) builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
-		// Verify the snapshots are gone
-		ec2conn, _ := testEC2Conn()
-		snapshotResp, _ := ec2conn.DescribeSnapshots(
-			&ec2.DescribeSnapshotsInput{SnapshotIds: snapshotIds},
-		)
-
-		if len(snapshotResp.Snapshots) > 0 {
-			return fmt.Errorf("Snapshots weren't successfully deleted by `force_delete_snapshot`")
-		}
-		return nil
-	}
-}
-
-func TestBuilderAcc_amiSharing(t *testing.T) {
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccSharingPreCheck(t) },
-		Builder:  &Builder{},
-		Template: buildSharingConfig(os.Getenv("TESTACC_AWS_ACCOUNT_ID")),
-		Check:    checkAMISharing(2, os.Getenv("TESTACC_AWS_ACCOUNT_ID"), "all"),
-	})
-}
-
-func TestBuilderAcc_encryptedBoot(t *testing.T) {
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: testBuilderAccEncrypted,
-		Check:    checkBootEncrypted(),
-	})
-}
-
-func checkAMISharing(count int, uid, group string) builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
-		if len(artifacts) > 1 {
-			return fmt.Errorf("more than 1 artifact")
-		}
-
-		// Get the actual *Artifact pointer so we can access the AMIs directly
-		artifactRaw := artifacts[0]
-		artifact, ok := artifactRaw.(*common.Artifact)
-		if !ok {
-			return fmt.Errorf("unknown artifact: %#v", artifactRaw)
-		}
-
-		// describe the image, get block devices with a snapshot
-		ec2conn, _ := testEC2Conn()
-		imageResp, err := ec2conn.DescribeImageAttribute(&ec2.DescribeImageAttributeInput{
-			Attribute: aws.String("launchPermission"),
-			ImageId:   aws.String(artifact.Amis["us-east-1"]),
-		})
-
-		if err != nil {
-			return fmt.Errorf("Error retrieving Image Attributes for AMI Artifact (%#v) in AMI Sharing Test: %s", artifact, err)
-		}
-
-		// Launch Permissions are in addition to the userid that created it, so if
-		// you add 3 additional ami_users, you expect 2 Launch Permissions here
-		if len(imageResp.LaunchPermissions) != count {
-			return fmt.Errorf("Error in Image Attributes, expected (%d) Launch Permissions, got (%d)", count, len(imageResp.LaunchPermissions))
-		}
-
-		userFound := false
-		for _, lp := range imageResp.LaunchPermissions {
-			if lp.UserId != nil && uid == *lp.UserId {
-				userFound = true
-			}
-		}
-
-		if !userFound {
-			return fmt.Errorf("Error in Image Attributes, expected User ID (%s) to have Launch Permissions, but was not found", uid)
-		}
-
-		groupFound := false
-		for _, lp := range imageResp.LaunchPermissions {
-			if lp.Group != nil && group == *lp.Group {
-				groupFound = true
-			}
-		}
-
-		if !groupFound {
-			return fmt.Errorf("Error in Image Attributes, expected Group ID (%s) to have Launch Permissions, but was not found", group)
-		}
-
-		return nil
-	}
-}
-
-func checkRegionCopy(regions []string) builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
-		if len(artifacts) > 1 {
-			return fmt.Errorf("more than 1 artifact")
-		}
-
-		// Get the actual *Artifact pointer so we can access the AMIs directly
-		artifactRaw := artifacts[0]
-		artifact, ok := artifactRaw.(*common.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.Amis {
-			if _, ok := regionSet[r]; !ok {
-				return fmt.Errorf("unknown region: %s", r)
-			}
-
-			delete(regionSet, r)
-		}
-		if len(regionSet) > 0 {
-			return fmt.Errorf("didn't copy to: %#v", regionSet)
-		}
-
-		return nil
-	}
-}
-
-func checkBootEncrypted() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
-
-		// Get the actual *Artifact pointer so we can access the AMIs directly
-		artifactRaw := artifacts[0]
-		artifact, ok := artifactRaw.(*common.Artifact)
-		if !ok {
-			return fmt.Errorf("unknown artifact: %#v", artifactRaw)
-		}
-
-		// describe the image, get block devices with a snapshot
-		ec2conn, _ := testEC2Conn()
-		imageResp, err := ec2conn.DescribeImages(&ec2.DescribeImagesInput{
-			ImageIds: []*string{aws.String(artifact.Amis["us-east-1"])},
-		})
-
-		if err != nil {
-			return fmt.Errorf("Error retrieving Image Attributes for AMI (%s) in AMI Encrypted Boot Test: %s", artifact, err)
-		}
-
-		image := imageResp.Images[0] // Only requested a single AMI ID
-
-		rootDeviceName := image.RootDeviceName
-
-		for _, bd := range image.BlockDeviceMappings {
-			if *bd.DeviceName == *rootDeviceName {
-				if *bd.Ebs.Encrypted != true {
-					return fmt.Errorf("volume not encrypted: %s", *bd.Ebs.SnapshotId)
-				}
-			}
-		}
-
-		return nil
-	}
-}
-
-func TestBuilderAcc_SessionManagerInterface(t *testing.T) {
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: testBuilderAccSessionManagerInterface,
-	})
-}
-
-func testAccPreCheck(t *testing.T) {
-}
-
-func testAccSharingPreCheck(t *testing.T) {
-	if v := os.Getenv("TESTACC_AWS_ACCOUNT_ID"); v == "" {
-		t.Fatal(fmt.Sprintf("TESTACC_AWS_ACCOUNT_ID must be set for acceptance tests"))
-	}
-}
-
-func testEC2Conn() (*ec2.EC2, error) {
-	access := &common.AccessConfig{RawRegion: "us-east-1"}
-	session, err := access.Session()
-	if err != nil {
-		return nil, err
-	}
-
-	return ec2.New(session), nil
-}
-
-const testBuilderAccBasic = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "us-east-1",
-		"instance_type": "m3.medium",
-		"source_ami": "ami-76b2a71e",
-		"ssh_username": "ubuntu",
-		"ami_name": "packer-test {{timestamp}}"
-	}]
-}
-`
-
-const testBuilderAccRegionCopy = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "us-east-1",
-		"instance_type": "m3.medium",
-		"source_ami": "ami-76b2a71e",
-		"ssh_username": "ubuntu",
-		"ami_name": "packer-test {{timestamp}}",
-		"ami_regions": ["us-east-1", "us-west-2"]
-	}]
-}
-`
-
-const testBuilderAccForceDeregister = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "us-east-1",
-		"instance_type": "m3.medium",
-		"source_ami": "ami-76b2a71e",
-		"ssh_username": "ubuntu",
-		"force_deregister": "%s",
-		"ami_name": "%s"
-	}]
-}
-`
-
-const testBuilderAccForceDeleteSnapshot = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "us-east-1",
-		"instance_type": "m3.medium",
-		"source_ami": "ami-76b2a71e",
-		"ssh_username": "ubuntu",
-		"force_deregister": "%s",
-		"force_delete_snapshot": "%s",
-		"ami_name": "%s"
-	}]
-}
-`
-
-const testBuilderAccSharing = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "us-east-1",
-		"instance_type": "m3.medium",
-		"source_ami": "ami-76b2a71e",
-		"ssh_username": "ubuntu",
-		"ami_name": "packer-test {{timestamp}}",
-		"ami_users":["%s"],
-		"ami_groups":["all"]
-	}]
-}
-`
-
-const testBuilderAccEncrypted = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "us-east-1",
-		"instance_type": "m3.medium",
-		"source_ami":"ami-c15bebaa",
-		"ssh_username": "ubuntu",
-		"ami_name": "packer-enc-test {{timestamp}}",
-		"encrypt_boot": true
-	}]
-}
-`
-
-const testBuilderAccSessionManagerInterface = `
-{
-	"builders": [{
-		"type": "test",
-		"region": "us-east-1",
-		"instance_type": "m3.medium",
-		"source_ami_filter": {
-				"filters": {
-						"virtualization-type": "hvm",
-						"name": "ubuntu/images/*ubuntu-xenial-16.04-amd64-server-*",
-						"root-device-type": "ebs"
-				},
-				"owners": [
-						"099720109477"
-				],
-				"most_recent": true
-		},
-		"ssh_username": "ubuntu",
-		"ssh_interface": "session_manager",
-		"iam_instance_profile": "SSMInstanceProfile",
-		"ami_name": "packer-ssm-test-{{timestamp}}"
-	}]
-}
-`
-
-func buildForceDeregisterConfig(val, name string) string {
-	return fmt.Sprintf(testBuilderAccForceDeregister, val, name)
-}
-
-func buildForceDeleteSnapshotConfig(val, name string) string {
-	return fmt.Sprintf(testBuilderAccForceDeleteSnapshot, val, val, name)
-}
-
-func buildSharingConfig(val string) string {
-	return fmt.Sprintf(testBuilderAccSharing, val)
-}

builder/amazon/ebs/builder_test.go

@@ -1,166 +0,0 @@
-package ebs
-
-import (
-	"testing"
-
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-)
-
-func testConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"access_key":    "foo",
-		"secret_key":    "bar",
-		"source_ami":    "foo",
-		"instance_type": "foo",
-		"region":        "us-east-1",
-		"ssh_username":  "root",
-		"ami_name":      "foo",
-	}
-}
-
-func TestBuilder_ImplementsBuilder(t *testing.T) {
-	var raw interface{}
-	raw = &Builder{}
-	if _, ok := raw.(packersdk.Builder); !ok {
-		t.Fatalf("Builder should be a builder")
-	}
-}
-
-func TestBuilder_Prepare_BadType(t *testing.T) {
-	b := &Builder{}
-	c := map[string]interface{}{
-		"access_key": []string{},
-	}
-
-	_, warnings, err := b.Prepare(c)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatalf("prepare should fail")
-	}
-}
-
-func TestBuilderPrepare_AMIName(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	// Test good
-	config["ami_name"] = "foo"
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	// Test bad
-	config["ami_name"] = "foo {{"
-	b = Builder{}
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-
-	// Test bad
-	delete(config, "ami_name")
-	b = Builder{}
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-}
-
-func TestBuilderPrepare_InvalidKey(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	// Add a random key
-	config["i_should_not_be_valid"] = true
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-}
-
-func TestBuilderPrepare_InvalidShutdownBehavior(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	// Test good
-	config["shutdown_behavior"] = "terminate"
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	// Test good
-	config["shutdown_behavior"] = "stop"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	// Test bad
-	config["shutdown_behavior"] = "foobar"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-}
-
-func TestBuilderPrepare_ReturnGeneratedData(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	generatedData, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
-	if generatedData[0] != "SourceAMIName" {
-		t.Fatalf("Generated data should contain SourceAMIName")
-	}
-	if generatedData[1] != "BuildRegion" {
-		t.Fatalf("Generated data should contain BuildRegion")
-	}
-	if generatedData[2] != "SourceAMI" {
-		t.Fatalf("Generated data should contain SourceAMI")
-	}
-	if generatedData[3] != "SourceAMICreationDate" {
-		t.Fatalf("Generated data should contain SourceAMICreationDate")
-	}
-	if generatedData[4] != "SourceAMIOwner" {
-		t.Fatalf("Generated data should contain SourceAMIOwner")
-	}
-	if generatedData[5] != "SourceAMIOwnerName" {
-		t.Fatalf("Generated data should contain SourceAMIOwnerName")
-	}
-}

builder/amazon/ebs/tags_acc_test.go

@@ -1,137 +0,0 @@
-package ebs
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	builderT "github.com/hashicorp/packer-plugin-sdk/acctest"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer/builder/amazon/common"
-)
-
-type TFBuilder struct {
-	Type         string            `json:"type"`
-	Region       string            `json:"region"`
-	SourceAmi    string            `json:"source_ami"`
-	InstanceType string            `json:"instance_type"`
-	SshUsername  string            `json:"ssh_username"`
-	AmiName      string            `json:"ami_name"`
-	Tags         map[string]string `json:"tags"`
-	SnapshotTags map[string]string `json:"snapshot_tags"`
-}
-
-type TFConfig struct {
-	Builders []TFBuilder `json:"builders"`
-}
-
-func TestBuilderTagsAcc_basic(t *testing.T) {
-	builderT.Test(t, builderT.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		Builder:  &Builder{},
-		Template: testBuilderTagsAccBasic,
-		Check:    checkTags(),
-	})
-}
-
-func checkTags() builderT.TestCheckFunc {
-	return func(artifacts []packersdk.Artifact) error {
-		if len(artifacts) > 1 {
-			return fmt.Errorf("more than 1 artifact")
-		}
-
-		config := TFConfig{}
-		json.Unmarshal([]byte(testBuilderTagsAccBasic), &config)
-		tags := config.Builders[0].Tags
-		snapshotTags := config.Builders[0].SnapshotTags
-
-		// Get the actual *Artifact pointer so we can access the AMIs directly
-		artifactRaw := artifacts[0]
-		artifact, ok := artifactRaw.(*common.Artifact)
-		if !ok {
-			return fmt.Errorf("unknown artifact: %#v", artifactRaw)
-		}
-
-		// Describe the image, get block devices with a snapshot
-		ec2conn, _ := testEC2Conn()
-		imageResp, err := ec2conn.DescribeImages(&ec2.DescribeImagesInput{
-			ImageIds: []*string{aws.String(artifact.Amis["us-east-1"])},
-		})
-
-		if err != nil {
-			return fmt.Errorf("Error retrieving details for AMI Artifact (%#v) in Tags Test: %s", artifact, err)
-		}
-
-		if len(imageResp.Images) == 0 {
-			return fmt.Errorf("No images found for AMI Artifact (%#v) in Tags Test: %s", artifact, err)
-		}
-
-		image := imageResp.Images[0]
-
-		// Check only those with a Snapshot ID, i.e. not Ephemeral
-		var snapshots []*string
-		for _, device := range image.BlockDeviceMappings {
-			if device.Ebs != nil && device.Ebs.SnapshotId != nil {
-				snapshots = append(snapshots, device.Ebs.SnapshotId)
-			}
-		}
-
-		// Grab matching snapshot info
-		resp, err := ec2conn.DescribeSnapshots(&ec2.DescribeSnapshotsInput{
-			SnapshotIds: snapshots,
-		})
-
-		if err != nil {
-			return fmt.Errorf("Error retrieving Snapshots for AMI Artifact (%#v) in Tags Test: %s", artifact, err)
-		}
-
-		if len(resp.Snapshots) == 0 {
-			return fmt.Errorf("No Snapshots found for AMI Artifact (%#v) in Tags Test", artifact)
-		}
-
-		// Grab the snapshots, check the tags
-		for _, s := range resp.Snapshots {
-			expected := len(tags)
-			for _, t := range s.Tags {
-				for key, value := range tags {
-					if val, ok := snapshotTags[key]; ok && val == *t.Value {
-						expected--
-					} else if key == *t.Key && value == *t.Value {
-						expected--
-					}
-				}
-			}
-
-			if expected > 0 {
-				return fmt.Errorf("Not all tags found")
-			}
-		}
-
-		return nil
-	}
-}
-
-const testBuilderTagsAccBasic = `
-{
-  "builders": [
-    {
-      "type": "test",
-      "region": "us-east-1",
-      "source_ami": "ami-9eaa1cf6",
-      "instance_type": "t2.micro",
-      "ssh_username": "ubuntu",
-      "ami_name": "packer-tags-testing-{{timestamp}}",
-      "tags": {
-        "OS_Version": "Ubuntu",
-        "Release": "Latest",
-        "Name": "Bleep"
-      },
-      "snapshot_tags": {
-        "Name": "Foobar"
-      }
-    }
-  ]
-}
-`

builder/amazon/ebssurrogate/builder_test.go

@@ -1,110 +0,0 @@
-package ebssurrogate
-
-import (
-	"testing"
-
-	"github.com/hashicorp/packer/builder/amazon/common"
-
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-)
-
-func testConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"access_key":    "foo",
-		"secret_key":    "bar",
-		"source_ami":    "foo",
-		"instance_type": "foo",
-		"region":        "us-east-1",
-		"ssh_username":  "root",
-	}
-}
-
-func TestBuilder_ImplementsBuilder(t *testing.T) {
-	var raw interface{}
-	raw = &Builder{}
-	if _, ok := raw.(packersdk.Builder); !ok {
-		t.Fatal("Builder should be a builder")
-	}
-}
-
-func TestBuilder_Prepare_BadType(t *testing.T) {
-	b := &Builder{}
-	c := map[string]interface{}{
-		"access_key": []string{},
-	}
-
-	_, warnings, err := b.Prepare(c)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("prepare should fail")
-	}
-}
-
-func TestBuilderPrepare_InvalidKey(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	// Add a random key
-	config["i_should_not_be_valid"] = true
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-}
-
-func TestBuilderPrepare_ReturnGeneratedData(t *testing.T) {
-	var b Builder
-	// Basic configuration
-	b.config.RootDevice = RootBlockDevice{
-		SourceDeviceName: "device name",
-		DeviceName:       "device name",
-	}
-	b.config.LaunchMappings = BlockDevices{
-		BlockDevice{
-			BlockDevice: common.BlockDevice{
-				DeviceName: "device name",
-			},
-			OmitFromArtifact: false,
-		},
-	}
-	b.config.AMIVirtType = "type"
-	config := testConfig()
-	config["ami_name"] = "name"
-
-	generatedData, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
-	if generatedData[0] != "SourceAMIName" {
-		t.Fatalf("Generated data should contain SourceAMIName")
-	}
-	if generatedData[1] != "BuildRegion" {
-		t.Fatalf("Generated data should contain BuildRegion")
-	}
-	if generatedData[2] != "SourceAMI" {
-		t.Fatalf("Generated data should contain SourceAMI")
-	}
-	if generatedData[3] != "SourceAMICreationDate" {
-		t.Fatalf("Generated data should contain SourceAMICreationDate")
-	}
-	if generatedData[4] != "SourceAMIOwner" {
-		t.Fatalf("Generated data should contain SourceAMIOwner")
-	}
-	if generatedData[5] != "SourceAMIOwnerName" {
-		t.Fatalf("Generated data should contain SourceAMIOwnerName")
-	}
-}

builder/amazon/ebssurrogate/step_register_ami_test.go

@@ -1,249 +0,0 @@
-package ebssurrogate
-
-import (
-	"reflect"
-	"sort"
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder/amazon/common"
-)
-
-const sourceDeviceName = "/dev/xvdf"
-const rootDeviceName = "/dev/xvda"
-
-func newStepRegisterAMI(amiDevices, launchDevices []*ec2.BlockDeviceMapping) *StepRegisterAMI {
-	return &StepRegisterAMI{
-		RootDevice: RootBlockDevice{
-			SourceDeviceName:    sourceDeviceName,
-			DeviceName:          rootDeviceName,
-			DeleteOnTermination: true,
-			VolumeType:          "ebs",
-			VolumeSize:          10,
-		},
-		AMIDevices:    amiDevices,
-		LaunchDevices: launchDevices,
-		PollingConfig: new(common.AWSPollingConfig),
-	}
-}
-
-func sorted(devices []*ec2.BlockDeviceMapping) []*ec2.BlockDeviceMapping {
-	sort.SliceStable(devices, func(i, j int) bool {
-		return *devices[i].DeviceName < *devices[j].DeviceName
-	})
-	return devices
-}
-
-func TestStepRegisterAmi_combineDevices(t *testing.T) {
-	cases := []struct {
-		snapshotIds   map[string]string
-		amiDevices    []*ec2.BlockDeviceMapping
-		launchDevices []*ec2.BlockDeviceMapping
-		allDevices    []*ec2.BlockDeviceMapping
-	}{
-		{
-			snapshotIds:   map[string]string{},
-			amiDevices:    []*ec2.BlockDeviceMapping{},
-			launchDevices: []*ec2.BlockDeviceMapping{},
-			allDevices:    []*ec2.BlockDeviceMapping{},
-		},
-		{
-			snapshotIds: map[string]string{},
-			amiDevices:  []*ec2.BlockDeviceMapping{},
-			launchDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs:        &ec2.EbsBlockDevice{},
-					DeviceName: aws.String(sourceDeviceName),
-				},
-			},
-			allDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs:        &ec2.EbsBlockDevice{},
-					DeviceName: aws.String(rootDeviceName),
-				},
-			},
-		},
-		{
-			// Minimal single device
-			snapshotIds: map[string]string{
-				sourceDeviceName: "snap-0123456789abcdef1",
-			},
-			amiDevices: []*ec2.BlockDeviceMapping{},
-			launchDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs:        &ec2.EbsBlockDevice{},
-					DeviceName: aws.String(sourceDeviceName),
-				},
-			},
-			allDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						SnapshotId: aws.String("snap-0123456789abcdef1"),
-					},
-					DeviceName: aws.String(rootDeviceName),
-				},
-			},
-		},
-		{
-			// Single launch device with AMI device
-			snapshotIds: map[string]string{
-				sourceDeviceName: "snap-0123456789abcdef1",
-			},
-			amiDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs:        &ec2.EbsBlockDevice{},
-					DeviceName: aws.String("/dev/xvdg"),
-				},
-			},
-			launchDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs:        &ec2.EbsBlockDevice{},
-					DeviceName: aws.String(sourceDeviceName),
-				},
-			},
-			allDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						SnapshotId: aws.String("snap-0123456789abcdef1"),
-					},
-					DeviceName: aws.String(rootDeviceName),
-				},
-				{
-					Ebs:        &ec2.EbsBlockDevice{},
-					DeviceName: aws.String("/dev/xvdg"),
-				},
-			},
-		},
-		{
-			// Multiple launch devices
-			snapshotIds: map[string]string{
-				sourceDeviceName: "snap-0123456789abcdef1",
-				"/dev/xvdg":      "snap-0123456789abcdef2",
-			},
-			amiDevices: []*ec2.BlockDeviceMapping{},
-			launchDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs:        &ec2.EbsBlockDevice{},
-					DeviceName: aws.String(sourceDeviceName),
-				},
-				{
-					Ebs:        &ec2.EbsBlockDevice{},
-					DeviceName: aws.String("/dev/xvdg"),
-				},
-			},
-			allDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						SnapshotId: aws.String("snap-0123456789abcdef1"),
-					},
-					DeviceName: aws.String(rootDeviceName),
-				},
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						SnapshotId: aws.String("snap-0123456789abcdef2"),
-					},
-					DeviceName: aws.String("/dev/xvdg"),
-				},
-			},
-		},
-		{
-			// Multiple launch devices with encryption
-			snapshotIds: map[string]string{
-				sourceDeviceName: "snap-0123456789abcdef1",
-				"/dev/xvdg":      "snap-0123456789abcdef2",
-			},
-			amiDevices: []*ec2.BlockDeviceMapping{},
-			launchDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						Encrypted: aws.Bool(true),
-					},
-					DeviceName: aws.String(sourceDeviceName),
-				},
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						Encrypted: aws.Bool(true),
-					},
-					DeviceName: aws.String("/dev/xvdg"),
-				},
-			},
-			allDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						SnapshotId: aws.String("snap-0123456789abcdef1"),
-						// Encrypted: true stripped from snapshotted devices
-					},
-					DeviceName: aws.String(rootDeviceName),
-				},
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						SnapshotId: aws.String("snap-0123456789abcdef2"),
-					},
-					DeviceName: aws.String("/dev/xvdg"),
-				},
-			},
-		},
-		{
-			// Multiple launch devices and AMI devices with encryption
-			snapshotIds: map[string]string{
-				sourceDeviceName: "snap-0123456789abcdef1",
-				"/dev/xvdg":      "snap-0123456789abcdef2",
-			},
-			amiDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						Encrypted: aws.Bool(true),
-						KmsKeyId:  aws.String("keyId"),
-					},
-					// Source device name can be used in AMI devices
-					// since launch device of same name gets renamed
-					// to root device name
-					DeviceName: aws.String(sourceDeviceName),
-				},
-			},
-			launchDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						Encrypted: aws.Bool(true),
-					},
-					DeviceName: aws.String(sourceDeviceName),
-				},
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						Encrypted: aws.Bool(true),
-					},
-					DeviceName: aws.String("/dev/xvdg"),
-				},
-			},
-			allDevices: []*ec2.BlockDeviceMapping{
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						Encrypted: aws.Bool(true),
-						KmsKeyId:  aws.String("keyId"),
-					},
-					DeviceName: aws.String(sourceDeviceName),
-				},
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						SnapshotId: aws.String("snap-0123456789abcdef1"),
-					},
-					DeviceName: aws.String(rootDeviceName),
-				},
-				{
-					Ebs: &ec2.EbsBlockDevice{
-						SnapshotId: aws.String("snap-0123456789abcdef2"),
-					},
-					DeviceName: aws.String("/dev/xvdg"),
-				},
-			},
-		},
-	}
-	for _, tc := range cases {
-		stepRegisterAmi := newStepRegisterAMI(tc.amiDevices, tc.launchDevices)
-		allDevices := stepRegisterAmi.combineDevices(tc.snapshotIds)
-		if !reflect.DeepEqual(sorted(allDevices), sorted(tc.allDevices)) {
-			t.Fatalf("Unexpected output from combineDevices")
-		}
-	}
-}

builder/amazon/ebsvolume/artifact_test.go

@@ -1,29 +0,0 @@
-package ebsvolume
-
-import "testing"
-
-func TestArtifactState(t *testing.T) {
-	expectedData := "this is the data"
-	artifact := &Artifact{
-		StateData: map[string]interface{}{"state_data": expectedData},
-	}
-
-	// Valid state
-	result := artifact.State("state_data")
-	if result != expectedData {
-		t.Fatalf("Bad: State data was %s instead of %s", result, expectedData)
-	}
-
-	// Invalid state
-	result = artifact.State("invalid_key")
-	if result != nil {
-		t.Fatalf("Bad: State should be nil for invalid state data name")
-	}
-
-	// Nil StateData should not fail and should return nil
-	artifact = &Artifact{}
-	result = artifact.State("key")
-	if result != nil {
-		t.Fatalf("Bad: State should be nil for nil StateData")
-	}
-}

builder/amazon/ebsvolume/builder_test.go

@@ -1,166 +0,0 @@
-package ebsvolume
-
-import (
-	"testing"
-
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-)
-
-func testConfig() map[string]interface{} {
-	return map[string]interface{}{
-		"access_key":    "foo",
-		"secret_key":    "bar",
-		"source_ami":    "foo",
-		"instance_type": "foo",
-		"region":        "us-east-1",
-		"ssh_username":  "root",
-	}
-}
-
-func TestBuilder_ImplementsBuilder(t *testing.T) {
-	var raw interface{}
-	raw = &Builder{}
-	if _, ok := raw.(packersdk.Builder); !ok {
-		t.Fatalf("Builder should be a builder")
-	}
-}
-
-func TestBuilder_Prepare_BadType(t *testing.T) {
-	b := &Builder{}
-	c := map[string]interface{}{
-		"access_key": []string{},
-	}
-
-	_, warnings, err := b.Prepare(c)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatalf("prepare should fail")
-	}
-}
-
-func TestBuilderPrepare_InvalidKey(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	// Add a random key
-	config["i_should_not_be_valid"] = true
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-}
-
-func TestBuilderPrepare_InvalidShutdownBehavior(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	// Test good
-	config["shutdown_behavior"] = "terminate"
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	// Test good
-	config["shutdown_behavior"] = "stop"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	// Test bad
-	config["shutdown_behavior"] = "foobar"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-}
-
-func TestBuilderPrepare_ReturnGeneratedData(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	generatedData, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
-	if generatedData[0] != "SourceAMIName" {
-		t.Fatalf("Generated data should contain SourceAMIName")
-	}
-	if generatedData[1] != "BuildRegion" {
-		t.Fatalf("Generated data should contain BuildRegion")
-	}
-	if generatedData[2] != "SourceAMI" {
-		t.Fatalf("Generated data should contain SourceAMI")
-	}
-	if generatedData[3] != "SourceAMICreationDate" {
-		t.Fatalf("Generated data should contain SourceAMICreationDate")
-	}
-	if generatedData[4] != "SourceAMIOwner" {
-		t.Fatalf("Generated data should contain SourceAMIOwner")
-	}
-	if generatedData[5] != "SourceAMIOwnerName" {
-		t.Fatalf("Generated data should contain SourceAMIOwnerName")
-	}
-}
-
-func TestBuidler_ConfigBlockdevicemapping(t *testing.T) {
-	var b Builder
-	config := testConfig()
-
-	//Set some snapshot settings
-	config["ebs_volumes"] = []map[string]interface{}{
-		{
-			"device_name":           "/dev/xvdb",
-			"volume_size":           "32",
-			"delete_on_termination": true,
-		},
-		{
-			"device_name":           "/dev/xvdc",
-			"volume_size":           "32",
-			"delete_on_termination": true,
-			"snapshot_tags": map[string]string{
-				"Test_Tag":    "tag_value",
-				"another tag": "another value",
-			},
-			"snapshot_users": []string{
-				"123", "456",
-			},
-		},
-	}
-
-	generatedData, warnings, err := b.Prepare(config)
-
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
-
-	t.Logf("Test gen %+v", b.config.VolumeMappings)
-
-}

builder/amazon/ebsvolume/step_snapshot_ebs_volumes_test.go

@@ -1,170 +0,0 @@
-package ebsvolume
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/request"
-
-	//"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"github.com/hashicorp/packer-plugin-sdk/packer"
-	"github.com/hashicorp/packer/builder/amazon/common"
-)
-
-// Define a mock struct to be used in unit tests for common aws steps.
-type mockEC2Conn struct {
-	ec2iface.EC2API
-	Config *aws.Config
-}
-
-func (m *mockEC2Conn) CreateSnapshot(input *ec2.CreateSnapshotInput) (*ec2.Snapshot, error) {
-	snap := &ec2.Snapshot{
-		// This isn't typical amazon format, but injecting the volume id into
-		// this field lets us verify that the right volume was snapshotted with
-		// a simple string comparison
-		SnapshotId: aws.String(fmt.Sprintf("snap-of-%s", *input.VolumeId)),
-	}
-
-	return snap, nil
-}
-
-func (m *mockEC2Conn) WaitUntilSnapshotCompletedWithContext(aws.Context, *ec2.DescribeSnapshotsInput, ...request.WaiterOption) error {
-	return nil
-}
-
-func getMockConn(config *common.AccessConfig, target string) (ec2iface.EC2API, error) {
-	mockConn := &mockEC2Conn{
-		Config: aws.NewConfig(),
-	}
-	return mockConn, nil
-}
-
-// Create statebag for running test
-func tState(t *testing.T) multistep.StateBag {
-	state := new(multistep.BasicStateBag)
-	state.Put("ui", &packer.BasicUi{
-		Reader: new(bytes.Buffer),
-		Writer: new(bytes.Buffer),
-	})
-	// state.Put("amis", map[string]string{"us-east-1": "ami-12345"})
-	// state.Put("snapshots", map[string][]string{"us-east-1": {"snap-0012345"}})
-	conn, _ := getMockConn(&common.AccessConfig{}, "us-east-2")
-
-	state.Put("ec2", conn)
-	// Store a fake instance that contains a block device that matches the
-	// volumes defined in the config above
-	state.Put("instance", &ec2.Instance{
-		InstanceId: aws.String("instance-id"),
-		BlockDeviceMappings: []*ec2.InstanceBlockDeviceMapping{
-			{
-				DeviceName: aws.String("/dev/xvda"),
-				Ebs: &ec2.EbsInstanceBlockDevice{
-					VolumeId: aws.String("vol-1234"),
-				},
-			},
-			{
-				DeviceName: aws.String("/dev/xvdb"),
-				Ebs: &ec2.EbsInstanceBlockDevice{
-					VolumeId: aws.String("vol-5678"),
-				},
-			},
-		},
-	})
-	return state
-}
-
-func TestStepSnapshot_run_simple(t *testing.T) {
-	var b Builder
-	config := testConfig() //from builder_test
-
-	//Set some snapshot settings
-	config["ebs_volumes"] = []map[string]interface{}{
-		{
-			"device_name":           "/dev/xvdb",
-			"volume_size":           "32",
-			"delete_on_termination": true,
-			"snapshot_volume":       true,
-		},
-	}
-
-	generatedData, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
-
-	state := tState(t)
-
-	accessConfig := common.FakeAccessConfig()
-
-	step := stepSnapshotEBSVolumes{
-		PollingConfig: new(common.AWSPollingConfig),
-		AccessConfig:  accessConfig,
-		VolumeMapping: b.config.VolumeMappings,
-		Ctx:           b.config.ctx,
-	}
-
-	step.Run(context.Background(), state)
-
-	if len(step.snapshotMap) != 1 {
-		t.Fatalf("Missing Snapshot from step")
-	}
-
-	if volmapping := step.snapshotMap["snap-of-vol-5678"]; volmapping == nil {
-		t.Fatalf("Didn't snapshot correct volume: Map is %#v", step.snapshotMap)
-	}
-}
-
-func TestStepSnapshot_run_no_snaps(t *testing.T) {
-	var b Builder
-	config := testConfig() //from builder_test
-
-	//Set some snapshot settings
-	config["ebs_volumes"] = []map[string]interface{}{
-		{
-			"device_name":           "/dev/xvdb",
-			"volume_size":           "32",
-			"delete_on_termination": true,
-			"snapshot_volume":       false,
-		},
-	}
-
-	generatedData, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
-
-	state := tState(t)
-
-	accessConfig := common.FakeAccessConfig()
-
-	step := stepSnapshotEBSVolumes{
-		PollingConfig: new(common.AWSPollingConfig),
-		AccessConfig:  accessConfig,
-		VolumeMapping: b.config.VolumeMappings,
-		Ctx:           b.config.ctx,
-	}
-
-	step.Run(context.Background(), state)
-
-	if len(step.snapshotMap) != 0 {
-		t.Fatalf("Shouldn't have snapshotted any volumes")
-	}
-}

builder/amazon/examples/apache_server/README.Md

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

builder/amazon/examples/apache_server/apache.json

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

builder/amazon/examples/apache_server/packages.sh

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

builder/amazon/examples/nginx_server/README.Md

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

builder/amazon/examples/nginx_server/nginx.json

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

builder/amazon/examples/nginx_server/packages.sh

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

builder/amazon/instance/builder_test.go

@@ -1,343 +0,0 @@
-package instance
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-)
-
-func testConfig() (config map[string]interface{}, tf *os.File) {
-	tf, err := ioutil.TempFile("", "packer")
-	if err != nil {
-		panic(err)
-	}
-
-	config = map[string]interface{}{
-		"account_id":       "foo",
-		"ami_name":         "foo",
-		"instance_type":    "m1.small",
-		"region":           "us-east-1",
-		"s3_bucket":        "foo",
-		"source_ami":       "foo",
-		"ssh_username":     "bob",
-		"x509_cert_path":   tf.Name(),
-		"x509_key_path":    tf.Name(),
-		"x509_upload_path": "/foo",
-	}
-
-	return config, tf
-}
-
-func TestBuilder_ImplementsBuilder(t *testing.T) {
-	var raw interface{}
-	raw = &Builder{}
-	if _, ok := raw.(packersdk.Builder); !ok {
-		t.Fatalf("Builder should be a builder")
-	}
-}
-
-func TestBuilderPrepare_AccountId(t *testing.T) {
-	b := &Builder{}
-	config, tempfile := testConfig()
-	config["skip_region_validation"] = true
-
-	defer os.Remove(tempfile.Name())
-	defer tempfile.Close()
-
-	config["account_id"] = ""
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-
-	config["account_id"] = "foo"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Errorf("err: %s", err)
-	}
-
-	config["account_id"] = "0123-0456-7890"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	if b.config.AccountId != "012304567890" {
-		t.Errorf("should strip hyphens: %s", b.config.AccountId)
-	}
-}
-
-func TestBuilderPrepare_AMIName(t *testing.T) {
-	var b Builder
-	config, tempfile := testConfig()
-	defer os.Remove(tempfile.Name())
-	defer tempfile.Close()
-
-	// Test good
-	config["ami_name"] = "foo"
-	config["skip_region_validation"] = true
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-
-	// Test bad
-	config["ami_name"] = "foo {{"
-	b = Builder{}
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-
-	// Test bad
-	delete(config, "ami_name")
-	b = Builder{}
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-}
-
-func TestBuilderPrepare_BundleDestination(t *testing.T) {
-	b := &Builder{}
-	config, tempfile := testConfig()
-	config["skip_region_validation"] = true
-	defer os.Remove(tempfile.Name())
-	defer tempfile.Close()
-
-	config["bundle_destination"] = ""
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	if b.config.BundleDestination != "/tmp" {
-		t.Fatalf("bad: %s", b.config.BundleDestination)
-	}
-}
-
-func TestBuilderPrepare_BundlePrefix(t *testing.T) {
-	b := &Builder{}
-	config, tempfile := testConfig()
-	config["skip_region_validation"] = true
-	defer os.Remove(tempfile.Name())
-	defer tempfile.Close()
-
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	if b.config.BundlePrefix == "" {
-		t.Fatalf("bad: %s", b.config.BundlePrefix)
-	}
-}
-
-func TestBuilderPrepare_InvalidKey(t *testing.T) {
-	var b Builder
-	config, tempfile := testConfig()
-	defer os.Remove(tempfile.Name())
-	defer tempfile.Close()
-
-	// Add a random key
-	config["i_should_not_be_valid"] = true
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-}
-
-func TestBuilderPrepare_S3Bucket(t *testing.T) {
-	b := &Builder{}
-	config, tempfile := testConfig()
-	config["skip_region_validation"] = true
-	defer os.Remove(tempfile.Name())
-	defer tempfile.Close()
-
-	config["s3_bucket"] = ""
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-
-	config["s3_bucket"] = "foo"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Errorf("err: %s", err)
-	}
-}
-
-func TestBuilderPrepare_X509CertPath(t *testing.T) {
-	b := &Builder{}
-	config, tempfile := testConfig()
-	config["skip_region_validation"] = true
-	defer os.Remove(tempfile.Name())
-	defer tempfile.Close()
-
-	config["x509_cert_path"] = ""
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-
-	config["x509_cert_path"] = "i/am/a/file/that/doesnt/exist"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Error("should have error")
-	}
-
-	tf, err := ioutil.TempFile("", "packer")
-	if err != nil {
-		t.Fatalf("error tempfile: %s", err)
-	}
-	defer os.Remove(tf.Name())
-	defer tf.Close()
-
-	config["x509_cert_path"] = tf.Name()
-	_, 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)
-	}
-}
-
-func TestBuilderPrepare_X509KeyPath(t *testing.T) {
-	b := &Builder{}
-	config, tempfile := testConfig()
-	config["skip_region_validation"] = true
-	defer os.Remove(tempfile.Name())
-	defer tempfile.Close()
-
-	config["x509_key_path"] = ""
-	_, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Fatal("should have error")
-	}
-
-	config["x509_key_path"] = "i/am/a/file/that/doesnt/exist"
-	_, warnings, err = b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err == nil {
-		t.Error("should have error")
-	}
-
-	tf, err := ioutil.TempFile("", "packer")
-	if err != nil {
-		t.Fatalf("error tempfile: %s", err)
-	}
-	defer os.Remove(tf.Name())
-	defer tf.Close()
-
-	config["x509_key_path"] = tf.Name()
-	_, 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)
-	}
-}
-
-func TestBuilderPrepare_X509UploadPath(t *testing.T) {
-	b := &Builder{}
-	config, tempfile := testConfig()
-	config["skip_region_validation"] = true
-	defer os.Remove(tempfile.Name())
-	defer tempfile.Close()
-
-	config["x509_upload_path"] = ""
-	_, 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)
-	}
-}
-
-func TestBuilderPrepare_ReturnGeneratedData(t *testing.T) {
-	var b Builder
-	config, tempfile := testConfig()
-	defer os.Remove(tempfile.Name())
-	defer tempfile.Close()
-
-	generatedData, warnings, err := b.Prepare(config)
-	if len(warnings) > 0 {
-		t.Fatalf("bad: %#v", warnings)
-	}
-	if err != nil {
-		t.Fatalf("should not have error: %s", err)
-	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
-	if len(generatedData) == 0 {
-		t.Fatalf("Generated data should not be empty")
-	}
-	if generatedData[0] != "SourceAMIName" {
-		t.Fatalf("Generated data should contain SourceAMIName")
-	}
-	if generatedData[1] != "BuildRegion" {
-		t.Fatalf("Generated data should contain BuildRegion")
-	}
-	if generatedData[2] != "SourceAMI" {
-		t.Fatalf("Generated data should contain SourceAMI")
-	}
-	if generatedData[3] != "SourceAMICreationDate" {
-		t.Fatalf("Generated data should contain SourceAMICreationDate")
-	}
-	if generatedData[4] != "SourceAMIOwner" {
-		t.Fatalf("Generated data should contain SourceAMIOwner")
-	}
-	if generatedData[5] != "SourceAMIOwnerName" {
-		t.Fatalf("Generated data should contain SourceAMIOwnerName")
-	}
-}

builder/amazon/version/version.go

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

builder/azure/arm/builder_acc_test.go

@@ -30,8 +30,8 @@ import (
 
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/azure/auth"
-	builderT "github.com/hashicorp/packer-plugin-sdk/acctest"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	builderT "github.com/hashicorp/packer/acctest"
 )
 
 const DeviceLoginAcceptanceTest = "DEVICELOGIN_TEST"

builder/azure/arm/config.go

@@ -1,5 +1,5 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type Config,SharedImageGallery,SharedImageGalleryDestination,PlanInformation
+//go:generate packer-sdc struct-markdown
+//go:generate packer-sdc mapstructure-to-hcl2 -type Config,SharedImageGallery,SharedImageGalleryDestination,PlanInformation
 
 package arm
 

builder/azure/arm/config.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type Config,SharedImageGallery,SharedImageGalleryDestination,PlanInformation"; DO NOT EDIT.
+// Code generated by "packer-sdc mapstructure-to-hcl2"; DO NOT EDIT.
 
 package arm
 

builder/azure/chroot/builder.go

@@ -1,5 +1,5 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type Config
+//go:generate packer-sdc struct-markdown
+//go:generate packer-sdc mapstructure-to-hcl2 -type Config
 
 // Package chroot is able to create an Azure managed image without requiring the
 // launch of a new virtual machine for every build. It does this by attaching and

builder/azure/chroot/builder.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type Config"; DO NOT EDIT.
+// Code generated by "packer-sdc mapstructure-to-hcl2"; DO NOT EDIT.
 
 package chroot
 

builder/azure/chroot/shared_image_gallery_destination.go

@@ -1,5 +1,5 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type SharedImageGalleryDestination,TargetRegion
+//go:generate packer-sdc struct-markdown
+//go:generate packer-sdc mapstructure-to-hcl2 -type SharedImageGalleryDestination,TargetRegion
 
 package chroot
 

builder/azure/chroot/shared_image_gallery_destination.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type SharedImageGalleryDestination,TargetRegion"; DO NOT EDIT.
+// Code generated by "packer-sdc mapstructure-to-hcl2"; DO NOT EDIT.
 
 package chroot
 

builder/azure/common/client/config.go

@@ -1,4 +1,4 @@
-//go:generate struct-markdown
+//go:generate packer-sdc struct-markdown
 
 package client
 

builder/azure/dtl/azure_client.go

@@ -181,7 +181,6 @@ func NewAzureClient(subscriptionID, resourceGroupName string,
 	azureClient.GalleryImageVersionsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
 	azureClient.GalleryImageVersionsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GalleryImageVersionsClient.UserAgent)
 	azureClient.GalleryImageVersionsClient.Client.PollingDuration = SharedGalleryTimeout
-	azureClient.GalleryImageVersionsClient.Client.PollingDuration = PollingDuration
 
 	azureClient.GalleryImagesClient = newCompute.NewGalleryImagesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.GalleryImagesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)

builder/azure/dtl/builder_acc_test.go

@@ -28,7 +28,7 @@ package dtl
 import (
 	"testing"
 
-	builderT "github.com/hashicorp/packer-plugin-sdk/acctest"
+	builderT "github.com/hashicorp/packer/acctest"
 )
 
 const DeviceLoginAcceptanceTest = "DEVICELOGIN_TEST"

builder/azure/dtl/config.go

@@ -1,5 +1,5 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type Config,SharedImageGallery,SharedImageGalleryDestination,DtlArtifact,ArtifactParameter
+//go:generate packer-sdc struct-markdown
+//go:generate packer-sdc mapstructure-to-hcl2 -type Config,SharedImageGallery,SharedImageGalleryDestination,DtlArtifact,ArtifactParameter
 
 package dtl
 

builder/azure/dtl/config.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type Config,SharedImageGallery,SharedImageGalleryDestination,DtlArtifact,ArtifactParameter"; DO NOT EDIT.
+// Code generated by "packer-sdc mapstructure-to-hcl2"; DO NOT EDIT.
 
 package dtl
 

builder/cloudstack/config.go

@@ -1,5 +1,5 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type Config
+//go:generate packer-sdc struct-markdown
+//go:generate packer-sdc mapstructure-to-hcl2 -type Config
 
 package cloudstack
 

builder/cloudstack/config.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type Config"; DO NOT EDIT.
+// Code generated by "packer-sdc mapstructure-to-hcl2"; DO NOT EDIT.
 
 package cloudstack
 

builder/digitalocean/builder.go

@@ -80,10 +80,17 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 
 	// Build the steps
 	steps := []multistep.Step{
-		&stepCreateSSHKey{
-			Debug:        b.config.PackerDebug,
-			DebugKeyPath: fmt.Sprintf("do_%s.pem", b.config.PackerBuildName),
+		&communicator.StepSSHKeyGen{
+			CommConf:            &b.config.Comm,
+			SSHTemporaryKeyPair: b.config.Comm.SSH.SSHTemporaryKeyPair,
 		},
+		multistep.If(b.config.PackerDebug && b.config.Comm.SSHPrivateKeyFile == "",
+			&communicator.StepDumpSSHKey{
+				Path: fmt.Sprintf("do_%s.pem", b.config.PackerBuildName),
+				SSH:  &b.config.Comm.SSH,
+			},
+		),
+		&stepCreateSSHKey{},
 		new(stepCreateDroplet),
 		new(stepDropletInfo),
 		&communicator.StepConnect{

builder/digitalocean/builder_acc_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/digitalocean/godo"
-	builderT "github.com/hashicorp/packer-plugin-sdk/acctest"
+	builderT "github.com/hashicorp/packer/acctest"
 	"golang.org/x/oauth2"
 )
 

builder/digitalocean/config.go

@@ -1,5 +1,5 @@
-//go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type Config
+//go:generate packer-sdc struct-markdown
+//go:generate packer-sdc mapstructure-to-hcl2 -type Config
 
 package digitalocean
 

builder/digitalocean/config.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type Config"; DO NOT EDIT.
+// Code generated by "packer-sdc mapstructure-to-hcl2"; DO NOT EDIT.
 
 package digitalocean
 

builder/digitalocean/step_create_ssh_key.go

@@ -2,26 +2,16 @@ package digitalocean
 
 import (
 	"context"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/pem"
 	"fmt"
 	"log"
-	"os"
-	"runtime"
 
 	"github.com/digitalocean/godo"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/uuid"
-	"golang.org/x/crypto/ssh"
 )
 
 type stepCreateSSHKey struct {
-	Debug        bool
-	DebugKeyPath string
-
 	keyId int
 }
 
@@ -30,31 +20,12 @@ func (s *stepCreateSSHKey) Run(ctx context.Context, state multistep.StateBag) mu
 	ui := state.Get("ui").(packersdk.Ui)
 	c := state.Get("config").(*Config)
 
-	ui.Say("Creating temporary ssh key for droplet...")
-
-	priv, err := rsa.GenerateKey(rand.Reader, 2014)
-	if err != nil {
-		err := fmt.Errorf("error generating RSA key: %s", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
+	if c.Comm.SSHPublicKey == nil {
+		ui.Say("No public SSH key found; skipping SSH public key import...")
+		return multistep.ActionContinue
 	}
 
-	// ASN.1 DER encoded form
-	priv_der := x509.MarshalPKCS1PrivateKey(priv)
-	priv_blk := pem.Block{
-		Type:    "RSA PRIVATE KEY",
-		Headers: nil,
-		Bytes:   priv_der,
-	}
-
-	// Set the private key in the config for later
-	c.Comm.SSHPrivateKey = pem.EncodeToMemory(&priv_blk)
-
-	// Marshal the public key into SSH compatible format
-	// TODO properly handle the public key error
-	pub, _ := ssh.NewPublicKey(&priv.PublicKey)
-	pub_sshformat := string(ssh.MarshalAuthorizedKey(pub))
+	ui.Say("Importing SSH public key...")
 
 	// The name of the public key on DO
 	name := fmt.Sprintf("packer-%s", uuid.TimeOrderedUUID())
@@ -62,7 +33,7 @@ func (s *stepCreateSSHKey) Run(ctx context.Context, state multistep.StateBag) mu
 	// Create the key!
 	key, _, err := client.Keys.Create(context.TODO(), &godo.KeyCreateRequest{
 		Name:      name,
-		PublicKey: pub_sshformat,
+		PublicKey: string(c.Comm.SSHPublicKey),
 	})
 	if err != nil {
 		err := fmt.Errorf("Error creating temporary SSH key: %s", err)
@@ -79,31 +50,6 @@ func (s *stepCreateSSHKey) Run(ctx context.Context, state multistep.StateBag) mu
 	// Remember some state for the future
 	state.Put("ssh_key_id", key.ID)
 
-	// If we're in debug mode, output the private key to the working directory.
-	if s.Debug {
-		ui.Message(fmt.Sprintf("Saving key for debug purposes: %s", s.DebugKeyPath))
-		f, err := os.Create(s.DebugKeyPath)
-		if err != nil {
-			state.Put("error", fmt.Errorf("Error saving debug key: %s", err))
-			return multistep.ActionHalt
-		}
-		defer f.Close()
-
-		// Write the key out
-		if _, err := f.Write(pem.EncodeToMemory(&priv_blk)); err != nil {
-			state.Put("error", fmt.Errorf("Error saving debug key: %s", err))
-			return multistep.ActionHalt
-		}
-
-		// Chmod it so that it is SSH ready
-		if runtime.GOOS != "windows" {
-			if err := f.Chmod(0600); err != nil {
-				state.Put("error", fmt.Errorf("Error setting permissions of debug key: %s", err))
-				return multistep.ActionHalt
-			}
-		}
-	}
-
 	return multistep.ActionContinue
 }
 

builder/file/builder_test.go

@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"testing"
 
-	builderT "github.com/hashicorp/packer-plugin-sdk/acctest"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	builderT "github.com/hashicorp/packer/acctest"
 )
 
 func TestBuilder_implBuilder(t *testing.T) {

builder/file/config.go

@@ -1,4 +1,4 @@
-//go:generate mapstructure-to-hcl2 -type Config
+//go:generate packer-sdc mapstructure-to-hcl2 -type Config
 
 package file
 

builder/file/config.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type Config"; DO NOT EDIT.
+// Code generated by "packer-sdc mapstructure-to-hcl2"; DO NOT EDIT.
 
 package file
 

builder/googlecompute/artifact_test.go

@@ -1,37 +0,0 @@
-package googlecompute
-
-import (
-	"testing"
-
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-)
-
-func TestArtifact_impl(t *testing.T) {
-	var _ packersdk.Artifact = new(Artifact)
-}
-
-func TestArtifactState_StateData(t *testing.T) {
-	expectedData := "this is the data"
-	artifact := &Artifact{
-		StateData: map[string]interface{}{"state_data": expectedData},
-	}
-
-	// Valid state
-	result := artifact.State("state_data")
-	if result != expectedData {
-		t.Fatalf("Bad: State data was %s instead of %s", result, expectedData)
-	}
-
-	// Invalid state
-	result = artifact.State("invalid_key")
-	if result != nil {
-		t.Fatalf("Bad: State should be nil for invalid state data name")
-	}
-
-	// Nil StateData should not fail and should return nil
-	artifact = &Artifact{}
-	result = artifact.State("key")
-	if result != nil {
-		t.Fatalf("Bad: State should be nil for nil StateData")
-	}
-}

builder/googlecompute/config_test.go

@@ -1,692 +0,0 @@
-package googlecompute
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
-)
-
-func TestConfigPrepare(t *testing.T) {
-	cases := []struct {
-		Key   string
-		Value interface{}
-		Err   bool
-	}{
-		{
-			"unknown_key",
-			"bad",
-			true,
-		},
-
-		{
-			"private_key_file",
-			"/tmp/i/should/not/exist",
-			true,
-		},
-
-		{
-			"project_id",
-			nil,
-			true,
-		},
-		{
-			"project_id",
-			"foo",
-			false,
-		},
-
-		{
-			"source_image",
-			nil,
-			true,
-		},
-		{
-			"source_image",
-			"foo",
-			false,
-		},
-
-		{
-			"source_image_family",
-			nil,
-			false,
-		},
-		{
-			"source_image_family",
-			"foo",
-			false,
-		},
-
-		{
-			"zone",
-			nil,
-			true,
-		},
-		{
-			"zone",
-			"foo",
-			false,
-		},
-
-		{
-			"ssh_timeout",
-			"SO BAD",
-			true,
-		},
-		{
-			"ssh_timeout",
-			"5s",
-			false,
-		},
-
-		{
-			"wait_to_add_ssh_keys",
-			"SO BAD",
-			true,
-		},
-		{
-			"wait_to_add_ssh_keys",
-			"5s",
-			false,
-		},
-
-		{
-			"state_timeout",
-			"SO BAD",
-			true,
-		},
-		{
-			"state_timeout",
-			"5s",
-			false,
-		},
-		{
-			"use_internal_ip",
-			nil,
-			false,
-		},
-		{
-			"use_internal_ip",
-			false,
-			false,
-		},
-		{
-			"use_internal_ip",
-			"SO VERY BAD",
-			true,
-		},
-		{
-			"on_host_maintenance",
-			nil,
-			false,
-		},
-		{
-			"on_host_maintenance",
-			"TERMINATE",
-			false,
-		},
-		{
-			"on_host_maintenance",
-			"SO VERY BAD",
-			true,
-		},
-		{
-			"preemptible",
-			nil,
-			false,
-		},
-		{
-			"preemptible",
-			false,
-			false,
-		},
-		{
-			"preemptible",
-			"SO VERY BAD",
-			true,
-		},
-		{
-			"image_family",
-			nil,
-			false,
-		},
-		{
-			"image_family",
-			"",
-			false,
-		},
-		{
-			"image_family",
-			"foo-bar",
-			false,
-		},
-		{
-			"image_family",
-			"foo bar",
-			true,
-		},
-		{
-			// underscore is not allowed
-			"image_name",
-			"foo_bar",
-			true,
-		},
-		{
-			// too long
-			"image_name",
-			"foobar123xyz_abc-456-one-two_three_five_nine_seventeen_eleventy-seven",
-			true,
-		},
-		{
-			// starts with non-alphabetic character
-			"image_name",
-			"1boohoo",
-			true,
-		},
-		{
-			"image_encryption_key",
-			map[string]string{"kmsKeyName": "foo"},
-			false,
-		},
-		{
-			"image_encryption_key",
-			map[string]string{"No such key": "foo"},
-			true,
-		},
-		{
-			"image_encryption_key",
-			map[string]string{"kmsKeyName": "foo", "RawKey": "foo"},
-			false,
-		},
-		{
-			"scopes",
-			[]string{},
-			false,
-		},
-		{
-			"scopes",
-			[]string{"https://www.googleapis.com/auth/userinfo.email", "https://www.googleapis.com/auth/compute", "https://www.googleapis.com/auth/devstorage.full_control", "https://www.googleapis.com/auth/sqlservice.admin"},
-			false,
-		},
-		{
-			"scopes",
-			[]string{"https://www.googleapis.com/auth/cloud-platform"},
-			false,
-		},
-
-		{
-			"disable_default_service_account",
-			"",
-			false,
-		},
-		{
-			"disable_default_service_account",
-			nil,
-			false,
-		},
-		{
-			"disable_default_service_account",
-			false,
-			false,
-		},
-		{
-			"disable_default_service_account",
-			true,
-			false,
-		},
-		{
-			"disable_default_service_account",
-			"NOT A BOOL",
-			true,
-		},
-	}
-
-	for _, tc := range cases {
-		raw, tempfile := testConfig(t)
-		defer os.Remove(tempfile)
-
-		if tc.Value == nil {
-			delete(raw, tc.Key)
-		} else {
-			raw[tc.Key] = tc.Value
-		}
-
-		var c Config
-		warns, errs := c.Prepare(raw)
-
-		if tc.Err {
-			testConfigErr(t, warns, errs, tc.Key)
-		} else {
-			testConfigOk(t, warns, errs)
-		}
-	}
-}
-
-func TestConfigPrepareAccelerator(t *testing.T) {
-	cases := []struct {
-		Keys   []string
-		Values []interface{}
-		Err    bool
-	}{
-		{
-			[]string{"accelerator_count", "on_host_maintenance", "accelerator_type"},
-			[]interface{}{1, "MIGRATE", "something_valid"},
-			true,
-		},
-		{
-			[]string{"accelerator_count", "on_host_maintenance", "accelerator_type"},
-			[]interface{}{1, "TERMINATE", "something_valid"},
-			false,
-		},
-		{
-			[]string{"accelerator_count", "on_host_maintenance", "accelerator_type"},
-			[]interface{}{1, "TERMINATE", nil},
-			true,
-		},
-		{
-			[]string{"accelerator_count", "on_host_maintenance", "accelerator_type"},
-			[]interface{}{1, "TERMINATE", ""},
-			true,
-		},
-		{
-			[]string{"accelerator_count", "on_host_maintenance", "accelerator_type"},
-			[]interface{}{1, "TERMINATE", "something_valid"},
-			false,
-		},
-	}
-
-	for _, tc := range cases {
-		raw, tempfile := testConfig(t)
-		defer os.Remove(tempfile)
-
-		errStr := ""
-		for k := range tc.Keys {
-
-			// Create the string for error reporting
-			// convert value to string if it can be converted
-			errStr += fmt.Sprintf("%s:%v, ", tc.Keys[k], tc.Values[k])
-			if tc.Values[k] == nil {
-				delete(raw, tc.Keys[k])
-			} else {
-				raw[tc.Keys[k]] = tc.Values[k]
-			}
-		}
-
-		var c Config
-		warns, errs := c.Prepare(raw)
-
-		if tc.Err {
-			testConfigErr(t, warns, errs, strings.TrimRight(errStr, ", "))
-		} else {
-			testConfigOk(t, warns, errs)
-		}
-	}
-}
-
-func TestConfigPrepareServiceAccount(t *testing.T) {
-	cases := []struct {
-		Keys   []string
-		Values []interface{}
-		Err    bool
-	}{
-		{
-			[]string{"disable_default_service_account", "service_account_email"},
-			[]interface{}{true, "service@account.email.com"},
-			true,
-		},
-		{
-			[]string{"disable_default_service_account", "service_account_email"},
-			[]interface{}{false, "service@account.email.com"},
-			false,
-		},
-		{
-			[]string{"disable_default_service_account", "service_account_email"},
-			[]interface{}{true, ""},
-			false,
-		},
-	}
-
-	for _, tc := range cases {
-		raw, tempfile := testConfig(t)
-		defer os.Remove(tempfile)
-
-		errStr := ""
-		for k := range tc.Keys {
-
-			// Create the string for error reporting
-			// convert value to string if it can be converted
-			errStr += fmt.Sprintf("%s:%v, ", tc.Keys[k], tc.Values[k])
-			if tc.Values[k] == nil {
-				delete(raw, tc.Keys[k])
-			} else {
-				raw[tc.Keys[k]] = tc.Values[k]
-			}
-		}
-
-		var c Config
-		warns, errs := c.Prepare(raw)
-
-		if tc.Err {
-			testConfigErr(t, warns, errs, strings.TrimRight(errStr, ", "))
-		} else {
-			testConfigOk(t, warns, errs)
-		}
-	}
-}
-
-func TestConfigPrepareStartupScriptFile(t *testing.T) {
-	config := map[string]interface{}{
-		"project_id":          "project",
-		"source_image":        "foo",
-		"ssh_username":        "packer",
-		"startup_script_file": "no-such-file",
-		"zone":                "us-central1-a",
-	}
-
-	var c Config
-	_, errs := c.Prepare(config)
-
-	if errs == nil || !strings.Contains(errs.Error(), "startup_script_file") {
-		t.Fatalf("should error: startup_script_file")
-	}
-}
-
-func TestConfigPrepareIAP_SSH(t *testing.T) {
-	config := map[string]interface{}{
-		"project_id":   "project",
-		"source_image": "foo",
-		"ssh_username": "packer",
-		"zone":         "us-central1-a",
-		"communicator": "ssh",
-		"use_iap":      true,
-	}
-
-	var c Config
-	_, err := c.Prepare(config)
-	if err != nil {
-		t.Fatalf("Shouldn't have errors. Err = %s", err)
-	}
-	if c.Comm.SSHHost != "localhost" {
-		t.Fatalf("Should have set SSHHost")
-	}
-
-	testIAPScript(t, &c)
-}
-
-func TestConfigPrepareIAP_WinRM(t *testing.T) {
-	config := map[string]interface{}{
-		"project_id":     "project",
-		"source_image":   "foo",
-		"winrm_username": "packer",
-		"zone":           "us-central1-a",
-		"communicator":   "winrm",
-		"use_iap":        true,
-	}
-
-	var c Config
-	_, err := c.Prepare(config)
-	if err != nil {
-		t.Fatalf("Shouldn't have errors. Err = %s", err)
-	}
-	if c.Comm.WinRMHost != "localhost" {
-		t.Fatalf("Should have set WinRMHost")
-	}
-
-	testIAPScript(t, &c)
-}
-
-func TestConfigPrepareIAP_failures(t *testing.T) {
-	config := map[string]interface{}{
-		"project_id":     "project",
-		"source_image":   "foo",
-		"winrm_username": "packer",
-		"zone":           "us-central1-a",
-		"communicator":   "none",
-		"iap_hashbang":   "/bin/bash",
-		"iap_ext":        ".ps1",
-		"use_iap":        true,
-	}
-
-	var c Config
-	_, errs := c.Prepare(config)
-	if errs == nil {
-		t.Fatalf("Should have errored because we're using none.")
-	}
-	if c.IAPHashBang != "/bin/bash" {
-		t.Fatalf("IAP hashbang defaulted even though set.")
-	}
-	if c.IAPExt != ".ps1" {
-		t.Fatalf("IAP tempfile defaulted even though set.")
-	}
-}
-
-func TestConfigDefaults(t *testing.T) {
-	cases := []struct {
-		Read  func(c *Config) interface{}
-		Value interface{}
-	}{
-		{
-			func(c *Config) interface{} { return c.Comm.Type },
-			"ssh",
-		},
-
-		{
-			func(c *Config) interface{} { return c.Comm.SSHPort },
-			22,
-		},
-	}
-
-	for _, tc := range cases {
-		raw, tempfile := testConfig(t)
-		defer os.Remove(tempfile)
-
-		var c Config
-		warns, errs := c.Prepare(raw)
-		testConfigOk(t, warns, errs)
-
-		actual := tc.Read(&c)
-		if actual != tc.Value {
-			t.Fatalf("bad: %#v", actual)
-		}
-	}
-}
-
-func TestImageName(t *testing.T) {
-	raw, tempfile := testConfig(t)
-	defer os.Remove(tempfile)
-
-	var c Config
-	c.Prepare(raw)
-	if !strings.HasPrefix(c.ImageName, "packer-") {
-		t.Fatalf("ImageName should have 'packer-' prefix, found %s", c.ImageName)
-	}
-	if strings.Contains(c.ImageName, "{{timestamp}}") {
-		t.Errorf("ImageName should be interpolated; found %s", c.ImageName)
-	}
-}
-
-func TestRegion(t *testing.T) {
-	raw, tempfile := testConfig(t)
-	defer os.Remove(tempfile)
-
-	var c Config
-	c.Prepare(raw)
-	if c.Region != "us-east1" {
-		t.Fatalf("Region should be 'us-east1' given Zone of 'us-east1-a', but is %s", c.Region)
-	}
-}
-
-func TestApplyIAPTunnel_SSH(t *testing.T) {
-	c := &communicator.Config{
-		Type: "ssh",
-		SSH: communicator.SSH{
-			SSHHost: "example",
-			SSHPort: 1234,
-		},
-	}
-
-	err := ApplyIAPTunnel(c, 8447)
-	if err != nil {
-		t.Fatalf("Shouldn't have errors")
-	}
-	if c.SSHPort != 8447 {
-		t.Fatalf("Should have set SSHPort")
-	}
-}
-
-func TestApplyIAPTunnel_WinRM(t *testing.T) {
-	c := &communicator.Config{
-		Type: "winrm",
-		WinRM: communicator.WinRM{
-			WinRMHost: "example",
-			WinRMPort: 1234,
-		},
-	}
-
-	err := ApplyIAPTunnel(c, 8447)
-	if err != nil {
-		t.Fatalf("Shouldn't have errors")
-	}
-	if c.WinRMPort != 8447 {
-		t.Fatalf("Should have set WinRMPort")
-	}
-}
-
-func TestApplyIAPTunnel_none(t *testing.T) {
-	c := &communicator.Config{
-		Type: "none",
-	}
-
-	err := ApplyIAPTunnel(c, 8447)
-	if err == nil {
-		t.Fatalf("Should have errors, none is not supported")
-	}
-}
-
-// Helper stuff below
-
-func testConfig(t *testing.T) (config map[string]interface{}, tempAccountFile string) {
-	tempAccountFile = testAccountFile(t)
-
-	config = map[string]interface{}{
-		"account_file": tempAccountFile,
-		"project_id":   "hashicorp",
-		"source_image": "foo",
-		"ssh_username": "root",
-		"image_family": "bar",
-		"image_labels": map[string]string{
-			"label-1": "value-1",
-			"label-2": "value-2",
-		},
-		"image_licenses": []string{
-			"test-license",
-		},
-		"image_storage_locations": []string{
-			"us-east1",
-		},
-		"metadata_files": map[string]string{},
-		"zone":           "us-east1-a",
-	}
-
-	return config, tempAccountFile
-}
-
-func testConfigStruct(t *testing.T) *Config {
-	raw, tempfile := testConfig(t)
-	defer os.Remove(tempfile)
-
-	var c Config
-	warns, errs := c.Prepare(raw)
-	if len(warns) > 0 {
-		t.Fatalf("bad: %#v", len(warns))
-	}
-	if errs != nil {
-		t.Fatalf("bad: %#v", errs)
-	}
-
-	return &c
-}
-
-func testConfigErr(t *testing.T, warns []string, err error, extra string) {
-	if len(warns) > 0 {
-		t.Fatalf("bad: %#v", warns)
-	}
-	if err == nil {
-		t.Fatalf("should error: %s", extra)
-	}
-}
-
-func testConfigOk(t *testing.T, warns []string, err error) {
-	if len(warns) > 0 {
-		t.Fatalf("bad: %#v", warns)
-	}
-	if err != nil {
-		t.Fatalf("bad: %s", err)
-	}
-}
-
-func testAccountFile(t *testing.T) string {
-	tf, err := ioutil.TempFile("", "packer")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	defer tf.Close()
-
-	if _, err := tf.Write([]byte(testAccountContent)); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	return tf.Name()
-}
-
-func testIAPScript(t *testing.T, c *Config) {
-	if runtime.GOOS == "windows" {
-		if c.IAPExt != ".cmd" {
-			t.Fatalf("IAP tempfile extension didn't default correctly to .cmd")
-		}
-		if c.IAPHashBang != "" {
-			t.Fatalf("IAP hashbang didn't default correctly to nothing.")
-		}
-	} else {
-		if c.IAPExt != "" {
-			t.Fatalf("IAP tempfile extension should default to empty on unix mahcines")
-		}
-		if c.IAPHashBang != "/bin/sh" {
-			t.Fatalf("IAP hashbang didn't default correctly to /bin/sh.")
-		}
-	}
-}
-
-const testMetadataFileContent = `testMetadata`
-
-func testMetadataFile(t *testing.T) string {
-	tf, err := ioutil.TempFile("", "packer")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	defer tf.Close()
-	if _, err := tf.Write([]byte(testMetadataFileContent)); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-
-	return tf.Name()
-}
-
-// This is just some dummy data that doesn't actually work
-const testAccountContent = `{
-  "type": "service_account",
-  "project_id": "test-project-123456789",
-  "private_key_id": "bananaphone",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nring_ring_ring_ring_ring_ring_ring_BANANAPHONE\n-----END PRIVATE KEY-----\n",
-  "client_email": "raffi-compute@developer.gserviceaccount.com",
-  "client_id": "1234567890",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://accounts.google.com/o/oauth2/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/12345-compute%40developer.gserviceaccount.com"
-}`

builder/googlecompute/image_test.go

@@ -1,26 +0,0 @@
-package googlecompute
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func StubImage(name, project string, licenses []string, sizeGb int64) *Image {
-	return &Image{
-		Licenses:  licenses,
-		Name:      name,
-		ProjectId: project,
-		SelfLink:  fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/images/%s", project, name),
-		SizeGb:    sizeGb,
-	}
-}
-
-func TestImage_IsWindows(t *testing.T) {
-	i := StubImage("foo", "foo-project", []string{"license-foo", "license-bar"}, 100)
-	assert.False(t, i.IsWindows())
-
-	i = StubImage("foo", "foo-project", []string{"license-foo", "windows-license"}, 100)
-	assert.True(t, i.IsWindows())
-}

builder/googlecompute/networking_test.go

@@ -1,72 +0,0 @@
-package googlecompute
-
-import (
-	"testing"
-)
-
-func TestGetNetworking(t *testing.T) {
-	cases := []struct {
-		c                  *InstanceConfig
-		expectedNetwork    string
-		expectedSubnetwork string
-		error              bool
-	}{
-		{
-			c: &InstanceConfig{
-				Network:          "default",
-				Subnetwork:       "",
-				NetworkProjectId: "project-id",
-				Region:           "region-id",
-			},
-			expectedNetwork:    "global/networks/default",
-			expectedSubnetwork: "",
-			error:              false,
-		},
-		{
-			c: &InstanceConfig{
-				Network:          "",
-				Subnetwork:       "",
-				NetworkProjectId: "project-id",
-				Region:           "region-id",
-			},
-			expectedNetwork:    "",
-			expectedSubnetwork: "",
-			error:              true,
-		},
-		{
-			c: &InstanceConfig{
-				Network:          "some/network/path",
-				Subnetwork:       "some/subnetwork/path",
-				NetworkProjectId: "project-id",
-				Region:           "region-id",
-			},
-			expectedNetwork:    "some/network/path",
-			expectedSubnetwork: "some/subnetwork/path",
-			error:              false,
-		},
-		{
-			c: &InstanceConfig{
-				Network:          "network-value",
-				Subnetwork:       "subnetwork-value",
-				NetworkProjectId: "project-id",
-				Region:           "region-id",
-			},
-			expectedNetwork:    "projects/project-id/global/networks/network-value",
-			expectedSubnetwork: "projects/project-id/regions/region-id/subnetworks/subnetwork-value",
-			error:              false,
-		},
-	}
-
-	for _, tc := range cases {
-		n, sn, err := getNetworking(tc.c)
-		if n != tc.expectedNetwork {
-			t.Errorf("Expected network %q but got network %q", tc.expectedNetwork, n)
-		}
-		if sn != tc.expectedSubnetwork {
-			t.Errorf("Expected subnetwork %q but got subnetwork %q", tc.expectedSubnetwork, sn)
-		}
-		if !tc.error && err != nil {
-			t.Errorf("Did not expect an error but got: %v", err)
-		}
-	}
-}

builder/googlecompute/step_check_existing_image_test.go

@@ -1,34 +0,0 @@
-package googlecompute
-
-import (
-	"context"
-	"testing"
-
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-)
-
-func TestStepCheckExistingImage_impl(t *testing.T) {
-	var _ multistep.Step = new(StepCheckExistingImage)
-}
-
-func TestStepCheckExistingImage(t *testing.T) {
-	state := testState(t)
-	step := new(StepCheckExistingImage)
-	defer step.Cleanup(state)
-
-	state.Put("instance_name", "foo")
-
-	config := state.Get("config").(*Config)
-	driver := state.Get("driver").(*DriverMock)
-	driver.ImageExistsResult = true
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionHalt {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	// Verify state
-	if driver.ImageExistsName != config.ImageName {
-		t.Fatalf("bad: %#v", driver.ImageExistsName)
-	}
-}

builder/googlecompute/step_create_image_test.go

@@ -1,72 +0,0 @@
-package googlecompute
-
-import (
-	"context"
-	"errors"
-	"testing"
-
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestStepCreateImage_impl(t *testing.T) {
-	var _ multistep.Step = new(StepCreateImage)
-}
-
-func TestStepCreateImage(t *testing.T) {
-	state := testState(t)
-	step := new(StepCreateImage)
-	defer step.Cleanup(state)
-
-	c := state.Get("config").(*Config)
-	d := state.Get("driver").(*DriverMock)
-
-	// These are the values of the image the driver will return.
-	d.CreateImageResultProjectId = "test-project"
-	d.CreateImageResultSizeGb = 100
-
-	// run the step
-	action := step.Run(context.Background(), state)
-	assert.Equal(t, action, multistep.ActionContinue, "Step did not pass.")
-
-	uncastImage, ok := state.GetOk("image")
-	assert.True(t, ok, "State does not have resulting image.")
-	image, ok := uncastImage.(*Image)
-	assert.True(t, ok, "Image in state is not an Image.")
-
-	// Verify created Image results.
-	assert.Equal(t, image.Name, c.ImageName, "Created image does not match config name.")
-	assert.Equal(t, image.ProjectId, d.CreateImageResultProjectId, "Created image project does not match driver project.")
-	assert.Equal(t, image.SizeGb, d.CreateImageResultSizeGb, "Created image size does not match the size returned by the driver.")
-
-	// Verify proper args passed to driver.CreateImage.
-	assert.Equal(t, d.CreateImageName, c.ImageName, "Incorrect image name passed to driver.")
-	assert.Equal(t, d.CreateImageDesc, c.ImageDescription, "Incorrect image description passed to driver.")
-	assert.Equal(t, d.CreateImageFamily, c.ImageFamily, "Incorrect image family passed to driver.")
-	assert.Equal(t, d.CreateImageZone, c.Zone, "Incorrect image zone passed to driver.")
-	assert.Equal(t, d.CreateImageDisk, c.DiskName, "Incorrect disk passed to driver.")
-	assert.Equal(t, d.CreateImageLabels, c.ImageLabels, "Incorrect image_labels passed to driver.")
-	assert.Equal(t, d.CreateImageLicenses, c.ImageLicenses, "Incorrect image_licenses passed to driver.")
-	assert.Equal(t, d.CreateImageEncryptionKey, c.ImageEncryptionKey.ComputeType(), "Incorrect image_encryption_key passed to driver.")
-	assert.Equal(t, d.CreateImageStorageLocations, c.ImageStorageLocations, "Incorrect image_storage_locations passed to driver.")
-}
-
-func TestStepCreateImage_errorOnChannel(t *testing.T) {
-	state := testState(t)
-	step := new(StepCreateImage)
-	defer step.Cleanup(state)
-
-	errCh := make(chan error, 1)
-	errCh <- errors.New("error")
-
-	driver := state.Get("driver").(*DriverMock)
-	driver.CreateImageErrCh = errCh
-
-	// run the step
-	action := step.Run(context.Background(), state)
-	assert.Equal(t, action, multistep.ActionHalt, "Step should not have passed.")
-	_, ok := state.GetOk("error")
-	assert.True(t, ok, "State should have an error.")
-	_, ok = state.GetOk("image_name")
-	assert.False(t, ok, "State should not have a resulting image.")
-}

builder/googlecompute/step_create_instance_test.go

@@ -1,475 +0,0 @@
-package googlecompute
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestStepCreateInstance_impl(t *testing.T) {
-	var _ multistep.Step = new(StepCreateInstance)
-}
-
-func TestStepCreateInstance(t *testing.T) {
-	state := testState(t)
-	step := new(StepCreateInstance)
-	defer step.Cleanup(state)
-
-	state.Put("ssh_public_key", "key")
-
-	c := state.Get("config").(*Config)
-	d := state.Get("driver").(*DriverMock)
-	d.GetImageResult = StubImage("test-image", "test-project", []string{}, 100)
-
-	// run the step
-	assert.Equal(t, step.Run(context.Background(), state), multistep.ActionContinue, "Step should have passed and continued.")
-
-	// Verify state
-	nameRaw, ok := state.GetOk("instance_name")
-	assert.True(t, ok, "State should have an instance name.")
-
-	// cleanup
-	step.Cleanup(state)
-
-	// Check args passed to the driver.
-	assert.Equal(t, d.DeleteInstanceName, nameRaw.(string), "Incorrect instance name passed to driver.")
-	assert.Equal(t, d.DeleteInstanceZone, c.Zone, "Incorrect instance zone passed to driver.")
-	assert.Equal(t, d.DeleteDiskName, c.InstanceName, "Incorrect disk name passed to driver.")
-	assert.Equal(t, d.DeleteDiskZone, c.Zone, "Incorrect disk zone passed to driver.")
-}
-
-func TestStepCreateInstance_fromFamily(t *testing.T) {
-	cases := []struct {
-		Name   string
-		Family string
-		Expect bool
-	}{
-		{"test-image", "", false},
-		{"test-image", "test-family", false}, // name trumps family
-		{"", "test-family", true},
-	}
-
-	for _, tc := range cases {
-		state := testState(t)
-		step := new(StepCreateInstance)
-		defer step.Cleanup(state)
-
-		state.Put("ssh_public_key", "key")
-
-		c := state.Get("config").(*Config)
-		c.SourceImage = tc.Name
-		c.SourceImageFamily = tc.Family
-		d := state.Get("driver").(*DriverMock)
-		d.GetImageResult = StubImage("test-image", "test-project", []string{}, 100)
-
-		// run the step
-		assert.Equal(t, step.Run(context.Background(), state), multistep.ActionContinue, "Step should have passed and continued.")
-
-		// cleanup
-		step.Cleanup(state)
-
-		// Check args passed to the driver.
-		if tc.Expect {
-			assert.True(t, d.GetImageFromFamily, "Driver wasn't instructed to use an image family")
-		} else {
-			assert.False(t, d.GetImageFromFamily, "Driver was unexpectedly instructed to use an image family")
-		}
-	}
-}
-
-func TestStepCreateInstance_windowsNeedsPassword(t *testing.T) {
-
-	state := testState(t)
-	step := new(StepCreateInstance)
-	defer step.Cleanup(state)
-
-	state.Put("ssh_public_key", "key")
-	c := state.Get("config").(*Config)
-	d := state.Get("driver").(*DriverMock)
-	d.GetImageResult = StubImage("test-image", "test-project", []string{"windows"}, 100)
-	c.Comm.Type = "winrm"
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	// Verify state
-	nameRaw, ok := state.GetOk("instance_name")
-	if !ok {
-		t.Fatal("should have instance name")
-	}
-
-	createPassword, ok := state.GetOk("create_windows_password")
-
-	if !ok || !createPassword.(bool) {
-		t.Fatal("should need to create a windows password")
-	}
-
-	// cleanup
-	step.Cleanup(state)
-
-	if d.DeleteInstanceName != nameRaw.(string) {
-		t.Fatal("should've deleted instance")
-	}
-	if d.DeleteInstanceZone != c.Zone {
-		t.Fatalf("bad instance zone: %#v", d.DeleteInstanceZone)
-	}
-
-	if d.DeleteDiskName != c.InstanceName {
-		t.Fatal("should've deleted disk")
-	}
-	if d.DeleteDiskZone != c.Zone {
-		t.Fatalf("bad disk zone: %#v", d.DeleteDiskZone)
-	}
-}
-
-func TestStepCreateInstance_windowsPasswordSet(t *testing.T) {
-
-	state := testState(t)
-	step := new(StepCreateInstance)
-	defer step.Cleanup(state)
-
-	state.Put("ssh_public_key", "key")
-
-	config := state.Get("config").(*Config)
-	driver := state.Get("driver").(*DriverMock)
-	driver.GetImageResult = StubImage("test-image", "test-project", []string{"windows"}, 100)
-	config.Comm.Type = "winrm"
-	config.Comm.WinRMPassword = "password"
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	// Verify state
-	nameRaw, ok := state.GetOk("instance_name")
-	if !ok {
-		t.Fatal("should have instance name")
-	}
-
-	_, ok = state.GetOk("create_windows_password")
-
-	if ok {
-		t.Fatal("should not need to create windows password")
-	}
-
-	// cleanup
-	step.Cleanup(state)
-
-	if driver.DeleteInstanceName != nameRaw.(string) {
-		t.Fatal("should've deleted instance")
-	}
-	if driver.DeleteInstanceZone != config.Zone {
-		t.Fatalf("bad instance zone: %#v", driver.DeleteInstanceZone)
-	}
-
-	if driver.DeleteDiskName != config.InstanceName {
-		t.Fatal("should've deleted disk")
-	}
-	if driver.DeleteDiskZone != config.Zone {
-		t.Fatalf("bad disk zone: %#v", driver.DeleteDiskZone)
-	}
-}
-
-func TestStepCreateInstance_error(t *testing.T) {
-	state := testState(t)
-	step := new(StepCreateInstance)
-	defer step.Cleanup(state)
-
-	state.Put("ssh_public_key", "key")
-
-	d := state.Get("driver").(*DriverMock)
-	d.RunInstanceErr = errors.New("error")
-	d.GetImageResult = StubImage("test-image", "test-project", []string{}, 100)
-
-	// run the step
-	assert.Equal(t, step.Run(context.Background(), state), multistep.ActionHalt, "Step should have failed and halted.")
-
-	// Verify state
-	_, ok := state.GetOk("error")
-	assert.True(t, ok, "State should have an error.")
-	_, ok = state.GetOk("instance_name")
-	assert.False(t, ok, "State should not have an instance name.")
-}
-
-func TestStepCreateInstance_errorOnChannel(t *testing.T) {
-	state := testState(t)
-	step := new(StepCreateInstance)
-	defer step.Cleanup(state)
-
-	state.Put("ssh_public_key", "key")
-
-	errCh := make(chan error, 1)
-	errCh <- errors.New("error")
-
-	d := state.Get("driver").(*DriverMock)
-	d.RunInstanceErrCh = errCh
-	d.GetImageResult = StubImage("test-image", "test-project", []string{}, 100)
-
-	// run the step
-	assert.Equal(t, step.Run(context.Background(), state), multistep.ActionHalt, "Step should have failed and halted.")
-
-	// Verify state
-	_, ok := state.GetOk("error")
-	assert.True(t, ok, "State should have an error.")
-	_, ok = state.GetOk("instance_name")
-	assert.False(t, ok, "State should not have an instance name.")
-}
-
-func TestStepCreateInstance_errorTimeout(t *testing.T) {
-	state := testState(t)
-	step := new(StepCreateInstance)
-	defer step.Cleanup(state)
-
-	state.Put("ssh_public_key", "key")
-
-	errCh := make(chan error, 1)
-
-	config := state.Get("config").(*Config)
-	config.StateTimeout = 1 * time.Millisecond
-
-	d := state.Get("driver").(*DriverMock)
-	d.RunInstanceErrCh = errCh
-	d.GetImageResult = StubImage("test-image", "test-project", []string{}, 100)
-
-	// run the step
-	assert.Equal(t, step.Run(context.Background(), state), multistep.ActionHalt, "Step should have failed and halted.")
-
-	// Verify state
-	_, ok := state.GetOk("error")
-	assert.True(t, ok, "State should have an error.")
-	_, ok = state.GetOk("instance_name")
-	assert.False(t, ok, "State should not have an instance name.")
-}
-
-func TestStepCreateInstance_noServiceAccount(t *testing.T) {
-	state := testState(t)
-	step := new(StepCreateInstance)
-	defer step.Cleanup(state)
-
-	state.Put("ssh_public_key", "key")
-
-	c := state.Get("config").(*Config)
-	c.DisableDefaultServiceAccount = true
-	c.ServiceAccountEmail = ""
-	d := state.Get("driver").(*DriverMock)
-	d.GetImageResult = StubImage("test-image", "test-project", []string{}, 100)
-
-	// run the step
-	assert.Equal(t, step.Run(context.Background(), state), multistep.ActionContinue, "Step should have passed and continued.")
-
-	// cleanup
-	step.Cleanup(state)
-
-	// Check args passed to the driver.
-	assert.Equal(t, d.RunInstanceConfig.DisableDefaultServiceAccount, c.DisableDefaultServiceAccount, "Incorrect value for DisableDefaultServiceAccount passed to driver.")
-	assert.Equal(t, d.RunInstanceConfig.ServiceAccountEmail, c.ServiceAccountEmail, "Incorrect value for ServiceAccountEmail passed to driver.")
-}
-
-func TestStepCreateInstance_customServiceAccount(t *testing.T) {
-	state := testState(t)
-	step := new(StepCreateInstance)
-	defer step.Cleanup(state)
-
-	state.Put("ssh_public_key", "key")
-
-	c := state.Get("config").(*Config)
-	c.DisableDefaultServiceAccount = true
-	c.ServiceAccountEmail = "custom-service-account"
-	d := state.Get("driver").(*DriverMock)
-	d.GetImageResult = StubImage("test-image", "test-project", []string{}, 100)
-
-	// run the step
-	assert.Equal(t, step.Run(context.Background(), state), multistep.ActionContinue, "Step should have passed and continued.")
-
-	// cleanup
-	step.Cleanup(state)
-
-	// Check args passed to the driver.
-	assert.Equal(t, d.RunInstanceConfig.DisableDefaultServiceAccount, c.DisableDefaultServiceAccount, "Incorrect value for DisableDefaultServiceAccount passed to driver.")
-	assert.Equal(t, d.RunInstanceConfig.ServiceAccountEmail, c.ServiceAccountEmail, "Incorrect value for ServiceAccountEmail passed to driver.")
-}
-
-func TestCreateInstanceMetadata(t *testing.T) {
-	state := testState(t)
-	c := state.Get("config").(*Config)
-	image := StubImage("test-image", "test-project", []string{}, 100)
-	key := "abcdefgh12345678"
-
-	// create our metadata
-	_, metadataSSHKeys, err := c.createInstanceMetadata(image, key)
-
-	assert.True(t, err == nil, "Metadata creation should have succeeded.")
-
-	// ensure our key is listed
-	assert.True(t, strings.Contains(metadataSSHKeys["ssh-keys"], key), "Instance metadata should contain provided key")
-}
-
-func TestCreateInstanceMetadata_noPublicKey(t *testing.T) {
-	state := testState(t)
-	c := state.Get("config").(*Config)
-	image := StubImage("test-image", "test-project", []string{}, 100)
-	sshKeys := c.Metadata["ssh-keys"]
-
-	// create our metadata
-	_, metadataSSHKeys, err := c.createInstanceMetadata(image, "")
-
-	assert.True(t, err == nil, "Metadata creation should have succeeded.")
-
-	// ensure the ssh metadata hasn't changed
-	assert.Equal(t, metadataSSHKeys["ssh-keys"], sshKeys, "Instance metadata should not have been modified")
-}
-
-func TestCreateInstanceMetadata_metadataFile(t *testing.T) {
-	state := testState(t)
-	c := state.Get("config").(*Config)
-	image := StubImage("test-image", "test-project", []string{}, 100)
-	content := testMetadataFileContent
-	fileName := testMetadataFile(t)
-	c.MetadataFiles["user-data"] = fileName
-
-	// create our metadata
-	metadataNoSSHKeys, _, err := c.createInstanceMetadata(image, "")
-
-	assert.True(t, err == nil, "Metadata creation should have succeeded.")
-
-	// ensure the user-data key in metadata is updated with file content
-	assert.Equal(t, metadataNoSSHKeys["user-data"], content, "user-data field of the instance metadata should have been updated.")
-}
-
-func TestCreateInstanceMetadata_withWrapStartupScript(t *testing.T) {
-	tt := []struct {
-		WrapStartupScript            config.Trilean
-		StartupScriptContents        string
-		WrappedStartupScriptContents string
-		WrappedStartupScriptStatus   string
-	}{
-		{
-			WrapStartupScript:     config.TriUnset,
-			StartupScriptContents: testMetadataFileContent,
-		},
-		{
-			WrapStartupScript:     config.TriFalse,
-			StartupScriptContents: testMetadataFileContent,
-		},
-		{
-			WrapStartupScript:            config.TriTrue,
-			StartupScriptContents:        StartupScriptLinux,
-			WrappedStartupScriptContents: testMetadataFileContent,
-			WrappedStartupScriptStatus:   StartupScriptStatusNotDone,
-		},
-	}
-
-	for _, tc := range tt {
-		tc := tc
-		state := testState(t)
-		image := StubImage("test-image", "test-project", []string{}, 100)
-		c := state.Get("config").(*Config)
-		c.StartupScriptFile = testMetadataFile(t)
-		c.WrapStartupScriptFile = tc.WrapStartupScript
-
-		// create our metadata
-		metadataNoSSHKeys, _, err := c.createInstanceMetadata(image, "")
-
-		assert.True(t, err == nil, "Metadata creation should have succeeded.")
-		assert.Equal(t, tc.StartupScriptContents, metadataNoSSHKeys[StartupScriptKey], fmt.Sprintf("Instance metadata for startup script should be %q.", tc.StartupScriptContents))
-		assert.Equal(t, tc.WrappedStartupScriptContents, metadataNoSSHKeys[StartupWrappedScriptKey], fmt.Sprintf("Instance metadata for wrapped startup script should be %q.", tc.WrappedStartupScriptContents))
-		assert.Equal(t, tc.WrappedStartupScriptStatus, metadataNoSSHKeys[StartupScriptStatusKey], fmt.Sprintf("Instance metadata startup script status should be %q.", tc.WrappedStartupScriptStatus))
-	}
-}
-
-func TestCreateInstanceMetadataWaitToAddSSHKeys(t *testing.T) {
-	state := testState(t)
-	c := state.Get("config").(*Config)
-	image := StubImage("test-image", "test-project", []string{}, 100)
-	key := "abcdefgh12345678"
-
-	var waitTime int = 4
-	c.WaitToAddSSHKeys = time.Duration(waitTime) * time.Second
-	c.Metadata = map[string]string{
-		"metadatakey1": "xyz",
-		"metadatakey2": "123",
-	}
-
-	// create our metadata
-	metadataNoSSHKeys, metadataSSHKeys, err := c.createInstanceMetadata(image, key)
-
-	assert.True(t, err == nil, "Metadata creation should have succeeded.")
-
-	// ensure our metadata is listed
-	assert.True(t, strings.Contains(metadataSSHKeys["ssh-keys"], key), "Instance metadata should contain provided SSH key")
-	assert.True(t, strings.Contains(metadataNoSSHKeys["metadatakey1"], "xyz"), "Instance metadata should contain provided key: metadatakey1")
-	assert.True(t, strings.Contains(metadataNoSSHKeys["metadatakey2"], "123"), "Instance metadata should contain provided key: metadatakey2")
-}
-
-func TestStepCreateInstanceWaitToAddSSHKeys(t *testing.T) {
-	state := testState(t)
-	step := new(StepCreateInstance)
-	defer step.Cleanup(state)
-
-	state.Put("ssh_public_key", "key")
-
-	c := state.Get("config").(*Config)
-	d := state.Get("driver").(*DriverMock)
-	d.GetImageResult = StubImage("test-image", "test-project", []string{}, 100)
-
-	key := "abcdefgh12345678"
-
-	var waitTime int = 5
-	c.WaitToAddSSHKeys = time.Duration(waitTime) * time.Second
-	c.Comm.SSHPublicKey = []byte(key)
-
-	c.Metadata = map[string]string{
-		"metadatakey1": "xyz",
-		"metadatakey2": "123",
-	}
-
-	// run the step
-	assert.Equal(t, step.Run(context.Background(), state), multistep.ActionContinue, "Step should have passed and continued.")
-
-	// Verify state
-	_, ok := state.GetOk("instance_name")
-	assert.True(t, ok, "State should have an instance name.")
-
-	// cleanup
-	step.Cleanup(state)
-}
-
-func TestStepCreateInstanceNoWaitToAddSSHKeys(t *testing.T) {
-	state := testState(t)
-	step := new(StepCreateInstance)
-	defer step.Cleanup(state)
-
-	state.Put("ssh_public_key", "key")
-
-	c := state.Get("config").(*Config)
-	d := state.Get("driver").(*DriverMock)
-	d.GetImageResult = StubImage("test-image", "test-project", []string{}, 100)
-
-	key := "abcdefgh12345678"
-
-	c.Comm.SSHPublicKey = []byte(key)
-
-	c.Metadata = map[string]string{
-		"metadatakey1": "xyz",
-		"metadatakey2": "123",
-	}
-
-	// run the step
-	assert.Equal(t, step.Run(context.Background(), state), multistep.ActionContinue, "Step should have passed and continued.")
-
-	// Verify state
-	_, ok := state.GetOk("instance_name")
-	assert.True(t, ok, "State should have an instance name.")
-
-	// cleanup
-	step.Cleanup(state)
-}

builder/googlecompute/step_create_windows_password_test.go

@@ -1,164 +0,0 @@
-package googlecompute
-
-import (
-	"context"
-	"errors"
-	"io/ioutil"
-	"os"
-
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-
-	"testing"
-)
-
-func TestStepCreateOrResetWindowsPassword(t *testing.T) {
-	state := testState(t)
-
-	// Step is run after the instance is created so we will have an instance name set
-	state.Put("instance_name", "mock_instance")
-	state.Put("create_windows_password", true)
-
-	step := new(StepCreateWindowsPassword)
-	defer step.Cleanup(state)
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	if password, ok := state.GetOk("winrm_password"); !ok || password.(string) != "MOCK_PASSWORD" {
-		t.Fatal("should have a password", password, ok)
-	}
-}
-
-func TestStepCreateOrResetWindowsPassword_passwordSet(t *testing.T) {
-	state := testState(t)
-
-	// Step is run after the instance is created so we will have an instance name set
-	state.Put("instance_name", "mock_instance")
-
-	c := state.Get("config").(*Config)
-
-	c.Comm.WinRMPassword = "password"
-
-	step := new(StepCreateWindowsPassword)
-	defer step.Cleanup(state)
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	if password, ok := state.GetOk("winrm_password"); !ok || password.(string) != "password" {
-		t.Fatal("should have used existing password", password, ok)
-	}
-}
-
-func TestStepCreateOrResetWindowsPassword_dontNeedPassword(t *testing.T) {
-	state := testState(t)
-
-	// Step is run after the instance is created so we will have an instance name set
-	state.Put("instance_name", "mock_instance")
-
-	step := new(StepCreateWindowsPassword)
-	defer step.Cleanup(state)
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-}
-
-func TestStepCreateOrResetWindowsPassword_debug(t *testing.T) {
-	tf, err := ioutil.TempFile("", "packer")
-	if err != nil {
-		t.Fatalf("err: %s", err)
-	}
-	defer os.Remove(tf.Name())
-	tf.Close()
-
-	state := testState(t)
-	// Step is run after the instance is created so we will have an instance name set
-	state.Put("instance_name", "mock_instance")
-	state.Put("create_windows_password", true)
-
-	step := new(StepCreateWindowsPassword)
-
-	step.Debug = true
-	step.DebugKeyPath = tf.Name()
-
-	defer step.Cleanup(state)
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	if password, ok := state.GetOk("winrm_password"); !ok || password.(string) != "MOCK_PASSWORD" {
-		t.Fatal("should have a password", password, ok)
-	}
-
-	if _, err := os.Stat(tf.Name()); err != nil {
-		t.Fatalf("err: %s", err)
-	}
-}
-
-func TestStepCreateOrResetWindowsPassword_error(t *testing.T) {
-	state := testState(t)
-
-	// Step is run after the instance is created so we will have an instance name set
-	state.Put("instance_name", "mock_instance")
-	state.Put("create_windows_password", true)
-
-	step := new(StepCreateWindowsPassword)
-	defer step.Cleanup(state)
-
-	driver := state.Get("driver").(*DriverMock)
-	driver.CreateOrResetWindowsPasswordErr = errors.New("error")
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionHalt {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	// Verify state
-	if _, ok := state.GetOk("error"); !ok {
-		t.Fatal("should have error")
-	}
-
-	if _, ok := state.GetOk("winrm_password"); ok {
-		t.Fatal("should NOT have instance name")
-	}
-}
-
-func TestStepCreateOrResetWindowsPassword_errorOnChannel(t *testing.T) {
-	state := testState(t)
-
-	// Step is run after the instance is created so we will have an instance name set
-	state.Put("instance_name", "mock_instance")
-	state.Put("create_windows_password", true)
-
-	step := new(StepCreateWindowsPassword)
-	defer step.Cleanup(state)
-
-	driver := state.Get("driver").(*DriverMock)
-
-	errCh := make(chan error, 1)
-	errCh <- errors.New("error")
-
-	driver.CreateOrResetWindowsPasswordErrCh = errCh
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionHalt {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	// Verify state
-	if _, ok := state.GetOk("error"); !ok {
-		t.Fatal("should have error")
-	}
-	if _, ok := state.GetOk("winrm_password"); ok {
-		t.Fatal("should NOT have instance name")
-	}
-}

builder/googlecompute/step_import_os_login_ssh_key_test.go

@@ -1,152 +0,0 @@
-package googlecompute
-
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"testing"
-
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"google.golang.org/api/oauth2/v2"
-)
-
-func TestStepImportOSLoginSSHKey_impl(t *testing.T) {
-	var _ multistep.Step = new(StepImportOSLoginSSHKey)
-}
-
-func TestStepImportOSLoginSSHKey(t *testing.T) {
-	tt := []struct {
-		Name           string
-		UseOSLogin     bool
-		ExpectedEmail  string
-		ExpectedAction multistep.StepAction
-		PubKeyExpected bool
-	}{
-		{
-			Name:           "UseOSLoginDisabled",
-			ExpectedAction: multistep.ActionContinue,
-		},
-		{
-			Name:           "UseOSLoginWithAccountFile",
-			UseOSLogin:     true,
-			ExpectedAction: multistep.ActionContinue,
-			ExpectedEmail:  "raffi-compute@developer.gserviceaccount.com",
-			PubKeyExpected: true,
-		},
-	}
-
-	for _, tc := range tt {
-		tc := tc
-		state := testState(t)
-		step := new(StepImportOSLoginSSHKey)
-		defer step.Cleanup(state)
-
-		config := state.Get("config").(*Config)
-		config.UseOSLogin = tc.UseOSLogin
-
-		if tc.PubKeyExpected {
-			config.Comm.SSHPublicKey = []byte{'k', 'e', 'y'}
-		}
-
-		if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-			t.Fatalf("bad action: %#v", action)
-		}
-
-		if step.accountEmail != tc.ExpectedEmail {
-			t.Fatalf("expected accountEmail to be %q but got %q", tc.ExpectedEmail, step.accountEmail)
-		}
-
-		if _, ok := state.GetOk("ssh_key_public_sha256"); !ok && tc.PubKeyExpected {
-			t.Fatal("expected to see a public key")
-		}
-	}
-}
-
-func TestStepImportOSLoginSSHKey_withAccountFile(t *testing.T) {
-	// default teststate contains an account file
-	state := testState(t)
-	step := new(StepImportOSLoginSSHKey)
-	defer step.Cleanup(state)
-
-	config := state.Get("config").(*Config)
-	config.UseOSLogin = true
-	config.Comm.SSHPublicKey = []byte{'k', 'e', 'y'}
-
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	fakeAccountEmail := "raffi-compute@developer.gserviceaccount.com"
-	if step.accountEmail != fakeAccountEmail {
-		t.Fatalf("expected accountEmail to be %q but got %q", fakeAccountEmail, step.accountEmail)
-	}
-
-	pubKey, ok := state.GetOk("ssh_key_public_sha256")
-	if !ok {
-		t.Fatal("expected to see a public key")
-	}
-
-	sha256sum := sha256.Sum256(config.Comm.SSHPublicKey)
-	if pubKey != hex.EncodeToString(sha256sum[:]) {
-		t.Errorf("expected to see a matching public key, but got %q", pubKey)
-	}
-}
-
-func TestStepImportOSLoginSSHKey_withNoAccountFile(t *testing.T) {
-	state := testState(t)
-	fakeAccountEmail := "testing@packer.io"
-	step := &StepImportOSLoginSSHKey{
-		TokeninfoFunc: func(ctx context.Context) (*oauth2.Tokeninfo, error) {
-			return &oauth2.Tokeninfo{Email: fakeAccountEmail}, nil
-		},
-	}
-	defer step.Cleanup(state)
-
-	config := state.Get("config").(*Config)
-	config.account = nil
-	config.UseOSLogin = true
-	config.Comm.SSHPublicKey = []byte{'k', 'e', 'y'}
-
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	if step.accountEmail != fakeAccountEmail {
-		t.Fatalf("expected accountEmail to be %q but got %q", fakeAccountEmail, step.accountEmail)
-	}
-
-	pubKey, ok := state.GetOk("ssh_key_public_sha256")
-	if !ok {
-		t.Fatal("expected to see a public key")
-	}
-
-	sha256sum := sha256.Sum256(config.Comm.SSHPublicKey)
-	if pubKey != hex.EncodeToString(sha256sum[:]) {
-		t.Errorf("expected to see a matching public key, but got %q", pubKey)
-	}
-}
-
-func TestStepImportOSLoginSSHKey_withPrivateSSHKey(t *testing.T) {
-	// default teststate contains an account file
-	state := testState(t)
-	step := new(StepImportOSLoginSSHKey)
-	defer step.Cleanup(state)
-
-	config := state.Get("config").(*Config)
-	config.UseOSLogin = true
-	config.Comm.SSHPrivateKey = []byte{'k', 'e', 'y'}
-	config.Comm.SSHPublicKey = nil
-
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	if step.accountEmail != "" {
-		t.Fatalf("expected accountEmail to be unset but got %q", step.accountEmail)
-	}
-
-	pubKey, ok := state.GetOk("ssh_key_public_sha256")
-	if ok {
-		t.Errorf("expected to not see a public key when using a dedicated private key, but got %q", pubKey)
-	}
-}

builder/googlecompute/step_instance_info_test.go

@@ -1,176 +0,0 @@
-package googlecompute
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-)
-
-func TestStepInstanceInfo_impl(t *testing.T) {
-	var _ multistep.Step = new(StepInstanceInfo)
-}
-
-func TestStepInstanceInfo(t *testing.T) {
-	state := testState(t)
-	step := new(StepInstanceInfo)
-	defer step.Cleanup(state)
-
-	state.Put("instance_name", "foo")
-
-	config := state.Get("config").(*Config)
-	driver := state.Get("driver").(*DriverMock)
-	driver.GetNatIPResult = "1.2.3.4"
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	// Verify state
-	if driver.WaitForInstanceState != "RUNNING" {
-		t.Fatalf("bad: %#v", driver.WaitForInstanceState)
-	}
-	if driver.WaitForInstanceZone != config.Zone {
-		t.Fatalf("bad: %#v", driver.WaitForInstanceZone)
-	}
-	if driver.WaitForInstanceName != "foo" {
-		t.Fatalf("bad: %#v", driver.WaitForInstanceName)
-	}
-
-	ipRaw, ok := state.GetOk("instance_ip")
-	if !ok {
-		t.Fatal("should have ip")
-	}
-	if ip, ok := ipRaw.(string); !ok {
-		t.Fatal("ip is not a string")
-	} else if ip != "1.2.3.4" {
-		t.Fatalf("bad ip: %s", ip)
-	}
-}
-
-func TestStepInstanceInfo_InternalIP(t *testing.T) {
-	state := testState(t)
-	step := new(StepInstanceInfo)
-	defer step.Cleanup(state)
-
-	state.Put("instance_name", "foo")
-
-	config := state.Get("config").(*Config)
-	config.UseInternalIP = true
-	driver := state.Get("driver").(*DriverMock)
-	driver.GetNatIPResult = "1.2.3.4"
-	driver.GetInternalIPResult = "5.6.7.8"
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	// Verify state
-	if driver.WaitForInstanceState != "RUNNING" {
-		t.Fatalf("bad: %#v", driver.WaitForInstanceState)
-	}
-	if driver.WaitForInstanceZone != config.Zone {
-		t.Fatalf("bad: %#v", driver.WaitForInstanceZone)
-	}
-	if driver.WaitForInstanceName != "foo" {
-		t.Fatalf("bad: %#v", driver.WaitForInstanceName)
-	}
-
-	ipRaw, ok := state.GetOk("instance_ip")
-	if !ok {
-		t.Fatal("should have ip")
-	}
-	if ip, ok := ipRaw.(string); !ok {
-		t.Fatal("ip is not a string")
-	} else if ip != "5.6.7.8" {
-		t.Fatalf("bad ip: %s", ip)
-	}
-}
-
-func TestStepInstanceInfo_getNatIPError(t *testing.T) {
-	state := testState(t)
-	step := new(StepInstanceInfo)
-	defer step.Cleanup(state)
-
-	state.Put("instance_name", "foo")
-
-	driver := state.Get("driver").(*DriverMock)
-	driver.GetNatIPErr = errors.New("error")
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionHalt {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	// Verify state
-	if _, ok := state.GetOk("error"); !ok {
-		t.Fatal("should have error")
-	}
-	if _, ok := state.GetOk("instance_ip"); ok {
-		t.Fatal("should NOT have instance IP")
-	}
-}
-
-func TestStepInstanceInfo_waitError(t *testing.T) {
-	state := testState(t)
-	step := new(StepInstanceInfo)
-	defer step.Cleanup(state)
-
-	state.Put("instance_name", "foo")
-
-	errCh := make(chan error, 1)
-	errCh <- errors.New("error")
-
-	driver := state.Get("driver").(*DriverMock)
-	driver.WaitForInstanceErrCh = errCh
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionHalt {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	// Verify state
-	if _, ok := state.GetOk("error"); !ok {
-		t.Fatal("should have error")
-	}
-	if _, ok := state.GetOk("instance_ip"); ok {
-		t.Fatal("should NOT have instance IP")
-	}
-}
-
-func TestStepInstanceInfo_errorTimeout(t *testing.T) {
-	state := testState(t)
-	step := new(StepInstanceInfo)
-	defer step.Cleanup(state)
-
-	errCh := make(chan error, 1)
-	go func() {
-		<-time.After(50 * time.Millisecond)
-		errCh <- nil
-	}()
-
-	state.Put("instance_name", "foo")
-
-	config := state.Get("config").(*Config)
-	config.StateTimeout = 1 * time.Millisecond
-
-	driver := state.Get("driver").(*DriverMock)
-	driver.WaitForInstanceErrCh = errCh
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionHalt {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	// Verify state
-	if _, ok := state.GetOk("error"); !ok {
-		t.Fatal("should have error")
-	}
-	if _, ok := state.GetOk("instance_ip"); ok {
-		t.Fatal("should NOT have instance IP")
-	}
-}

builder/googlecompute/step_start_tunnel_test.go

@@ -1,137 +0,0 @@
-package googlecompute
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"runtime"
-	"testing"
-
-	"github.com/hashicorp/packer-plugin-sdk/communicator"
-)
-
-type MockTunnelDriver struct {
-	StopTunnelCalled   bool
-	StartTunnelCalled  bool
-	StartTunnelTimeout int
-}
-
-func (m *MockTunnelDriver) StopTunnel() {
-	m.StopTunnelCalled = true
-}
-
-func (m *MockTunnelDriver) StartTunnel(_ context.Context, _ string, timeout int) error {
-	m.StartTunnelCalled = true
-	m.StartTunnelTimeout = timeout
-	return nil
-}
-
-func getTestStepStartTunnel() *StepStartTunnel {
-	return &StepStartTunnel{
-		IAPConf: &IAPConfig{
-			IAP:              true,
-			IAPLocalhostPort: 0,
-			IAPHashBang:      "/bin/bash",
-			IAPExt:           "",
-		},
-		CommConf: &communicator.Config{
-			SSH: communicator.SSH{
-				SSHPort: 1234,
-			},
-		},
-		AccountFile: "/path/to/account_file.json",
-		ProjectId:   "fake-project-123",
-	}
-}
-
-func TestStepStartTunnel_CreateTempScript(t *testing.T) {
-	s := getTestStepStartTunnel()
-
-	args := []string{"compute", "start-iap-tunnel", "fakeinstance-12345",
-		"1234", "--local-host-port=localhost:8774", "--zone", "us-central-b",
-		"--project", "fake-project-123"}
-
-	scriptPath, err := s.createTempGcloudScript(args)
-	if err != nil {
-		t.Fatalf("Shouldn't have error building script file.")
-	}
-	defer os.Remove(scriptPath)
-
-	f, err := ioutil.ReadFile(scriptPath)
-	if err != nil {
-		t.Fatalf("couldn't read created inventoryfile: %s", err)
-	}
-
-	expected := `#!/bin/bash
-
-gcloud auth activate-service-account --key-file='/path/to/account_file.json'
-gcloud compute start-iap-tunnel fakeinstance-12345 1234 --local-host-port=localhost:8774 --zone us-central-b --project fake-project-123
-`
-	if runtime.GOOS == "windows" {
-		// in real life you'd not be passing a HashBang here, but GIGO.
-		expected = `#!/bin/bash
-
-call gcloud auth activate-service-account --key-file "/path/to/account_file.json"
-call gcloud compute start-iap-tunnel fakeinstance-12345 1234 --local-host-port=localhost:8774 --zone us-central-b --project fake-project-123
-`
-	}
-	if fmt.Sprintf("%s", f) != expected {
-		t.Fatalf("script didn't match expected:\n\n expected: \n%s\n; recieved: \n%s\n", expected, f)
-	}
-}
-
-func TestStepStartTunnel_Cleanup(t *testing.T) {
-	// Check IAP true
-	s := getTestStepStartTunnel()
-	td := &MockTunnelDriver{}
-	s.tunnelDriver = td
-
-	state := testState(t)
-	s.Cleanup(state)
-
-	if !td.StopTunnelCalled {
-		t.Fatalf("Should have called StopTunnel, since IAP is true")
-	}
-
-	// Check IAP false
-	s = getTestStepStartTunnel()
-	td = &MockTunnelDriver{}
-	s.tunnelDriver = td
-
-	s.IAPConf.IAP = false
-
-	s.Cleanup(state)
-
-	if td.StopTunnelCalled {
-		t.Fatalf("Should not have called StopTunnel, since IAP is false")
-	}
-}
-
-func TestStepStartTunnel_ConfigurePort_port_set_by_user(t *testing.T) {
-	s := getTestStepStartTunnel()
-	s.IAPConf.IAPLocalhostPort = 8447
-
-	ctx := context.TODO()
-	err := s.ConfigureLocalHostPort(ctx)
-	if err != nil {
-		t.Fatalf("Shouldn't have error detecting port")
-	}
-	if s.IAPConf.IAPLocalhostPort != 8447 {
-		t.Fatalf("Shouldn't have found new port; one was configured.")
-	}
-}
-
-func TestStepStartTunnel_ConfigurePort_port_not_set_by_user(t *testing.T) {
-	s := getTestStepStartTunnel()
-	s.IAPConf.IAPLocalhostPort = 0
-
-	ctx := context.TODO()
-	err := s.ConfigureLocalHostPort(ctx)
-	if err != nil {
-		t.Fatalf("Shouldn't have error detecting port")
-	}
-	if s.IAPConf.IAPLocalhostPort == 0 {
-		t.Fatalf("Should have found new port; none was configured.")
-	}
-}

builder/googlecompute/step_teardown_instance_test.go

@@ -1,43 +0,0 @@
-package googlecompute
-
-import (
-	"context"
-	"testing"
-
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-)
-
-func TestStepTeardownInstance_impl(t *testing.T) {
-	var _ multistep.Step = new(StepTeardownInstance)
-}
-
-func TestStepTeardownInstance(t *testing.T) {
-	state := testState(t)
-	step := new(StepTeardownInstance)
-	defer step.Cleanup(state)
-
-	config := state.Get("config").(*Config)
-	driver := state.Get("driver").(*DriverMock)
-
-	// run the step
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-
-	if driver.DeleteInstanceName != config.InstanceName {
-		t.Fatal("should've deleted instance")
-	}
-	if driver.DeleteInstanceZone != config.Zone {
-		t.Fatalf("bad zone: %#v", driver.DeleteInstanceZone)
-	}
-
-	// cleanup
-	step.Cleanup(state)
-
-	if driver.DeleteDiskName != config.InstanceName {
-		t.Fatal("should've deleted disk")
-	}
-	if driver.DeleteDiskZone != config.Zone {
-		t.Fatalf("bad zone: %#v", driver.DeleteDiskZone)
-	}
-}

builder/googlecompute/step_test.go

@@ -1,21 +0,0 @@
-package googlecompute
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
-)
-
-func testState(t *testing.T) multistep.StateBag {
-	state := new(multistep.BasicStateBag)
-	state.Put("config", testConfigStruct(t))
-	state.Put("driver", &DriverMock{})
-	state.Put("hook", &packersdk.MockHook{})
-	state.Put("ui", &packersdk.BasicUi{
-		Reader: new(bytes.Buffer),
-		Writer: new(bytes.Buffer),
-	})
-	return state
-}

builder/googlecompute/step_wait_startup_script_test.go

@@ -1,66 +0,0 @@
-package googlecompute
-
-import (
-	"context"
-	"testing"
-
-	"github.com/hashicorp/packer-plugin-sdk/multistep"
-	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestStepWaitStartupScript(t *testing.T) {
-	state := testState(t)
-	step := new(StepWaitStartupScript)
-	c := state.Get("config").(*Config)
-	d := state.Get("driver").(*DriverMock)
-
-	testZone := "test-zone"
-	testInstanceName := "test-instance-name"
-
-	c.Zone = testZone
-	state.Put("instance_name", testInstanceName)
-
-	// This step stops when it gets Done back from the metadata.
-	d.GetInstanceMetadataResult = StartupScriptStatusDone
-
-	// Run the step.
-	assert.Equal(t, step.Run(context.Background(), state), multistep.ActionContinue, "Step should have passed and continued.")
-
-	// Check that GetInstanceMetadata was called properly.
-	assert.Equal(t, d.GetInstanceMetadataZone, testZone, "Incorrect zone passed to GetInstanceMetadata.")
-	assert.Equal(t, d.GetInstanceMetadataName, testInstanceName, "Incorrect instance name passed to GetInstanceMetadata.")
-}
-
-func TestStepWaitStartupScript_withWrapStartupScript(t *testing.T) {
-	tt := []struct {
-		WrapStartup                config.Trilean
-		Result, Zone, MetadataName string
-	}{
-		{WrapStartup: config.TriTrue, Result: StartupScriptStatusDone, Zone: "test-zone", MetadataName: "test-instance-name"},
-		{WrapStartup: config.TriFalse},
-	}
-
-	for _, tc := range tt {
-		tc := tc
-		state := testState(t)
-		step := new(StepWaitStartupScript)
-		c := state.Get("config").(*Config)
-		d := state.Get("driver").(*DriverMock)
-
-		c.StartupScriptFile = "startup.sh"
-		c.WrapStartupScriptFile = tc.WrapStartup
-		c.Zone = "test-zone"
-		state.Put("instance_name", "test-instance-name")
-
-		// This step stops when it gets Done back from the metadata.
-		d.GetInstanceMetadataResult = tc.Result
-
-		// Run the step.
-		assert.Equal(t, step.Run(context.Background(), state), multistep.ActionContinue, "Step should have continued.")
-
-		assert.Equal(t, d.GetInstanceMetadataResult, tc.Result, "MetadataResult was not the expected value.")
-		assert.Equal(t, d.GetInstanceMetadataZone, tc.Zone, "Zone was not the expected value.")
-		assert.Equal(t, d.GetInstanceMetadataName, tc.MetadataName, "Instance name was not the expected value.")
-	}
-}

builder/googlecompute/template_funcs_test.go

@@ -1,45 +0,0 @@
-package googlecompute
-
-import "testing"
-
-func Test_templateCleanImageName(t *testing.T) {
-	vals := []struct {
-		origName string
-		expected string
-	}{
-		// test that valid name is unchanged
-		{
-			origName: "abcde-012345xyz",
-			expected: "abcde-012345xyz",
-		},
-
-		//test that capital letters are converted to lowercase
-		{
-			origName: "ABCDE-012345xyz",
-			expected: "abcde-012345xyz",
-		},
-		// test that periods and colons are converted to hyphens
-		{
-			origName: "abcde-012345v1.0:0",
-			expected: "abcde-012345v1-0-0",
-		},
-		// Name starting with number is not valid, but not in scope of this
-		// function to correct
-		{
-			origName: "012345v1.0:0",
-			expected: "012345v1-0-0",
-		},
-		// Name over 64 chars is not valid, but not corrected by this function.
-		{
-			origName: "loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong",
-			expected: "loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong",
-		},
-	}
-
-	for _, v := range vals {
-		name := templateCleanImageName(v.origName)
-		if name != v.expected {
-			t.Fatalf("template names do not match: expected %s got %s\n", v.expected, name)
-		}
-	}
-}

builder/googlecompute/test-fixtures/fake-key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
------END RSA PRIVATE KEY-----

builder/hcloud/builder_acc_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	builderT "github.com/hashicorp/packer-plugin-sdk/acctest"
+	builderT "github.com/hashicorp/packer/acctest"
 )
 
 func TestBuilderAcc_basic(t *testing.T) {

builder/hcloud/config.go

@@ -1,4 +1,4 @@
-//go:generate mapstructure-to-hcl2 -type Config,imageFilter
+//go:generate packer-sdc mapstructure-to-hcl2 -type Config,imageFilter
 
 package hcloud
 

builder/hcloud/config.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type Config,imageFilter"; DO NOT EDIT.
+// Code generated by "packer-sdc mapstructure-to-hcl2"; DO NOT EDIT.
 
 package hcloud