diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 064259792..59087c18b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -462,8 +462,8 @@ The following example has been adapted from a shell-local provisioner test: ``` import ( - "github.com/hashicorp/packer/packer-plugin-sdk/acctest/provisioneracc" - "github.com/hashicorp/packer/packer-plugin-sdk/acctest/testutils" + "github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc" + "github.com/hashicorp/packer-plugin-sdk/acctest/testutils" ) // ... diff --git a/builder/alicloud/ecs/access_config.go b/builder/alicloud/ecs/access_config.go index 222f1ce12..d7892518b 100644 --- a/builder/alicloud/ecs/access_config.go +++ b/builder/alicloud/ecs/access_config.go @@ -11,8 +11,8 @@ import ( "time" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/alicloud/version" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-homedir" ) diff --git a/builder/alicloud/ecs/artifact.go b/builder/alicloud/ecs/artifact.go index d1127d53c..21ca4b3ae 100644 --- a/builder/alicloud/ecs/artifact.go +++ b/builder/alicloud/ecs/artifact.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type Artifact struct { diff --git a/builder/alicloud/ecs/artifact_test.go b/builder/alicloud/ecs/artifact_test.go index 3038431da..2d263d7c7 100644 --- a/builder/alicloud/ecs/artifact_test.go +++ b/builder/alicloud/ecs/artifact_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_Impl(t *testing.T) { diff --git a/builder/alicloud/ecs/builder.go b/builder/alicloud/ecs/builder.go index a207645b0..fff28b7f4 100644 --- a/builder/alicloud/ecs/builder.go +++ b/builder/alicloud/ecs/builder.go @@ -9,13 +9,13 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/alicloud/ecs/builder.hcl2spec.go b/builder/alicloud/ecs/builder.hcl2spec.go index a74d66eb4..f9a2f37b7 100644 --- a/builder/alicloud/ecs/builder.hcl2spec.go +++ b/builder/alicloud/ecs/builder.hcl2spec.go @@ -4,7 +4,7 @@ package ecs import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/alicloud/ecs/builder_acc_test.go b/builder/alicloud/ecs/builder_acc_test.go index 31a416eb1..cbc25e0e7 100644 --- a/builder/alicloud/ecs/builder_acc_test.go +++ b/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/packer-plugin-sdk/acctest" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const defaultTestRegion = "cn-beijing" diff --git a/builder/alicloud/ecs/builder_test.go b/builder/alicloud/ecs/builder_test.go index 3d2f898e2..1127dd69b 100644 --- a/builder/alicloud/ecs/builder_test.go +++ b/builder/alicloud/ecs/builder_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - helperconfig "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + helperconfig "github.com/hashicorp/packer-plugin-sdk/template/config" ) func testBuilderConfig() map[string]interface{} { diff --git a/builder/alicloud/ecs/image_config.go b/builder/alicloud/ecs/image_config.go index 77d7547f9..69b452316 100644 --- a/builder/alicloud/ecs/image_config.go +++ b/builder/alicloud/ecs/image_config.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // The "AlicloudDiskDevice" object us used for the `ECSSystemDiskMapping` and diff --git a/builder/alicloud/ecs/packer_helper.go b/builder/alicloud/ecs/packer_helper.go index 51169f4ec..a0e8266a4 100644 --- a/builder/alicloud/ecs/packer_helper.go +++ b/builder/alicloud/ecs/packer_helper.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func cleanUpMessage(state multistep.StateBag, module string) { diff --git a/builder/alicloud/ecs/run_config.go b/builder/alicloud/ecs/run_config.go index 27d8f4c98..0b96be7af 100644 --- a/builder/alicloud/ecs/run_config.go +++ b/builder/alicloud/ecs/run_config.go @@ -8,10 +8,10 @@ import ( "os" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type RunConfig struct { diff --git a/builder/alicloud/ecs/run_config_test.go b/builder/alicloud/ecs/run_config_test.go index 1c5e99198..b7e5411d9 100644 --- a/builder/alicloud/ecs/run_config_test.go +++ b/builder/alicloud/ecs/run_config_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator" ) func testConfig() *RunConfig { diff --git a/builder/alicloud/ecs/ssh_helper.go b/builder/alicloud/ecs/ssh_helper.go index d400b9347..9e08160d6 100644 --- a/builder/alicloud/ecs/ssh_helper.go +++ b/builder/alicloud/ecs/ssh_helper.go @@ -3,7 +3,7 @@ package ecs import ( "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) var ( diff --git a/builder/alicloud/ecs/step_attach_keypair.go b/builder/alicloud/ecs/step_attach_keypair.go index 55f81f8ca..64bc1a4d2 100644 --- a/builder/alicloud/ecs/step_attach_keypair.go +++ b/builder/alicloud/ecs/step_attach_keypair.go @@ -6,8 +6,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepAttachKeyPair struct { diff --git a/builder/alicloud/ecs/step_check_source_image.go b/builder/alicloud/ecs/step_check_source_image.go index 95c2168c5..54a83384d 100644 --- a/builder/alicloud/ecs/step_check_source_image.go +++ b/builder/alicloud/ecs/step_check_source_image.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCheckAlicloudSourceImage struct { diff --git a/builder/alicloud/ecs/step_config_eip.go b/builder/alicloud/ecs/step_config_eip.go index ce17b35d4..ce63be6ab 100644 --- a/builder/alicloud/ecs/step_config_eip.go +++ b/builder/alicloud/ecs/step_config_eip.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepConfigAlicloudEIP struct { diff --git a/builder/alicloud/ecs/step_config_key_pair.go b/builder/alicloud/ecs/step_config_key_pair.go index c89d812c9..16ac2c551 100644 --- a/builder/alicloud/ecs/step_config_key_pair.go +++ b/builder/alicloud/ecs/step_config_key_pair.go @@ -7,9 +7,9 @@ import ( "runtime" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepConfigAlicloudKeyPair struct { diff --git a/builder/alicloud/ecs/step_config_public_ip.go b/builder/alicloud/ecs/step_config_public_ip.go index 94a6a2cbf..79bc75302 100644 --- a/builder/alicloud/ecs/step_config_public_ip.go +++ b/builder/alicloud/ecs/step_config_public_ip.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepConfigAlicloudPublicIP struct { diff --git a/builder/alicloud/ecs/step_config_security_group.go b/builder/alicloud/ecs/step_config_security_group.go index 0a3ff9685..b986fcab7 100644 --- a/builder/alicloud/ecs/step_config_security_group.go +++ b/builder/alicloud/ecs/step_config_security_group.go @@ -6,9 +6,9 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type stepConfigAlicloudSecurityGroup struct { diff --git a/builder/alicloud/ecs/step_config_vpc.go b/builder/alicloud/ecs/step_config_vpc.go index 72d990aac..56a01b353 100644 --- a/builder/alicloud/ecs/step_config_vpc.go +++ b/builder/alicloud/ecs/step_config_vpc.go @@ -7,9 +7,9 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type stepConfigAlicloudVPC struct { diff --git a/builder/alicloud/ecs/step_config_vswitch.go b/builder/alicloud/ecs/step_config_vswitch.go index 0718e1f8e..7f4376ba6 100644 --- a/builder/alicloud/ecs/step_config_vswitch.go +++ b/builder/alicloud/ecs/step_config_vswitch.go @@ -6,9 +6,9 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type stepConfigAlicloudVSwitch struct { diff --git a/builder/alicloud/ecs/step_create_image.go b/builder/alicloud/ecs/step_create_image.go index 7506777cf..0fa922d10 100644 --- a/builder/alicloud/ecs/step_create_image.go +++ b/builder/alicloud/ecs/step_create_image.go @@ -5,13 +5,13 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/random" + "github.com/hashicorp/packer-plugin-sdk/random" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type stepCreateAlicloudImage struct { diff --git a/builder/alicloud/ecs/step_create_instance.go b/builder/alicloud/ecs/step_create_instance.go index a086a42a1..f4867410e 100644 --- a/builder/alicloud/ecs/step_create_instance.go +++ b/builder/alicloud/ecs/step_create_instance.go @@ -7,14 +7,14 @@ import ( "io/ioutil" "strconv" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + confighelper "github.com/hashicorp/packer-plugin-sdk/template/config" ) type stepCreateAlicloudInstance struct { diff --git a/builder/alicloud/ecs/step_create_snapshot.go b/builder/alicloud/ecs/step_create_snapshot.go index dd29c2925..dbc7c2a30 100644 --- a/builder/alicloud/ecs/step_create_snapshot.go +++ b/builder/alicloud/ecs/step_create_snapshot.go @@ -7,8 +7,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreateAlicloudSnapshot struct { diff --git a/builder/alicloud/ecs/step_create_tags.go b/builder/alicloud/ecs/step_create_tags.go index 31224a709..383d94fcd 100644 --- a/builder/alicloud/ecs/step_create_tags.go +++ b/builder/alicloud/ecs/step_create_tags.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreateTags struct { diff --git a/builder/alicloud/ecs/step_delete_images_snapshots.go b/builder/alicloud/ecs/step_delete_images_snapshots.go index 4eac1d103..df3476bb9 100644 --- a/builder/alicloud/ecs/step_delete_images_snapshots.go +++ b/builder/alicloud/ecs/step_delete_images_snapshots.go @@ -6,8 +6,8 @@ import ( "log" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepDeleteAlicloudImageSnapshots struct { diff --git a/builder/alicloud/ecs/step_pre_validate.go b/builder/alicloud/ecs/step_pre_validate.go index be7441157..2bd3bfa53 100644 --- a/builder/alicloud/ecs/step_pre_validate.go +++ b/builder/alicloud/ecs/step_pre_validate.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepPreValidate struct { diff --git a/builder/alicloud/ecs/step_region_copy_image.go b/builder/alicloud/ecs/step_region_copy_image.go index 716639f12..9ac4b0662 100644 --- a/builder/alicloud/ecs/step_region_copy_image.go +++ b/builder/alicloud/ecs/step_region_copy_image.go @@ -7,9 +7,9 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + confighelper "github.com/hashicorp/packer-plugin-sdk/template/config" ) type stepRegionCopyAlicloudImage struct { diff --git a/builder/alicloud/ecs/step_run_instance.go b/builder/alicloud/ecs/step_run_instance.go index 2f99e9f3e..bbfd39fca 100644 --- a/builder/alicloud/ecs/step_run_instance.go +++ b/builder/alicloud/ecs/step_run_instance.go @@ -6,8 +6,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepRunAlicloudInstance struct { diff --git a/builder/alicloud/ecs/step_share_image.go b/builder/alicloud/ecs/step_share_image.go index f7c07a0b2..699a90be6 100644 --- a/builder/alicloud/ecs/step_share_image.go +++ b/builder/alicloud/ecs/step_share_image.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepShareAlicloudImage struct { diff --git a/builder/alicloud/ecs/step_stop_instance.go b/builder/alicloud/ecs/step_stop_instance.go index 7fbebc19b..cb47d2694 100644 --- a/builder/alicloud/ecs/step_stop_instance.go +++ b/builder/alicloud/ecs/step_stop_instance.go @@ -8,8 +8,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/services/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepStopAlicloudInstance struct { diff --git a/builder/alicloud/version/version.go b/builder/alicloud/version/version.go index 5be3ed32d..c5aac293a 100644 --- a/builder/alicloud/version/version.go +++ b/builder/alicloud/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index ed974e0e7..23d5be8f4 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -15,15 +15,15 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/chroot" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/chroot" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/amazon/chroot/builder.hcl2spec.go b/builder/amazon/chroot/builder.hcl2spec.go index c04b4cb7d..f00c35e65 100644 --- a/builder/amazon/chroot/builder.hcl2spec.go +++ b/builder/amazon/chroot/builder.hcl2spec.go @@ -4,8 +4,8 @@ package chroot import ( "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/amazon/chroot/builder_test.go b/builder/amazon/chroot/builder_test.go index d43dd9f26..69502f3d6 100644 --- a/builder/amazon/chroot/builder_test.go +++ b/builder/amazon/chroot/builder_test.go @@ -3,7 +3,7 @@ package chroot import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/amazon/chroot/copy_files_test.go b/builder/amazon/chroot/copy_files_test.go index 2924e1193..fe6b27e88 100644 --- a/builder/amazon/chroot/copy_files_test.go +++ b/builder/amazon/chroot/copy_files_test.go @@ -7,7 +7,7 @@ import ( "runtime" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/common" ) func TestCopyFile(t *testing.T) { diff --git a/builder/amazon/chroot/step_attach_volume.go b/builder/amazon/chroot/step_attach_volume.go index 572ebce6e..5c45251a9 100644 --- a/builder/amazon/chroot/step_attach_volume.go +++ b/builder/amazon/chroot/step_attach_volume.go @@ -7,9 +7,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // StepAttachVolume attaches the previously created volume to an diff --git a/builder/amazon/chroot/step_attach_volume_test.go b/builder/amazon/chroot/step_attach_volume_test.go index cfc3dad76..72f8b24f0 100644 --- a/builder/amazon/chroot/step_attach_volume_test.go +++ b/builder/amazon/chroot/step_attach_volume_test.go @@ -3,7 +3,7 @@ package chroot import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/chroot" + "github.com/hashicorp/packer-plugin-sdk/chroot" ) func TestAttachVolumeCleanupFunc_ImplementsCleanupFunc(t *testing.T) { diff --git a/builder/amazon/chroot/step_check_root_device.go b/builder/amazon/chroot/step_check_root_device.go index e9391c41e..f5d83b7bd 100644 --- a/builder/amazon/chroot/step_check_root_device.go +++ b/builder/amazon/chroot/step_check_root_device.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCheckRootDevice makes sure the root device on the AMI is EBS-backed. diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go index 95a2eee66..c7bb056a3 100644 --- a/builder/amazon/chroot/step_create_volume.go +++ b/builder/amazon/chroot/step_create_volume.go @@ -8,11 +8,11 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // StepCreateVolume creates a new volume from the snapshot of the root diff --git a/builder/amazon/chroot/step_create_volume_test.go b/builder/amazon/chroot/step_create_volume_test.go index 787312feb..22cb82a75 100644 --- a/builder/amazon/chroot/step_create_volume_test.go +++ b/builder/amazon/chroot/step_create_volume_test.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + confighelper "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" ) diff --git a/builder/amazon/chroot/step_early_unflock.go b/builder/amazon/chroot/step_early_unflock.go index 5abe7dd1d..d2fd76c6e 100644 --- a/builder/amazon/chroot/step_early_unflock.go +++ b/builder/amazon/chroot/step_early_unflock.go @@ -5,9 +5,9 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/chroot" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/chroot" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepEarlyUnflock unlocks the flock. diff --git a/builder/amazon/chroot/step_flock.go b/builder/amazon/chroot/step_flock.go index c8d92f5a3..54ffaa22a 100644 --- a/builder/amazon/chroot/step_flock.go +++ b/builder/amazon/chroot/step_flock.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepFlock provisions the instance within a chroot. diff --git a/builder/amazon/chroot/step_flock_test.go b/builder/amazon/chroot/step_flock_test.go index 8c20aefbd..ea113861f 100644 --- a/builder/amazon/chroot/step_flock_test.go +++ b/builder/amazon/chroot/step_flock_test.go @@ -3,7 +3,7 @@ package chroot import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/chroot" + "github.com/hashicorp/packer-plugin-sdk/chroot" ) func TestFlockCleanupFunc_ImplementsCleanupFunc(t *testing.T) { diff --git a/builder/amazon/chroot/step_instance_info.go b/builder/amazon/chroot/step_instance_info.go index 4cc488991..cab55c0e9 100644 --- a/builder/amazon/chroot/step_instance_info.go +++ b/builder/amazon/chroot/step_instance_info.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepInstanceInfo verifies that this builder is running on an EC2 instance. diff --git a/builder/amazon/chroot/step_mount_device.go b/builder/amazon/chroot/step_mount_device.go index b4e56f42c..201dfd0c7 100644 --- a/builder/amazon/chroot/step_mount_device.go +++ b/builder/amazon/chroot/step_mount_device.go @@ -10,11 +10,11 @@ import ( "strings" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type mountPathData struct { diff --git a/builder/amazon/chroot/step_mount_device_test.go b/builder/amazon/chroot/step_mount_device_test.go index 0ae140af0..9c0433245 100644 --- a/builder/amazon/chroot/step_mount_device_test.go +++ b/builder/amazon/chroot/step_mount_device_test.go @@ -3,7 +3,7 @@ package chroot import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/chroot" + "github.com/hashicorp/packer-plugin-sdk/chroot" ) func TestMountDeviceCleanupFunc_ImplementsCleanupFunc(t *testing.T) { diff --git a/builder/amazon/chroot/step_prepare_device.go b/builder/amazon/chroot/step_prepare_device.go index 464dd950e..3eeaceff4 100644 --- a/builder/amazon/chroot/step_prepare_device.go +++ b/builder/amazon/chroot/step_prepare_device.go @@ -6,9 +6,9 @@ import ( "log" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" ) // StepPrepareDevice finds an available device and sets it. diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go index 1f29a051c..5c1e9b019 100644 --- a/builder/amazon/chroot/step_register_ami.go +++ b/builder/amazon/chroot/step_register_ami.go @@ -6,11 +6,11 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/random" + confighelper "github.com/hashicorp/packer-plugin-sdk/template/config" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/random" - confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // StepRegisterAMI creates the AMI. diff --git a/builder/amazon/chroot/step_register_ami_test.go b/builder/amazon/chroot/step_register_ami_test.go index 861fd4ca7..bf86249e8 100644 --- a/builder/amazon/chroot/step_register_ami_test.go +++ b/builder/amazon/chroot/step_register_ami_test.go @@ -3,8 +3,8 @@ package chroot import ( "testing" + "github.com/hashicorp/packer-plugin-sdk/common" amazon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" diff --git a/builder/amazon/chroot/step_snapshot.go b/builder/amazon/chroot/step_snapshot.go index 3f01cd1b2..3492f5f02 100644 --- a/builder/amazon/chroot/step_snapshot.go +++ b/builder/amazon/chroot/step_snapshot.go @@ -6,9 +6,9 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // StepSnapshot creates a snapshot of the created volume. diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go index b441f0477..6dcb23eb8 100644 --- a/builder/amazon/common/access_config.go +++ b/builder/amazon/common/access_config.go @@ -17,8 +17,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2/ec2iface" awsbase "github.com/hashicorp/aws-sdk-go-base" cleanhttp "github.com/hashicorp/go-cleanhttp" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" vaultapi "github.com/hashicorp/vault/api" ) diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go index aa1437241..2f9620bd2 100644 --- a/builder/amazon/common/ami_config.go +++ b/builder/amazon/common/ami_config.go @@ -7,8 +7,8 @@ import ( "log" "regexp" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // AMIConfig is for common configuration related to creating AMIs. diff --git a/builder/amazon/common/ami_config_test.go b/builder/amazon/common/ami_config_test.go index 5764a6045..ca2815589 100644 --- a/builder/amazon/common/ami_config_test.go +++ b/builder/amazon/common/ami_config_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/config" ) func testAMIConfig() *AMIConfig { diff --git a/builder/amazon/common/artifact.go b/builder/amazon/common/artifact.go index 6ba0e626f..76977bbd3 100644 --- a/builder/amazon/common/artifact.go +++ b/builder/amazon/common/artifact.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // Artifact is an artifact implementation that contains built AMIs. diff --git a/builder/amazon/common/artifact_test.go b/builder/amazon/common/artifact_test.go index 927e9a7ab..7931f218a 100644 --- a/builder/amazon/common/artifact_test.go +++ b/builder/amazon/common/artifact_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_Impl(t *testing.T) { diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go index 46d70b096..a7cc95b58 100644 --- a/builder/amazon/common/block_device.go +++ b/builder/amazon/common/block_device.go @@ -9,8 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/amazon/common/block_device_test.go b/builder/amazon/common/block_device_test.go index 55ffcfe65..67e817467 100644 --- a/builder/amazon/common/block_device_test.go +++ b/builder/amazon/common/block_device_test.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestBlockDevice(t *testing.T) { diff --git a/builder/amazon/common/helper_funcs.go b/builder/amazon/common/helper_funcs.go index cf7fec1f1..6bdaa2313 100644 --- a/builder/amazon/common/helper_funcs.go +++ b/builder/amazon/common/helper_funcs.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/retry" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) // DestroyAMIs deregisters the AWS machine images in imageids from an active AWS account diff --git a/builder/amazon/common/interpolate_build_info.go b/builder/amazon/common/interpolate_build_info.go index 5617db61f..010e1b20f 100644 --- a/builder/amazon/common/interpolate_build_info.go +++ b/builder/amazon/common/interpolate_build_info.go @@ -3,8 +3,8 @@ package common import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" ) type BuildInfoTemplate struct { diff --git a/builder/amazon/common/interpolate_build_info_test.go b/builder/amazon/common/interpolate_build_info_test.go index ea98bb417..f371d3ce7 100644 --- a/builder/amazon/common/interpolate_build_info_test.go +++ b/builder/amazon/common/interpolate_build_info_test.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" ) func testImage() *ec2.Image { diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go index cc7ee691d..e51bfc03f 100644 --- a/builder/amazon/common/run_config.go +++ b/builder/amazon/common/run_config.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$") diff --git a/builder/amazon/common/run_config.hcl2spec.go b/builder/amazon/common/run_config.hcl2spec.go index 67c743044..7fa7c062c 100644 --- a/builder/amazon/common/run_config.hcl2spec.go +++ b/builder/amazon/common/run_config.hcl2spec.go @@ -4,7 +4,7 @@ package common import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/amazon/common/run_config_test.go b/builder/amazon/common/run_config_test.go index c2aaed044..e679fb2b8 100644 --- a/builder/amazon/common/run_config_test.go +++ b/builder/amazon/common/run_config_test.go @@ -6,8 +6,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/config" ) func init() { diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go index add5308ec..9535d7036 100644 --- a/builder/amazon/common/ssh.go +++ b/builder/amazon/common/ssh.go @@ -7,7 +7,7 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) type ec2Describer interface { diff --git a/builder/amazon/common/ssh_test.go b/builder/amazon/common/ssh_test.go index 73099b7ef..27bedca80 100644 --- a/builder/amazon/common/ssh_test.go +++ b/builder/amazon/common/ssh_test.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) const ( diff --git a/builder/amazon/common/ssm/session.go b/builder/amazon/common/ssm/session.go index 4dc3cf923..7eee759fb 100644 --- a/builder/amazon/common/ssm/session.go +++ b/builder/amazon/common/ssm/session.go @@ -12,10 +12,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ssm" "github.com/aws/aws-sdk-go/service/ssm/ssmiface" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/shell-local/localexec" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec" ) type Session struct { diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go index 07ad956fe..bae45a3fb 100644 --- a/builder/amazon/common/state.go +++ b/builder/amazon/common/state.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // StateRefreshFunc is a function type used for StateChangeConf that is diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go index 9acf967ea..9fe7d41c8 100644 --- a/builder/amazon/common/step_ami_region_copy.go +++ b/builder/amazon/common/step_ami_region_copy.go @@ -8,9 +8,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" ) type StepAMIRegionCopy struct { diff --git a/builder/amazon/common/step_ami_region_copy_test.go b/builder/amazon/common/step_ami_region_copy_test.go index da386cec6..9f5e3fe5d 100644 --- a/builder/amazon/common/step_ami_region_copy_test.go +++ b/builder/amazon/common/step_ami_region_copy_test.go @@ -11,9 +11,9 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-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. diff --git a/builder/amazon/common/step_cleanup_volumes.go b/builder/amazon/common/step_cleanup_volumes.go index 87a562bd2..69613b84b 100644 --- a/builder/amazon/common/step_cleanup_volumes.go +++ b/builder/amazon/common/step_cleanup_volumes.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // stepCleanupVolumes cleans up any orphaned volumes that were not designated to diff --git a/builder/amazon/common/step_create_ssm_tunnel.go b/builder/amazon/common/step_create_ssm_tunnel.go index cdb41f8bf..eda61cb02 100644 --- a/builder/amazon/common/step_create_ssm_tunnel.go +++ b/builder/amazon/common/step_create_ssm_tunnel.go @@ -9,10 +9,10 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ssm" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/net" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" pssm "github.com/hashicorp/packer/builder/amazon/common/ssm" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/net" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepCreateSSMTunnel struct { diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go index 4301c4c40..f392e574e 100644 --- a/builder/amazon/common/step_create_tags.go +++ b/builder/amazon/common/step_create_tags.go @@ -8,11 +8,11 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type StepCreateTags struct { diff --git a/builder/amazon/common/step_deregister_ami.go b/builder/amazon/common/step_deregister_ami.go index ea5a4f385..135052229 100644 --- a/builder/amazon/common/step_deregister_ami.go +++ b/builder/amazon/common/step_deregister_ami.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepDeregisterAMI struct { diff --git a/builder/amazon/common/step_get_password.go b/builder/amazon/common/step_get_password.go index 54d57df45..08258e429 100644 --- a/builder/amazon/common/step_get_password.go +++ b/builder/amazon/common/step_get_password.go @@ -12,10 +12,10 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" ) // StepGetPassword reads the password from a Windows server and sets it diff --git a/builder/amazon/common/step_iam_instance_profile.go b/builder/amazon/common/step_iam_instance_profile.go index 09ac5030c..823a3fdcb 100644 --- a/builder/amazon/common/step_iam_instance_profile.go +++ b/builder/amazon/common/step_iam_instance_profile.go @@ -8,9 +8,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type StepIamInstanceProfile struct { diff --git a/builder/amazon/common/step_key_pair.go b/builder/amazon/common/step_key_pair.go index 87335c0b9..b0cf02e5a 100644 --- a/builder/amazon/common/step_key_pair.go +++ b/builder/amazon/common/step_key_pair.go @@ -8,10 +8,10 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" ) type StepKeyPair struct { diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go index 3f45639dd..34f6ec296 100644 --- a/builder/amazon/common/step_modify_ami_attributes.go +++ b/builder/amazon/common/step_modify_ami_attributes.go @@ -7,10 +7,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type StepModifyAMIAttributes struct { diff --git a/builder/amazon/common/step_modify_ebs_instance.go b/builder/amazon/common/step_modify_ebs_instance.go index 776deced6..d58196d9e 100644 --- a/builder/amazon/common/step_modify_ebs_instance.go +++ b/builder/amazon/common/step_modify_ebs_instance.go @@ -7,9 +7,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + confighelper "github.com/hashicorp/packer-plugin-sdk/template/config" ) type StepModifyEBSBackedInstance struct { diff --git a/builder/amazon/common/step_network_info.go b/builder/amazon/common/step_network_info.go index 75477863a..1ab905631 100644 --- a/builder/amazon/common/step_network_info.go +++ b/builder/amazon/common/step_network_info.go @@ -8,8 +8,8 @@ import ( "sort" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepNetworkInfo queries AWS for information about diff --git a/builder/amazon/common/step_pre_validate.go b/builder/amazon/common/step_pre_validate.go index 7f43fc0be..97871bea8 100644 --- a/builder/amazon/common/step_pre_validate.go +++ b/builder/amazon/common/step_pre_validate.go @@ -9,10 +9,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) // StepPreValidate provides an opportunity to pre-validate any configuration for diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index 4543b520b..9c33d8224 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -11,12 +11,12 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type StepRunSourceInstance struct { diff --git a/builder/amazon/common/step_run_spot_instance.go b/builder/amazon/common/step_run_spot_instance.go index 63dc4741a..210498eef 100644 --- a/builder/amazon/common/step_run_spot_instance.go +++ b/builder/amazon/common/step_run_spot_instance.go @@ -12,13 +12,13 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/random" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/random" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type EC2BlockDeviceMappingsBuilder interface { diff --git a/builder/amazon/common/step_run_spot_instance_test.go b/builder/amazon/common/step_run_spot_instance_test.go index cc5b8d6f5..a30bc4702 100644 --- a/builder/amazon/common/step_run_spot_instance_test.go +++ b/builder/amazon/common/step_run_spot_instance_test.go @@ -9,9 +9,9 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // Create statebag for running test diff --git a/builder/amazon/common/step_security_group.go b/builder/amazon/common/step_security_group.go index 32c4b9b40..e5d6cfde4 100644 --- a/builder/amazon/common/step_security_group.go +++ b/builder/amazon/common/step_security_group.go @@ -10,10 +10,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type StepSecurityGroup struct { diff --git a/builder/amazon/common/step_set_generated_data.go b/builder/amazon/common/step_set_generated_data.go index f90b669b2..6a28c18a0 100644 --- a/builder/amazon/common/step_set_generated_data.go +++ b/builder/amazon/common/step_set_generated_data.go @@ -4,8 +4,8 @@ import ( "context" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" ) // &awscommon.StepSetGeneratedData{ diff --git a/builder/amazon/common/step_source_ami_info.go b/builder/amazon/common/step_source_ami_info.go index 32b4dabc5..6e3cafb60 100644 --- a/builder/amazon/common/step_source_ami_info.go +++ b/builder/amazon/common/step_source_ami_info.go @@ -8,9 +8,9 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + confighelper "github.com/hashicorp/packer-plugin-sdk/template/config" ) // StepSourceAMIInfo extracts critical information from the source AMI diff --git a/builder/amazon/common/step_stop_ebs_instance.go b/builder/amazon/common/step_stop_ebs_instance.go index 4351de063..f907916b1 100644 --- a/builder/amazon/common/step_stop_ebs_instance.go +++ b/builder/amazon/common/step_stop_ebs_instance.go @@ -6,10 +6,10 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) type StepStopEBSBackedInstance struct { diff --git a/builder/amazon/common/tags.go b/builder/amazon/common/tags.go index 2ecac7f8c..6db6a65d3 100644 --- a/builder/amazon/common/tags.go +++ b/builder/amazon/common/tags.go @@ -5,10 +5,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type TagMap map[string]string diff --git a/builder/amazon/ebs/acceptance/builder_acceptance.go b/builder/amazon/ebs/acceptance/builder_acceptance.go index c63bbfa97..9363a1647 100644 --- a/builder/amazon/ebs/acceptance/builder_acceptance.go +++ b/builder/amazon/ebs/acceptance/builder_acceptance.go @@ -11,7 +11,7 @@ import ( amazonebsbuilder "github.com/hashicorp/packer/builder/amazon/ebs" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type AmazonEBSAccTest struct{} diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index d8696c1d0..106b52f9b 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -15,15 +15,15 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/amazon/ebs/builder.hcl2spec.go b/builder/amazon/ebs/builder.hcl2spec.go index bc55f2398..8f1a3e74b 100644 --- a/builder/amazon/ebs/builder.hcl2spec.go +++ b/builder/amazon/ebs/builder.hcl2spec.go @@ -4,8 +4,8 @@ package ebs import ( "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/amazon/ebs/builder_acc_test.go b/builder/amazon/ebs/builder_acc_test.go index b2f84683e..13623f435 100644 --- a/builder/amazon/ebs/builder_acc_test.go +++ b/builder/amazon/ebs/builder_acc_test.go @@ -11,9 +11,9 @@ import ( "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" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/amazon/ebs/builder_test.go b/builder/amazon/ebs/builder_test.go index 0035bb796..33a0d0d28 100644 --- a/builder/amazon/ebs/builder_test.go +++ b/builder/amazon/ebs/builder_test.go @@ -3,7 +3,7 @@ package ebs import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go index 8f741c3d5..1dcb55997 100644 --- a/builder/amazon/ebs/step_create_ami.go +++ b/builder/amazon/ebs/step_create_ami.go @@ -8,12 +8,12 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/random" + "github.com/hashicorp/packer-plugin-sdk/retry" awscommon "github.com/hashicorp/packer/builder/amazon/common" "github.com/hashicorp/packer/builder/amazon/common/awserrors" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/random" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) type stepCreateAMI struct { diff --git a/builder/amazon/ebs/tags_acc_test.go b/builder/amazon/ebs/tags_acc_test.go index 933b73ce1..c6337b902 100644 --- a/builder/amazon/ebs/tags_acc_test.go +++ b/builder/amazon/ebs/tags_acc_test.go @@ -7,9 +7,9 @@ import ( "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" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type TFBuilder struct { diff --git a/builder/amazon/ebssurrogate/block_device.go b/builder/amazon/ebssurrogate/block_device.go index dc00d4d00..b39510940 100644 --- a/builder/amazon/ebssurrogate/block_device.go +++ b/builder/amazon/ebssurrogate/block_device.go @@ -4,8 +4,8 @@ package ebssurrogate import ( "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type BlockDevice struct { diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go index 747415e23..1d02ec505 100644 --- a/builder/amazon/ebssurrogate/builder.go +++ b/builder/amazon/ebssurrogate/builder.go @@ -13,15 +13,15 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "mitchellh.amazon.ebssurrogate" diff --git a/builder/amazon/ebssurrogate/builder.hcl2spec.go b/builder/amazon/ebssurrogate/builder.hcl2spec.go index 36d7aea4d..39b337491 100644 --- a/builder/amazon/ebssurrogate/builder.hcl2spec.go +++ b/builder/amazon/ebssurrogate/builder.hcl2spec.go @@ -4,8 +4,8 @@ package ebssurrogate import ( "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/amazon/ebssurrogate/builder_test.go b/builder/amazon/ebssurrogate/builder_test.go index a913ada32..5e724466e 100644 --- a/builder/amazon/ebssurrogate/builder_test.go +++ b/builder/amazon/ebssurrogate/builder_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/packer/builder/amazon/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/amazon/ebssurrogate/root_block_device.go b/builder/amazon/ebssurrogate/root_block_device.go index 2a52b37ba..88a511bd3 100644 --- a/builder/amazon/ebssurrogate/root_block_device.go +++ b/builder/amazon/ebssurrogate/root_block_device.go @@ -5,7 +5,7 @@ package ebssurrogate import ( "errors" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type RootBlockDevice struct { diff --git a/builder/amazon/ebssurrogate/step_register_ami.go b/builder/amazon/ebssurrogate/step_register_ami.go index cf4cc1465..b3e0c2c83 100644 --- a/builder/amazon/ebssurrogate/step_register_ami.go +++ b/builder/amazon/ebssurrogate/step_register_ami.go @@ -6,11 +6,11 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/random" + confighelper "github.com/hashicorp/packer-plugin-sdk/template/config" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/random" - confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // StepRegisterAMI creates the AMI. diff --git a/builder/amazon/ebssurrogate/step_snapshot_volumes.go b/builder/amazon/ebssurrogate/step_snapshot_volumes.go index f3225766a..825e0bb8d 100644 --- a/builder/amazon/ebssurrogate/step_snapshot_volumes.go +++ b/builder/amazon/ebssurrogate/step_snapshot_volumes.go @@ -9,10 +9,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" multierror "github.com/hashicorp/go-multierror" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // StepSnapshotVolumes creates snapshots of the created volumes. diff --git a/builder/amazon/ebsvolume/artifact.go b/builder/amazon/ebsvolume/artifact.go index 79037867b..683bcbbd3 100644 --- a/builder/amazon/ebsvolume/artifact.go +++ b/builder/amazon/ebsvolume/artifact.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/aws/aws-sdk-go/service/ec2" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // map of region to list of volume IDs diff --git a/builder/amazon/ebsvolume/block_device.go b/builder/amazon/ebsvolume/block_device.go index 111be84bb..a16b90344 100644 --- a/builder/amazon/ebsvolume/block_device.go +++ b/builder/amazon/ebsvolume/block_device.go @@ -4,9 +4,9 @@ package ebsvolume import ( "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type BlockDevice struct { diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go index e40402c46..5ef27ec77 100644 --- a/builder/amazon/ebsvolume/builder.go +++ b/builder/amazon/ebsvolume/builder.go @@ -12,15 +12,15 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "mitchellh.amazon.ebsvolume" diff --git a/builder/amazon/ebsvolume/builder.hcl2spec.go b/builder/amazon/ebsvolume/builder.hcl2spec.go index 76d1f0a8e..016566710 100644 --- a/builder/amazon/ebsvolume/builder.hcl2spec.go +++ b/builder/amazon/ebsvolume/builder.hcl2spec.go @@ -4,8 +4,8 @@ package ebsvolume import ( "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/amazon/ebsvolume/builder_test.go b/builder/amazon/ebsvolume/builder_test.go index f2a7b8ce5..f7110f30e 100644 --- a/builder/amazon/ebsvolume/builder_test.go +++ b/builder/amazon/ebsvolume/builder_test.go @@ -3,7 +3,7 @@ package ebsvolume import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go index aede0c511..56770a303 100644 --- a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go +++ b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go @@ -7,10 +7,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type stepTagEBSVolumes struct { diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index 22e1b8ffc..56d33876a 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -15,15 +15,15 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/amazon/instance/builder.hcl2spec.go b/builder/amazon/instance/builder.hcl2spec.go index 0f48f3cb7..481eb46da 100644 --- a/builder/amazon/instance/builder.hcl2spec.go +++ b/builder/amazon/instance/builder.hcl2spec.go @@ -4,8 +4,8 @@ package instance import ( "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/amazon/instance/builder_test.go b/builder/amazon/instance/builder_test.go index 539761b4d..41300e4c4 100644 --- a/builder/amazon/instance/builder_test.go +++ b/builder/amazon/instance/builder_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() (config map[string]interface{}, tf *os.File) { diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go index e4721d06c..efd663f48 100644 --- a/builder/amazon/instance/step_bundle_volume.go +++ b/builder/amazon/instance/step_bundle_volume.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type bundleCmdData struct { diff --git a/builder/amazon/instance/step_register_ami.go b/builder/amazon/instance/step_register_ami.go index 40a72cadc..1d90ca0ea 100644 --- a/builder/amazon/instance/step_register_ami.go +++ b/builder/amazon/instance/step_register_ami.go @@ -6,11 +6,11 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/random" + confighelper "github.com/hashicorp/packer-plugin-sdk/template/config" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/random" - confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type StepRegisterAMI struct { diff --git a/builder/amazon/instance/step_upload_bundle.go b/builder/amazon/instance/step_upload_bundle.go index dd278df49..24412eb45 100644 --- a/builder/amazon/instance/step_upload_bundle.go +++ b/builder/amazon/instance/step_upload_bundle.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type uploadCmdData struct { diff --git a/builder/amazon/instance/step_upload_x509_cert.go b/builder/amazon/instance/step_upload_x509_cert.go index 9eda67877..7937023ce 100644 --- a/builder/amazon/instance/step_upload_x509_cert.go +++ b/builder/amazon/instance/step_upload_x509_cert.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepUploadX509Cert struct{} diff --git a/builder/amazon/version/version.go b/builder/amazon/version/version.go index d5ab83e6a..2dd13f9f5 100644 --- a/builder/amazon/version/version.go +++ b/builder/amazon/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/azure/arm/azure_client.go b/builder/azure/arm/azure_client.go index 87b07139c..db4244907 100644 --- a/builder/azure/arm/azure_client.go +++ b/builder/azure/arm/azure_client.go @@ -21,9 +21,9 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" + "github.com/hashicorp/packer-plugin-sdk/useragent" "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/version" - "github.com/hashicorp/packer/packer-plugin-sdk/useragent" ) const ( diff --git a/builder/azure/arm/azure_error_response_test.go b/builder/azure/arm/azure_error_response_test.go index 130353c8b..91f03ed8d 100644 --- a/builder/azure/arm/azure_error_response_test.go +++ b/builder/azure/arm/azure_error_response_test.go @@ -5,7 +5,7 @@ import ( "testing" approvaltests "github.com/approvals/go-approval-tests" - "github.com/hashicorp/packer/packer-plugin-sdk/json" + "github.com/hashicorp/packer-plugin-sdk/json" ) const AzureErrorSimple = `{"error":{"code":"ResourceNotFound","message":"The Resource 'Microsoft.Compute/images/PackerUbuntuImage' under resource group 'packer-test00' was not found."}}` diff --git a/builder/azure/arm/builder.go b/builder/azure/arm/builder.go index 75b43f818..e35ee2c3f 100644 --- a/builder/azure/arm/builder.go +++ b/builder/azure/arm/builder.go @@ -15,13 +15,13 @@ import ( "github.com/Azure/go-autorest/autorest/adal" "github.com/dgrijalva/jwt-go" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" packerAzureCommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/constants" "github.com/hashicorp/packer/builder/azure/common/lin" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type Builder struct { diff --git a/builder/azure/arm/builder_acc_test.go b/builder/azure/arm/builder_acc_test.go index dc7b2fc00..ddd98af57 100644 --- a/builder/azure/arm/builder_acc_test.go +++ b/builder/azure/arm/builder_acc_test.go @@ -25,7 +25,7 @@ import ( "fmt" "os" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) const DeviceLoginAcceptanceTest = "DEVICELOGIN_TEST" diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go index 0d87053fd..d7433bae3 100644 --- a/builder/azure/arm/config.go +++ b/builder/azure/arm/config.go @@ -18,21 +18,21 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/random" + "github.com/hashicorp/packer-plugin-sdk/random" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/masterzen/winrm" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" azcommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/client" "github.com/hashicorp/packer/builder/azure/common/constants" "github.com/hashicorp/packer/builder/azure/pkcs12" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/crypto/ssh" ) diff --git a/builder/azure/arm/config.hcl2spec.go b/builder/azure/arm/config.hcl2spec.go index 28dd0c721..f097d662b 100644 --- a/builder/azure/arm/config.hcl2spec.go +++ b/builder/azure/arm/config.hcl2spec.go @@ -4,7 +4,7 @@ package arm import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/azure/arm/config_test.go b/builder/azure/arm/config_test.go index cb85d6a31..98995d89a 100644 --- a/builder/azure/arm/config_test.go +++ b/builder/azure/arm/config_test.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/google/go-cmp/cmp" + sdkconfig "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/builder/azure/common/constants" - sdkconfig "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) // List of configuration parameters that are required by the ARM builder. diff --git a/builder/azure/arm/step.go b/builder/azure/arm/step.go index a9f53a34e..def6ebd72 100644 --- a/builder/azure/arm/step.go +++ b/builder/azure/arm/step.go @@ -1,8 +1,8 @@ package arm import ( + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func processStepResult( diff --git a/builder/azure/arm/step_capture_image.go b/builder/azure/arm/step_capture_image.go index 34431971a..fa65f8415 100644 --- a/builder/azure/arm/step_capture_image.go +++ b/builder/azure/arm/step_capture_image.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepCaptureImage struct { diff --git a/builder/azure/arm/step_capture_image_test.go b/builder/azure/arm/step_capture_image_test.go index 4f4d0f0fb..3ca6d7756 100644 --- a/builder/azure/arm/step_capture_image_test.go +++ b/builder/azure/arm/step_capture_image_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCaptureImageShouldFailIfCaptureFails(t *testing.T) { diff --git a/builder/azure/arm/step_certificate_in_keyvault.go b/builder/azure/arm/step_certificate_in_keyvault.go index 62b6d0d6d..523d88609 100644 --- a/builder/azure/arm/step_certificate_in_keyvault.go +++ b/builder/azure/arm/step_certificate_in_keyvault.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepCertificateInKeyVault struct { diff --git a/builder/azure/arm/step_certificate_in_keyvault_test.go b/builder/azure/arm/step_certificate_in_keyvault_test.go index 4549658a7..a892943f3 100644 --- a/builder/azure/arm/step_certificate_in_keyvault_test.go +++ b/builder/azure/arm/step_certificate_in_keyvault_test.go @@ -5,10 +5,10 @@ import ( "context" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" azcommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func TestNewStepCertificateInKeyVault(t *testing.T) { diff --git a/builder/azure/arm/step_create_resource_group.go b/builder/azure/arm/step_create_resource_group.go index 9f9ee0edb..e8d8c4a75 100644 --- a/builder/azure/arm/step_create_resource_group.go +++ b/builder/azure/arm/step_create_resource_group.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-02-01/resources" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepCreateResourceGroup struct { diff --git a/builder/azure/arm/step_create_resource_group_test.go b/builder/azure/arm/step_create_resource_group_test.go index 9ee79a550..d07d39830 100644 --- a/builder/azure/arm/step_create_resource_group_test.go +++ b/builder/azure/arm/step_create_resource_group_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepCreateResourceGroupShouldFailIfBothGroupNames(t *testing.T) { diff --git a/builder/azure/arm/step_delete_additional_disks.go b/builder/azure/arm/step_delete_additional_disks.go index 0d4e7cf53..f87992323 100644 --- a/builder/azure/arm/step_delete_additional_disks.go +++ b/builder/azure/arm/step_delete_additional_disks.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepDeleteAdditionalDisk struct { diff --git a/builder/azure/arm/step_delete_additional_disks_test.go b/builder/azure/arm/step_delete_additional_disks_test.go index 9aba4b3fe..1a2729012 100644 --- a/builder/azure/arm/step_delete_additional_disks_test.go +++ b/builder/azure/arm/step_delete_additional_disks_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepDeleteAdditionalDiskShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_deploy_template.go b/builder/azure/arm/step_deploy_template.go index a91cb70fe..0ac029f60 100644 --- a/builder/azure/arm/step_deploy_template.go +++ b/builder/azure/arm/step_deploy_template.go @@ -8,10 +8,10 @@ import ( "strings" "time" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) type StepDeployTemplate struct { diff --git a/builder/azure/arm/step_deploy_template_test.go b/builder/azure/arm/step_deploy_template_test.go index 92e43177f..e24daf0d1 100644 --- a/builder/azure/arm/step_deploy_template_test.go +++ b/builder/azure/arm/step_deploy_template_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepDeployTemplateShouldFailIfDeployFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_additional_disks.go b/builder/azure/arm/step_get_additional_disks.go index f1131a907..bccc6faa0 100644 --- a/builder/azure/arm/step_get_additional_disks.go +++ b/builder/azure/arm/step_get_additional_disks.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepGetDataDisk struct { diff --git a/builder/azure/arm/step_get_additional_disks_test.go b/builder/azure/arm/step_get_additional_disks_test.go index 454fa1792..511379fd9 100644 --- a/builder/azure/arm/step_get_additional_disks_test.go +++ b/builder/azure/arm/step_get_additional_disks_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepGetAdditionalDiskShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_certificate.go b/builder/azure/arm/step_get_certificate.go index 26f1b49a5..9102f965a 100644 --- a/builder/azure/arm/step_get_certificate.go +++ b/builder/azure/arm/step_get_certificate.go @@ -5,9 +5,9 @@ import ( "fmt" "time" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepGetCertificate struct { diff --git a/builder/azure/arm/step_get_certificate_test.go b/builder/azure/arm/step_get_certificate_test.go index 61574e126..640fda60a 100644 --- a/builder/azure/arm/step_get_certificate_test.go +++ b/builder/azure/arm/step_get_certificate_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetCertificateShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_ip_address.go b/builder/azure/arm/step_get_ip_address.go index b284441e6..6a5ace4c1 100644 --- a/builder/azure/arm/step_get_ip_address.go +++ b/builder/azure/arm/step_get_ip_address.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type EndpointType int diff --git a/builder/azure/arm/step_get_ip_address_test.go b/builder/azure/arm/step_get_ip_address_test.go index a23cecddd..bb5beb5bf 100644 --- a/builder/azure/arm/step_get_ip_address_test.go +++ b/builder/azure/arm/step_get_ip_address_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepGetIPAddressShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_get_os_disk.go b/builder/azure/arm/step_get_os_disk.go index 1fb177472..719f7e3a3 100644 --- a/builder/azure/arm/step_get_os_disk.go +++ b/builder/azure/arm/step_get_os_disk.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepGetOSDisk struct { diff --git a/builder/azure/arm/step_get_os_disk_test.go b/builder/azure/arm/step_get_os_disk_test.go index 7e27b7ab1..3c229dced 100644 --- a/builder/azure/arm/step_get_os_disk_test.go +++ b/builder/azure/arm/step_get_os_disk_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepGetOSDiskShouldFailIfGetFails(t *testing.T) { diff --git a/builder/azure/arm/step_power_off_compute.go b/builder/azure/arm/step_power_off_compute.go index b7af984fc..2cd126aeb 100644 --- a/builder/azure/arm/step_power_off_compute.go +++ b/builder/azure/arm/step_power_off_compute.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepPowerOffCompute struct { diff --git a/builder/azure/arm/step_power_off_compute_test.go b/builder/azure/arm/step_power_off_compute_test.go index 991a603ce..69235a289 100644 --- a/builder/azure/arm/step_power_off_compute_test.go +++ b/builder/azure/arm/step_power_off_compute_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPowerOffComputeShouldFailIfPowerOffFails(t *testing.T) { diff --git a/builder/azure/arm/step_publish_to_shared_image_gallery.go b/builder/azure/arm/step_publish_to_shared_image_gallery.go index 5b81d229d..866ff203e 100644 --- a/builder/azure/arm/step_publish_to_shared_image_gallery.go +++ b/builder/azure/arm/step_publish_to_shared_image_gallery.go @@ -6,9 +6,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" "github.com/Azure/go-autorest/autorest/date" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepPublishToSharedImageGallery struct { diff --git a/builder/azure/arm/step_publish_to_shared_image_gallery_test.go b/builder/azure/arm/step_publish_to_shared_image_gallery_test.go index ad87b47d4..77c68d4cc 100644 --- a/builder/azure/arm/step_publish_to_shared_image_gallery_test.go +++ b/builder/azure/arm/step_publish_to_shared_image_gallery_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepPublishToSharedImageGalleryShouldNotPublishForVhd(t *testing.T) { diff --git a/builder/azure/arm/step_set_certificate.go b/builder/azure/arm/step_set_certificate.go index 285f0e19a..de8845275 100644 --- a/builder/azure/arm/step_set_certificate.go +++ b/builder/azure/arm/step_set_certificate.go @@ -3,9 +3,9 @@ package arm import ( "context" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepSetCertificate struct { diff --git a/builder/azure/arm/step_set_certificate_test.go b/builder/azure/arm/step_set_certificate_test.go index 69d5377fd..59c0a0fc1 100644 --- a/builder/azure/arm/step_set_certificate_test.go +++ b/builder/azure/arm/step_set_certificate_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSetCertificateShouldPassIfGetPasses(t *testing.T) { diff --git a/builder/azure/arm/step_snapshot_data_disks.go b/builder/azure/arm/step_snapshot_data_disks.go index 5fc2a263d..a18e20e24 100644 --- a/builder/azure/arm/step_snapshot_data_disks.go +++ b/builder/azure/arm/step_snapshot_data_disks.go @@ -7,9 +7,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/Azure/go-autorest/autorest/to" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepSnapshotDataDisks struct { diff --git a/builder/azure/arm/step_snapshot_data_disks_test.go b/builder/azure/arm/step_snapshot_data_disks_test.go index 88b1dfaf6..344b24fb7 100644 --- a/builder/azure/arm/step_snapshot_data_disks_test.go +++ b/builder/azure/arm/step_snapshot_data_disks_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSnapshotDataDisksShouldFailIfSnapshotFails(t *testing.T) { diff --git a/builder/azure/arm/step_snapshot_os_disk.go b/builder/azure/arm/step_snapshot_os_disk.go index 9aa1bf00b..03c4090ed 100644 --- a/builder/azure/arm/step_snapshot_os_disk.go +++ b/builder/azure/arm/step_snapshot_os_disk.go @@ -6,9 +6,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute" "github.com/Azure/go-autorest/autorest/to" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepSnapshotOSDisk struct { diff --git a/builder/azure/arm/step_snapshot_os_disk_test.go b/builder/azure/arm/step_snapshot_os_disk_test.go index 7e0e99aa1..9cbcd89e0 100644 --- a/builder/azure/arm/step_snapshot_os_disk_test.go +++ b/builder/azure/arm/step_snapshot_os_disk_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepSnapshotOSDiskShouldFailIfSnapshotFails(t *testing.T) { diff --git a/builder/azure/arm/step_test.go b/builder/azure/arm/step_test.go index 1c6b37e70..6d53cf957 100644 --- a/builder/azure/arm/step_test.go +++ b/builder/azure/arm/step_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestProcessStepResultShouldContinueForNonErrors(t *testing.T) { diff --git a/builder/azure/arm/step_validate_template.go b/builder/azure/arm/step_validate_template.go index cd09bba69..415f1ff36 100644 --- a/builder/azure/arm/step_validate_template.go +++ b/builder/azure/arm/step_validate_template.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepValidateTemplate struct { diff --git a/builder/azure/arm/step_validate_template_test.go b/builder/azure/arm/step_validate_template_test.go index 7e127a2aa..972bbd692 100644 --- a/builder/azure/arm/step_validate_template_test.go +++ b/builder/azure/arm/step_validate_template_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepValidateTemplateShouldFailIfValidateFails(t *testing.T) { diff --git a/builder/azure/arm/tempname.go b/builder/azure/arm/tempname.go index e90d2c420..f566e267c 100644 --- a/builder/azure/arm/tempname.go +++ b/builder/azure/arm/tempname.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/random" + "github.com/hashicorp/packer-plugin-sdk/random" ) type TempName struct { diff --git a/builder/azure/arm/tempname_test.go b/builder/azure/arm/tempname_test.go index 5f0baa52f..e982a5ad2 100644 --- a/builder/azure/arm/tempname_test.go +++ b/builder/azure/arm/tempname_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/random" + "github.com/hashicorp/packer-plugin-sdk/random" ) func TestTempNameShouldCreatePrefixedRandomNames(t *testing.T) { diff --git a/builder/azure/chroot/builder.go b/builder/azure/chroot/builder.go index b5a818793..03143020d 100644 --- a/builder/azure/chroot/builder.go +++ b/builder/azure/chroot/builder.go @@ -16,15 +16,15 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/chroot" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" azcommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/chroot" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/azure" diff --git a/builder/azure/chroot/builder_test.go b/builder/azure/chroot/builder_test.go index 08e6132e5..88a38cc8e 100644 --- a/builder/azure/chroot/builder_test.go +++ b/builder/azure/chroot/builder_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" ) diff --git a/builder/azure/chroot/packerui_test.go b/builder/azure/chroot/packerui_test.go index c14fdf6ec..250d7063c 100644 --- a/builder/azure/chroot/packerui_test.go +++ b/builder/azure/chroot/packerui_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "strings" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // testUI returns a test ui plus a function to retrieve the errors written to the ui diff --git a/builder/azure/chroot/step_attach_disk.go b/builder/azure/chroot/step_attach_disk.go index 1fe61051f..7d8c83425 100644 --- a/builder/azure/chroot/step_attach_disk.go +++ b/builder/azure/chroot/step_attach_disk.go @@ -6,9 +6,9 @@ import ( "log" "time" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) var _ multistep.Step = &StepAttachDisk{} diff --git a/builder/azure/chroot/step_attach_disk_test.go b/builder/azure/chroot/step_attach_disk_test.go index 8425f5f2e..f512c015c 100644 --- a/builder/azure/chroot/step_attach_disk_test.go +++ b/builder/azure/chroot/step_attach_disk_test.go @@ -11,9 +11,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func TestStepAttachDisk_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_create_image.go b/builder/azure/chroot/step_create_image.go index d52dee3ee..4c61a9b11 100644 --- a/builder/azure/chroot/step_create_image.go +++ b/builder/azure/chroot/step_create_image.go @@ -9,9 +9,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) var _ multistep.Step = &StepCreateImage{} diff --git a/builder/azure/chroot/step_create_image_test.go b/builder/azure/chroot/step_create_image_test.go index 5873e228f..054771715 100644 --- a/builder/azure/chroot/step_create_image_test.go +++ b/builder/azure/chroot/step_create_image_test.go @@ -8,9 +8,9 @@ import ( "regexp" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_create_new_diskset.go b/builder/azure/chroot/step_create_new_diskset.go index 9749bd31a..1eb1612b1 100644 --- a/builder/azure/chroot/step_create_new_diskset.go +++ b/builder/azure/chroot/step_create_new_diskset.go @@ -7,9 +7,9 @@ import ( "strings" "time" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" diff --git a/builder/azure/chroot/step_create_new_diskset_test.go b/builder/azure/chroot/step_create_new_diskset_test.go index a76685e87..470c25dec 100644 --- a/builder/azure/chroot/step_create_new_diskset_test.go +++ b/builder/azure/chroot/step_create_new_diskset_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_create_shared_image_version.go b/builder/azure/chroot/step_create_shared_image_version.go index 68db7fb9f..4e4843442 100644 --- a/builder/azure/chroot/step_create_shared_image_version.go +++ b/builder/azure/chroot/step_create_shared_image_version.go @@ -9,9 +9,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepCreateSharedImageVersion struct { diff --git a/builder/azure/chroot/step_create_shared_image_version_test.go b/builder/azure/chroot/step_create_shared_image_version_test.go index 5983ca41e..bdaee7618 100644 --- a/builder/azure/chroot/step_create_shared_image_version_test.go +++ b/builder/azure/chroot/step_create_shared_image_version_test.go @@ -8,9 +8,9 @@ import ( "regexp" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_create_snapshotset.go b/builder/azure/chroot/step_create_snapshotset.go index f742e9dbe..2e67c6660 100644 --- a/builder/azure/chroot/step_create_snapshotset.go +++ b/builder/azure/chroot/step_create_snapshotset.go @@ -7,9 +7,9 @@ import ( "strings" "time" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" diff --git a/builder/azure/chroot/step_create_snapshotset_test.go b/builder/azure/chroot/step_create_snapshotset_test.go index eb12488fb..73a183353 100644 --- a/builder/azure/chroot/step_create_snapshotset_test.go +++ b/builder/azure/chroot/step_create_snapshotset_test.go @@ -10,9 +10,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func TestStepCreateSnapshot_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_mount_device.go b/builder/azure/chroot/step_mount_device.go index 9c535bd22..1944ffb51 100644 --- a/builder/azure/chroot/step_mount_device.go +++ b/builder/azure/chroot/step_mount_device.go @@ -12,10 +12,10 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) var _ multistep.Step = &StepMountDevice{} diff --git a/builder/azure/chroot/step_mount_device_test.go b/builder/azure/chroot/step_mount_device_test.go index ee601ef52..b1fb07355 100644 --- a/builder/azure/chroot/step_mount_device_test.go +++ b/builder/azure/chroot/step_mount_device_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepMountDevice_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_resolve_plaform_image_version.go b/builder/azure/chroot/step_resolve_plaform_image_version.go index cf5b3363b..677eb016c 100644 --- a/builder/azure/chroot/step_resolve_plaform_image_version.go +++ b/builder/azure/chroot/step_resolve_plaform_image_version.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/to" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // StepResolvePlatformImageVersion resolves the exact PIR version when the version is 'latest' diff --git a/builder/azure/chroot/step_resolve_plaform_image_version_test.go b/builder/azure/chroot/step_resolve_plaform_image_version_test.go index 687037f64..60b4e2791 100644 --- a/builder/azure/chroot/step_resolve_plaform_image_version_test.go +++ b/builder/azure/chroot/step_resolve_plaform_image_version_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_verify_shared_image_destination.go b/builder/azure/chroot/step_verify_shared_image_destination.go index ac2da44ca..a05103b9c 100644 --- a/builder/azure/chroot/step_verify_shared_image_destination.go +++ b/builder/azure/chroot/step_verify_shared_image_destination.go @@ -8,9 +8,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) var _ multistep.Step = &StepVerifySharedImageDestination{} diff --git a/builder/azure/chroot/step_verify_shared_image_destination_test.go b/builder/azure/chroot/step_verify_shared_image_destination_test.go index 6bbefe0d2..6df5d099b 100644 --- a/builder/azure/chroot/step_verify_shared_image_destination_test.go +++ b/builder/azure/chroot/step_verify_shared_image_destination_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" diff --git a/builder/azure/chroot/step_verify_shared_image_source.go b/builder/azure/chroot/step_verify_shared_image_source.go index 3c29aa177..840160eff 100644 --- a/builder/azure/chroot/step_verify_shared_image_source.go +++ b/builder/azure/chroot/step_verify_shared_image_source.go @@ -8,9 +8,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest/to" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) var _ multistep.Step = &StepVerifySharedImageSource{} diff --git a/builder/azure/chroot/step_verify_shared_image_source_test.go b/builder/azure/chroot/step_verify_shared_image_source_test.go index e12479573..9950a6cf2 100644 --- a/builder/azure/chroot/step_verify_shared_image_source_test.go +++ b/builder/azure/chroot/step_verify_shared_image_source_test.go @@ -11,9 +11,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func TestStepVerifySharedImageSource_Run(t *testing.T) { diff --git a/builder/azure/chroot/step_verify_source_disk.go b/builder/azure/chroot/step_verify_source_disk.go index 2aa19dc68..5f71fe415 100644 --- a/builder/azure/chroot/step_verify_source_disk.go +++ b/builder/azure/chroot/step_verify_source_disk.go @@ -9,9 +9,9 @@ import ( "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepVerifySourceDisk struct { diff --git a/builder/azure/chroot/step_verify_source_disk_test.go b/builder/azure/chroot/step_verify_source_disk_test.go index 6f6084d93..c9b69dd57 100644 --- a/builder/azure/chroot/step_verify_source_disk_test.go +++ b/builder/azure/chroot/step_verify_source_disk_test.go @@ -11,9 +11,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/go-autorest/autorest" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func Test_StepVerifySourceDisk_Run(t *testing.T) { diff --git a/builder/azure/common/artifact.go b/builder/azure/common/artifact.go index 04cc3de0b..498f7292e 100644 --- a/builder/azure/common/artifact.go +++ b/builder/azure/common/artifact.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/Azure/go-autorest/autorest/azure" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/client" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // Artifact is an artifact implementation that contains built Managed Images or Disks. diff --git a/builder/azure/common/client/azure_client_set.go b/builder/azure/common/client/azure_client_set.go index 5948192ff..e1dbbe507 100644 --- a/builder/azure/common/client/azure_client_set.go +++ b/builder/azure/common/client/azure_client_set.go @@ -6,7 +6,7 @@ import ( "regexp" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/useragent" + "github.com/hashicorp/packer-plugin-sdk/useragent" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute/computeapi" diff --git a/builder/azure/common/client/config.go b/builder/azure/common/client/config.go index e34a3f620..11c31d64f 100644 --- a/builder/azure/common/client/config.go +++ b/builder/azure/common/client/config.go @@ -11,7 +11,7 @@ import ( "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" jwt "github.com/dgrijalva/jwt-go" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // Config allows for various ways to authenticate Azure clients. diff --git a/builder/azure/common/client/config_test.go b/builder/azure/common/client/config_test.go index af9a56690..74484d883 100644 --- a/builder/azure/common/client/config_test.go +++ b/builder/azure/common/client/config_test.go @@ -14,7 +14,7 @@ import ( "github.com/Azure/go-autorest/autorest/azure" jwt "github.com/dgrijalva/jwt-go" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func Test_ClientConfig_RequiredParametersSet(t *testing.T) { diff --git a/builder/azure/common/client/devicelogin.go b/builder/azure/common/client/devicelogin.go index 02555fc64..0833b5587 100644 --- a/builder/azure/common/client/devicelogin.go +++ b/builder/azure/common/client/devicelogin.go @@ -15,8 +15,8 @@ import ( "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/to" + "github.com/hashicorp/packer-plugin-sdk/useragent" version "github.com/hashicorp/packer/builder/azure/version" - "github.com/hashicorp/packer/packer-plugin-sdk/useragent" ) var ( diff --git a/builder/azure/common/lin/ssh.go b/builder/azure/common/lin/ssh.go index 5e48273d9..0b91a41d4 100644 --- a/builder/azure/common/lin/ssh.go +++ b/builder/azure/common/lin/ssh.go @@ -1,8 +1,8 @@ package lin import ( + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func SSHHost(state multistep.StateBag) (string, error) { diff --git a/builder/azure/common/state_bag.go b/builder/azure/common/state_bag.go index ced0362f1..e62969c14 100644 --- a/builder/azure/common/state_bag.go +++ b/builder/azure/common/state_bag.go @@ -1,6 +1,6 @@ package common -import "github.com/hashicorp/packer/packer-plugin-sdk/multistep" +import "github.com/hashicorp/packer-plugin-sdk/multistep" func IsStateCancelled(stateBag multistep.StateBag) bool { _, ok := stateBag.GetOk(multistep.StateCancelled) diff --git a/builder/azure/dtl/azure_client.go b/builder/azure/dtl/azure_client.go index 595d0e746..38ed225ff 100644 --- a/builder/azure/dtl/azure_client.go +++ b/builder/azure/dtl/azure_client.go @@ -19,9 +19,9 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" + "github.com/hashicorp/packer-plugin-sdk/useragent" "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/version" - "github.com/hashicorp/packer/packer-plugin-sdk/useragent" ) const ( diff --git a/builder/azure/dtl/azure_error_response_test.go b/builder/azure/dtl/azure_error_response_test.go index 6e1e78d7b..fec3aa7f6 100644 --- a/builder/azure/dtl/azure_error_response_test.go +++ b/builder/azure/dtl/azure_error_response_test.go @@ -5,7 +5,7 @@ import ( "testing" approvaltests "github.com/approvals/go-approval-tests" - "github.com/hashicorp/packer/packer-plugin-sdk/json" + "github.com/hashicorp/packer-plugin-sdk/json" ) const AzureErrorSimple = `{"error":{"code":"ResourceNotFound","message":"The Resource 'Microsoft.Compute/images/PackerUbuntuImage' under resource group 'packer-test00' was not found."}}` diff --git a/builder/azure/dtl/builder.go b/builder/azure/dtl/builder.go index 9838b21e7..05fd4102b 100644 --- a/builder/azure/dtl/builder.go +++ b/builder/azure/dtl/builder.go @@ -14,13 +14,13 @@ import ( "github.com/Azure/go-autorest/autorest/adal" "github.com/dgrijalva/jwt-go" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" packerAzureCommon "github.com/hashicorp/packer/builder/azure/common" "github.com/hashicorp/packer/builder/azure/common/constants" "github.com/hashicorp/packer/builder/azure/common/lin" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type Builder struct { diff --git a/builder/azure/dtl/builder_acc_test.go b/builder/azure/dtl/builder_acc_test.go index 218d9910d..99a8b1b36 100644 --- a/builder/azure/dtl/builder_acc_test.go +++ b/builder/azure/dtl/builder_acc_test.go @@ -28,7 +28,7 @@ package dtl import ( "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) const DeviceLoginAcceptanceTest = "DEVICELOGIN_TEST" diff --git a/builder/azure/dtl/config.go b/builder/azure/dtl/config.go index 72a4cdeae..2edddba2f 100644 --- a/builder/azure/dtl/config.go +++ b/builder/azure/dtl/config.go @@ -23,12 +23,12 @@ import ( "github.com/hashicorp/packer/builder/azure/common/client" "github.com/hashicorp/packer/builder/azure/common/constants" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/azure/pkcs12" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/crypto/ssh" ) diff --git a/builder/azure/dtl/step.go b/builder/azure/dtl/step.go index 39320e5bd..b5de4cb95 100644 --- a/builder/azure/dtl/step.go +++ b/builder/azure/dtl/step.go @@ -1,8 +1,8 @@ package dtl import ( + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func processStepResult( diff --git a/builder/azure/dtl/step_capture_image.go b/builder/azure/dtl/step_capture_image.go index da01d2f3e..a16315977 100644 --- a/builder/azure/dtl/step_capture_image.go +++ b/builder/azure/dtl/step_capture_image.go @@ -6,9 +6,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepCaptureImage struct { diff --git a/builder/azure/dtl/step_delete_virtual_machine.go b/builder/azure/dtl/step_delete_virtual_machine.go index d0d6f3a66..ae21a6ed1 100644 --- a/builder/azure/dtl/step_delete_virtual_machine.go +++ b/builder/azure/dtl/step_delete_virtual_machine.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepDeleteVirtualMachine struct { diff --git a/builder/azure/dtl/step_deploy_template.go b/builder/azure/dtl/step_deploy_template.go index 9c1b3ae58..b6dd83589 100644 --- a/builder/azure/dtl/step_deploy_template.go +++ b/builder/azure/dtl/step_deploy_template.go @@ -7,9 +7,9 @@ import ( "net/url" "strings" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepDeployTemplate struct { diff --git a/builder/azure/dtl/step_power_off_compute.go b/builder/azure/dtl/step_power_off_compute.go index 3504149f2..f0eed13d8 100644 --- a/builder/azure/dtl/step_power_off_compute.go +++ b/builder/azure/dtl/step_power_off_compute.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepPowerOffCompute struct { diff --git a/builder/azure/dtl/step_publish_to_shared_image_gallery.go b/builder/azure/dtl/step_publish_to_shared_image_gallery.go index 3fa62523d..f080a0dde 100644 --- a/builder/azure/dtl/step_publish_to_shared_image_gallery.go +++ b/builder/azure/dtl/step_publish_to_shared_image_gallery.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepPublishToSharedImageGallery struct { diff --git a/builder/azure/dtl/step_save_winrm_password.go b/builder/azure/dtl/step_save_winrm_password.go index 569f82557..975a9ff39 100644 --- a/builder/azure/dtl/step_save_winrm_password.go +++ b/builder/azure/dtl/step_save_winrm_password.go @@ -3,8 +3,8 @@ package dtl import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepSaveWinRMPassword struct { diff --git a/builder/azure/dtl/step_test.go b/builder/azure/dtl/step_test.go index 1dedc7e85..d337a5e49 100644 --- a/builder/azure/dtl/step_test.go +++ b/builder/azure/dtl/step_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/azure/common/constants" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestProcessStepResultShouldContinueForNonErrors(t *testing.T) { diff --git a/builder/azure/dtl/template_funcs.go b/builder/azure/dtl/template_funcs.go index 0bb93fa08..d34952e1c 100644 --- a/builder/azure/dtl/template_funcs.go +++ b/builder/azure/dtl/template_funcs.go @@ -4,7 +4,7 @@ import ( "bytes" "text/template" - packertpl "github.com/hashicorp/packer/packer-plugin-sdk/template" + packertpl "github.com/hashicorp/packer-plugin-sdk/template" ) func isValidByteValue(b byte) bool { diff --git a/builder/azure/dtl/tempname.go b/builder/azure/dtl/tempname.go index c5d64ac04..38a138c39 100644 --- a/builder/azure/dtl/tempname.go +++ b/builder/azure/dtl/tempname.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/random" + "github.com/hashicorp/packer-plugin-sdk/random" ) type TempName struct { diff --git a/builder/azure/version/version.go b/builder/azure/version/version.go index a0d76ec4d..7e0d2c0f4 100644 --- a/builder/azure/version/version.go +++ b/builder/azure/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/cloudstack/artifact_test.go b/builder/cloudstack/artifact_test.go index 5b2a85b6d..25d8863a2 100644 --- a/builder/cloudstack/artifact_test.go +++ b/builder/cloudstack/artifact_test.go @@ -3,7 +3,7 @@ package cloudstack import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/builder.go b/builder/cloudstack/builder.go index 4d17e6144..53d71a901 100644 --- a/builder/cloudstack/builder.go +++ b/builder/cloudstack/builder.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/builder_test.go b/builder/cloudstack/builder_test.go index 31af3fd96..b9729bc6e 100644 --- a/builder/cloudstack/builder_test.go +++ b/builder/cloudstack/builder_test.go @@ -3,7 +3,7 @@ package cloudstack import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilder_Impl(t *testing.T) { diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go index a1ca124a5..1e629667b 100644 --- a/builder/cloudstack/config.go +++ b/builder/cloudstack/config.go @@ -9,13 +9,13 @@ import ( "os" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) // Config holds all the details needed to configure the builder. diff --git a/builder/cloudstack/ssh.go b/builder/cloudstack/ssh.go index 3be57e3e9..64403e1ed 100644 --- a/builder/cloudstack/ssh.go +++ b/builder/cloudstack/ssh.go @@ -3,7 +3,7 @@ package cloudstack import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func commPort(state multistep.StateBag) (int, error) { diff --git a/builder/cloudstack/step_configure_networking.go b/builder/cloudstack/step_configure_networking.go index 44ea28bdf..6e59677a5 100644 --- a/builder/cloudstack/step_configure_networking.go +++ b/builder/cloudstack/step_configure_networking.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_create_instance.go b/builder/cloudstack/step_create_instance.go index 0636b5723..b02d82173 100644 --- a/builder/cloudstack/step_create_instance.go +++ b/builder/cloudstack/step_create_instance.go @@ -8,9 +8,9 @@ import ( "net" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_create_security_group.go b/builder/cloudstack/step_create_security_group.go index 25772e178..7a6a94c7d 100644 --- a/builder/cloudstack/step_create_security_group.go +++ b/builder/cloudstack/step_create_security_group.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_create_template.go b/builder/cloudstack/step_create_template.go index 1ed8e7420..93f6f7bda 100644 --- a/builder/cloudstack/step_create_template.go +++ b/builder/cloudstack/step_create_template.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_detach_iso.go b/builder/cloudstack/step_detach_iso.go index 2e6028ba4..4c0e1d781 100644 --- a/builder/cloudstack/step_detach_iso.go +++ b/builder/cloudstack/step_detach_iso.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_keypair.go b/builder/cloudstack/step_keypair.go index 1e70149d3..c8efe6892 100644 --- a/builder/cloudstack/step_keypair.go +++ b/builder/cloudstack/step_keypair.go @@ -6,9 +6,9 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_prepare_config.go b/builder/cloudstack/step_prepare_config.go index dd276fb0a..317b6d484 100644 --- a/builder/cloudstack/step_prepare_config.go +++ b/builder/cloudstack/step_prepare_config.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "regexp" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/step_shutdown_instance.go b/builder/cloudstack/step_shutdown_instance.go index c96b51bf2..723f57369 100644 --- a/builder/cloudstack/step_shutdown_instance.go +++ b/builder/cloudstack/step_shutdown_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/xanzy/go-cloudstack/cloudstack" ) diff --git a/builder/cloudstack/version/version.go b/builder/cloudstack/version/version.go index 69744c9c7..831976bc1 100644 --- a/builder/cloudstack/version/version.go +++ b/builder/cloudstack/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/digitalocean/artifact_test.go b/builder/digitalocean/artifact_test.go index 19c1e69df..ec1134a06 100644 --- a/builder/digitalocean/artifact_test.go +++ b/builder/digitalocean/artifact_test.go @@ -3,7 +3,7 @@ package digitalocean import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func generatedData() map[string]interface{} { diff --git a/builder/digitalocean/builder.go b/builder/digitalocean/builder.go index 6734641f4..7cf07788a 100644 --- a/builder/digitalocean/builder.go +++ b/builder/digitalocean/builder.go @@ -11,10 +11,10 @@ import ( "github.com/digitalocean/godo" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "golang.org/x/oauth2" ) diff --git a/builder/digitalocean/builder_acc_test.go b/builder/digitalocean/builder_acc_test.go index 4273def7c..bd0982caf 100644 --- a/builder/digitalocean/builder_acc_test.go +++ b/builder/digitalocean/builder_acc_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/digitalocean/godo" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" "golang.org/x/oauth2" ) diff --git a/builder/digitalocean/builder_test.go b/builder/digitalocean/builder_test.go index d49d4140e..d90a890cb 100644 --- a/builder/digitalocean/builder_test.go +++ b/builder/digitalocean/builder_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/digitalocean/config.go b/builder/digitalocean/config.go index 7a6c87ea8..8ac9569b0 100644 --- a/builder/digitalocean/config.go +++ b/builder/digitalocean/config.go @@ -10,12 +10,12 @@ import ( "regexp" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/mitchellh/mapstructure" ) diff --git a/builder/digitalocean/step_create_droplet.go b/builder/digitalocean/step_create_droplet.go index 8a83caaeb..5f360bb52 100644 --- a/builder/digitalocean/step_create_droplet.go +++ b/builder/digitalocean/step_create_droplet.go @@ -9,8 +9,8 @@ import ( "io/ioutil" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreateDroplet struct { diff --git a/builder/digitalocean/step_create_ssh_key.go b/builder/digitalocean/step_create_ssh_key.go index 911d28484..76e988d2a 100644 --- a/builder/digitalocean/step_create_ssh_key.go +++ b/builder/digitalocean/step_create_ssh_key.go @@ -12,9 +12,9 @@ import ( "runtime" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "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" ) diff --git a/builder/digitalocean/step_droplet_info.go b/builder/digitalocean/step_droplet_info.go index 9ca1fd65b..9101dfc9d 100644 --- a/builder/digitalocean/step_droplet_info.go +++ b/builder/digitalocean/step_droplet_info.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepDropletInfo struct{} diff --git a/builder/digitalocean/step_power_off.go b/builder/digitalocean/step_power_off.go index d72ba4bda..c25842396 100644 --- a/builder/digitalocean/step_power_off.go +++ b/builder/digitalocean/step_power_off.go @@ -6,8 +6,8 @@ import ( "log" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepPowerOff struct{} diff --git a/builder/digitalocean/step_shutdown.go b/builder/digitalocean/step_shutdown.go index a49524eed..02f71bcac 100644 --- a/builder/digitalocean/step_shutdown.go +++ b/builder/digitalocean/step_shutdown.go @@ -7,8 +7,8 @@ import ( "time" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepShutdown struct{} diff --git a/builder/digitalocean/step_snapshot.go b/builder/digitalocean/step_snapshot.go index c87be05e5..4db457f5d 100644 --- a/builder/digitalocean/step_snapshot.go +++ b/builder/digitalocean/step_snapshot.go @@ -8,8 +8,8 @@ import ( "time" "github.com/digitalocean/godo" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepSnapshot struct { diff --git a/builder/digitalocean/version/version.go b/builder/digitalocean/version/version.go index bceba8ddd..9afba213e 100644 --- a/builder/digitalocean/version/version.go +++ b/builder/digitalocean/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/docker/artifact_export_test.go b/builder/docker/artifact_export_test.go index 364e3adb6..d8514b9a2 100644 --- a/builder/docker/artifact_export_test.go +++ b/builder/docker/artifact_export_test.go @@ -3,7 +3,7 @@ package docker import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestExportArtifact_impl(t *testing.T) { diff --git a/builder/docker/artifact_import_test.go b/builder/docker/artifact_import_test.go index 119560c98..648290262 100644 --- a/builder/docker/artifact_import_test.go +++ b/builder/docker/artifact_import_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestImportArtifact_impl(t *testing.T) { diff --git a/builder/docker/builder.go b/builder/docker/builder.go index af78d0945..37fa1cfe0 100644 --- a/builder/docker/builder.go +++ b/builder/docker/builder.go @@ -5,11 +5,11 @@ import ( "log" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" ) const ( diff --git a/builder/docker/builder_test.go b/builder/docker/builder_test.go index 4b4dc5c47..377483148 100644 --- a/builder/docker/builder_test.go +++ b/builder/docker/builder_test.go @@ -3,7 +3,7 @@ package docker import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilder_implBuilder(t *testing.T) { diff --git a/builder/docker/comm.go b/builder/docker/comm.go index dbc4198fb..faa2fbf51 100644 --- a/builder/docker/comm.go +++ b/builder/docker/comm.go @@ -3,7 +3,7 @@ package docker import ( "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func commHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/docker/communicator.go b/builder/docker/communicator.go index 360ac92d3..87c82723e 100644 --- a/builder/docker/communicator.go +++ b/builder/docker/communicator.go @@ -15,7 +15,7 @@ import ( "syscall" "github.com/hashicorp/go-version" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type Communicator struct { diff --git a/builder/docker/communicator_test.go b/builder/docker/communicator_test.go index 31d6d00d7..275751c0c 100644 --- a/builder/docker/communicator_test.go +++ b/builder/docker/communicator_test.go @@ -9,8 +9,8 @@ import ( "os/exec" "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // RenderConfig helps create dynamic packer template configs for parsing by diff --git a/builder/docker/config.go b/builder/docker/config.go index 14463dff5..4b860ba1e 100644 --- a/builder/docker/config.go +++ b/builder/docker/config.go @@ -7,11 +7,11 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/docker/driver_docker.go b/builder/docker/driver_docker.go index 3d1cb7d11..195174041 100644 --- a/builder/docker/driver_docker.go +++ b/builder/docker/driver_docker.go @@ -12,8 +12,8 @@ import ( "sync" "github.com/hashicorp/go-version" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type DockerDriver struct { diff --git a/builder/docker/exec.go b/builder/docker/exec.go index 1b5375c12..6040e153d 100644 --- a/builder/docker/exec.go +++ b/builder/docker/exec.go @@ -3,8 +3,8 @@ package docker import ( "os/exec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/shell-local/localexec" ) func runAndStream(cmd *exec.Cmd, ui packersdk.Ui) error { diff --git a/builder/docker/step_commit.go b/builder/docker/step_commit.go index 8ef4012b6..da5763a35 100644 --- a/builder/docker/step_commit.go +++ b/builder/docker/step_commit.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCommit commits the container to a image. diff --git a/builder/docker/step_commit_test.go b/builder/docker/step_commit_test.go index c7c9e7067..80030a315 100644 --- a/builder/docker/step_commit_test.go +++ b/builder/docker/step_commit_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func testStepCommitState(t *testing.T) multistep.StateBag { diff --git a/builder/docker/step_connect_docker.go b/builder/docker/step_connect_docker.go index bff5108eb..3b0a888f8 100644 --- a/builder/docker/step_connect_docker.go +++ b/builder/docker/step_connect_docker.go @@ -6,7 +6,7 @@ import ( "os/exec" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) type StepConnectDocker struct{} diff --git a/builder/docker/step_export.go b/builder/docker/step_export.go index 9bdbe1ba3..546296f60 100644 --- a/builder/docker/step_export.go +++ b/builder/docker/step_export.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepExport exports the container to a flat tar file. diff --git a/builder/docker/step_export_test.go b/builder/docker/step_export_test.go index cdffcc4b6..30246cc91 100644 --- a/builder/docker/step_export_test.go +++ b/builder/docker/step_export_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func testStepExportState(t *testing.T) multistep.StateBag { diff --git a/builder/docker/step_pull.go b/builder/docker/step_pull.go index b13e94489..682949133 100644 --- a/builder/docker/step_pull.go +++ b/builder/docker/step_pull.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepPull struct{} diff --git a/builder/docker/step_pull_test.go b/builder/docker/step_pull_test.go index c921612dd..234058f57 100644 --- a/builder/docker/step_pull_test.go +++ b/builder/docker/step_pull_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepPull_impl(t *testing.T) { diff --git a/builder/docker/step_run.go b/builder/docker/step_run.go index 00bfd212f..1fddebdc7 100644 --- a/builder/docker/step_run.go +++ b/builder/docker/step_run.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepRun struct { diff --git a/builder/docker/step_run_test.go b/builder/docker/step_run_test.go index cc5908951..f1d5a065f 100644 --- a/builder/docker/step_run_test.go +++ b/builder/docker/step_run_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func testStepRunState(t *testing.T) multistep.StateBag { diff --git a/builder/docker/step_set_generated_data.go b/builder/docker/step_set_generated_data.go index 9576cab17..112f0a71c 100644 --- a/builder/docker/step_set_generated_data.go +++ b/builder/docker/step_set_generated_data.go @@ -3,8 +3,8 @@ package docker import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" ) type StepSetGeneratedData struct { diff --git a/builder/docker/step_set_generated_data_test.go b/builder/docker/step_set_generated_data_test.go index 930956095..dc3eec02f 100644 --- a/builder/docker/step_set_generated_data_test.go +++ b/builder/docker/step_set_generated_data_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" ) func TestStepSetGeneratedData_Run(t *testing.T) { diff --git a/builder/docker/step_temp_dir.go b/builder/docker/step_temp_dir.go index 179d1db09..06f8fb2ee 100644 --- a/builder/docker/step_temp_dir.go +++ b/builder/docker/step_temp_dir.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/pathing" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/pathing" ) // StepTempDir creates a temporary directory that we use in order to diff --git a/builder/docker/step_temp_dir_test.go b/builder/docker/step_temp_dir_test.go index d58906df9..b6f8afe3c 100644 --- a/builder/docker/step_temp_dir_test.go +++ b/builder/docker/step_temp_dir_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepTempDir_impl(t *testing.T) { diff --git a/builder/docker/step_test.go b/builder/docker/step_test.go index 565a3d805..e12b7a6ab 100644 --- a/builder/docker/step_test.go +++ b/builder/docker/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/docker/version/version.go b/builder/docker/version/version.go index 56302680d..f71ac2cac 100644 --- a/builder/docker/version/version.go +++ b/builder/docker/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/docker/windows_container_communicator.go b/builder/docker/windows_container_communicator.go index ee4fd5dbb..97a34bb39 100644 --- a/builder/docker/windows_container_communicator.go +++ b/builder/docker/windows_container_communicator.go @@ -10,7 +10,7 @@ import ( "os" "path/filepath" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // Windows containers are a special beast in Docker; you can't use docker cp diff --git a/builder/file/artifact_test.go b/builder/file/artifact_test.go index 5e798f4ae..3d37f8116 100644 --- a/builder/file/artifact_test.go +++ b/builder/file/artifact_test.go @@ -3,7 +3,7 @@ package file import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestNullArtifact(t *testing.T) { diff --git a/builder/file/builder.go b/builder/file/builder.go index 062557389..08a991b79 100644 --- a/builder/file/builder.go +++ b/builder/file/builder.go @@ -14,8 +14,8 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const BuilderId = "packer.file" diff --git a/builder/file/builder_test.go b/builder/file/builder_test.go index b72e8a2b6..bfccfbed2 100644 --- a/builder/file/builder_test.go +++ b/builder/file/builder_test.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilder_implBuilder(t *testing.T) { diff --git a/builder/file/config.go b/builder/file/config.go index 65234e487..988255692 100644 --- a/builder/file/config.go +++ b/builder/file/config.go @@ -5,10 +5,10 @@ package file import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) var ErrTargetRequired = fmt.Errorf("target required") diff --git a/builder/file/version/version.go b/builder/file/version/version.go index e99f8c173..3b26a6e55 100644 --- a/builder/file/version/version.go +++ b/builder/file/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/googlecompute/artifact_test.go b/builder/googlecompute/artifact_test.go index 9b9ba10de..d4600fc02 100644 --- a/builder/googlecompute/artifact_test.go +++ b/builder/googlecompute/artifact_test.go @@ -3,7 +3,7 @@ package googlecompute import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_impl(t *testing.T) { diff --git a/builder/googlecompute/builder.go b/builder/googlecompute/builder.go index e2d41c356..f7b6bf384 100644 --- a/builder/googlecompute/builder.go +++ b/builder/googlecompute/builder.go @@ -8,10 +8,10 @@ import ( "log" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // The unique ID for this builder. diff --git a/builder/googlecompute/config.go b/builder/googlecompute/config.go index 7f5a5a050..462836f69 100644 --- a/builder/googlecompute/config.go +++ b/builder/googlecompute/config.go @@ -11,12 +11,12 @@ import ( "runtime" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" compute "google.golang.org/api/compute/v1" ) diff --git a/builder/googlecompute/config_test.go b/builder/googlecompute/config_test.go index 344c74ea3..0c9ee96bc 100644 --- a/builder/googlecompute/config_test.go +++ b/builder/googlecompute/config_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator" ) func TestConfigPrepare(t *testing.T) { diff --git a/builder/googlecompute/driver_gce.go b/builder/googlecompute/driver_gce.go index 1d1835114..ef2e5601b 100644 --- a/builder/googlecompute/driver_gce.go +++ b/builder/googlecompute/driver_gce.go @@ -19,10 +19,10 @@ import ( "google.golang.org/api/option" oslogin "google.golang.org/api/oslogin/v1" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/useragent" "github.com/hashicorp/packer/builder/googlecompute/version" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/useragent" vaultapi "github.com/hashicorp/vault/api" "golang.org/x/oauth2" diff --git a/builder/googlecompute/step_check_existing_image.go b/builder/googlecompute/step_check_existing_image.go index a57461dda..6bd133adf 100644 --- a/builder/googlecompute/step_check_existing_image.go +++ b/builder/googlecompute/step_check_existing_image.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCheckExistingImage represents a Packer build step that checks if the diff --git a/builder/googlecompute/step_check_existing_image_test.go b/builder/googlecompute/step_check_existing_image_test.go index 162d6188b..71f1a06f3 100644 --- a/builder/googlecompute/step_check_existing_image_test.go +++ b/builder/googlecompute/step_check_existing_image_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCheckExistingImage_impl(t *testing.T) { diff --git a/builder/googlecompute/step_create_image.go b/builder/googlecompute/step_create_image.go index 2c28c3a50..ab78490b8 100644 --- a/builder/googlecompute/step_create_image.go +++ b/builder/googlecompute/step_create_image.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCreateImage represents a Packer build step that creates GCE machine diff --git a/builder/googlecompute/step_create_image_test.go b/builder/googlecompute/step_create_image_test.go index f8084412c..c5a669cd2 100644 --- a/builder/googlecompute/step_create_image_test.go +++ b/builder/googlecompute/step_create_image_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/step_create_instance.go b/builder/googlecompute/step_create_instance.go index 303bdf5fe..9297cf2c8 100644 --- a/builder/googlecompute/step_create_instance.go +++ b/builder/googlecompute/step_create_instance.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCreateInstance represents a Packer build step that creates GCE instances. diff --git a/builder/googlecompute/step_create_instance_test.go b/builder/googlecompute/step_create_instance_test.go index 9db780d02..47176ca2a 100644 --- a/builder/googlecompute/step_create_instance_test.go +++ b/builder/googlecompute/step_create_instance_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/step_create_windows_password.go b/builder/googlecompute/step_create_windows_password.go index 3c012a2f3..a5dd9c18a 100644 --- a/builder/googlecompute/step_create_windows_password.go +++ b/builder/googlecompute/step_create_windows_password.go @@ -13,8 +13,8 @@ import ( "os" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCreateWindowsPassword represents a Packer build step that sets the windows password on a Windows GCE instance. diff --git a/builder/googlecompute/step_create_windows_password_test.go b/builder/googlecompute/step_create_windows_password_test.go index 03dd188dd..93bb6dd20 100644 --- a/builder/googlecompute/step_create_windows_password_test.go +++ b/builder/googlecompute/step_create_windows_password_test.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "testing" ) diff --git a/builder/googlecompute/step_import_os_login_ssh_key.go b/builder/googlecompute/step_import_os_login_ssh_key.go index 87fa087ff..155691fd0 100644 --- a/builder/googlecompute/step_import_os_login_ssh_key.go +++ b/builder/googlecompute/step_import_os_login_ssh_key.go @@ -6,8 +6,8 @@ import ( "encoding/hex" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "google.golang.org/api/oauth2/v2" ) diff --git a/builder/googlecompute/step_import_os_login_ssh_key_test.go b/builder/googlecompute/step_import_os_login_ssh_key_test.go index b038ddca3..525879ad4 100644 --- a/builder/googlecompute/step_import_os_login_ssh_key_test.go +++ b/builder/googlecompute/step_import_os_login_ssh_key_test.go @@ -6,7 +6,7 @@ import ( "encoding/hex" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "google.golang.org/api/oauth2/v2" ) diff --git a/builder/googlecompute/step_instance_info.go b/builder/googlecompute/step_instance_info.go index 471c37274..776b3369b 100644 --- a/builder/googlecompute/step_instance_info.go +++ b/builder/googlecompute/step_instance_info.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // stepInstanceInfo represents a Packer build step that gathers GCE instance info. diff --git a/builder/googlecompute/step_instance_info_test.go b/builder/googlecompute/step_instance_info_test.go index 502bbedfd..22cfebeee 100644 --- a/builder/googlecompute/step_instance_info_test.go +++ b/builder/googlecompute/step_instance_info_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepInstanceInfo_impl(t *testing.T) { diff --git a/builder/googlecompute/step_start_tunnel.go b/builder/googlecompute/step_start_tunnel.go index 55e9ec594..92ffb776b 100644 --- a/builder/googlecompute/step_start_tunnel.go +++ b/builder/googlecompute/step_start_tunnel.go @@ -18,12 +18,12 @@ import ( "text/template" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/net" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/net" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) // StepStartTunnel represents a Packer build step that launches an IAP tunnel diff --git a/builder/googlecompute/step_start_tunnel_test.go b/builder/googlecompute/step_start_tunnel_test.go index 19642d201..fd625896e 100644 --- a/builder/googlecompute/step_start_tunnel_test.go +++ b/builder/googlecompute/step_start_tunnel_test.go @@ -8,7 +8,7 @@ import ( "runtime" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator" ) type MockTunnelDriver struct { diff --git a/builder/googlecompute/step_teardown_instance.go b/builder/googlecompute/step_teardown_instance.go index 93b0e3aff..5973d9f4c 100644 --- a/builder/googlecompute/step_teardown_instance.go +++ b/builder/googlecompute/step_teardown_instance.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepTeardownInstance represents a Packer build step that tears down GCE diff --git a/builder/googlecompute/step_teardown_instance_test.go b/builder/googlecompute/step_teardown_instance_test.go index 96db676f6..ce021b160 100644 --- a/builder/googlecompute/step_teardown_instance_test.go +++ b/builder/googlecompute/step_teardown_instance_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepTeardownInstance_impl(t *testing.T) { diff --git a/builder/googlecompute/step_test.go b/builder/googlecompute/step_test.go index c43c2730a..9e0f12265 100644 --- a/builder/googlecompute/step_test.go +++ b/builder/googlecompute/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/googlecompute/step_wait_startup_script.go b/builder/googlecompute/step_wait_startup_script.go index 8723f0690..52c5865a3 100644 --- a/builder/googlecompute/step_wait_startup_script.go +++ b/builder/googlecompute/step_wait_startup_script.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" ) type StepWaitStartupScript int diff --git a/builder/googlecompute/step_wait_startup_script_test.go b/builder/googlecompute/step_wait_startup_script_test.go index 0e783f8dd..cb5565587 100644 --- a/builder/googlecompute/step_wait_startup_script_test.go +++ b/builder/googlecompute/step_wait_startup_script_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" ) diff --git a/builder/googlecompute/version/version.go b/builder/googlecompute/version/version.go index 55050dfae..0d16fde2a 100644 --- a/builder/googlecompute/version/version.go +++ b/builder/googlecompute/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/googlecompute/winrm.go b/builder/googlecompute/winrm.go index 0734d4b6e..62bbbeb15 100644 --- a/builder/googlecompute/winrm.go +++ b/builder/googlecompute/winrm.go @@ -1,8 +1,8 @@ package googlecompute import ( - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // winrmConfig returns the WinRM configuration. diff --git a/builder/hcloud/artifact_test.go b/builder/hcloud/artifact_test.go index d7e802157..06de9b081 100644 --- a/builder/hcloud/artifact_test.go +++ b/builder/hcloud/artifact_test.go @@ -3,7 +3,7 @@ package hcloud import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_Impl(t *testing.T) { diff --git a/builder/hcloud/builder.go b/builder/hcloud/builder.go index e8348708b..3a5a47b3a 100644 --- a/builder/hcloud/builder.go +++ b/builder/hcloud/builder.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hcloud/builder_acc_test.go b/builder/hcloud/builder_acc_test.go index 7c5ee1e85..a6121da5b 100644 --- a/builder/hcloud/builder_acc_test.go +++ b/builder/hcloud/builder_acc_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/hcloud/config.go b/builder/hcloud/config.go index 6ddd25f18..8e2cf29f1 100644 --- a/builder/hcloud/config.go +++ b/builder/hcloud/config.go @@ -8,13 +8,13 @@ import ( "os" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/hetznercloud/hcloud-go/hcloud" "github.com/mitchellh/mapstructure" ) diff --git a/builder/hcloud/step_create_server.go b/builder/hcloud/step_create_server.go index c5936ed78..7f764563f 100644 --- a/builder/hcloud/step_create_server.go +++ b/builder/hcloud/step_create_server.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hcloud/step_create_snapshot.go b/builder/hcloud/step_create_snapshot.go index 9764b76d8..a8f8b8536 100644 --- a/builder/hcloud/step_create_snapshot.go +++ b/builder/hcloud/step_create_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hcloud/step_create_sshkey.go b/builder/hcloud/step_create_sshkey.go index 9f2a666a8..b57d953f6 100644 --- a/builder/hcloud/step_create_sshkey.go +++ b/builder/hcloud/step_create_sshkey.go @@ -11,9 +11,9 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/hetznercloud/hcloud-go/hcloud" "golang.org/x/crypto/ssh" ) diff --git a/builder/hcloud/step_shutdown_server.go b/builder/hcloud/step_shutdown_server.go index 20a390e4a..ad38c869b 100644 --- a/builder/hcloud/step_shutdown_server.go +++ b/builder/hcloud/step_shutdown_server.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hetznercloud/hcloud-go/hcloud" ) diff --git a/builder/hcloud/version/version.go b/builder/hcloud/version/version.go index 34734bb27..7a0c24545 100644 --- a/builder/hcloud/version/version.go +++ b/builder/hcloud/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/hyperone/builder.go b/builder/hyperone/builder.go index b11520d43..eab11bf4a 100644 --- a/builder/hyperone/builder.go +++ b/builder/hyperone/builder.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/builder_acc_test.go b/builder/hyperone/builder_acc_test.go index 625309f37..90c0bb1cd 100644 --- a/builder/hyperone/builder_acc_test.go +++ b/builder/hyperone/builder_acc_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/hyperone/chroot_communicator.go b/builder/hyperone/chroot_communicator.go index de63f0fc8..c5af1f1fa 100644 --- a/builder/hyperone/chroot_communicator.go +++ b/builder/hyperone/chroot_communicator.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strconv" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type CommandWrapper func(string) (string, error) diff --git a/builder/hyperone/config.go b/builder/hyperone/config.go index 419cce44d..80c8e5d45 100644 --- a/builder/hyperone/config.go +++ b/builder/hyperone/config.go @@ -10,14 +10,14 @@ import ( "os" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/json" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/json" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/mitchellh/go-homedir" "github.com/mitchellh/mapstructure" ) diff --git a/builder/hyperone/config.hcl2spec.go b/builder/hyperone/config.hcl2spec.go index 8bc7b08c2..3062b1445 100644 --- a/builder/hyperone/config.hcl2spec.go +++ b/builder/hyperone/config.hcl2spec.go @@ -4,7 +4,7 @@ package hyperone import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/hyperone/step_chroot_provision.go b/builder/hyperone/step_chroot_provision.go index 6f353d96f..ef397c3e9 100644 --- a/builder/hyperone/step_chroot_provision.go +++ b/builder/hyperone/step_chroot_provision.go @@ -3,9 +3,9 @@ package hyperone import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepChrootProvision struct{} diff --git a/builder/hyperone/step_copy_files.go b/builder/hyperone/step_copy_files.go index 5d952c1b3..9055d34a5 100644 --- a/builder/hyperone/step_copy_files.go +++ b/builder/hyperone/step_copy_files.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCopyFiles struct{} diff --git a/builder/hyperone/step_create_image.go b/builder/hyperone/step_create_image.go index 06599085e..d2ffacf92 100644 --- a/builder/hyperone/step_create_image.go +++ b/builder/hyperone/step_create_image.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_create_ssh_key.go b/builder/hyperone/step_create_ssh_key.go index fb0f629c5..6f2c10bf9 100644 --- a/builder/hyperone/step_create_ssh_key.go +++ b/builder/hyperone/step_create_ssh_key.go @@ -10,8 +10,8 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "golang.org/x/crypto/ssh" ) diff --git a/builder/hyperone/step_create_vm.go b/builder/hyperone/step_create_vm.go index daa61b90e..4310637bc 100644 --- a/builder/hyperone/step_create_vm.go +++ b/builder/hyperone/step_create_vm.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_create_vm_from_disk.go b/builder/hyperone/step_create_vm_from_disk.go index f0775e3b7..1c1828592 100644 --- a/builder/hyperone/step_create_vm_from_disk.go +++ b/builder/hyperone/step_create_vm_from_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_detach_disk.go b/builder/hyperone/step_detach_disk.go index 63c6cb2d2..5978ea534 100644 --- a/builder/hyperone/step_detach_disk.go +++ b/builder/hyperone/step_detach_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/step_mount_chroot.go b/builder/hyperone/step_mount_chroot.go index e2647c1de..e7e8abc2f 100644 --- a/builder/hyperone/step_mount_chroot.go +++ b/builder/hyperone/step_mount_chroot.go @@ -6,8 +6,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepMountChroot struct{} diff --git a/builder/hyperone/step_mount_extra.go b/builder/hyperone/step_mount_extra.go index 5d51904d5..965afeb71 100644 --- a/builder/hyperone/step_mount_extra.go +++ b/builder/hyperone/step_mount_extra.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepMountExtra struct{} diff --git a/builder/hyperone/step_post_mount_commands.go b/builder/hyperone/step_post_mount_commands.go index 2ab56f186..af1ae6eb3 100644 --- a/builder/hyperone/step_post_mount_commands.go +++ b/builder/hyperone/step_post_mount_commands.go @@ -3,8 +3,8 @@ package hyperone import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type postMountCommandsData struct { diff --git a/builder/hyperone/step_pre_mount_commands.go b/builder/hyperone/step_pre_mount_commands.go index fbbb0db4e..ad102a18b 100644 --- a/builder/hyperone/step_pre_mount_commands.go +++ b/builder/hyperone/step_pre_mount_commands.go @@ -3,8 +3,8 @@ package hyperone import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type preMountCommandsData struct { diff --git a/builder/hyperone/step_prepare_device.go b/builder/hyperone/step_prepare_device.go index a8b1a052e..8faa58192 100644 --- a/builder/hyperone/step_prepare_device.go +++ b/builder/hyperone/step_prepare_device.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const ( diff --git a/builder/hyperone/step_stop_vm.go b/builder/hyperone/step_stop_vm.go index a736356f1..6181f08b4 100644 --- a/builder/hyperone/step_stop_vm.go +++ b/builder/hyperone/step_stop_vm.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/token_by_ssh.go b/builder/hyperone/token_by_ssh.go index 47e626bf5..420c8ea6b 100644 --- a/builder/hyperone/token_by_ssh.go +++ b/builder/hyperone/token_by_ssh.go @@ -11,7 +11,7 @@ import ( "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" - "github.com/hashicorp/packer/packer-plugin-sdk/json" + "github.com/hashicorp/packer-plugin-sdk/json" ) const ( diff --git a/builder/hyperone/utils.go b/builder/hyperone/utils.go index fa6e9df46..4ba862e5a 100644 --- a/builder/hyperone/utils.go +++ b/builder/hyperone/utils.go @@ -7,9 +7,9 @@ import ( "log" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" openapi "github.com/hyperonecom/h1-client-go" ) diff --git a/builder/hyperone/version/version.go b/builder/hyperone/version/version.go index 3832ad6f6..328db1273 100644 --- a/builder/hyperone/version/version.go +++ b/builder/hyperone/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/hyperv/common/artifact.go b/builder/hyperv/common/artifact.go index e85f66948..a6cbd5428 100644 --- a/builder/hyperv/common/artifact.go +++ b/builder/hyperv/common/artifact.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This is the common builder ID to all of these artifacts. diff --git a/builder/hyperv/common/artifact_test.go b/builder/hyperv/common/artifact_test.go index a6b9dcb27..e01726ad3 100644 --- a/builder/hyperv/common/artifact_test.go +++ b/builder/hyperv/common/artifact_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_impl(t *testing.T) { diff --git a/builder/hyperv/common/config.go b/builder/hyperv/common/config.go index 17e79c5d3..a7429afd5 100644 --- a/builder/hyperv/common/config.go +++ b/builder/hyperv/common/config.go @@ -8,11 +8,11 @@ import ( "os" "strings" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" "github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/hyperv/common/output_config.go b/builder/hyperv/common/output_config.go index 2637ae87e..af663cd61 100644 --- a/builder/hyperv/common/output_config.go +++ b/builder/hyperv/common/output_config.go @@ -6,8 +6,8 @@ package common import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/hyperv/common/output_config_test.go b/builder/hyperv/common/output_config_test.go index 278969a42..0e1567629 100644 --- a/builder/hyperv/common/output_config_test.go +++ b/builder/hyperv/common/output_config_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/hyperv/common/powershell/powershell.go b/builder/hyperv/common/powershell/powershell.go index 5c10e991c..706b2f41b 100644 --- a/builder/hyperv/common/powershell/powershell.go +++ b/builder/hyperv/common/powershell/powershell.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) const ( diff --git a/builder/hyperv/common/ssh.go b/builder/hyperv/common/ssh.go index c116f2f3f..2844f2802 100644 --- a/builder/hyperv/common/ssh.go +++ b/builder/hyperv/common/ssh.go @@ -3,7 +3,7 @@ package common import ( "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/hyperv/common/ssh_config.go b/builder/hyperv/common/ssh_config.go index cd2c24081..56f6cf637 100644 --- a/builder/hyperv/common/ssh_config.go +++ b/builder/hyperv/common/ssh_config.go @@ -1,8 +1,8 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type SSHConfig struct { diff --git a/builder/hyperv/common/step_clone_vm.go b/builder/hyperv/common/step_clone_vm.go index 397f075b5..8ec609100 100644 --- a/builder/hyperv/common/step_clone_vm.go +++ b/builder/hyperv/common/step_clone_vm.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step clones an existing virtual machine. diff --git a/builder/hyperv/common/step_collate_artifacts.go b/builder/hyperv/common/step_collate_artifacts.go index 597d26c4f..de95fe3af 100644 --- a/builder/hyperv/common/step_collate_artifacts.go +++ b/builder/hyperv/common/step_collate_artifacts.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepCollateArtifacts struct { diff --git a/builder/hyperv/common/step_collate_artifacts_test.go b/builder/hyperv/common/step_collate_artifacts_test.go index 88fa325ad..9ca5cde1c 100644 --- a/builder/hyperv/common/step_collate_artifacts_test.go +++ b/builder/hyperv/common/step_collate_artifacts_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCollateArtifacts_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_compact_disk.go b/builder/hyperv/common/step_compact_disk.go index d374f102f..36c3f8f40 100644 --- a/builder/hyperv/common/step_compact_disk.go +++ b/builder/hyperv/common/step_compact_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepCompactDisk struct { diff --git a/builder/hyperv/common/step_compact_disk_test.go b/builder/hyperv/common/step_compact_disk_test.go index a88a637e2..0e83e5940 100644 --- a/builder/hyperv/common/step_compact_disk_test.go +++ b/builder/hyperv/common/step_compact_disk_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCompactDisk_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_configure_ip.go b/builder/hyperv/common/step_configure_ip.go index 617c20587..7126e144a 100644 --- a/builder/hyperv/common/step_configure_ip.go +++ b/builder/hyperv/common/step_configure_ip.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepConfigureIp struct { diff --git a/builder/hyperv/common/step_configure_vlan.go b/builder/hyperv/common/step_configure_vlan.go index 146df7f23..6f72f8883 100644 --- a/builder/hyperv/common/step_configure_vlan.go +++ b/builder/hyperv/common/step_configure_vlan.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepConfigureVlan struct { diff --git a/builder/hyperv/common/step_create_build_dir.go b/builder/hyperv/common/step_create_build_dir.go index 707db2124..2f77e5bfd 100644 --- a/builder/hyperv/common/step_create_build_dir.go +++ b/builder/hyperv/common/step_create_build_dir.go @@ -7,9 +7,9 @@ import ( "log" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) type StepCreateBuildDir struct { diff --git a/builder/hyperv/common/step_create_build_dir_test.go b/builder/hyperv/common/step_create_build_dir_test.go index 80e4d391f..f7f87eb32 100644 --- a/builder/hyperv/common/step_create_build_dir_test.go +++ b/builder/hyperv/common/step_create_build_dir_test.go @@ -7,7 +7,7 @@ import ( "regexp" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreateBuildDir_imp(t *testing.T) { diff --git a/builder/hyperv/common/step_create_external_switch.go b/builder/hyperv/common/step_create_external_switch.go index a372238ff..2976a13bc 100644 --- a/builder/hyperv/common/step_create_external_switch.go +++ b/builder/hyperv/common/step_create_external_switch.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) // This step creates an external switch for the VM. diff --git a/builder/hyperv/common/step_create_switch.go b/builder/hyperv/common/step_create_switch.go index 48d420498..6f2eb2d00 100644 --- a/builder/hyperv/common/step_create_switch.go +++ b/builder/hyperv/common/step_create_switch.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const ( diff --git a/builder/hyperv/common/step_create_vm.go b/builder/hyperv/common/step_create_vm.go index 7b9375aa2..f95bbbe47 100644 --- a/builder/hyperv/common/step_create_vm.go +++ b/builder/hyperv/common/step_create_vm.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step creates the actual virtual machine. diff --git a/builder/hyperv/common/step_create_vm_test.go b/builder/hyperv/common/step_create_vm_test.go index d97623895..c36c5fe07 100644 --- a/builder/hyperv/common/step_create_vm_test.go +++ b/builder/hyperv/common/step_create_vm_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreateVM_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_disable_vlan.go b/builder/hyperv/common/step_disable_vlan.go index b73922caa..4bd499d3c 100644 --- a/builder/hyperv/common/step_disable_vlan.go +++ b/builder/hyperv/common/step_disable_vlan.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepDisableVlan struct { diff --git a/builder/hyperv/common/step_enable_integration_service.go b/builder/hyperv/common/step_enable_integration_service.go index 15420c704..b62059502 100644 --- a/builder/hyperv/common/step_enable_integration_service.go +++ b/builder/hyperv/common/step_enable_integration_service.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepEnableIntegrationService struct { diff --git a/builder/hyperv/common/step_export_vm.go b/builder/hyperv/common/step_export_vm.go index 0bf3fce48..099120b12 100644 --- a/builder/hyperv/common/step_export_vm.go +++ b/builder/hyperv/common/step_export_vm.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepExportVm struct { diff --git a/builder/hyperv/common/step_export_vm_test.go b/builder/hyperv/common/step_export_vm_test.go index dcffa5bc2..575a6d313 100644 --- a/builder/hyperv/common/step_export_vm_test.go +++ b/builder/hyperv/common/step_export_vm_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepExportVm_impl(t *testing.T) { diff --git a/builder/hyperv/common/step_mount_dvddrive.go b/builder/hyperv/common/step_mount_dvddrive.go index 95113c2f7..6a8a4587f 100644 --- a/builder/hyperv/common/step_mount_dvddrive.go +++ b/builder/hyperv/common/step_mount_dvddrive.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepMountDvdDrive struct { diff --git a/builder/hyperv/common/step_mount_floppydrive.go b/builder/hyperv/common/step_mount_floppydrive.go index f26ce933c..2d5379b16 100644 --- a/builder/hyperv/common/step_mount_floppydrive.go +++ b/builder/hyperv/common/step_mount_floppydrive.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) const ( diff --git a/builder/hyperv/common/step_mount_guest_additions.go b/builder/hyperv/common/step_mount_guest_additions.go index 2e8ab92c1..2663521ac 100644 --- a/builder/hyperv/common/step_mount_guest_additions.go +++ b/builder/hyperv/common/step_mount_guest_additions.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepMountGuestAdditions struct { diff --git a/builder/hyperv/common/step_mount_secondary_dvd_images.go b/builder/hyperv/common/step_mount_secondary_dvd_images.go index a52845c25..39a0d9e43 100644 --- a/builder/hyperv/common/step_mount_secondary_dvd_images.go +++ b/builder/hyperv/common/step_mount_secondary_dvd_images.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepMountSecondaryDvdImages struct { diff --git a/builder/hyperv/common/step_polling_installation.go b/builder/hyperv/common/step_polling_installation.go index 2d15ad424..7c71c430b 100644 --- a/builder/hyperv/common/step_polling_installation.go +++ b/builder/hyperv/common/step_polling_installation.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const port string = "13000" diff --git a/builder/hyperv/common/step_reboot_vm.go b/builder/hyperv/common/step_reboot_vm.go index 85cb697b1..e9df6eee1 100644 --- a/builder/hyperv/common/step_reboot_vm.go +++ b/builder/hyperv/common/step_reboot_vm.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepRebootVm struct { diff --git a/builder/hyperv/common/step_run.go b/builder/hyperv/common/step_run.go index b176be2af..e17e7ec09 100644 --- a/builder/hyperv/common/step_run.go +++ b/builder/hyperv/common/step_run.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepRun struct { diff --git a/builder/hyperv/common/step_set_boot_order.go b/builder/hyperv/common/step_set_boot_order.go index b5b72fb63..6a47c0e02 100644 --- a/builder/hyperv/common/step_set_boot_order.go +++ b/builder/hyperv/common/step_set_boot_order.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepSetBootOrder struct { diff --git a/builder/hyperv/common/step_set_boot_order_test.go b/builder/hyperv/common/step_set_boot_order_test.go index bd1916ac9..5dbbab573 100644 --- a/builder/hyperv/common/step_set_boot_order_test.go +++ b/builder/hyperv/common/step_set_boot_order_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) type bootOrderTest struct { diff --git a/builder/hyperv/common/step_set_first_boot_device.go b/builder/hyperv/common/step_set_first_boot_device.go index 20dbb676f..cbcd8b177 100644 --- a/builder/hyperv/common/step_set_first_boot_device.go +++ b/builder/hyperv/common/step_set_first_boot_device.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepSetFirstBootDevice struct { diff --git a/builder/hyperv/common/step_set_first_boot_device_test.go b/builder/hyperv/common/step_set_first_boot_device_test.go index 80e4b28b3..20341bb90 100644 --- a/builder/hyperv/common/step_set_first_boot_device_test.go +++ b/builder/hyperv/common/step_set_first_boot_device_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) type parseBootDeviceIdentifierTest struct { diff --git a/builder/hyperv/common/step_shutdown.go b/builder/hyperv/common/step_shutdown.go index 4033be990..fd210ea44 100644 --- a/builder/hyperv/common/step_shutdown.go +++ b/builder/hyperv/common/step_shutdown.go @@ -8,8 +8,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/hyperv/common/step_sleep.go b/builder/hyperv/common/step_sleep.go index a69f74c50..411d27eda 100644 --- a/builder/hyperv/common/step_sleep.go +++ b/builder/hyperv/common/step_sleep.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepSleep struct { diff --git a/builder/hyperv/common/step_test.go b/builder/hyperv/common/step_test.go index 966b1e2f8..13a83bcbb 100644 --- a/builder/hyperv/common/step_test.go +++ b/builder/hyperv/common/step_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/hyperv/common/step_type_boot_command.go b/builder/hyperv/common/step_type_boot_command.go index c40fdb19b..4f5f86794 100644 --- a/builder/hyperv/common/step_type_boot_command.go +++ b/builder/hyperv/common/step_type_boot_command.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type bootCommandTemplateData struct { diff --git a/builder/hyperv/common/step_unmount_dvddrive.go b/builder/hyperv/common/step_unmount_dvddrive.go index b59bc5f20..29a2beaf3 100644 --- a/builder/hyperv/common/step_unmount_dvddrive.go +++ b/builder/hyperv/common/step_unmount_dvddrive.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepUnmountDvdDrive struct { diff --git a/builder/hyperv/common/step_unmount_floppydrive.go b/builder/hyperv/common/step_unmount_floppydrive.go index 06bd7aaa5..862bfbf8a 100644 --- a/builder/hyperv/common/step_unmount_floppydrive.go +++ b/builder/hyperv/common/step_unmount_floppydrive.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepUnmountFloppyDrive struct { diff --git a/builder/hyperv/common/step_unmount_guest_additions.go b/builder/hyperv/common/step_unmount_guest_additions.go index 12451f2fc..602f1cb5e 100644 --- a/builder/hyperv/common/step_unmount_guest_additions.go +++ b/builder/hyperv/common/step_unmount_guest_additions.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepUnmountGuestAdditions struct { diff --git a/builder/hyperv/common/step_unmount_secondary_dvd_images.go b/builder/hyperv/common/step_unmount_secondary_dvd_images.go index 8429de0c4..46cd93e38 100644 --- a/builder/hyperv/common/step_unmount_secondary_dvd_images.go +++ b/builder/hyperv/common/step_unmount_secondary_dvd_images.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepUnmountSecondaryDvdImages struct { diff --git a/builder/hyperv/common/step_wait_for_install_to_complete.go b/builder/hyperv/common/step_wait_for_install_to_complete.go index 5c54eac1b..91da113af 100644 --- a/builder/hyperv/common/step_wait_for_install_to_complete.go +++ b/builder/hyperv/common/step_wait_for_install_to_complete.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const ( diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go index 24e6f91ae..dc2615344 100644 --- a/builder/hyperv/iso/builder.go +++ b/builder/hyperv/iso/builder.go @@ -12,16 +12,16 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/hyperv/iso/builder_test.go b/builder/hyperv/iso/builder_test.go index b1a18f3a8..fa9f5e889 100644 --- a/builder/hyperv/iso/builder_test.go +++ b/builder/hyperv/iso/builder_test.go @@ -9,10 +9,10 @@ import ( "strconv" "testing" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/hyperv/version/version.go b/builder/hyperv/version/version.go index 9b2f13701..86482937a 100644 --- a/builder/hyperv/version/version.go +++ b/builder/hyperv/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go index fa25bcab4..48917a251 100644 --- a/builder/hyperv/vmcx/builder.go +++ b/builder/hyperv/vmcx/builder.go @@ -11,17 +11,17 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/hyperv/vmcx/builder_test.go b/builder/hyperv/vmcx/builder_test.go index 4daec3d7d..a26ebc40c 100644 --- a/builder/hyperv/vmcx/builder_test.go +++ b/builder/hyperv/vmcx/builder_test.go @@ -9,10 +9,10 @@ import ( "io/ioutil" "os" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" hypervcommon "github.com/hashicorp/packer/builder/hyperv/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/jdcloud/builder.go b/builder/jdcloud/builder.go index 1f0119750..b93bc1d5c 100644 --- a/builder/jdcloud/builder.go +++ b/builder/jdcloud/builder.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstructure().HCL2Spec() } diff --git a/builder/jdcloud/common.go b/builder/jdcloud/common.go index f60889450..2d52c6fa4 100644 --- a/builder/jdcloud/common.go +++ b/builder/jdcloud/common.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client" vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client" ) diff --git a/builder/jdcloud/credential_config.go b/builder/jdcloud/credential_config.go index 0648c6565..97b7962bc 100644 --- a/builder/jdcloud/credential_config.go +++ b/builder/jdcloud/credential_config.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/jdcloud-api/jdcloud-sdk-go/core" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client" vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client" diff --git a/builder/jdcloud/instance_config.go b/builder/jdcloud/instance_config.go index 978925ed5..c7b069214 100644 --- a/builder/jdcloud/instance_config.go +++ b/builder/jdcloud/instance_config.go @@ -3,8 +3,8 @@ package jdcloud import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type JDCloudInstanceSpecConfig struct { diff --git a/builder/jdcloud/step_config_credentials.go b/builder/jdcloud/step_config_credentials.go index 9f036486a..58965555a 100644 --- a/builder/jdcloud/step_config_credentials.go +++ b/builder/jdcloud/step_config_credentials.go @@ -5,8 +5,8 @@ import ( "fmt" "io/ioutil" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" ) diff --git a/builder/jdcloud/step_create_image.go b/builder/jdcloud/step_create_image.go index 315d8f169..db29cf017 100644 --- a/builder/jdcloud/step_create_image.go +++ b/builder/jdcloud/step_create_image.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" ) diff --git a/builder/jdcloud/step_create_instance.go b/builder/jdcloud/step_create_instance.go index 266b55914..d00faf30d 100644 --- a/builder/jdcloud/step_create_instance.go +++ b/builder/jdcloud/step_create_instance.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/jdcloud-api/jdcloud-sdk-go/core" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models" diff --git a/builder/jdcloud/step_stop_instance.go b/builder/jdcloud/step_stop_instance.go index 99465ff07..31b529b09 100644 --- a/builder/jdcloud/step_stop_instance.go +++ b/builder/jdcloud/step_stop_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" ) diff --git a/builder/jdcloud/step_validate_parameters.go b/builder/jdcloud/step_validate_parameters.go index b31fcfbde..f4ce1e442 100644 --- a/builder/jdcloud/step_validate_parameters.go +++ b/builder/jdcloud/step_validate_parameters.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis" vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis" ) diff --git a/builder/jdcloud/version/version.go b/builder/jdcloud/version/version.go index 033c0b378..5383c98ac 100644 --- a/builder/jdcloud/version/version.go +++ b/builder/jdcloud/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/linode/artifact_test.go b/builder/linode/artifact_test.go index 855477178..2bc6242b3 100644 --- a/builder/linode/artifact_test.go +++ b/builder/linode/artifact_test.go @@ -3,7 +3,7 @@ package linode import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_Impl(t *testing.T) { diff --git a/builder/linode/builder.go b/builder/linode/builder.go index 94f175520..2efe7d132 100644 --- a/builder/linode/builder.go +++ b/builder/linode/builder.go @@ -11,10 +11,10 @@ import ( "github.com/hashicorp/hcl/v2/hcldec" "github.com/linode/linodego" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // The unique ID for this builder. diff --git a/builder/linode/builder_acc_test.go b/builder/linode/builder_acc_test.go index 19a74ccad..211035de0 100644 --- a/builder/linode/builder_acc_test.go +++ b/builder/linode/builder_acc_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/linode/builder_test.go b/builder/linode/builder_test.go index f19a78615..856ed03fb 100644 --- a/builder/linode/builder_test.go +++ b/builder/linode/builder_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/linode/config.go b/builder/linode/config.go index 549d015c1..a7dd7ab27 100644 --- a/builder/linode/config.go +++ b/builder/linode/config.go @@ -11,11 +11,11 @@ import ( "regexp" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/linode/step_create_image.go b/builder/linode/step_create_image.go index c9839fe38..5edf92ec6 100644 --- a/builder/linode/step_create_image.go +++ b/builder/linode/step_create_image.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/linode/linodego" ) diff --git a/builder/linode/step_create_linode.go b/builder/linode/step_create_linode.go index ab67db698..8089a28f9 100644 --- a/builder/linode/step_create_linode.go +++ b/builder/linode/step_create_linode.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/linode/linodego" ) diff --git a/builder/linode/step_create_ssh_key.go b/builder/linode/step_create_ssh_key.go index 9c0dde950..458421ab3 100644 --- a/builder/linode/step_create_ssh_key.go +++ b/builder/linode/step_create_ssh_key.go @@ -10,8 +10,8 @@ import ( "io/ioutil" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "golang.org/x/crypto/ssh" ) diff --git a/builder/linode/step_shutdown_linode.go b/builder/linode/step_shutdown_linode.go index 0f63f9157..9e32aaf19 100644 --- a/builder/linode/step_shutdown_linode.go +++ b/builder/linode/step_shutdown_linode.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/linode/linodego" ) diff --git a/builder/linode/version/version.go b/builder/linode/version/version.go index 3616d9049..bb1195568 100644 --- a/builder/linode/version/version.go +++ b/builder/linode/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/lxc/builder.go b/builder/lxc/builder.go index b2f6fadb8..df4b88a41 100644 --- a/builder/lxc/builder.go +++ b/builder/lxc/builder.go @@ -6,10 +6,10 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/lxc/builder_test.go b/builder/lxc/builder_test.go index 2300a9aaf..d7c3244a2 100644 --- a/builder/lxc/builder_test.go +++ b/builder/lxc/builder_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/lxc/communicator.go b/builder/lxc/communicator.go index 809c5b3cf..f73fbcc91 100644 --- a/builder/lxc/communicator.go +++ b/builder/lxc/communicator.go @@ -12,8 +12,8 @@ import ( "strings" "syscall" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) type LxcAttachCommunicator struct { diff --git a/builder/lxc/communicator_test.go b/builder/lxc/communicator_test.go index cf555fd5c..149a4d0ca 100644 --- a/builder/lxc/communicator_test.go +++ b/builder/lxc/communicator_test.go @@ -3,7 +3,7 @@ package lxc import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestCommunicator_ImplementsCommunicator(t *testing.T) { diff --git a/builder/lxc/config.go b/builder/lxc/config.go index fb66ef13c..7a59fbc2c 100644 --- a/builder/lxc/config.go +++ b/builder/lxc/config.go @@ -8,10 +8,10 @@ import ( "os" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/lxc/step_export.go b/builder/lxc/step_export.go index 470222e3f..e57f397c9 100644 --- a/builder/lxc/step_export.go +++ b/builder/lxc/step_export.go @@ -9,8 +9,8 @@ import ( "os/user" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepExport struct{} diff --git a/builder/lxc/step_lxc_create.go b/builder/lxc/step_lxc_create.go index aa0a07e3a..e5b4ddb15 100644 --- a/builder/lxc/step_lxc_create.go +++ b/builder/lxc/step_lxc_create.go @@ -7,8 +7,8 @@ import ( "os/user" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepLxcCreate struct{} diff --git a/builder/lxc/step_prepare_output_dir.go b/builder/lxc/step_prepare_output_dir.go index 2c89b5e3f..c38f90f8f 100644 --- a/builder/lxc/step_prepare_output_dir.go +++ b/builder/lxc/step_prepare_output_dir.go @@ -6,8 +6,8 @@ import ( "os" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepPrepareOutputDir struct{} diff --git a/builder/lxc/step_provision.go b/builder/lxc/step_provision.go index a98283394..435f57e1b 100644 --- a/builder/lxc/step_provision.go +++ b/builder/lxc/step_provision.go @@ -4,9 +4,9 @@ import ( "context" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepProvision provisions the instance within a chroot. diff --git a/builder/lxc/step_wait_init.go b/builder/lxc/step_wait_init.go index 7d47aa712..fb9840231 100644 --- a/builder/lxc/step_wait_init.go +++ b/builder/lxc/step_wait_init.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepWaitInit struct { diff --git a/builder/lxc/version/version.go b/builder/lxc/version/version.go index 77e16b41a..7d85f3295 100644 --- a/builder/lxc/version/version.go +++ b/builder/lxc/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/lxd/builder.go b/builder/lxd/builder.go index 9fc618d50..f1b2ca81d 100644 --- a/builder/lxd/builder.go +++ b/builder/lxd/builder.go @@ -4,10 +4,10 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/lxd/builder_test.go b/builder/lxd/builder_test.go index 07e5f8583..ce0871db8 100644 --- a/builder/lxd/builder_test.go +++ b/builder/lxd/builder_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/lxd/communicator.go b/builder/lxd/communicator.go index d505e534f..aebd70905 100644 --- a/builder/lxd/communicator.go +++ b/builder/lxd/communicator.go @@ -10,7 +10,7 @@ import ( "path/filepath" "syscall" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type Communicator struct { diff --git a/builder/lxd/communicator_test.go b/builder/lxd/communicator_test.go index 2eaf87122..de46eb313 100644 --- a/builder/lxd/communicator_test.go +++ b/builder/lxd/communicator_test.go @@ -3,7 +3,7 @@ package lxd import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestCommunicator_ImplementsCommunicator(t *testing.T) { diff --git a/builder/lxd/config.go b/builder/lxd/config.go index f4e94f121..997ff1837 100644 --- a/builder/lxd/config.go +++ b/builder/lxd/config.go @@ -6,10 +6,10 @@ package lxd import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/lxd/step_lxd_launch.go b/builder/lxd/step_lxd_launch.go index 468463040..7730d508b 100644 --- a/builder/lxd/step_lxd_launch.go +++ b/builder/lxd/step_lxd_launch.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepLxdLaunch struct{} diff --git a/builder/lxd/step_provision.go b/builder/lxd/step_provision.go index a4d2f0d21..e0c0efada 100644 --- a/builder/lxd/step_provision.go +++ b/builder/lxd/step_provision.go @@ -4,9 +4,9 @@ import ( "context" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepProvision provisions the container diff --git a/builder/lxd/step_publish.go b/builder/lxd/step_publish.go index 4e9c2ca56..992bc1bc0 100644 --- a/builder/lxd/step_publish.go +++ b/builder/lxd/step_publish.go @@ -5,8 +5,8 @@ import ( "fmt" "regexp" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepPublish struct{} diff --git a/builder/lxd/version/version.go b/builder/lxd/version/version.go index d72cf0190..b48000710 100644 --- a/builder/lxd/version/version.go +++ b/builder/lxd/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/ncloud/builder.go b/builder/ncloud/builder.go index b9c975cee..d21efd465 100644 --- a/builder/ncloud/builder.go +++ b/builder/ncloud/builder.go @@ -5,10 +5,10 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // Builder assume this implements packersdk.Builder diff --git a/builder/ncloud/config.go b/builder/ncloud/config.go index 26cdd75a6..fbb7d5af2 100644 --- a/builder/ncloud/config.go +++ b/builder/ncloud/config.go @@ -10,11 +10,11 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // Config is structure to use packer builder plugin for Naver Cloud Platform diff --git a/builder/ncloud/step.go b/builder/ncloud/step.go index 537692de8..57599e745 100644 --- a/builder/ncloud/step.go +++ b/builder/ncloud/step.go @@ -1,7 +1,7 @@ package ncloud import ( - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func processStepResult(err error, sayError func(error), state multistep.StateBag) multistep.StepAction { diff --git a/builder/ncloud/step_create_block_storage_instance.go b/builder/ncloud/step_create_block_storage_instance.go index 767484243..c3c1d591c 100644 --- a/builder/ncloud/step_create_block_storage_instance.go +++ b/builder/ncloud/step_create_block_storage_instance.go @@ -9,8 +9,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCreateBlockStorageInstance struct is for making extra block storage diff --git a/builder/ncloud/step_create_block_storage_instance_test.go b/builder/ncloud/step_create_block_storage_instance_test.go index f5fb575a0..0a79684eb 100644 --- a/builder/ncloud/step_create_block_storage_instance_test.go +++ b/builder/ncloud/step_create_block_storage_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreateBlockStorageInstanceShouldFailIfOperationCreateBlockStorageInstanceFails(t *testing.T) { diff --git a/builder/ncloud/step_create_login_key.go b/builder/ncloud/step_create_login_key.go index 5189c97db..9283faa63 100644 --- a/builder/ncloud/step_create_login_key.go +++ b/builder/ncloud/step_create_login_key.go @@ -6,8 +6,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type LoginKey struct { diff --git a/builder/ncloud/step_create_login_key_test.go b/builder/ncloud/step_create_login_key_test.go index df6cedd44..2e2003eb2 100644 --- a/builder/ncloud/step_create_login_key_test.go +++ b/builder/ncloud/step_create_login_key_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreateLoginKeyShouldFailIfOperationCreateLoginKeyFails(t *testing.T) { diff --git a/builder/ncloud/step_create_public_ip_instance.go b/builder/ncloud/step_create_public_ip_instance.go index 1fcfce714..cf6623d76 100644 --- a/builder/ncloud/step_create_public_ip_instance.go +++ b/builder/ncloud/step_create_public_ip_instance.go @@ -8,8 +8,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepCreatePublicIPInstance struct { diff --git a/builder/ncloud/step_create_public_ip_instance_test.go b/builder/ncloud/step_create_public_ip_instance_test.go index c4045fd03..14e4a62d6 100644 --- a/builder/ncloud/step_create_public_ip_instance_test.go +++ b/builder/ncloud/step_create_public_ip_instance_test.go @@ -8,7 +8,7 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreatePublicIPInstanceShouldFailIfOperationCreatePublicIPInstanceFails(t *testing.T) { diff --git a/builder/ncloud/step_create_server_image.go b/builder/ncloud/step_create_server_image.go index 3e665721e..f0a2b4d7c 100644 --- a/builder/ncloud/step_create_server_image.go +++ b/builder/ncloud/step_create_server_image.go @@ -7,8 +7,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepCreateServerImage struct { diff --git a/builder/ncloud/step_create_server_image_test.go b/builder/ncloud/step_create_server_image_test.go index 3d42a2a26..a6ff44aaa 100644 --- a/builder/ncloud/step_create_server_image_test.go +++ b/builder/ncloud/step_create_server_image_test.go @@ -7,7 +7,7 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreateServerImageShouldFailIfOperationCreateServerImageFails(t *testing.T) { diff --git a/builder/ncloud/step_create_server_instance.go b/builder/ncloud/step_create_server_instance.go index 4d8a80891..59df31ce4 100644 --- a/builder/ncloud/step_create_server_instance.go +++ b/builder/ncloud/step_create_server_instance.go @@ -10,8 +10,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepCreateServerInstance struct { diff --git a/builder/ncloud/step_create_server_instance_test.go b/builder/ncloud/step_create_server_instance_test.go index b740f1466..cc970dcad 100644 --- a/builder/ncloud/step_create_server_instance_test.go +++ b/builder/ncloud/step_create_server_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreateServerInstanceShouldFailIfOperationCreateFails(t *testing.T) { diff --git a/builder/ncloud/step_delete_block_storage_instance.go b/builder/ncloud/step_delete_block_storage_instance.go index 72cf85b17..0134e1856 100644 --- a/builder/ncloud/step_delete_block_storage_instance.go +++ b/builder/ncloud/step_delete_block_storage_instance.go @@ -8,8 +8,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepDeleteBlockStorageInstance struct { diff --git a/builder/ncloud/step_delete_block_storage_instance_test.go b/builder/ncloud/step_delete_block_storage_instance_test.go index e5448bbb4..6f8008343 100644 --- a/builder/ncloud/step_delete_block_storage_instance_test.go +++ b/builder/ncloud/step_delete_block_storage_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepDeleteBlockStorageInstanceShouldFailIfOperationDeleteBlockStorageInstanceFails(t *testing.T) { diff --git a/builder/ncloud/step_get_rootpassword.go b/builder/ncloud/step_get_rootpassword.go index 6c724a34d..20da12f37 100644 --- a/builder/ncloud/step_get_rootpassword.go +++ b/builder/ncloud/step_get_rootpassword.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepGetRootPassword struct { diff --git a/builder/ncloud/step_get_rootpassword_test.go b/builder/ncloud/step_get_rootpassword_test.go index 4bff59c1d..1f147da66 100644 --- a/builder/ncloud/step_get_rootpassword_test.go +++ b/builder/ncloud/step_get_rootpassword_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepGetRootPasswordShouldFailIfOperationGetRootPasswordFails(t *testing.T) { diff --git a/builder/ncloud/step_stop_server_instance.go b/builder/ncloud/step_stop_server_instance.go index e0ed00dd3..11b315bc6 100644 --- a/builder/ncloud/step_stop_server_instance.go +++ b/builder/ncloud/step_stop_server_instance.go @@ -7,8 +7,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepStopServerInstance struct { diff --git a/builder/ncloud/step_stop_server_instance_test.go b/builder/ncloud/step_stop_server_instance_test.go index f63386349..64db61f12 100644 --- a/builder/ncloud/step_stop_server_instance_test.go +++ b/builder/ncloud/step_stop_server_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepStopServerInstanceShouldFailIfOperationStopFails(t *testing.T) { diff --git a/builder/ncloud/step_terminate_server_instance.go b/builder/ncloud/step_terminate_server_instance.go index 706220f81..28666a420 100644 --- a/builder/ncloud/step_terminate_server_instance.go +++ b/builder/ncloud/step_terminate_server_instance.go @@ -6,8 +6,8 @@ import ( "time" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepTerminateServerInstance struct { diff --git a/builder/ncloud/step_terminate_server_instance_test.go b/builder/ncloud/step_terminate_server_instance_test.go index ff5fafd59..e06a69b90 100644 --- a/builder/ncloud/step_terminate_server_instance_test.go +++ b/builder/ncloud/step_terminate_server_instance_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepTerminateServerInstanceShouldFailIfOperationTerminationFails(t *testing.T) { diff --git a/builder/ncloud/step_validate_template.go b/builder/ncloud/step_validate_template.go index 36ca61c49..9dc85a95b 100644 --- a/builder/ncloud/step_validate_template.go +++ b/builder/ncloud/step_validate_template.go @@ -9,8 +9,8 @@ import ( "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud" "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/olekukonko/tablewriter" ) diff --git a/builder/ncloud/step_validate_template_test.go b/builder/ncloud/step_validate_template_test.go index 42d582561..1641715e3 100644 --- a/builder/ncloud/step_validate_template_test.go +++ b/builder/ncloud/step_validate_template_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepValidateTemplateShouldFailIfValidateFails(t *testing.T) { diff --git a/builder/ncloud/version/version.go b/builder/ncloud/version/version.go index 52a84e043..3835ee3ef 100644 --- a/builder/ncloud/version/version.go +++ b/builder/ncloud/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/null/artifact_export_test.go b/builder/null/artifact_export_test.go index 72665260a..77eeeced8 100644 --- a/builder/null/artifact_export_test.go +++ b/builder/null/artifact_export_test.go @@ -3,7 +3,7 @@ package null import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestNullArtifact(t *testing.T) { diff --git a/builder/null/builder.go b/builder/null/builder.go index 11d3d4490..5e2a7d369 100644 --- a/builder/null/builder.go +++ b/builder/null/builder.go @@ -4,10 +4,10 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const BuilderId = "fnoeding.null" diff --git a/builder/null/builder_test.go b/builder/null/builder_test.go index 4be603dc8..f710f1dfd 100644 --- a/builder/null/builder_test.go +++ b/builder/null/builder_test.go @@ -3,7 +3,7 @@ package null import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilder_implBuilder(t *testing.T) { diff --git a/builder/null/config.go b/builder/null/config.go index a12e698a6..d6fe1480f 100644 --- a/builder/null/config.go +++ b/builder/null/config.go @@ -5,11 +5,11 @@ package null import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/null/config_test.go b/builder/null/config_test.go index 7c6232c08..47e023312 100644 --- a/builder/null/config_test.go +++ b/builder/null/config_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator" ) func testConfig() map[string]interface{} { diff --git a/builder/null/ssh.go b/builder/null/ssh.go index 335c93dca..730ebe5fb 100644 --- a/builder/null/ssh.go +++ b/builder/null/ssh.go @@ -1,7 +1,7 @@ package null import ( - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/null/version/version.go b/builder/null/version/version.go index a6a76bca0..5e2659824 100644 --- a/builder/null/version/version.go +++ b/builder/null/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/oneandone/builder.go b/builder/oneandone/builder.go index 68da0f1cf..76e0c26f9 100644 --- a/builder/oneandone/builder.go +++ b/builder/oneandone/builder.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const BuilderId = "packer.oneandone" diff --git a/builder/oneandone/builder_acc_test.go b/builder/oneandone/builder_acc_test.go index b3811e2b9..0c3967ad6 100644 --- a/builder/oneandone/builder_acc_test.go +++ b/builder/oneandone/builder_acc_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/oneandone/builder_test.go b/builder/oneandone/builder_test.go index 50446e5e8..d3c518ffe 100644 --- a/builder/oneandone/builder_test.go +++ b/builder/oneandone/builder_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/oneandone/config.go b/builder/oneandone/config.go index 94defbc76..77973d38f 100644 --- a/builder/oneandone/config.go +++ b/builder/oneandone/config.go @@ -8,11 +8,11 @@ import ( "strings" "github.com/1and1/oneandone-cloudserver-sdk-go" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/oneandone/step_create_server.go b/builder/oneandone/step_create_server.go index 18293e86b..90ca7c159 100644 --- a/builder/oneandone/step_create_server.go +++ b/builder/oneandone/step_create_server.go @@ -7,8 +7,8 @@ import ( "time" "github.com/1and1/oneandone-cloudserver-sdk-go" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreateServer struct{} diff --git a/builder/oneandone/step_create_sshkey.go b/builder/oneandone/step_create_sshkey.go index 64dd5f667..48bed2ae8 100644 --- a/builder/oneandone/step_create_sshkey.go +++ b/builder/oneandone/step_create_sshkey.go @@ -7,8 +7,8 @@ import ( "fmt" "io/ioutil" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "golang.org/x/crypto/ssh" ) diff --git a/builder/oneandone/step_take_snapshot.go b/builder/oneandone/step_take_snapshot.go index 2c8571f79..3c19adbe8 100644 --- a/builder/oneandone/step_take_snapshot.go +++ b/builder/oneandone/step_take_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "github.com/1and1/oneandone-cloudserver-sdk-go" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepTakeSnapshot struct{} diff --git a/builder/oneandone/version/version.go b/builder/oneandone/version/version.go index ba95169b8..411992b9e 100644 --- a/builder/oneandone/version/version.go +++ b/builder/oneandone/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/openstack/access_config.go b/builder/openstack/access_config.go index 8c18beed0..49385f6de 100644 --- a/builder/openstack/access_config.go +++ b/builder/openstack/access_config.go @@ -16,8 +16,8 @@ import ( "github.com/gophercloud/gophercloud/openstack" "github.com/gophercloud/utils/openstack/clientconfig" "github.com/hashicorp/go-cleanhttp" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // AccessConfig is for common configuration related to openstack access diff --git a/builder/openstack/artifact_test.go b/builder/openstack/artifact_test.go index 8dec93bb3..180906ef3 100644 --- a/builder/openstack/artifact_test.go +++ b/builder/openstack/artifact_test.go @@ -3,7 +3,7 @@ package openstack import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_Impl(t *testing.T) { diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go index 2de376425..145f91732 100644 --- a/builder/openstack/builder.go +++ b/builder/openstack/builder.go @@ -10,13 +10,13 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/openstack/builder_test.go b/builder/openstack/builder_test.go index 4b838ba0a..15ed1c37c 100644 --- a/builder/openstack/builder_test.go +++ b/builder/openstack/builder_test.go @@ -3,7 +3,7 @@ package openstack import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilder_ImplementsBuilder(t *testing.T) { diff --git a/builder/openstack/image_config.go b/builder/openstack/image_config.go index d36e5caae..704b83155 100644 --- a/builder/openstack/image_config.go +++ b/builder/openstack/image_config.go @@ -7,7 +7,7 @@ import ( "strings" imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // ImageConfig is for common configuration related to creating Images. diff --git a/builder/openstack/run_config.go b/builder/openstack/run_config.go index 3fb04621c..f75b3d900 100644 --- a/builder/openstack/run_config.go +++ b/builder/openstack/run_config.go @@ -7,9 +7,9 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) // RunConfig contains configuration for running an instance from a source image diff --git a/builder/openstack/run_config_test.go b/builder/openstack/run_config_test.go index 4662b6c4d..af14715dc 100644 --- a/builder/openstack/run_config_test.go +++ b/builder/openstack/run_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator" "github.com/mitchellh/mapstructure" ) diff --git a/builder/openstack/server.go b/builder/openstack/server.go index af7b3c3dc..61a198ad1 100644 --- a/builder/openstack/server.go +++ b/builder/openstack/server.go @@ -8,7 +8,7 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // StateRefreshFunc is a function type used for StateChangeConf that is diff --git a/builder/openstack/ssh.go b/builder/openstack/ssh.go index 95fb1e32c..ff716b57d 100644 --- a/builder/openstack/ssh.go +++ b/builder/openstack/ssh.go @@ -9,7 +9,7 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // CommHost looks up the host for the communicator. diff --git a/builder/openstack/step_add_image_members.go b/builder/openstack/step_add_image_members.go index d612d8510..1d3617b4c 100644 --- a/builder/openstack/step_add_image_members.go +++ b/builder/openstack/step_add_image_members.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/members" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepAddImageMembers struct{} diff --git a/builder/openstack/step_allocate_ip.go b/builder/openstack/step_allocate_ip.go index c113d3385..c677d437e 100644 --- a/builder/openstack/step_allocate_ip.go +++ b/builder/openstack/step_allocate_ip.go @@ -6,8 +6,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepAllocateIp struct { diff --git a/builder/openstack/step_create_image.go b/builder/openstack/step_create_image.go index f6d241dc0..585d86d4b 100644 --- a/builder/openstack/step_create_image.go +++ b/builder/openstack/step_create_image.go @@ -11,8 +11,8 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreateImage struct { diff --git a/builder/openstack/step_create_volume.go b/builder/openstack/step_create_volume.go index 3c820580a..cfbc8fbb6 100644 --- a/builder/openstack/step_create_volume.go +++ b/builder/openstack/step_create_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepCreateVolume struct { diff --git a/builder/openstack/step_detach_volume.go b/builder/openstack/step_detach_volume.go index 05553d587..f80d9e8a2 100644 --- a/builder/openstack/step_detach_volume.go +++ b/builder/openstack/step_detach_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepDetachVolume struct { diff --git a/builder/openstack/step_discover_network.go b/builder/openstack/step_discover_network.go index 210272497..642abdfa6 100644 --- a/builder/openstack/step_discover_network.go +++ b/builder/openstack/step_discover_network.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepDiscoverNetwork struct { diff --git a/builder/openstack/step_get_password.go b/builder/openstack/step_get_password.go index 13adec12d..7f0745888 100644 --- a/builder/openstack/step_get_password.go +++ b/builder/openstack/step_get_password.go @@ -8,9 +8,9 @@ import ( "time" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "golang.org/x/crypto/ssh" ) diff --git a/builder/openstack/step_key_pair.go b/builder/openstack/step_key_pair.go index 8738bc833..4c6ebdbb8 100644 --- a/builder/openstack/step_key_pair.go +++ b/builder/openstack/step_key_pair.go @@ -10,10 +10,10 @@ import ( "runtime" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/tmp" "golang.org/x/crypto/ssh" ) diff --git a/builder/openstack/step_key_pair_test.go b/builder/openstack/step_key_pair_test.go index c002c3d16..9e0579f32 100644 --- a/builder/openstack/step_key_pair_test.go +++ b/builder/openstack/step_key_pair_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "golang.org/x/crypto/ssh" ) diff --git a/builder/openstack/step_load_flavor.go b/builder/openstack/step_load_flavor.go index a865a4374..59b460cab 100644 --- a/builder/openstack/step_load_flavor.go +++ b/builder/openstack/step_load_flavor.go @@ -7,8 +7,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors" flavors_utils "github.com/gophercloud/utils/openstack/compute/v2/flavors" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepLoadFlavor gets the FlavorRef from a Flavor. It first assumes diff --git a/builder/openstack/step_run_source_server.go b/builder/openstack/step_run_source_server.go index 1524a76f8..94c777d55 100644 --- a/builder/openstack/step_run_source_server.go +++ b/builder/openstack/step_run_source_server.go @@ -9,8 +9,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/bootfromvolume" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepRunSourceServer struct { diff --git a/builder/openstack/step_source_image_info.go b/builder/openstack/step_source_image_info.go index 915c16bd7..511c1528d 100644 --- a/builder/openstack/step_source_image_info.go +++ b/builder/openstack/step_source_image_info.go @@ -9,8 +9,8 @@ import ( "github.com/gophercloud/gophercloud/openstack/imageservice/v2/imageimport" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" "github.com/gophercloud/gophercloud/pagination" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepSourceImageInfo struct { diff --git a/builder/openstack/step_stop_server.go b/builder/openstack/step_stop_server.go index 6a7baa5d8..3fbc3ed2a 100644 --- a/builder/openstack/step_stop_server.go +++ b/builder/openstack/step_stop_server.go @@ -8,8 +8,8 @@ import ( "github.com/gophercloud/gophercloud" "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/startstop" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepStopServer struct{} diff --git a/builder/openstack/step_update_image_mindisk.go b/builder/openstack/step_update_image_mindisk.go index fcaf55468..c15711bf1 100644 --- a/builder/openstack/step_update_image_mindisk.go +++ b/builder/openstack/step_update_image_mindisk.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepUpdateImageMinDisk struct{} diff --git a/builder/openstack/step_update_image_tags.go b/builder/openstack/step_update_image_tags.go index 34fdc674d..366939238 100644 --- a/builder/openstack/step_update_image_tags.go +++ b/builder/openstack/step_update_image_tags.go @@ -6,8 +6,8 @@ import ( "strings" imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepUpdateImageTags struct{} diff --git a/builder/openstack/step_update_image_visibility.go b/builder/openstack/step_update_image_visibility.go index e7da67d7c..023a00a6d 100644 --- a/builder/openstack/step_update_image_visibility.go +++ b/builder/openstack/step_update_image_visibility.go @@ -5,8 +5,8 @@ import ( "fmt" imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepUpdateImageVisibility struct{} diff --git a/builder/openstack/step_wait_for_rackconnect.go b/builder/openstack/step_wait_for_rackconnect.go index d97da15f4..63bf1cf87 100644 --- a/builder/openstack/step_wait_for_rackconnect.go +++ b/builder/openstack/step_wait_for_rackconnect.go @@ -6,8 +6,8 @@ import ( "time" "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepWaitForRackConnect struct { diff --git a/builder/openstack/version/version.go b/builder/openstack/version/version.go index 26f7141ec..3161752de 100644 --- a/builder/openstack/version/version.go +++ b/builder/openstack/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go index bc06b1281..695007afd 100644 --- a/builder/oracle/classic/builder.go +++ b/builder/oracle/classic/builder.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/go-oracle-terraform/compute" "github.com/hashicorp/go-oracle-terraform/opc" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ocommon "github.com/hashicorp/packer/builder/oracle/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // BuilderId uniquely identifies the builder diff --git a/builder/oracle/classic/builder.hcl2spec.go b/builder/oracle/classic/builder.hcl2spec.go index 29e98b6be..1528d3afa 100644 --- a/builder/oracle/classic/builder.hcl2spec.go +++ b/builder/oracle/classic/builder.hcl2spec.go @@ -4,7 +4,7 @@ package classic import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/oracle/classic/config.go b/builder/oracle/classic/config.go index a5a6719ab..cdc7159b2 100644 --- a/builder/oracle/classic/config.go +++ b/builder/oracle/classic/config.go @@ -9,11 +9,11 @@ import ( "regexp" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/oracle/classic/pv_config.go b/builder/oracle/classic/pv_config.go index 950d6e57b..f69f1d197 100644 --- a/builder/oracle/classic/pv_config.go +++ b/builder/oracle/classic/pv_config.go @@ -3,9 +3,9 @@ package classic import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) const imageListDefault = "/oracle/public/OL_7.2_UEKR4_x86_64" diff --git a/builder/oracle/classic/step_add_keys.go b/builder/oracle/classic/step_add_keys.go index bf1598d85..a2279f775 100644 --- a/builder/oracle/classic/step_add_keys.go +++ b/builder/oracle/classic/step_add_keys.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepAddKeysToAPI struct { diff --git a/builder/oracle/classic/step_attach_volume.go b/builder/oracle/classic/step_attach_volume.go index 686c01a2b..b3f81a9c2 100644 --- a/builder/oracle/classic/step_attach_volume.go +++ b/builder/oracle/classic/step_attach_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepAttachVolume struct { diff --git a/builder/oracle/classic/step_connect_builder.go b/builder/oracle/classic/step_connect_builder.go index 12e0ac973..94385229f 100644 --- a/builder/oracle/classic/step_connect_builder.go +++ b/builder/oracle/classic/step_connect_builder.go @@ -3,8 +3,8 @@ package classic import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) type stepConnectBuilder struct { diff --git a/builder/oracle/classic/step_create_image.go b/builder/oracle/classic/step_create_image.go index 7eae037d1..6f6a14381 100644 --- a/builder/oracle/classic/step_create_image.go +++ b/builder/oracle/classic/step_create_image.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreateImage struct { diff --git a/builder/oracle/classic/step_create_instance.go b/builder/oracle/classic/step_create_instance.go index 86ea5d74f..5884755ef 100644 --- a/builder/oracle/classic/step_create_instance.go +++ b/builder/oracle/classic/step_create_instance.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreateInstance struct{} diff --git a/builder/oracle/classic/step_create_ip_reservation.go b/builder/oracle/classic/step_create_ip_reservation.go index 24948c68a..546d33275 100644 --- a/builder/oracle/classic/step_create_ip_reservation.go +++ b/builder/oracle/classic/step_create_ip_reservation.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type stepCreateIPReservation struct{} diff --git a/builder/oracle/classic/step_create_persistent_volume.go b/builder/oracle/classic/step_create_persistent_volume.go index 268354c62..07321ad99 100644 --- a/builder/oracle/classic/step_create_persistent_volume.go +++ b/builder/oracle/classic/step_create_persistent_volume.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreatePersistentVolume struct { diff --git a/builder/oracle/classic/step_create_pv_builder.go b/builder/oracle/classic/step_create_pv_builder.go index c10849a8b..aff02d328 100644 --- a/builder/oracle/classic/step_create_pv_builder.go +++ b/builder/oracle/classic/step_create_pv_builder.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreatePVBuilder struct { diff --git a/builder/oracle/classic/step_create_pv_master.go b/builder/oracle/classic/step_create_pv_master.go index bb4843ddc..6773506d0 100644 --- a/builder/oracle/classic/step_create_pv_master.go +++ b/builder/oracle/classic/step_create_pv_master.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreatePVMaster struct { diff --git a/builder/oracle/classic/step_list_images.go b/builder/oracle/classic/step_list_images.go index b7aea6e56..cf61ff4f5 100644 --- a/builder/oracle/classic/step_list_images.go +++ b/builder/oracle/classic/step_list_images.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepListImages struct{} diff --git a/builder/oracle/classic/step_security.go b/builder/oracle/classic/step_security.go index b290e41a4..6098322b9 100644 --- a/builder/oracle/classic/step_security.go +++ b/builder/oracle/classic/step_security.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepSecurity struct { diff --git a/builder/oracle/classic/step_snapshot.go b/builder/oracle/classic/step_snapshot.go index 6120df025..6a2a90cbd 100644 --- a/builder/oracle/classic/step_snapshot.go +++ b/builder/oracle/classic/step_snapshot.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepSnapshot struct { diff --git a/builder/oracle/classic/step_terminate_pv_master.go b/builder/oracle/classic/step_terminate_pv_master.go index 87820ff48..39de6afae 100644 --- a/builder/oracle/classic/step_terminate_pv_master.go +++ b/builder/oracle/classic/step_terminate_pv_master.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/go-oracle-terraform/compute" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepTerminatePVMaster struct { diff --git a/builder/oracle/classic/step_upload_image.go b/builder/oracle/classic/step_upload_image.go index 061c28d38..c0d47c9c1 100644 --- a/builder/oracle/classic/step_upload_image.go +++ b/builder/oracle/classic/step_upload_image.go @@ -6,9 +6,9 @@ import ( "log" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type stepUploadImage struct { diff --git a/builder/oracle/common/step_ssh_key_pair.go b/builder/oracle/common/step_ssh_key_pair.go index d0fe8d723..4b42a0f00 100644 --- a/builder/oracle/common/step_ssh_key_pair.go +++ b/builder/oracle/common/step_ssh_key_pair.go @@ -10,9 +10,9 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "golang.org/x/crypto/ssh" ) diff --git a/builder/oracle/oci/artifact_test.go b/builder/oracle/oci/artifact_test.go index d6574f7f7..366d1267c 100644 --- a/builder/oracle/oci/artifact_test.go +++ b/builder/oracle/oci/artifact_test.go @@ -3,7 +3,7 @@ package oci import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifactImpl(t *testing.T) { diff --git a/builder/oracle/oci/builder.go b/builder/oracle/oci/builder.go index a68c450d3..55247ee8c 100644 --- a/builder/oracle/oci/builder.go +++ b/builder/oracle/oci/builder.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ocommon "github.com/hashicorp/packer/builder/oracle/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/oracle/oci-go-sdk/core" ) diff --git a/builder/oracle/oci/builder_test.go b/builder/oracle/oci/builder_test.go index 8772e8863..bb4b0fb21 100644 --- a/builder/oracle/oci/builder_test.go +++ b/builder/oracle/oci/builder_test.go @@ -3,7 +3,7 @@ package oci import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilder_ImplementsBuilder(t *testing.T) { diff --git a/builder/oracle/oci/config.go b/builder/oracle/oci/config.go index c794f5384..a1a4c980f 100644 --- a/builder/oracle/oci/config.go +++ b/builder/oracle/oci/config.go @@ -13,12 +13,12 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/pathing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/pathing" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ocicommon "github.com/oracle/oci-go-sdk/common" ociauth "github.com/oracle/oci-go-sdk/common/auth" ) diff --git a/builder/oracle/oci/step_create_instance.go b/builder/oracle/oci/step_create_instance.go index bc4a0a067..0f9aedda0 100644 --- a/builder/oracle/oci/step_create_instance.go +++ b/builder/oracle/oci/step_create_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepCreateInstance struct{} diff --git a/builder/oracle/oci/step_create_instance_test.go b/builder/oracle/oci/step_create_instance_test.go index 436802c69..746e53536 100644 --- a/builder/oracle/oci/step_create_instance_test.go +++ b/builder/oracle/oci/step_create_instance_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreateInstance(t *testing.T) { diff --git a/builder/oracle/oci/step_get_default_credentials.go b/builder/oracle/oci/step_get_default_credentials.go index e421fd5c0..3499221c1 100644 --- a/builder/oracle/oci/step_get_default_credentials.go +++ b/builder/oracle/oci/step_get_default_credentials.go @@ -5,9 +5,9 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepGetDefaultCredentials struct { diff --git a/builder/oracle/oci/step_image.go b/builder/oracle/oci/step_image.go index 69b0550b9..fb4814b59 100644 --- a/builder/oracle/oci/step_image.go +++ b/builder/oracle/oci/step_image.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepImage struct{} diff --git a/builder/oracle/oci/step_image_test.go b/builder/oracle/oci/step_image_test.go index c142872ec..52bb321b0 100644 --- a/builder/oracle/oci/step_image_test.go +++ b/builder/oracle/oci/step_image_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepImage(t *testing.T) { diff --git a/builder/oracle/oci/step_instance_info.go b/builder/oracle/oci/step_instance_info.go index 11edc3f1d..78b3a00fe 100644 --- a/builder/oracle/oci/step_instance_info.go +++ b/builder/oracle/oci/step_instance_info.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepInstanceInfo struct{} diff --git a/builder/oracle/oci/step_instance_info_test.go b/builder/oracle/oci/step_instance_info_test.go index d5b9f0b3d..5625dc78c 100644 --- a/builder/oracle/oci/step_instance_info_test.go +++ b/builder/oracle/oci/step_instance_info_test.go @@ -6,8 +6,8 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestInstanceInfo(t *testing.T) { diff --git a/builder/oracle/oci/step_test.go b/builder/oracle/oci/step_test.go index a7d0a1ea1..f4c6a0569 100644 --- a/builder/oracle/oci/step_test.go +++ b/builder/oracle/oci/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // TODO(apryde): It would be good not to have to write a key file to disk to diff --git a/builder/oracle/version/version.go b/builder/oracle/version/version.go index 81b5e2aba..27d0da1c4 100644 --- a/builder/oracle/version/version.go +++ b/builder/oracle/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go index 0b58b4cc9..25810c25f 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -12,14 +12,14 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/osc/bsu/builder_acc_test.go b/builder/osc/bsu/builder_acc_test.go index bc25e445b..04646e9b4 100644 --- a/builder/osc/bsu/builder_acc_test.go +++ b/builder/osc/bsu/builder_acc_test.go @@ -4,7 +4,7 @@ package bsu import ( "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/osc/bsu/builder_test.go b/builder/osc/bsu/builder_test.go index 61f09eea1..3b4801dbb 100644 --- a/builder/osc/bsu/builder_test.go +++ b/builder/osc/bsu/builder_test.go @@ -3,7 +3,7 @@ package bsu import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/osc/bsu/step_create_omi.go b/builder/osc/bsu/step_create_omi.go index 63199f344..d2ba7c02d 100644 --- a/builder/osc/bsu/step_create_omi.go +++ b/builder/osc/bsu/step_create_omi.go @@ -6,9 +6,9 @@ import ( "log" "github.com/antihax/optional" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go index 15e133f4e..31ac74211 100644 --- a/builder/osc/bsusurrogate/builder.go +++ b/builder/osc/bsusurrogate/builder.go @@ -10,14 +10,14 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "oapi.outscale.bsusurrogate" diff --git a/builder/osc/bsusurrogate/builder_acc_test.go b/builder/osc/bsusurrogate/builder_acc_test.go index bda5366e0..b39f8c38d 100644 --- a/builder/osc/bsusurrogate/builder_acc_test.go +++ b/builder/osc/bsusurrogate/builder_acc_test.go @@ -3,7 +3,7 @@ package bsusurrogate import ( "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/osc/bsusurrogate/builder_test.go b/builder/osc/bsusurrogate/builder_test.go index 329aa23eb..a99afbed3 100644 --- a/builder/osc/bsusurrogate/builder_test.go +++ b/builder/osc/bsusurrogate/builder_test.go @@ -3,7 +3,7 @@ package bsusurrogate import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilder_ImplementsBuilder(t *testing.T) { diff --git a/builder/osc/bsusurrogate/root_block_device.go b/builder/osc/bsusurrogate/root_block_device.go index 987636b12..67bcfca77 100644 --- a/builder/osc/bsusurrogate/root_block_device.go +++ b/builder/osc/bsusurrogate/root_block_device.go @@ -3,7 +3,7 @@ package bsusurrogate import ( "errors" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type RootBlockDevice struct { diff --git a/builder/osc/bsusurrogate/step_register_omi.go b/builder/osc/bsusurrogate/step_register_omi.go index eea7beb76..cee2eacdb 100644 --- a/builder/osc/bsusurrogate/step_register_omi.go +++ b/builder/osc/bsusurrogate/step_register_omi.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/antihax/optional" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/bsusurrogate/step_snapshop_volumes.go b/builder/osc/bsusurrogate/step_snapshop_volumes.go index 29abadd13..534edd135 100644 --- a/builder/osc/bsusurrogate/step_snapshop_volumes.go +++ b/builder/osc/bsusurrogate/step_snapshop_volumes.go @@ -8,9 +8,9 @@ import ( "github.com/antihax/optional" multierror "github.com/hashicorp/go-multierror" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/bsuvolume/artifact.go b/builder/osc/bsuvolume/artifact.go index 4b70513c2..88ab2a29a 100644 --- a/builder/osc/bsuvolume/artifact.go +++ b/builder/osc/bsuvolume/artifact.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/antihax/optional" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/bsuvolume/block_device.go b/builder/osc/bsuvolume/block_device.go index e2ee2d375..c759949a2 100644 --- a/builder/osc/bsuvolume/block_device.go +++ b/builder/osc/bsuvolume/block_device.go @@ -1,8 +1,8 @@ package bsuvolume import ( + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type BlockDevice struct { diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go index 4df09a2dd..4ad4ab320 100644 --- a/builder/osc/bsuvolume/builder.go +++ b/builder/osc/bsuvolume/builder.go @@ -10,14 +10,14 @@ import ( "log" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "oapi.outscale.bsuvolume" diff --git a/builder/osc/bsuvolume/builder_acc_test.go b/builder/osc/bsuvolume/builder_acc_test.go index e0046c706..f2fcab1a5 100644 --- a/builder/osc/bsuvolume/builder_acc_test.go +++ b/builder/osc/bsuvolume/builder_acc_test.go @@ -4,7 +4,7 @@ package bsuvolume import ( "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/osc/bsuvolume/builder_test.go b/builder/osc/bsuvolume/builder_test.go index 0d48f9734..709b2832d 100644 --- a/builder/osc/bsuvolume/builder_test.go +++ b/builder/osc/bsuvolume/builder_test.go @@ -3,7 +3,7 @@ package bsuvolume import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/osc/bsuvolume/step_tag_bsu_volumes.go b/builder/osc/bsuvolume/step_tag_bsu_volumes.go index 53b515fdb..ecef68c43 100644 --- a/builder/osc/bsuvolume/step_tag_bsu_volumes.go +++ b/builder/osc/bsuvolume/step_tag_bsu_volumes.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/builder.go b/builder/osc/chroot/builder.go index 3aa0715ee..5734b63ad 100644 --- a/builder/osc/chroot/builder.go +++ b/builder/osc/chroot/builder.go @@ -12,13 +12,13 @@ import ( "runtime" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/osc/chroot/cleanup.go b/builder/osc/chroot/cleanup.go index 37691305a..d31d25ffd 100644 --- a/builder/osc/chroot/cleanup.go +++ b/builder/osc/chroot/cleanup.go @@ -1,7 +1,7 @@ package chroot import ( - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // Cleanup is an interface that some steps implement for early cleanup. diff --git a/builder/osc/chroot/communicator.go b/builder/osc/chroot/communicator.go index 0389c55cf..8152e5a00 100644 --- a/builder/osc/chroot/communicator.go +++ b/builder/osc/chroot/communicator.go @@ -13,8 +13,8 @@ import ( "strings" "syscall" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) // Communicator is a special communicator that works by executing diff --git a/builder/osc/chroot/communicator_test.go b/builder/osc/chroot/communicator_test.go index 284782eb0..dabff5024 100644 --- a/builder/osc/chroot/communicator_test.go +++ b/builder/osc/chroot/communicator_test.go @@ -3,7 +3,7 @@ package chroot import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestCommunicator_ImplementsCommunicator(t *testing.T) { diff --git a/builder/osc/chroot/run_local_commands.go b/builder/osc/chroot/run_local_commands.go index fb96e1eb3..209456c73 100644 --- a/builder/osc/chroot/run_local_commands.go +++ b/builder/osc/chroot/run_local_commands.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + sl "github.com/hashicorp/packer-plugin-sdk/shell-local" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func RunLocalCommands(commands []string, wrappedCommand CommandWrapper, ictx interpolate.Context, ui packersdk.Ui) error { diff --git a/builder/osc/chroot/step_check_root_device.go b/builder/osc/chroot/step_check_root_device.go index 97566e8d3..57f192909 100644 --- a/builder/osc/chroot/step_check_root_device.go +++ b/builder/osc/chroot/step_check_root_device.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_chroot_provision.go b/builder/osc/chroot/step_chroot_provision.go index 68fc8d5f0..f6b788b5f 100644 --- a/builder/osc/chroot/step_chroot_provision.go +++ b/builder/osc/chroot/step_chroot_provision.go @@ -4,9 +4,9 @@ import ( "context" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepChrootProvision provisions the instance within a chroot. diff --git a/builder/osc/chroot/step_copy_files.go b/builder/osc/chroot/step_copy_files.go index 6be919506..f59bab67b 100644 --- a/builder/osc/chroot/step_copy_files.go +++ b/builder/osc/chroot/step_copy_files.go @@ -7,8 +7,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCopyFiles copies some files from the host into the chroot environment. diff --git a/builder/osc/chroot/step_create_omi.go b/builder/osc/chroot/step_create_omi.go index 051ca7740..62afb7c32 100644 --- a/builder/osc/chroot/step_create_omi.go +++ b/builder/osc/chroot/step_create_omi.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/antihax/optional" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_create_volume.go b/builder/osc/chroot/step_create_volume.go index 447c7f652..319fdf988 100644 --- a/builder/osc/chroot/step_create_volume.go +++ b/builder/osc/chroot/step_create_volume.go @@ -7,10 +7,10 @@ import ( "log" "github.com/antihax/optional" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_early_cleanup.go b/builder/osc/chroot/step_early_cleanup.go index e8cf9593f..f91681a11 100644 --- a/builder/osc/chroot/step_early_cleanup.go +++ b/builder/osc/chroot/step_early_cleanup.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepEarlyCleanup performs some of the cleanup steps early in order to diff --git a/builder/osc/chroot/step_early_unflock.go b/builder/osc/chroot/step_early_unflock.go index fa3828315..60b7ff076 100644 --- a/builder/osc/chroot/step_early_unflock.go +++ b/builder/osc/chroot/step_early_unflock.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepEarlyUnflock unlocks the flock. diff --git a/builder/osc/chroot/step_flock.go b/builder/osc/chroot/step_flock.go index c8d92f5a3..54ffaa22a 100644 --- a/builder/osc/chroot/step_flock.go +++ b/builder/osc/chroot/step_flock.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepFlock provisions the instance within a chroot. diff --git a/builder/osc/chroot/step_link_volume.go b/builder/osc/chroot/step_link_volume.go index e14244dc1..cf42fddd3 100644 --- a/builder/osc/chroot/step_link_volume.go +++ b/builder/osc/chroot/step_link_volume.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/antihax/optional" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_mount_device.go b/builder/osc/chroot/step_mount_device.go index 11bbebfe9..38b190eb7 100644 --- a/builder/osc/chroot/step_mount_device.go +++ b/builder/osc/chroot/step_mount_device.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type mountPathData struct { diff --git a/builder/osc/chroot/step_mount_extra.go b/builder/osc/chroot/step_mount_extra.go index 87706081f..f0dfc6437 100644 --- a/builder/osc/chroot/step_mount_extra.go +++ b/builder/osc/chroot/step_mount_extra.go @@ -8,8 +8,8 @@ import ( "os/exec" "syscall" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepMountExtra mounts the attached device. diff --git a/builder/osc/chroot/step_post_mount_commands.go b/builder/osc/chroot/step_post_mount_commands.go index cbfb8e176..73866a9c1 100644 --- a/builder/osc/chroot/step_post_mount_commands.go +++ b/builder/osc/chroot/step_post_mount_commands.go @@ -3,8 +3,8 @@ package chroot import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type postMountCommandsData struct { diff --git a/builder/osc/chroot/step_pre_mount_commands.go b/builder/osc/chroot/step_pre_mount_commands.go index 4ddb5523a..714d80140 100644 --- a/builder/osc/chroot/step_pre_mount_commands.go +++ b/builder/osc/chroot/step_pre_mount_commands.go @@ -3,8 +3,8 @@ package chroot import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type preMountCommandsData struct { diff --git a/builder/osc/chroot/step_prepare_device.go b/builder/osc/chroot/step_prepare_device.go index 79e5ee9a8..fd134493f 100644 --- a/builder/osc/chroot/step_prepare_device.go +++ b/builder/osc/chroot/step_prepare_device.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepPrepareDevice finds an available device and sets it. diff --git a/builder/osc/chroot/step_snapshot.go b/builder/osc/chroot/step_snapshot.go index ba518ce72..ea0c0f692 100644 --- a/builder/osc/chroot/step_snapshot.go +++ b/builder/osc/chroot/step_snapshot.go @@ -6,9 +6,9 @@ import ( "time" "github.com/antihax/optional" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" osccommon "github.com/hashicorp/packer/builder/osc/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/chroot/step_vm_info.go b/builder/osc/chroot/step_vm_info.go index 6ae4c8b9b..079deb087 100644 --- a/builder/osc/chroot/step_vm_info.go +++ b/builder/osc/chroot/step_vm_info.go @@ -6,8 +6,8 @@ import ( "log" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/access_config.go b/builder/osc/common/access_config.go index beb040dfe..0170f1a62 100644 --- a/builder/osc/common/access_config.go +++ b/builder/osc/common/access_config.go @@ -7,7 +7,7 @@ import ( "net/http" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/artifact.go b/builder/osc/common/artifact.go index c543fa128..89ae713d6 100644 --- a/builder/osc/common/artifact.go +++ b/builder/osc/common/artifact.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/antihax/optional" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/block_device.go b/builder/osc/common/block_device.go index 32484de3e..3751e3867 100644 --- a/builder/osc/common/block_device.go +++ b/builder/osc/common/block_device.go @@ -5,7 +5,7 @@ import ( "log" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/interpolate_build_info.go b/builder/osc/common/interpolate_build_info.go index 820c63296..33444219b 100644 --- a/builder/osc/common/interpolate_build_info.go +++ b/builder/osc/common/interpolate_build_info.go @@ -1,7 +1,7 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/interpolate_build_info_test.go b/builder/osc/common/interpolate_build_info_test.go index 949e73c04..559acf7b8 100644 --- a/builder/osc/common/interpolate_build_info_test.go +++ b/builder/osc/common/interpolate_build_info_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/omi_config.go b/builder/osc/common/omi_config.go index a316d0298..d1dd25d4a 100644 --- a/builder/osc/common/omi_config.go +++ b/builder/osc/common/omi_config.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // OMIConfig is for common configuration related to creating OMIs. diff --git a/builder/osc/common/run_config.go b/builder/osc/common/run_config.go index 03d68ae4f..db8d3354a 100644 --- a/builder/osc/common/run_config.go +++ b/builder/osc/common/run_config.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$") diff --git a/builder/osc/common/run_config.hcl2spec.go b/builder/osc/common/run_config.hcl2spec.go index a15e89439..da3bf98dc 100644 --- a/builder/osc/common/run_config.hcl2spec.go +++ b/builder/osc/common/run_config.hcl2spec.go @@ -4,7 +4,7 @@ package common import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/osc/common/run_config_test.go b/builder/osc/common/run_config_test.go index 707825ca0..30cbe4d9a 100644 --- a/builder/osc/common/run_config_test.go +++ b/builder/osc/common/run_config_test.go @@ -6,8 +6,8 @@ import ( "regexp" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/config" ) func init() { diff --git a/builder/osc/common/ssh.go b/builder/osc/common/ssh.go index 46cc4368f..f16b9f1b8 100644 --- a/builder/osc/common/ssh.go +++ b/builder/osc/common/ssh.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_cleanup_volumes.go b/builder/osc/common/step_cleanup_volumes.go index a71cc1fbb..12f423704 100644 --- a/builder/osc/common/step_cleanup_volumes.go +++ b/builder/osc/common/step_cleanup_volumes.go @@ -6,8 +6,8 @@ import ( "reflect" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_create_tags.go b/builder/osc/common/step_create_tags.go index 902ce1c5a..4800bdd92 100644 --- a/builder/osc/common/step_create_tags.go +++ b/builder/osc/common/step_create_tags.go @@ -6,10 +6,10 @@ import ( "github.com/antihax/optional" "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/osc/common/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_deregister_omi.go b/builder/osc/common/step_deregister_omi.go index e7d538659..525d71825 100644 --- a/builder/osc/common/step_deregister_omi.go +++ b/builder/osc/common/step_deregister_omi.go @@ -8,8 +8,8 @@ import ( "github.com/antihax/optional" "github.com/outscale/osc-sdk-go/osc" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepDeregisterOMI struct { diff --git a/builder/osc/common/step_get_password.go b/builder/osc/common/step_get_password.go index 30d024f5c..f2d79f185 100644 --- a/builder/osc/common/step_get_password.go +++ b/builder/osc/common/step_get_password.go @@ -12,9 +12,9 @@ import ( "time" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_key_pair.go b/builder/osc/common/step_key_pair.go index 5dd86e326..e6df86c14 100644 --- a/builder/osc/common/step_key_pair.go +++ b/builder/osc/common/step_key_pair.go @@ -7,9 +7,9 @@ import ( "runtime" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_network_info.go b/builder/osc/common/step_network_info.go index e3ed82abc..c54c68dca 100644 --- a/builder/osc/common/step_network_info.go +++ b/builder/osc/common/step_network_info.go @@ -8,8 +8,8 @@ import ( "sort" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_pre_validate.go b/builder/osc/common/step_pre_validate.go index 3ac8d3622..76f7c4f65 100644 --- a/builder/osc/common/step_pre_validate.go +++ b/builder/osc/common/step_pre_validate.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_public_ip.go b/builder/osc/common/step_public_ip.go index 3252706bd..0d9da7141 100644 --- a/builder/osc/common/step_public_ip.go +++ b/builder/osc/common/step_public_ip.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_run_source_vm.go b/builder/osc/common/step_run_source_vm.go index 4cce9473a..1f9ec76ca 100644 --- a/builder/osc/common/step_run_source_vm.go +++ b/builder/osc/common/step_run_source_vm.go @@ -12,11 +12,11 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/outscale/osc-sdk-go/osc" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/osc/common/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/builder/osc/common/step_security_group.go b/builder/osc/common/step_security_group.go index c6d714f3c..ba70bf759 100644 --- a/builder/osc/common/step_security_group.go +++ b/builder/osc/common/step_security_group.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_source_omi_info.go b/builder/osc/common/step_source_omi_info.go index 18fc81877..4e0d9c11b 100644 --- a/builder/osc/common/step_source_omi_info.go +++ b/builder/osc/common/step_source_omi_info.go @@ -8,8 +8,8 @@ import ( "time" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_stop_bsu_backed_vm.go b/builder/osc/common/step_stop_bsu_backed_vm.go index aad924cd7..086f087dd 100644 --- a/builder/osc/common/step_stop_bsu_backed_vm.go +++ b/builder/osc/common/step_stop_bsu_backed_vm.go @@ -6,9 +6,9 @@ import ( "github.com/antihax/optional" "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/osc/common/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/step_update_bsu_vm.go b/builder/osc/common/step_update_bsu_vm.go index 325b5db6a..a30b726f7 100644 --- a/builder/osc/common/step_update_bsu_vm.go +++ b/builder/osc/common/step_update_bsu_vm.go @@ -3,7 +3,7 @@ package common import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) type StepUpdateBSUBackedVm struct { diff --git a/builder/osc/common/step_update_omi.go b/builder/osc/common/step_update_omi.go index 790e977d1..6e133239f 100644 --- a/builder/osc/common/step_update_omi.go +++ b/builder/osc/common/step_update_omi.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/common/tags.go b/builder/osc/common/tags.go index dca8922a4..7bbbcbc39 100644 --- a/builder/osc/common/tags.go +++ b/builder/osc/common/tags.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/antihax/optional" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/outscale/osc-sdk-go/osc" ) diff --git a/builder/osc/version/version.go b/builder/osc/version/version.go index e5d6e429d..a977cd9ac 100644 --- a/builder/osc/version/version.go +++ b/builder/osc/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/parallels/common/artifact.go b/builder/parallels/common/artifact.go index 63e74a473..7cc1b2560 100644 --- a/builder/parallels/common/artifact.go +++ b/builder/parallels/common/artifact.go @@ -6,7 +6,7 @@ import ( "path/filepath" "regexp" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // BuilderId is the common builder ID to all of these artifacts. diff --git a/builder/parallels/common/artifact_test.go b/builder/parallels/common/artifact_test.go index 0666ddf5b..6b6319d7c 100644 --- a/builder/parallels/common/artifact_test.go +++ b/builder/parallels/common/artifact_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_impl(t *testing.T) { diff --git a/builder/parallels/common/driver_9.go b/builder/parallels/common/driver_9.go index 9e088f10a..9b25193fe 100644 --- a/builder/parallels/common/driver_9.go +++ b/builder/parallels/common/driver_9.go @@ -15,7 +15,7 @@ import ( "github.com/ChrisTrenkamp/goxpath" "github.com/ChrisTrenkamp/goxpath/tree/xmltree" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) // Parallels9Driver is a base type for Parallels builders. diff --git a/builder/parallels/common/hw_config.go b/builder/parallels/common/hw_config.go index 06e27c411..505e95169 100644 --- a/builder/parallels/common/hw_config.go +++ b/builder/parallels/common/hw_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type HWConfig struct { diff --git a/builder/parallels/common/hw_config_test.go b/builder/parallels/common/hw_config_test.go index d6b40ea13..5d1b15e9f 100644 --- a/builder/parallels/common/hw_config_test.go +++ b/builder/parallels/common/hw_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestHWConfigPrepare(t *testing.T) { diff --git a/builder/parallels/common/output_config.go b/builder/parallels/common/output_config.go index 57f65b308..07e07c3d3 100644 --- a/builder/parallels/common/output_config.go +++ b/builder/parallels/common/output_config.go @@ -7,8 +7,8 @@ import ( "os" "path" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // OutputConfig contains the configuration for builder's output. diff --git a/builder/parallels/common/output_config_test.go b/builder/parallels/common/output_config_test.go index ca251c38c..7a47188af 100644 --- a/builder/parallels/common/output_config_test.go +++ b/builder/parallels/common/output_config_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/parallels/common/prlctl_config.go b/builder/parallels/common/prlctl_config.go index 4db738c82..c2892bcf8 100644 --- a/builder/parallels/common/prlctl_config.go +++ b/builder/parallels/common/prlctl_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // PrlctlConfig contains the configuration for running "prlctl" commands diff --git a/builder/parallels/common/prlctl_config_test.go b/builder/parallels/common/prlctl_config_test.go index 006ee44d3..13a2dec03 100644 --- a/builder/parallels/common/prlctl_config_test.go +++ b/builder/parallels/common/prlctl_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestPrlctlConfigPrepare_Prlctl(t *testing.T) { diff --git a/builder/parallels/common/prlctl_post_config.go b/builder/parallels/common/prlctl_post_config.go index c071e24e9..405104af7 100644 --- a/builder/parallels/common/prlctl_post_config.go +++ b/builder/parallels/common/prlctl_post_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // PrlctlPostConfig contains the configuration for running "prlctl" commands diff --git a/builder/parallels/common/prlctl_post_config_test.go b/builder/parallels/common/prlctl_post_config_test.go index 0f6abf065..5655a5490 100644 --- a/builder/parallels/common/prlctl_post_config_test.go +++ b/builder/parallels/common/prlctl_post_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestPrlctlPostConfigPrepare_PrlctlPost(t *testing.T) { diff --git a/builder/parallels/common/prlctl_version_config.go b/builder/parallels/common/prlctl_version_config.go index cd6e7de2e..835f94dc9 100644 --- a/builder/parallels/common/prlctl_version_config.go +++ b/builder/parallels/common/prlctl_version_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // PrlctlVersionConfig contains the configuration for `prlctl` version. diff --git a/builder/parallels/common/prlctl_version_config_test.go b/builder/parallels/common/prlctl_version_config_test.go index 32f24f0a6..c919f11d3 100644 --- a/builder/parallels/common/prlctl_version_config_test.go +++ b/builder/parallels/common/prlctl_version_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestPrlctlVersionConfigPrepare_BootWait(t *testing.T) { diff --git a/builder/parallels/common/ssh.go b/builder/parallels/common/ssh.go index 6059b4a42..b58ca1dec 100644 --- a/builder/parallels/common/ssh.go +++ b/builder/parallels/common/ssh.go @@ -3,7 +3,7 @@ package common import ( "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // CommHost returns the VM's IP address which should be used to access it by SSH. diff --git a/builder/parallels/common/ssh_config.go b/builder/parallels/common/ssh_config.go index 875458d7d..86caed992 100644 --- a/builder/parallels/common/ssh_config.go +++ b/builder/parallels/common/ssh_config.go @@ -1,8 +1,8 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // SSHConfig contains the configuration for SSH communicator. diff --git a/builder/parallels/common/ssh_config_test.go b/builder/parallels/common/ssh_config_test.go index ef3985976..d41781044 100644 --- a/builder/parallels/common/ssh_config_test.go +++ b/builder/parallels/common/ssh_config_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func testSSHConfig() *SSHConfig { diff --git a/builder/parallels/common/step_attach_floppy.go b/builder/parallels/common/step_attach_floppy.go index 854a9204c..82c3df56d 100644 --- a/builder/parallels/common/step_attach_floppy.go +++ b/builder/parallels/common/step_attach_floppy.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepAttachFloppy is a step that attaches a floppy to the virtual machine. diff --git a/builder/parallels/common/step_attach_floppy_test.go b/builder/parallels/common/step_attach_floppy_test.go index 87b07d0f5..4e2d037c1 100644 --- a/builder/parallels/common/step_attach_floppy_test.go +++ b/builder/parallels/common/step_attach_floppy_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepAttachFloppy_impl(t *testing.T) { diff --git a/builder/parallels/common/step_attach_parallels_tools.go b/builder/parallels/common/step_attach_parallels_tools.go index f1a8a807a..1ea7bf564 100644 --- a/builder/parallels/common/step_attach_parallels_tools.go +++ b/builder/parallels/common/step_attach_parallels_tools.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepAttachParallelsTools is a step that attaches Parallels Tools ISO image diff --git a/builder/parallels/common/step_compact_disk.go b/builder/parallels/common/step_compact_disk.go index 26aea8479..6519caae5 100644 --- a/builder/parallels/common/step_compact_disk.go +++ b/builder/parallels/common/step_compact_disk.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCompactDisk is a step that removes all empty blocks from expanding diff --git a/builder/parallels/common/step_compact_disk_test.go b/builder/parallels/common/step_compact_disk_test.go index 79b54d6f0..e549247d3 100644 --- a/builder/parallels/common/step_compact_disk_test.go +++ b/builder/parallels/common/step_compact_disk_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCompactDisk_impl(t *testing.T) { diff --git a/builder/parallels/common/step_output_dir.go b/builder/parallels/common/step_output_dir.go index b0b7083b9..c3d7411cb 100644 --- a/builder/parallels/common/step_output_dir.go +++ b/builder/parallels/common/step_output_dir.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepOutputDir sets up the output directory by creating it if it does diff --git a/builder/parallels/common/step_output_dir_test.go b/builder/parallels/common/step_output_dir_test.go index 70380fd51..7806ca725 100644 --- a/builder/parallels/common/step_output_dir_test.go +++ b/builder/parallels/common/step_output_dir_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func testStepOutputDir(t *testing.T) *StepOutputDir { diff --git a/builder/parallels/common/step_prepare_parallels_tools.go b/builder/parallels/common/step_prepare_parallels_tools.go index 075f36bfe..6fe6a6345 100644 --- a/builder/parallels/common/step_prepare_parallels_tools.go +++ b/builder/parallels/common/step_prepare_parallels_tools.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // StepPrepareParallelsTools is a step that prepares parameters related diff --git a/builder/parallels/common/step_prepare_parallels_tools_test.go b/builder/parallels/common/step_prepare_parallels_tools_test.go index 5fd2e065c..c39583b7c 100644 --- a/builder/parallels/common/step_prepare_parallels_tools_test.go +++ b/builder/parallels/common/step_prepare_parallels_tools_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepPrepareParallelsTools_impl(t *testing.T) { diff --git a/builder/parallels/common/step_prlctl.go b/builder/parallels/common/step_prlctl.go index 431b0a327..1bbbb8756 100644 --- a/builder/parallels/common/step_prlctl.go +++ b/builder/parallels/common/step_prlctl.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type commandTemplate struct { diff --git a/builder/parallels/common/step_run.go b/builder/parallels/common/step_run.go index a98ff9190..9f54aee2f 100644 --- a/builder/parallels/common/step_run.go +++ b/builder/parallels/common/step_run.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepRun is a step that starts the virtual machine. diff --git a/builder/parallels/common/step_shutdown.go b/builder/parallels/common/step_shutdown.go index 7f6666e18..0370d6be9 100644 --- a/builder/parallels/common/step_shutdown.go +++ b/builder/parallels/common/step_shutdown.go @@ -8,8 +8,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepShutdown is a step that shuts down the machine. It first attempts to do diff --git a/builder/parallels/common/step_shutdown_test.go b/builder/parallels/common/step_shutdown_test.go index 3012e7ae0..2b50a141e 100644 --- a/builder/parallels/common/step_shutdown_test.go +++ b/builder/parallels/common/step_shutdown_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestStepShutdown_impl(t *testing.T) { diff --git a/builder/parallels/common/step_test.go b/builder/parallels/common/step_test.go index 922a3b704..84305c1a0 100644 --- a/builder/parallels/common/step_test.go +++ b/builder/parallels/common/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/parallels/common/step_type_boot_command.go b/builder/parallels/common/step_type_boot_command.go index 344e8aa4b..9cd65f9ee 100644 --- a/builder/parallels/common/step_type_boot_command.go +++ b/builder/parallels/common/step_type_boot_command.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type bootCommandTemplateData struct { diff --git a/builder/parallels/common/step_upload_parallels_tools.go b/builder/parallels/common/step_upload_parallels_tools.go index 3a6d93563..87736937d 100644 --- a/builder/parallels/common/step_upload_parallels_tools.go +++ b/builder/parallels/common/step_upload_parallels_tools.go @@ -6,9 +6,9 @@ import ( "log" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // This step uploads the Parallels Tools ISO to the virtual machine. diff --git a/builder/parallels/common/step_upload_parallels_tools_test.go b/builder/parallels/common/step_upload_parallels_tools_test.go index de35b2120..1da393b06 100644 --- a/builder/parallels/common/step_upload_parallels_tools_test.go +++ b/builder/parallels/common/step_upload_parallels_tools_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestStepUploadParallelsTools_impl(t *testing.T) { diff --git a/builder/parallels/common/step_upload_version.go b/builder/parallels/common/step_upload_version.go index d32480a3d..3ee650a57 100644 --- a/builder/parallels/common/step_upload_version.go +++ b/builder/parallels/common/step_upload_version.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepUploadVersion is a step that uploads a file containing the version of diff --git a/builder/parallels/common/step_upload_version_test.go b/builder/parallels/common/step_upload_version_test.go index 45f6b78a5..c97f22fda 100644 --- a/builder/parallels/common/step_upload_version_test.go +++ b/builder/parallels/common/step_upload_version_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestStepUploadVersion_impl(t *testing.T) { diff --git a/builder/parallels/common/tools_config.go b/builder/parallels/common/tools_config.go index 00565d1fa..82cf49ea8 100644 --- a/builder/parallels/common/tools_config.go +++ b/builder/parallels/common/tools_config.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // These are the different valid mode values for "parallels_tools_mode" which diff --git a/builder/parallels/common/tools_config_test.go b/builder/parallels/common/tools_config_test.go index 89156fdcd..d319c5862 100644 --- a/builder/parallels/common/tools_config_test.go +++ b/builder/parallels/common/tools_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func testToolsConfig() *ToolsConfig { diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go index 577a58b53..65e12f330 100644 --- a/builder/parallels/iso/builder.go +++ b/builder/parallels/iso/builder.go @@ -9,16 +9,16 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "rickard-von-essen.parallels" diff --git a/builder/parallels/iso/builder_test.go b/builder/parallels/iso/builder_test.go index b29b7db6c..3559421f7 100644 --- a/builder/parallels/iso/builder_test.go +++ b/builder/parallels/iso/builder_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/parallels/iso/step_attach_iso.go b/builder/parallels/iso/step_attach_iso.go index c59c80c33..eefc54118 100644 --- a/builder/parallels/iso/step_attach_iso.go +++ b/builder/parallels/iso/step_attach_iso.go @@ -5,9 +5,9 @@ import ( "fmt" "log" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // This step attaches the ISO to the virtual machine. diff --git a/builder/parallels/iso/step_create_disk.go b/builder/parallels/iso/step_create_disk.go index d70f6d749..5162e72bb 100644 --- a/builder/parallels/iso/step_create_disk.go +++ b/builder/parallels/iso/step_create_disk.go @@ -5,9 +5,9 @@ import ( "fmt" "strconv" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // This step creates the virtual disk that will be used as the diff --git a/builder/parallels/iso/step_create_vm.go b/builder/parallels/iso/step_create_vm.go index f92ce5ddf..833fe6511 100644 --- a/builder/parallels/iso/step_create_vm.go +++ b/builder/parallels/iso/step_create_vm.go @@ -5,9 +5,9 @@ import ( "fmt" "strconv" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // This step creates the actual virtual machine. diff --git a/builder/parallels/iso/step_set_boot_order.go b/builder/parallels/iso/step_set_boot_order.go index d8891dd81..a5d613f48 100644 --- a/builder/parallels/iso/step_set_boot_order.go +++ b/builder/parallels/iso/step_set_boot_order.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // This step sets the device boot order for the virtual machine. diff --git a/builder/parallels/pvm/builder.go b/builder/parallels/pvm/builder.go index db799fd9e..283161201 100644 --- a/builder/parallels/pvm/builder.go +++ b/builder/parallels/pvm/builder.go @@ -6,11 +6,11 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // Builder implements packersdk.Builder and builds the actual Parallels diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go index d0c53be7d..63f63bc31 100644 --- a/builder/parallels/pvm/config.go +++ b/builder/parallels/pvm/config.go @@ -7,14 +7,14 @@ import ( "fmt" "os" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/parallels/pvm/config_test.go b/builder/parallels/pvm/config_test.go index 15f6a9ce1..0fb63cac2 100644 --- a/builder/parallels/pvm/config_test.go +++ b/builder/parallels/pvm/config_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig(t *testing.T) map[string]interface{} { diff --git a/builder/parallels/pvm/step_import.go b/builder/parallels/pvm/step_import.go index 6ee096504..5f035f790 100644 --- a/builder/parallels/pvm/step_import.go +++ b/builder/parallels/pvm/step_import.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // This step imports an PVM VM into Parallels. diff --git a/builder/parallels/pvm/step_test.go b/builder/parallels/pvm/step_test.go index 40be30b05..f3cf4ee8d 100644 --- a/builder/parallels/pvm/step_test.go +++ b/builder/parallels/pvm/step_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" parallelscommon "github.com/hashicorp/packer/builder/parallels/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/parallels/version/version.go b/builder/parallels/version/version.go index bb7db22bb..2407dd3b1 100644 --- a/builder/parallels/version/version.go +++ b/builder/parallels/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/profitbricks/artifact_test.go b/builder/profitbricks/artifact_test.go index 640c41e20..70a640e73 100644 --- a/builder/profitbricks/artifact_test.go +++ b/builder/profitbricks/artifact_test.go @@ -3,7 +3,7 @@ package profitbricks import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_Impl(t *testing.T) { diff --git a/builder/profitbricks/builder.go b/builder/profitbricks/builder.go index 6a9b1947c..e980582d4 100644 --- a/builder/profitbricks/builder.go +++ b/builder/profitbricks/builder.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const BuilderId = "packer.profitbricks" diff --git a/builder/profitbricks/builder_acc_test.go b/builder/profitbricks/builder_acc_test.go index ce22fa877..efeada06d 100644 --- a/builder/profitbricks/builder_acc_test.go +++ b/builder/profitbricks/builder_acc_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/profitbricks/builder_test.go b/builder/profitbricks/builder_test.go index c91998581..1d8d55012 100644 --- a/builder/profitbricks/builder_test.go +++ b/builder/profitbricks/builder_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/profitbricks/config.go b/builder/profitbricks/config.go index a5f0c15f7..fd95300d5 100644 --- a/builder/profitbricks/config.go +++ b/builder/profitbricks/config.go @@ -6,11 +6,11 @@ import ( "errors" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" ) diff --git a/builder/profitbricks/step_create_server.go b/builder/profitbricks/step_create_server.go index 7bcd60986..d7e19466e 100644 --- a/builder/profitbricks/step_create_server.go +++ b/builder/profitbricks/step_create_server.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/profitbricks/profitbricks-sdk-go" ) diff --git a/builder/profitbricks/step_create_ssh_key.go b/builder/profitbricks/step_create_ssh_key.go index aaa8fae48..e0c4a145a 100644 --- a/builder/profitbricks/step_create_ssh_key.go +++ b/builder/profitbricks/step_create_ssh_key.go @@ -6,8 +6,8 @@ import ( "encoding/pem" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "golang.org/x/crypto/ssh" ) diff --git a/builder/profitbricks/step_take_snapshot.go b/builder/profitbricks/step_take_snapshot.go index 58d3024e7..b038fc021 100644 --- a/builder/profitbricks/step_take_snapshot.go +++ b/builder/profitbricks/step_take_snapshot.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/profitbricks/profitbricks-sdk-go" ) diff --git a/builder/profitbricks/version/version.go b/builder/profitbricks/version/version.go index 01f67d615..c71c8d860 100644 --- a/builder/profitbricks/version/version.go +++ b/builder/profitbricks/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/proxmox/clone/builder.go b/builder/proxmox/clone/builder.go index 772ee1fa4..d4c026569 100644 --- a/builder/proxmox/clone/builder.go +++ b/builder/proxmox/clone/builder.go @@ -3,9 +3,9 @@ package proxmoxclone import ( proxmoxapi "github.com/Telmate/proxmox-api-go/proxmox" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "context" "fmt" diff --git a/builder/proxmox/clone/config.go b/builder/proxmox/clone/config.go index cc9c1db1a..4a4c96feb 100644 --- a/builder/proxmox/clone/config.go +++ b/builder/proxmox/clone/config.go @@ -3,9 +3,9 @@ package proxmoxclone import ( + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" proxmox "github.com/hashicorp/packer/builder/proxmox/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" ) type Config struct { diff --git a/builder/proxmox/clone/step_ssh_key_pair.go b/builder/proxmox/clone/step_ssh_key_pair.go index 08440863f..a4a562ddb 100644 --- a/builder/proxmox/clone/step_ssh_key_pair.go +++ b/builder/proxmox/clone/step_ssh_key_pair.go @@ -5,11 +5,11 @@ import ( "fmt" "os" + "github.com/hashicorp/packer-plugin-sdk/communicator/ssh" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" common "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator/ssh" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) // StepSshKeyPair executes the business logic for setting the SSH key pair in diff --git a/builder/proxmox/common/artifact.go b/builder/proxmox/common/artifact.go index 65b6fc6f9..fd8c5f1b8 100644 --- a/builder/proxmox/common/artifact.go +++ b/builder/proxmox/common/artifact.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/Telmate/proxmox-api-go/proxmox" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type Artifact struct { diff --git a/builder/proxmox/common/bootcommand_driver.go b/builder/proxmox/common/bootcommand_driver.go index 21fbaef1e..2f283a50e 100644 --- a/builder/proxmox/common/bootcommand_driver.go +++ b/builder/proxmox/common/bootcommand_driver.go @@ -7,7 +7,7 @@ import ( "unicode" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" ) type proxmoxDriver struct { diff --git a/builder/proxmox/common/builder.go b/builder/proxmox/common/builder.go index 275bc96a3..a609ec924 100644 --- a/builder/proxmox/common/builder.go +++ b/builder/proxmox/common/builder.go @@ -7,10 +7,10 @@ import ( "fmt" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func NewSharedBuilder(id string, config Config, preSteps []multistep.Step, postSteps []multistep.Step, vmCreator ProxmoxVMCreator) *Builder { diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go index a49758782..e0081298a 100644 --- a/builder/proxmox/common/config.go +++ b/builder/proxmox/common/config.go @@ -11,14 +11,14 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/mitchellh/mapstructure" ) diff --git a/builder/proxmox/common/config_test.go b/builder/proxmox/common/config_test.go index 7f0441aaf..a649924e2 100644 --- a/builder/proxmox/common/config_test.go +++ b/builder/proxmox/common/config_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func mandatoryConfig(t *testing.T) map[string]interface{} { diff --git a/builder/proxmox/common/step_convert_to_template.go b/builder/proxmox/common/step_convert_to_template.go index 58d4dfe41..9bdb7e2f5 100644 --- a/builder/proxmox/common/step_convert_to_template.go +++ b/builder/proxmox/common/step_convert_to_template.go @@ -6,8 +6,8 @@ import ( "log" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // stepConvertToTemplate takes the running VM configured in earlier steps, stops it, and diff --git a/builder/proxmox/common/step_convert_to_template_test.go b/builder/proxmox/common/step_convert_to_template_test.go index 7468cecd4..a1026296c 100644 --- a/builder/proxmox/common/step_convert_to_template_test.go +++ b/builder/proxmox/common/step_convert_to_template_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type converterMock struct { diff --git a/builder/proxmox/common/step_finalize_template_config.go b/builder/proxmox/common/step_finalize_template_config.go index d1bdea3d6..263020407 100644 --- a/builder/proxmox/common/step_finalize_template_config.go +++ b/builder/proxmox/common/step_finalize_template_config.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // stepFinalizeTemplateConfig does any required modifications to the configuration _after_ diff --git a/builder/proxmox/common/step_finalize_template_config_test.go b/builder/proxmox/common/step_finalize_template_config_test.go index 62d43fc2b..ae259f415 100644 --- a/builder/proxmox/common/step_finalize_template_config_test.go +++ b/builder/proxmox/common/step_finalize_template_config_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type finalizerMock struct { diff --git a/builder/proxmox/common/step_start_vm.go b/builder/proxmox/common/step_start_vm.go index 53b3c6754..e312b7abf 100644 --- a/builder/proxmox/common/step_start_vm.go +++ b/builder/proxmox/common/step_start_vm.go @@ -7,8 +7,8 @@ import ( "strconv" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // stepStartVM takes the given configuration and starts a VM on the given Proxmox node. diff --git a/builder/proxmox/common/step_start_vm_test.go b/builder/proxmox/common/step_start_vm_test.go index 3debeacba..b6dd87a8b 100644 --- a/builder/proxmox/common/step_start_vm_test.go +++ b/builder/proxmox/common/step_start_vm_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type startedVMCleanerMock struct { diff --git a/builder/proxmox/common/step_success.go b/builder/proxmox/common/step_success.go index cbedd1684..b91f568d1 100644 --- a/builder/proxmox/common/step_success.go +++ b/builder/proxmox/common/step_success.go @@ -3,7 +3,7 @@ package proxmox import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // stepSuccess runs after the full build has succeeded. diff --git a/builder/proxmox/common/step_type_boot_command.go b/builder/proxmox/common/step_type_boot_command.go index bcbe71e5a..7064ddf58 100644 --- a/builder/proxmox/common/step_type_boot_command.go +++ b/builder/proxmox/common/step_type_boot_command.go @@ -9,10 +9,10 @@ import ( "time" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // stepTypeBootCommand takes the started VM, and sends the keystrokes required to start diff --git a/builder/proxmox/common/step_type_boot_command_test.go b/builder/proxmox/common/step_type_boot_command_test.go index 8c333717b..36a7d0f8e 100644 --- a/builder/proxmox/common/step_type_boot_command_test.go +++ b/builder/proxmox/common/step_type_boot_command_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type commandTyperMock struct { diff --git a/builder/proxmox/iso/builder.go b/builder/proxmox/iso/builder.go index 0a90b9173..021af6c39 100644 --- a/builder/proxmox/iso/builder.go +++ b/builder/proxmox/iso/builder.go @@ -5,10 +5,10 @@ import ( proxmoxapi "github.com/Telmate/proxmox-api-go/proxmox" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // The unique id for the builder diff --git a/builder/proxmox/iso/config.go b/builder/proxmox/iso/config.go index afdbc2465..a055d97c6 100644 --- a/builder/proxmox/iso/config.go +++ b/builder/proxmox/iso/config.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" proxmox "github.com/hashicorp/packer/builder/proxmox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type Config struct { diff --git a/builder/proxmox/iso/config_test.go b/builder/proxmox/iso/config_test.go index 509d360a2..c709ef682 100644 --- a/builder/proxmox/iso/config_test.go +++ b/builder/proxmox/iso/config_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template" + "github.com/hashicorp/packer-plugin-sdk/template" ) func TestBasicExampleFromDocsIsValid(t *testing.T) { diff --git a/builder/proxmox/iso/step_finalize_iso.go b/builder/proxmox/iso/step_finalize_iso.go index ef9388896..3980f01ca 100644 --- a/builder/proxmox/iso/step_finalize_iso.go +++ b/builder/proxmox/iso/step_finalize_iso.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // stepFinalizeISOTemplate does any ISO-builder specific modifications after diff --git a/builder/proxmox/iso/step_finalize_iso_test.go b/builder/proxmox/iso/step_finalize_iso_test.go index 9ea16e2c1..236d3a541 100644 --- a/builder/proxmox/iso/step_finalize_iso_test.go +++ b/builder/proxmox/iso/step_finalize_iso_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type finalizerMock struct { diff --git a/builder/proxmox/iso/step_upload_additional_isos.go b/builder/proxmox/iso/step_upload_additional_isos.go index 8b2c87f3a..1f56bcb50 100644 --- a/builder/proxmox/iso/step_upload_additional_isos.go +++ b/builder/proxmox/iso/step_upload_additional_isos.go @@ -7,8 +7,8 @@ import ( "path/filepath" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // stepUploadAdditionalISOs uploads all additional ISO files that are mountet diff --git a/builder/proxmox/iso/step_upload_iso.go b/builder/proxmox/iso/step_upload_iso.go index 4a54bc87e..f2a50f96d 100644 --- a/builder/proxmox/iso/step_upload_iso.go +++ b/builder/proxmox/iso/step_upload_iso.go @@ -8,8 +8,8 @@ import ( "path/filepath" "github.com/Telmate/proxmox-api-go/proxmox" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // stepUploadISO uploads an ISO file to Proxmox so we can boot from it diff --git a/builder/proxmox/iso/step_upload_iso_test.go b/builder/proxmox/iso/step_upload_iso_test.go index c26ebf682..1d6493002 100644 --- a/builder/proxmox/iso/step_upload_iso_test.go +++ b/builder/proxmox/iso/step_upload_iso_test.go @@ -6,9 +6,9 @@ import ( "io" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type uploaderMock struct { diff --git a/builder/proxmox/version/version.go b/builder/proxmox/version/version.go index b6ed24f2a..ff0403973 100644 --- a/builder/proxmox/version/version.go +++ b/builder/proxmox/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go index a07667643..5bbc5268d 100644 --- a/builder/qemu/builder.go +++ b/builder/qemu/builder.go @@ -10,10 +10,10 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const BuilderId = "transcend.qemu" diff --git a/builder/qemu/builder_test.go b/builder/qemu/builder_test.go index 09f1a7d64..904f0c549 100644 --- a/builder/qemu/builder_test.go +++ b/builder/qemu/builder_test.go @@ -3,7 +3,7 @@ package qemu import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilder_ImplementsBuilder(t *testing.T) { diff --git a/builder/qemu/comm_config.go b/builder/qemu/comm_config.go index 9acdd88dd..500bba26f 100644 --- a/builder/qemu/comm_config.go +++ b/builder/qemu/comm_config.go @@ -4,8 +4,8 @@ package qemu import ( "errors" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type CommConfig struct { diff --git a/builder/qemu/comm_config_test.go b/builder/qemu/comm_config_test.go index d6a393242..a5854cf59 100644 --- a/builder/qemu/comm_config_test.go +++ b/builder/qemu/comm_config_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func testCommConfig() *CommConfig { diff --git a/builder/qemu/config.go b/builder/qemu/config.go index a5793aa43..605f101e9 100644 --- a/builder/qemu/config.go +++ b/builder/qemu/config.go @@ -13,13 +13,13 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) var accels = map[string]struct{}{ diff --git a/builder/qemu/config_test.go b/builder/qemu/config_test.go index 23b0309f3..7a7a65247 100644 --- a/builder/qemu/config_test.go +++ b/builder/qemu/config_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/driver.go b/builder/qemu/driver.go index 9aeb8f279..3cbcf6ecf 100644 --- a/builder/qemu/driver.go +++ b/builder/qemu/driver.go @@ -15,7 +15,7 @@ import ( "time" "unicode" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) type DriverCancelCallback func(state multistep.StateBag) bool diff --git a/builder/qemu/ssh.go b/builder/qemu/ssh.go index 25778c021..62ed86a41 100644 --- a/builder/qemu/ssh.go +++ b/builder/qemu/ssh.go @@ -3,7 +3,7 @@ package qemu import ( "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func commHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/qemu/step_configure_qmp.go b/builder/qemu/step_configure_qmp.go index a85ed092b..ccd867d6e 100644 --- a/builder/qemu/step_configure_qmp.go +++ b/builder/qemu/step_configure_qmp.go @@ -8,8 +8,8 @@ import ( "time" "github.com/digitalocean/go-qemu/qmp" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step configures the VM to enable the QMP listener. diff --git a/builder/qemu/step_configure_vnc.go b/builder/qemu/step_configure_vnc.go index 84da95bc9..776958c37 100644 --- a/builder/qemu/step_configure_vnc.go +++ b/builder/qemu/step_configure_vnc.go @@ -6,9 +6,9 @@ import ( "log" "math/rand" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/net" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/net" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step configures the VM to enable the VNC server. diff --git a/builder/qemu/step_convert_disk.go b/builder/qemu/step_convert_disk.go index 09636b5b0..0d16ed982 100644 --- a/builder/qemu/step_convert_disk.go +++ b/builder/qemu/step_convert_disk.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" "os" ) diff --git a/builder/qemu/step_copy_disk.go b/builder/qemu/step_copy_disk.go index e6fd64849..3fbc4e66b 100644 --- a/builder/qemu/step_copy_disk.go +++ b/builder/qemu/step_copy_disk.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step copies the virtual disk that will be used as the diff --git a/builder/qemu/step_copy_disk_test.go b/builder/qemu/step_copy_disk_test.go index 95b6c8bf5..cbcd93452 100644 --- a/builder/qemu/step_copy_disk_test.go +++ b/builder/qemu/step_copy_disk_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_create_disk.go b/builder/qemu/step_create_disk.go index 8f35ad640..e86ee49dc 100644 --- a/builder/qemu/step_create_disk.go +++ b/builder/qemu/step_create_disk.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step creates the virtual disk that will be used as the diff --git a/builder/qemu/step_create_disk_test.go b/builder/qemu/step_create_disk_test.go index c0d178fac..0af353652 100644 --- a/builder/qemu/step_create_disk_test.go +++ b/builder/qemu/step_create_disk_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_http_ip_discover.go b/builder/qemu/step_http_ip_discover.go index 3a87fd5a9..543fc111f 100644 --- a/builder/qemu/step_http_ip_discover.go +++ b/builder/qemu/step_http_ip_discover.go @@ -5,8 +5,8 @@ import ( "fmt" "net" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // Step to discover the http ip diff --git a/builder/qemu/step_http_ip_discover_test.go b/builder/qemu/step_http_ip_discover_test.go index 2e60e0261..6118ec259 100644 --- a/builder/qemu/step_http_ip_discover_test.go +++ b/builder/qemu/step_http_ip_discover_test.go @@ -5,8 +5,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/qemu/step_port_forward.go b/builder/qemu/step_port_forward.go index 279a913fc..5282cfdf9 100644 --- a/builder/qemu/step_port_forward.go +++ b/builder/qemu/step_port_forward.go @@ -5,9 +5,9 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/net" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/net" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step adds a NAT port forwarding definition so that SSH or WinRM is available diff --git a/builder/qemu/step_prepare_output_dir.go b/builder/qemu/step_prepare_output_dir.go index 11370bd98..26e9b69cf 100644 --- a/builder/qemu/step_prepare_output_dir.go +++ b/builder/qemu/step_prepare_output_dir.go @@ -6,8 +6,8 @@ import ( "os" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepPrepareOutputDir struct{} diff --git a/builder/qemu/step_resize_disk.go b/builder/qemu/step_resize_disk.go index 33288e3b8..65b9592af 100644 --- a/builder/qemu/step_resize_disk.go +++ b/builder/qemu/step_resize_disk.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step resizes the virtual disk that will be used as the diff --git a/builder/qemu/step_resize_disk_test.go b/builder/qemu/step_resize_disk_test.go index ecfa5b6ea..e0e1a23b7 100644 --- a/builder/qemu/step_resize_disk_test.go +++ b/builder/qemu/step_resize_disk_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_run.go b/builder/qemu/step_run.go index d66f4061f..4932eaace 100644 --- a/builder/qemu/step_run.go +++ b/builder/qemu/step_run.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/hashicorp/go-version" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // stepRun runs the virtual machine diff --git a/builder/qemu/step_run_test.go b/builder/qemu/step_run_test.go index 96665eeb8..e74f8b312 100644 --- a/builder/qemu/step_run_test.go +++ b/builder/qemu/step_run_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" ) diff --git a/builder/qemu/step_set_iso.go b/builder/qemu/step_set_iso.go index 3dec89501..cc4054d46 100644 --- a/builder/qemu/step_set_iso.go +++ b/builder/qemu/step_set_iso.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/net" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/net" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step set iso_patch to available url diff --git a/builder/qemu/step_shutdown.go b/builder/qemu/step_shutdown.go index d3841050b..b7cd17777 100644 --- a/builder/qemu/step_shutdown.go +++ b/builder/qemu/step_shutdown.go @@ -7,9 +7,9 @@ import ( "log" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/qemu/step_shutdown_test.go b/builder/qemu/step_shutdown_test.go index 7e2a77359..26f20cc32 100644 --- a/builder/qemu/step_shutdown_test.go +++ b/builder/qemu/step_shutdown_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func Test_Shutdown_Null_success(t *testing.T) { diff --git a/builder/qemu/step_test.go b/builder/qemu/step_test.go index 7b4b40a2c..3273a4c44 100644 --- a/builder/qemu/step_test.go +++ b/builder/qemu/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/qemu/step_type_boot_command.go b/builder/qemu/step_type_boot_command.go index 9167d914d..038f18d62 100644 --- a/builder/qemu/step_type_boot_command.go +++ b/builder/qemu/step_type_boot_command.go @@ -7,10 +7,10 @@ import ( "net" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-vnc" ) diff --git a/builder/qemu/step_wait_guest_address.go b/builder/qemu/step_wait_guest_address.go index 3acf42f33..c15da17f0 100644 --- a/builder/qemu/step_wait_guest_address.go +++ b/builder/qemu/step_wait_guest_address.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/digitalocean/go-qemu/qmp" ) diff --git a/builder/qemu/version/version.go b/builder/qemu/version/version.go index f8d93cb5c..4e0039bbf 100644 --- a/builder/qemu/version/version.go +++ b/builder/qemu/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/scaleway/artifact_test.go b/builder/scaleway/artifact_test.go index 568d4f8b7..a41ca8c55 100644 --- a/builder/scaleway/artifact_test.go +++ b/builder/scaleway/artifact_test.go @@ -3,7 +3,7 @@ package scaleway import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_Impl(t *testing.T) { diff --git a/builder/scaleway/builder.go b/builder/scaleway/builder.go index b90e45561..5592a0f03 100644 --- a/builder/scaleway/builder.go +++ b/builder/scaleway/builder.go @@ -9,10 +9,10 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/builder_test.go b/builder/scaleway/builder_test.go index a044cc1b8..befd6e7f1 100644 --- a/builder/scaleway/builder_test.go +++ b/builder/scaleway/builder_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go index 227b1a2f8..3f5277c24 100644 --- a/builder/scaleway/config.go +++ b/builder/scaleway/config.go @@ -9,14 +9,14 @@ import ( "log" "os" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/useragent" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/hashicorp/packer/builder/scaleway/version" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/useragent" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" "github.com/mitchellh/mapstructure" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/builder/scaleway/step_create_image.go b/builder/scaleway/step_create_image.go index 67244ff74..e57be80ec 100644 --- a/builder/scaleway/step_create_image.go +++ b/builder/scaleway/step_create_image.go @@ -6,8 +6,8 @@ import ( "log" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/api/marketplace/v1" "github.com/scaleway/scaleway-sdk-go/scw" diff --git a/builder/scaleway/step_create_server.go b/builder/scaleway/step_create_server.go index 7ead2b1a7..a05e24da0 100644 --- a/builder/scaleway/step_create_server.go +++ b/builder/scaleway/step_create_server.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_create_ssh_key.go b/builder/scaleway/step_create_ssh_key.go index f4f533371..dc8d6c8c7 100644 --- a/builder/scaleway/step_create_ssh_key.go +++ b/builder/scaleway/step_create_ssh_key.go @@ -11,8 +11,8 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "golang.org/x/crypto/ssh" ) diff --git a/builder/scaleway/step_pre_validate.go b/builder/scaleway/step_pre_validate.go index 3d4afb6bc..d530a132d 100644 --- a/builder/scaleway/step_pre_validate.go +++ b/builder/scaleway/step_pre_validate.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_pre_validate_test.go b/builder/scaleway/step_pre_validate_test.go index d447281db..0cc8a5bb1 100644 --- a/builder/scaleway/step_pre_validate_test.go +++ b/builder/scaleway/step_pre_validate_test.go @@ -10,8 +10,8 @@ import ( "strconv" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_remove_volume.go b/builder/scaleway/step_remove_volume.go index a9a3133a4..f704ca5ff 100644 --- a/builder/scaleway/step_remove_volume.go +++ b/builder/scaleway/step_remove_volume.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_server_info.go b/builder/scaleway/step_server_info.go index 3cc88aab5..b1fa0e4b0 100644 --- a/builder/scaleway/step_server_info.go +++ b/builder/scaleway/step_server_info.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_shutdown.go b/builder/scaleway/step_shutdown.go index b383f1765..12365a482 100644 --- a/builder/scaleway/step_shutdown.go +++ b/builder/scaleway/step_shutdown.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/step_snapshot.go b/builder/scaleway/step_snapshot.go index 785b8ae07..13e860985 100644 --- a/builder/scaleway/step_snapshot.go +++ b/builder/scaleway/step_snapshot.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/scaleway/scaleway-sdk-go/api/instance/v1" "github.com/scaleway/scaleway-sdk-go/scw" ) diff --git a/builder/scaleway/version/version.go b/builder/scaleway/version/version.go index f34f7d77d..bae3ea83a 100644 --- a/builder/scaleway/version/version.go +++ b/builder/scaleway/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/tencentcloud/cvm/access_config.go b/builder/tencentcloud/cvm/access_config.go index a1c021fc6..6c0d7e06e 100644 --- a/builder/tencentcloud/cvm/access_config.go +++ b/builder/tencentcloud/cvm/access_config.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/artifact.go b/builder/tencentcloud/cvm/artifact.go index 12bedc28e..6ee430d4a 100644 --- a/builder/tencentcloud/cvm/artifact.go +++ b/builder/tencentcloud/cvm/artifact.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/builder.go b/builder/tencentcloud/cvm/builder.go index 3159c054b..9424ade7e 100644 --- a/builder/tencentcloud/cvm/builder.go +++ b/builder/tencentcloud/cvm/builder.go @@ -7,13 +7,13 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) const BuilderId = "tencent.cloud" diff --git a/builder/tencentcloud/cvm/builder.hcl2spec.go b/builder/tencentcloud/cvm/builder.hcl2spec.go index 72aa43efd..b150d91b9 100644 --- a/builder/tencentcloud/cvm/builder.hcl2spec.go +++ b/builder/tencentcloud/cvm/builder.hcl2spec.go @@ -4,7 +4,7 @@ package cvm import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/tencentcloud/cvm/common.go b/builder/tencentcloud/cvm/common.go index fe12e238d..d827e8f39 100644 --- a/builder/tencentcloud/cvm/common.go +++ b/builder/tencentcloud/cvm/common.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" diff --git a/builder/tencentcloud/cvm/image_config.go b/builder/tencentcloud/cvm/image_config.go index 91f89427f..c66655c59 100644 --- a/builder/tencentcloud/cvm/image_config.go +++ b/builder/tencentcloud/cvm/image_config.go @@ -6,7 +6,7 @@ import ( "fmt" "unicode/utf8" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type TencentCloudImageConfig struct { diff --git a/builder/tencentcloud/cvm/run_config.go b/builder/tencentcloud/cvm/run_config.go index 938936b8a..65979e974 100644 --- a/builder/tencentcloud/cvm/run_config.go +++ b/builder/tencentcloud/cvm/run_config.go @@ -8,10 +8,10 @@ import ( "os" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/pkg/errors" ) diff --git a/builder/tencentcloud/cvm/run_config_test.go b/builder/tencentcloud/cvm/run_config_test.go index e1a615944..e53d380ca 100644 --- a/builder/tencentcloud/cvm/run_config_test.go +++ b/builder/tencentcloud/cvm/run_config_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator" ) func testConfig() *TencentCloudRunConfig { diff --git a/builder/tencentcloud/cvm/step_check_source_image.go b/builder/tencentcloud/cvm/step_check_source_image.go index f2fc01265..0ddf21c47 100644 --- a/builder/tencentcloud/cvm/step_check_source_image.go +++ b/builder/tencentcloud/cvm/step_check_source_image.go @@ -5,7 +5,7 @@ import ( "fmt" "regexp" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_key_pair.go b/builder/tencentcloud/cvm/step_config_key_pair.go index db7f09d09..7b05da19e 100644 --- a/builder/tencentcloud/cvm/step_config_key_pair.go +++ b/builder/tencentcloud/cvm/step_config_key_pair.go @@ -7,8 +7,8 @@ import ( "os" "runtime" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_security_group.go b/builder/tencentcloud/cvm/step_config_security_group.go index 97af73848..d8e0cbe2f 100644 --- a/builder/tencentcloud/cvm/step_config_security_group.go +++ b/builder/tencentcloud/cvm/step_config_security_group.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_subnet.go b/builder/tencentcloud/cvm/step_config_subnet.go index 10c9b01d3..eb13568d1 100644 --- a/builder/tencentcloud/cvm/step_config_subnet.go +++ b/builder/tencentcloud/cvm/step_config_subnet.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_config_vpc.go b/builder/tencentcloud/cvm/step_config_vpc.go index e89ec86f6..279e49e4e 100644 --- a/builder/tencentcloud/cvm/step_config_vpc.go +++ b/builder/tencentcloud/cvm/step_config_vpc.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_copy_image.go b/builder/tencentcloud/cvm/step_copy_image.go index bcfbd171f..036203995 100644 --- a/builder/tencentcloud/cvm/step_copy_image.go +++ b/builder/tencentcloud/cvm/step_copy_image.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_create_image.go b/builder/tencentcloud/cvm/step_create_image.go index f55ad28ce..74d309569 100644 --- a/builder/tencentcloud/cvm/step_create_image.go +++ b/builder/tencentcloud/cvm/step_create_image.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_detach_temp_key_pair.go b/builder/tencentcloud/cvm/step_detach_temp_key_pair.go index b8cc2ca67..e0a83cb90 100644 --- a/builder/tencentcloud/cvm/step_detach_temp_key_pair.go +++ b/builder/tencentcloud/cvm/step_detach_temp_key_pair.go @@ -3,7 +3,7 @@ package cvm import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_pre_validate.go b/builder/tencentcloud/cvm/step_pre_validate.go index d07d8f058..f1f24bf21 100644 --- a/builder/tencentcloud/cvm/step_pre_validate.go +++ b/builder/tencentcloud/cvm/step_pre_validate.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_run_instance.go b/builder/tencentcloud/cvm/step_run_instance.go index 811b71ed9..51ba12791 100644 --- a/builder/tencentcloud/cvm/step_run_instance.go +++ b/builder/tencentcloud/cvm/step_run_instance.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/cvm/step_share_image.go b/builder/tencentcloud/cvm/step_share_image.go index d83bb9fa5..a6eec0202 100644 --- a/builder/tencentcloud/cvm/step_share_image.go +++ b/builder/tencentcloud/cvm/step_share_image.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312" ) diff --git a/builder/tencentcloud/version/version.go b/builder/tencentcloud/version/version.go index 20b9b6ed3..b029ef780 100644 --- a/builder/tencentcloud/version/version.go +++ b/builder/tencentcloud/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/triton/access_config.go b/builder/triton/access_config.go index 99fafebc7..a032659d1 100644 --- a/builder/triton/access_config.go +++ b/builder/triton/access_config.go @@ -9,8 +9,8 @@ import ( "os" "github.com/hashicorp/errwrap" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" tgo "github.com/joyent/triton-go" "github.com/joyent/triton-go/authentication" "github.com/joyent/triton-go/compute" diff --git a/builder/triton/builder.go b/builder/triton/builder.go index 9f96c5952..deb23ecb1 100644 --- a/builder/triton/builder.go +++ b/builder/triton/builder.go @@ -5,11 +5,11 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" ) const ( diff --git a/builder/triton/config.go b/builder/triton/config.go index 40251158e..ea821cd5c 100644 --- a/builder/triton/config.go +++ b/builder/triton/config.go @@ -3,9 +3,9 @@ package triton import ( - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/triton/config.hcl2spec.go b/builder/triton/config.hcl2spec.go index 9e636c346..35bbf517c 100644 --- a/builder/triton/config.hcl2spec.go +++ b/builder/triton/config.hcl2spec.go @@ -4,7 +4,7 @@ package triton import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/triton/driver_triton.go b/builder/triton/driver_triton.go index 30c856ba3..f17134917 100644 --- a/builder/triton/driver_triton.go +++ b/builder/triton/driver_triton.go @@ -7,7 +7,7 @@ import ( "sort" "time" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/joyent/triton-go/compute" terrors "github.com/joyent/triton-go/errors" ) diff --git a/builder/triton/source_machine_config.go b/builder/triton/source_machine_config.go index 18db29d59..17f0f7553 100644 --- a/builder/triton/source_machine_config.go +++ b/builder/triton/source_machine_config.go @@ -6,8 +6,8 @@ package triton import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // SourceMachineConfig represents the configuration to run a machine using diff --git a/builder/triton/ssh.go b/builder/triton/ssh.go index 0adf15c45..44a1802ea 100644 --- a/builder/triton/ssh.go +++ b/builder/triton/ssh.go @@ -3,7 +3,7 @@ package triton import ( "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func commHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/triton/step_create_image_from_machine.go b/builder/triton/step_create_image_from_machine.go index c0401f3c6..e84a3dd30 100644 --- a/builder/triton/step_create_image_from_machine.go +++ b/builder/triton/step_create_image_from_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCreateImageFromMachine creates an image with the specified attributes diff --git a/builder/triton/step_create_image_from_machine_test.go b/builder/triton/step_create_image_from_machine_test.go index 8423e85d5..74d1791ce 100644 --- a/builder/triton/step_create_image_from_machine_test.go +++ b/builder/triton/step_create_image_from_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreateImageFromMachine(t *testing.T) { diff --git a/builder/triton/step_create_source_machine.go b/builder/triton/step_create_source_machine.go index 1281d7eb4..83563e2eb 100644 --- a/builder/triton/step_create_source_machine.go +++ b/builder/triton/step_create_source_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepCreateSourceMachine creates an machine with the specified attributes diff --git a/builder/triton/step_create_source_machine_test.go b/builder/triton/step_create_source_machine_test.go index d70bfd6a0..0894bc804 100644 --- a/builder/triton/step_create_source_machine_test.go +++ b/builder/triton/step_create_source_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreateSourceMachine(t *testing.T) { diff --git a/builder/triton/step_delete_machine.go b/builder/triton/step_delete_machine.go index d663d4f26..92a9140e1 100644 --- a/builder/triton/step_delete_machine.go +++ b/builder/triton/step_delete_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepDeleteMachine deletes the machine with the ID specified in state["machine"] diff --git a/builder/triton/step_delete_machine_test.go b/builder/triton/step_delete_machine_test.go index 1615f4f7d..5c6342c1c 100644 --- a/builder/triton/step_delete_machine_test.go +++ b/builder/triton/step_delete_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepDeleteMachine(t *testing.T) { diff --git a/builder/triton/step_stop_machine.go b/builder/triton/step_stop_machine.go index 571e9ca34..a831b401f 100644 --- a/builder/triton/step_stop_machine.go +++ b/builder/triton/step_stop_machine.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepStopMachine stops the machine with the given Machine ID, and waits diff --git a/builder/triton/step_stop_machine_test.go b/builder/triton/step_stop_machine_test.go index ded3e5053..ff9cfd073 100644 --- a/builder/triton/step_stop_machine_test.go +++ b/builder/triton/step_stop_machine_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepStopMachine(t *testing.T) { diff --git a/builder/triton/step_test.go b/builder/triton/step_test.go index ef5b5bf24..6cebcac2f 100644 --- a/builder/triton/step_test.go +++ b/builder/triton/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/triton/step_wait_for_stop_to_not_fail.go b/builder/triton/step_wait_for_stop_to_not_fail.go index 51cf80a93..5f374e9e0 100644 --- a/builder/triton/step_wait_for_stop_to_not_fail.go +++ b/builder/triton/step_wait_for_stop_to_not_fail.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepWaitForStopNotToFail waits for 10 seconds before returning with continue diff --git a/builder/triton/target_image_config.go b/builder/triton/target_image_config.go index 545240565..5a90a18c6 100644 --- a/builder/triton/target_image_config.go +++ b/builder/triton/target_image_config.go @@ -5,8 +5,8 @@ package triton import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // TargetImageConfig represents the configuration for the image to be created diff --git a/builder/triton/version/version.go b/builder/triton/version/version.go index 71a6bbaf7..79d52e320 100644 --- a/builder/triton/version/version.go +++ b/builder/triton/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/ucloud/common/access_config.go b/builder/ucloud/common/access_config.go index 192fd35b9..de499fa55 100644 --- a/builder/ucloud/common/access_config.go +++ b/builder/ucloud/common/access_config.go @@ -10,8 +10,8 @@ import ( "path/filepath" "runtime" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/ucloud/version" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/ucloud/ucloud-sdk-go/external" "github.com/ucloud/ucloud-sdk-go/private/protocol/http" "github.com/ucloud/ucloud-sdk-go/services/uaccount" diff --git a/builder/ucloud/common/artifact.go b/builder/ucloud/common/artifact.go index b1d13ec44..a9a8bd2e5 100644 --- a/builder/ucloud/common/artifact.go +++ b/builder/ucloud/common/artifact.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/common/artifact_test.go b/builder/ucloud/common/artifact_test.go index 32cc2e8ca..1cb4517f8 100644 --- a/builder/ucloud/common/artifact_test.go +++ b/builder/ucloud/common/artifact_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_Impl(t *testing.T) { diff --git a/builder/ucloud/common/image_config.go b/builder/ucloud/common/image_config.go index cf312000c..458203472 100644 --- a/builder/ucloud/common/image_config.go +++ b/builder/ucloud/common/image_config.go @@ -7,7 +7,7 @@ import ( "fmt" "regexp" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type ImageDestination struct { diff --git a/builder/ucloud/common/run_config.go b/builder/ucloud/common/run_config.go index 43c3ef274..0c5b8dee1 100644 --- a/builder/ucloud/common/run_config.go +++ b/builder/ucloud/common/run_config.go @@ -6,9 +6,9 @@ import ( "os" "regexp" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type RunConfig struct { diff --git a/builder/ucloud/common/run_config_test.go b/builder/ucloud/common/run_config_test.go index bbaaa3535..337f47abf 100644 --- a/builder/ucloud/common/run_config_test.go +++ b/builder/ucloud/common/run_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator" ) func testConfig() *RunConfig { diff --git a/builder/ucloud/common/utils.go b/builder/ucloud/common/utils.go index 3df40a38e..788340445 100644 --- a/builder/ucloud/common/utils.go +++ b/builder/ucloud/common/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/ucloud/ucloud-sdk-go/services/uhost" ) diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go index ccd3b5be9..31c47eaa3 100644 --- a/builder/ucloud/uhost/builder.go +++ b/builder/ucloud/uhost/builder.go @@ -8,14 +8,14 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // The unique ID for this builder diff --git a/builder/ucloud/uhost/builder_acc_test.go b/builder/ucloud/uhost/builder_acc_test.go index 264875f60..c8f3d48cd 100644 --- a/builder/ucloud/uhost/builder_acc_test.go +++ b/builder/ucloud/uhost/builder_acc_test.go @@ -5,11 +5,11 @@ import ( "os" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_validateRegion(t *testing.T) { diff --git a/builder/ucloud/uhost/builder_test.go b/builder/ucloud/uhost/builder_test.go index f227ef9cf..228281ebd 100644 --- a/builder/ucloud/uhost/builder_test.go +++ b/builder/ucloud/uhost/builder_test.go @@ -4,8 +4,8 @@ import ( "reflect" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func testBuilderConfig() map[string]interface{} { diff --git a/builder/ucloud/uhost/step_check_source_image.go b/builder/ucloud/uhost/step_check_source_image.go index 00b5593fd..51e7d72f5 100644 --- a/builder/ucloud/uhost/step_check_source_image.go +++ b/builder/ucloud/uhost/step_check_source_image.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type stepCheckSourceImageId struct { diff --git a/builder/ucloud/uhost/step_config_security_group.go b/builder/ucloud/uhost/step_config_security_group.go index 1c8af55f7..c1c8507b7 100644 --- a/builder/ucloud/uhost/step_config_security_group.go +++ b/builder/ucloud/uhost/step_config_security_group.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_config_subnet.go b/builder/ucloud/uhost/step_config_subnet.go index 24da1b116..03fcefca7 100644 --- a/builder/ucloud/uhost/step_config_subnet.go +++ b/builder/ucloud/uhost/step_config_subnet.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type stepConfigSubnet struct { diff --git a/builder/ucloud/uhost/step_config_vpc.go b/builder/ucloud/uhost/step_config_vpc.go index c35174c5a..b0319e91e 100644 --- a/builder/ucloud/uhost/step_config_vpc.go +++ b/builder/ucloud/uhost/step_config_vpc.go @@ -6,8 +6,8 @@ import ( ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepConfigVPC struct { diff --git a/builder/ucloud/uhost/step_copy_image.go b/builder/ucloud/uhost/step_copy_image.go index 0ebef1d1e..a35d0a755 100644 --- a/builder/ucloud/uhost/step_copy_image.go +++ b/builder/ucloud/uhost/step_copy_image.go @@ -6,11 +6,11 @@ import ( "strings" "time" + "github.com/hashicorp/packer-plugin-sdk/retry" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_create_image.go b/builder/ucloud/uhost/step_create_image.go index 4837325fd..7ff7edd23 100644 --- a/builder/ucloud/uhost/step_create_image.go +++ b/builder/ucloud/uhost/step_create_image.go @@ -5,11 +5,11 @@ import ( "fmt" "time" + "github.com/hashicorp/packer-plugin-sdk/retry" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_create_instance.go b/builder/ucloud/uhost/step_create_instance.go index 783c27c2e..d3a16d21e 100644 --- a/builder/ucloud/uhost/step_create_instance.go +++ b/builder/ucloud/uhost/step_create_instance.go @@ -9,10 +9,10 @@ import ( "strings" "time" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_pre_validate.go b/builder/ucloud/uhost/step_pre_validate.go index 9242d9a1a..939ece9fd 100644 --- a/builder/ucloud/uhost/step_pre_validate.go +++ b/builder/ucloud/uhost/step_pre_validate.go @@ -3,9 +3,9 @@ package uhost import ( "context" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type stepPreValidate struct { diff --git a/builder/ucloud/uhost/step_stop_instance.go b/builder/ucloud/uhost/step_stop_instance.go index 5d0c31b98..8c074b77f 100644 --- a/builder/ucloud/uhost/step_stop_instance.go +++ b/builder/ucloud/uhost/step_stop_instance.go @@ -5,11 +5,11 @@ import ( "fmt" "time" + "github.com/hashicorp/packer-plugin-sdk/retry" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/version/version.go b/builder/ucloud/version/version.go index 279a8646e..61f47154c 100644 --- a/builder/ucloud/version/version.go +++ b/builder/ucloud/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/vagrant/artifact.go b/builder/vagrant/artifact.go index 8e36c4e53..e1ec697f1 100644 --- a/builder/vagrant/artifact.go +++ b/builder/vagrant/artifact.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This is the common builder ID to all of these artifacts. diff --git a/builder/vagrant/artifact_test.go b/builder/vagrant/artifact_test.go index aacc3181c..e9bfd515d 100644 --- a/builder/vagrant/artifact_test.go +++ b/builder/vagrant/artifact_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_Impl(t *testing.T) { diff --git a/builder/vagrant/builder.go b/builder/vagrant/builder.go index a65a39461..2500990bb 100644 --- a/builder/vagrant/builder.go +++ b/builder/vagrant/builder.go @@ -14,14 +14,14 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // Builder implements packersdk.Builder and builds the actual VirtualBox diff --git a/builder/vagrant/builder_test.go b/builder/vagrant/builder_test.go index 59030f520..fdea90758 100644 --- a/builder/vagrant/builder_test.go +++ b/builder/vagrant/builder_test.go @@ -3,7 +3,7 @@ package vagrant import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilder_ImplementsBuilder(t *testing.T) { diff --git a/builder/vagrant/ssh.go b/builder/vagrant/ssh.go index 4d15819cb..ae48134fc 100644 --- a/builder/vagrant/ssh.go +++ b/builder/vagrant/ssh.go @@ -1,7 +1,7 @@ package vagrant import ( - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func CommHost() func(multistep.StateBag) (string, error) { diff --git a/builder/vagrant/step_add_box.go b/builder/vagrant/step_add_box.go index 38ff8c191..7c14ef106 100644 --- a/builder/vagrant/step_add_box.go +++ b/builder/vagrant/step_add_box.go @@ -5,8 +5,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepAddBox struct { diff --git a/builder/vagrant/step_add_box_test.go b/builder/vagrant/step_add_box_test.go index 475bcf501..2dabc9a81 100644 --- a/builder/vagrant/step_add_box_test.go +++ b/builder/vagrant/step_add_box_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepAdd_Impl(t *testing.T) { diff --git a/builder/vagrant/step_create_vagrantfile.go b/builder/vagrant/step_create_vagrantfile.go index 3fb1c8c09..82da88a5a 100644 --- a/builder/vagrant/step_create_vagrantfile.go +++ b/builder/vagrant/step_create_vagrantfile.go @@ -8,8 +8,8 @@ import ( "path/filepath" "text/template" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepCreateVagrantfile struct { diff --git a/builder/vagrant/step_create_vagrantfile_test.go b/builder/vagrant/step_create_vagrantfile_test.go index 2d8ff805c..0e8d752ee 100644 --- a/builder/vagrant/step_create_vagrantfile_test.go +++ b/builder/vagrant/step_create_vagrantfile_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCreateVagrantfile_Impl(t *testing.T) { diff --git a/builder/vagrant/step_package.go b/builder/vagrant/step_package.go index 77128150b..0a0367753 100644 --- a/builder/vagrant/step_package.go +++ b/builder/vagrant/step_package.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepPackage struct { diff --git a/builder/vagrant/step_ssh_config.go b/builder/vagrant/step_ssh_config.go index e5a6c96d2..3d9b9ed94 100644 --- a/builder/vagrant/step_ssh_config.go +++ b/builder/vagrant/step_ssh_config.go @@ -5,7 +5,7 @@ import ( "log" "strconv" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // Vagrant already sets up ssh on the guests; our job is to find out what diff --git a/builder/vagrant/step_ssh_config_test.go b/builder/vagrant/step_ssh_config_test.go index cf7f42a56..390287a1c 100644 --- a/builder/vagrant/step_ssh_config_test.go +++ b/builder/vagrant/step_ssh_config_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepSSHConfig_Impl(t *testing.T) { diff --git a/builder/vagrant/step_up.go b/builder/vagrant/step_up.go index 7a8ebab5f..2063e41cc 100644 --- a/builder/vagrant/step_up.go +++ b/builder/vagrant/step_up.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepUp struct { diff --git a/builder/vagrant/version/version.go b/builder/vagrant/version/version.go index 3a7ae432c..f756a982c 100644 --- a/builder/vagrant/version/version.go +++ b/builder/vagrant/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/virtualbox/common/artifact.go b/builder/virtualbox/common/artifact.go index ddd2c0efd..2494f5d4f 100644 --- a/builder/virtualbox/common/artifact.go +++ b/builder/virtualbox/common/artifact.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This is the common builder ID to all of these artifacts. diff --git a/builder/virtualbox/common/artifact_test.go b/builder/virtualbox/common/artifact_test.go index a6b9dcb27..e01726ad3 100644 --- a/builder/virtualbox/common/artifact_test.go +++ b/builder/virtualbox/common/artifact_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_impl(t *testing.T) { diff --git a/builder/virtualbox/common/comm.go b/builder/virtualbox/common/comm.go index a8811ae8d..a0a3906f7 100644 --- a/builder/virtualbox/common/comm.go +++ b/builder/virtualbox/common/comm.go @@ -1,7 +1,7 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/virtualbox/common/comm_config.go b/builder/virtualbox/common/comm_config.go index b08fa878c..44e428bb2 100644 --- a/builder/virtualbox/common/comm_config.go +++ b/builder/virtualbox/common/comm_config.go @@ -5,8 +5,8 @@ package common import ( "errors" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type CommConfig struct { diff --git a/builder/virtualbox/common/comm_config_test.go b/builder/virtualbox/common/comm_config_test.go index 0aec85d75..4a292cfab 100644 --- a/builder/virtualbox/common/comm_config_test.go +++ b/builder/virtualbox/common/comm_config_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func testCommConfig() *CommConfig { diff --git a/builder/virtualbox/common/driver_4_2.go b/builder/virtualbox/common/driver_4_2.go index 465506ace..92ba12acf 100644 --- a/builder/virtualbox/common/driver_4_2.go +++ b/builder/virtualbox/common/driver_4_2.go @@ -12,7 +12,7 @@ import ( "time" versionUtil "github.com/hashicorp/go-version" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/retry" ) type VBox42Driver struct { diff --git a/builder/virtualbox/common/export_config.go b/builder/virtualbox/common/export_config.go index 113d6cb64..201be65fe 100644 --- a/builder/virtualbox/common/export_config.go +++ b/builder/virtualbox/common/export_config.go @@ -5,7 +5,7 @@ package common import ( "errors" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type ExportConfig struct { diff --git a/builder/virtualbox/common/export_config_test.go b/builder/virtualbox/common/export_config_test.go index a08a047c0..cf6a056c6 100644 --- a/builder/virtualbox/common/export_config_test.go +++ b/builder/virtualbox/common/export_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestExportConfigPrepare_BootWait(t *testing.T) { diff --git a/builder/virtualbox/common/hw_config.go b/builder/virtualbox/common/hw_config.go index 2b86383e4..b145d9d22 100644 --- a/builder/virtualbox/common/hw_config.go +++ b/builder/virtualbox/common/hw_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type HWConfig struct { diff --git a/builder/virtualbox/common/hw_config_test.go b/builder/virtualbox/common/hw_config_test.go index d6b40ea13..5d1b15e9f 100644 --- a/builder/virtualbox/common/hw_config_test.go +++ b/builder/virtualbox/common/hw_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestHWConfigPrepare(t *testing.T) { diff --git a/builder/virtualbox/common/output_config.go b/builder/virtualbox/common/output_config.go index a7a1e2588..cef8e11b6 100644 --- a/builder/virtualbox/common/output_config.go +++ b/builder/virtualbox/common/output_config.go @@ -5,8 +5,8 @@ package common import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/virtualbox/common/output_config_test.go b/builder/virtualbox/common/output_config_test.go index 278969a42..0e1567629 100644 --- a/builder/virtualbox/common/output_config_test.go +++ b/builder/virtualbox/common/output_config_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/virtualbox/common/run_config.go b/builder/virtualbox/common/run_config.go index a2f8a7ff8..188f30035 100644 --- a/builder/virtualbox/common/run_config.go +++ b/builder/virtualbox/common/run_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type RunConfig struct { diff --git a/builder/virtualbox/common/run_config_test.go b/builder/virtualbox/common/run_config_test.go index e96d50c6a..574e59528 100644 --- a/builder/virtualbox/common/run_config_test.go +++ b/builder/virtualbox/common/run_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestRunConfigPrepare_VRDPBindAddress(t *testing.T) { diff --git a/builder/virtualbox/common/shutdown_config.go b/builder/virtualbox/common/shutdown_config.go index 963f32d91..30debe198 100644 --- a/builder/virtualbox/common/shutdown_config.go +++ b/builder/virtualbox/common/shutdown_config.go @@ -5,7 +5,7 @@ package common import ( "time" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type ShutdownConfig struct { diff --git a/builder/virtualbox/common/shutdown_config_test.go b/builder/virtualbox/common/shutdown_config_test.go index 4d68d6e1c..116ff33e6 100644 --- a/builder/virtualbox/common/shutdown_config_test.go +++ b/builder/virtualbox/common/shutdown_config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func testShutdownConfig() *ShutdownConfig { diff --git a/builder/virtualbox/common/step_attach_floppy.go b/builder/virtualbox/common/step_attach_floppy.go index ae4bc1f2e..10ae712c5 100644 --- a/builder/virtualbox/common/step_attach_floppy.go +++ b/builder/virtualbox/common/step_attach_floppy.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) // This step attaches the ISO to the virtual machine. diff --git a/builder/virtualbox/common/step_attach_floppy_test.go b/builder/virtualbox/common/step_attach_floppy_test.go index e34308799..ffd1cb757 100644 --- a/builder/virtualbox/common/step_attach_floppy_test.go +++ b/builder/virtualbox/common/step_attach_floppy_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepAttachFloppy_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_attach_isos.go b/builder/virtualbox/common/step_attach_isos.go index 5a6bbd624..fe1156d67 100644 --- a/builder/virtualbox/common/step_attach_isos.go +++ b/builder/virtualbox/common/step_attach_isos.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step attaches the boot ISO, cd_files iso, and guest additions to the diff --git a/builder/virtualbox/common/step_configure_vrdp.go b/builder/virtualbox/common/step_configure_vrdp.go index 9fd02cbeb..8b78347ed 100644 --- a/builder/virtualbox/common/step_configure_vrdp.go +++ b/builder/virtualbox/common/step_configure_vrdp.go @@ -5,9 +5,9 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/net" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/net" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step configures the VM to enable the VRDP server diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go index b98bbec51..82c10973d 100644 --- a/builder/virtualbox/common/step_download_guest_additions.go +++ b/builder/virtualbox/common/step_download_guest_additions.go @@ -9,11 +9,11 @@ import ( "os" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) var additionsVersionMap = map[string]string{ diff --git a/builder/virtualbox/common/step_export.go b/builder/virtualbox/common/step_export.go index 31dc8db64..dcac6adb5 100644 --- a/builder/virtualbox/common/step_export.go +++ b/builder/virtualbox/common/step_export.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step cleans up forwarded ports and exports the VM to an OVF. diff --git a/builder/virtualbox/common/step_export_test.go b/builder/virtualbox/common/step_export_test.go index 71fabf56b..ab1857203 100644 --- a/builder/virtualbox/common/step_export_test.go +++ b/builder/virtualbox/common/step_export_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepExport_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_http_ip_discover.go b/builder/virtualbox/common/step_http_ip_discover.go index 17bbe42b9..8194d6c84 100644 --- a/builder/virtualbox/common/step_http_ip_discover.go +++ b/builder/virtualbox/common/step_http_ip_discover.go @@ -3,7 +3,7 @@ package common import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // Step to discover the http ip diff --git a/builder/virtualbox/common/step_http_ip_discover_test.go b/builder/virtualbox/common/step_http_ip_discover_test.go index 0a5bc8d47..97d4e8629 100644 --- a/builder/virtualbox/common/step_http_ip_discover_test.go +++ b/builder/virtualbox/common/step_http_ip_discover_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/virtualbox/common/step_port_forwarding.go b/builder/virtualbox/common/step_port_forwarding.go index 6484cae86..404d0567a 100644 --- a/builder/virtualbox/common/step_port_forwarding.go +++ b/builder/virtualbox/common/step_port_forwarding.go @@ -6,10 +6,10 @@ import ( "log" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/net" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/net" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step adds a NAT port forwarding definition so that SSH or WinRM is available diff --git a/builder/virtualbox/common/step_remove_devices.go b/builder/virtualbox/common/step_remove_devices.go index 1a0c7f385..a3cb2ca9a 100644 --- a/builder/virtualbox/common/step_remove_devices.go +++ b/builder/virtualbox/common/step_remove_devices.go @@ -6,9 +6,9 @@ import ( "log" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" ) // This step removes any devices (floppy disks, ISOs, etc.) from the diff --git a/builder/virtualbox/common/step_remove_devices_test.go b/builder/virtualbox/common/step_remove_devices_test.go index 95174bec5..6db937aab 100644 --- a/builder/virtualbox/common/step_remove_devices_test.go +++ b/builder/virtualbox/common/step_remove_devices_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepRemoveDevices_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_run.go b/builder/virtualbox/common/step_run.go index 01144e4fa..069e308bf 100644 --- a/builder/virtualbox/common/step_run.go +++ b/builder/virtualbox/common/step_run.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step starts the virtual machine. diff --git a/builder/virtualbox/common/step_shutdown.go b/builder/virtualbox/common/step_shutdown.go index 1c36b53cb..ae58810f8 100644 --- a/builder/virtualbox/common/step_shutdown.go +++ b/builder/virtualbox/common/step_shutdown.go @@ -7,8 +7,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/virtualbox/common/step_shutdown_test.go b/builder/virtualbox/common/step_shutdown_test.go index b0225bf5d..ed3eecea1 100644 --- a/builder/virtualbox/common/step_shutdown_test.go +++ b/builder/virtualbox/common/step_shutdown_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestStepShutdown_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_ssh_key_pair.go b/builder/virtualbox/common/step_ssh_key_pair.go index 293ddd8d3..8a1e4f064 100644 --- a/builder/virtualbox/common/step_ssh_key_pair.go +++ b/builder/virtualbox/common/step_ssh_key_pair.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator/ssh" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator/ssh" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) // StepSshKeyPair executes the business logic for setting the SSH key pair in diff --git a/builder/virtualbox/common/step_suppress_messages.go b/builder/virtualbox/common/step_suppress_messages.go index ddfc2b852..72bbd2736 100644 --- a/builder/virtualbox/common/step_suppress_messages.go +++ b/builder/virtualbox/common/step_suppress_messages.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step sets some variables in VirtualBox so that annoying diff --git a/builder/virtualbox/common/step_suppress_messages_test.go b/builder/virtualbox/common/step_suppress_messages_test.go index e93ca958b..1af0eb10d 100644 --- a/builder/virtualbox/common/step_suppress_messages_test.go +++ b/builder/virtualbox/common/step_suppress_messages_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepSuppressMessages_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_test.go b/builder/virtualbox/common/step_test.go index 17116b361..52ddc3285 100644 --- a/builder/virtualbox/common/step_test.go +++ b/builder/virtualbox/common/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/virtualbox/common/step_type_boot_command.go b/builder/virtualbox/common/step_type_boot_command.go index a846fce98..51865fdce 100644 --- a/builder/virtualbox/common/step_type_boot_command.go +++ b/builder/virtualbox/common/step_type_boot_command.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) const KeyLeftShift uint32 = 0xFFE1 diff --git a/builder/virtualbox/common/step_upload_guest_additions.go b/builder/virtualbox/common/step_upload_guest_additions.go index 3dc2fbad7..702401be8 100644 --- a/builder/virtualbox/common/step_upload_guest_additions.go +++ b/builder/virtualbox/common/step_upload_guest_additions.go @@ -6,9 +6,9 @@ import ( "log" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type guestAdditionsPathTemplate struct { diff --git a/builder/virtualbox/common/step_upload_version.go b/builder/virtualbox/common/step_upload_version.go index 7f2aa3860..b9bebcf05 100644 --- a/builder/virtualbox/common/step_upload_version.go +++ b/builder/virtualbox/common/step_upload_version.go @@ -6,8 +6,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step uploads a file containing the VirtualBox version, which diff --git a/builder/virtualbox/common/step_upload_version_test.go b/builder/virtualbox/common/step_upload_version_test.go index 45f6b78a5..c97f22fda 100644 --- a/builder/virtualbox/common/step_upload_version_test.go +++ b/builder/virtualbox/common/step_upload_version_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestStepUploadVersion_impl(t *testing.T) { diff --git a/builder/virtualbox/common/step_vboxmanage.go b/builder/virtualbox/common/step_vboxmanage.go index 0e2e9cbf1..7046b85fb 100644 --- a/builder/virtualbox/common/step_vboxmanage.go +++ b/builder/virtualbox/common/step_vboxmanage.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type commandTemplate struct { diff --git a/builder/virtualbox/common/vboxbundle_config.go b/builder/virtualbox/common/vboxbundle_config.go index 8386a7f63..eb27436f1 100644 --- a/builder/virtualbox/common/vboxbundle_config.go +++ b/builder/virtualbox/common/vboxbundle_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type VBoxBundleConfig struct { diff --git a/builder/virtualbox/common/vboxbundle_config_test.go b/builder/virtualbox/common/vboxbundle_config_test.go index 2509a2f34..df2d75716 100644 --- a/builder/virtualbox/common/vboxbundle_config_test.go +++ b/builder/virtualbox/common/vboxbundle_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestVBoxBundleConfigPrepare_VBoxBundle(t *testing.T) { diff --git a/builder/virtualbox/common/vboxmanage_config.go b/builder/virtualbox/common/vboxmanage_config.go index 3664d3098..33556d129 100644 --- a/builder/virtualbox/common/vboxmanage_config.go +++ b/builder/virtualbox/common/vboxmanage_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) //In order to perform extra customization of the virtual machine, a template can diff --git a/builder/virtualbox/common/vboxmanage_config_test.go b/builder/virtualbox/common/vboxmanage_config_test.go index 1b7f0c671..0a557aa24 100644 --- a/builder/virtualbox/common/vboxmanage_config_test.go +++ b/builder/virtualbox/common/vboxmanage_config_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestVBoxManageConfigPrepare_VBoxManage(t *testing.T) { diff --git a/builder/virtualbox/iso/acceptance/builder_acceptance.go b/builder/virtualbox/iso/acceptance/builder_acceptance.go index 589efb91a..c27555802 100644 --- a/builder/virtualbox/iso/acceptance/builder_acceptance.go +++ b/builder/virtualbox/iso/acceptance/builder_acceptance.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/packer/builder/virtualbox/iso" - "github.com/hashicorp/packer/packer-plugin-sdk/acctest/testutils" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/acctest/testutils" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type VirtualBoxISOAccTest struct{} diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go index 85e4699b6..5cc5541f1 100644 --- a/builder/virtualbox/iso/builder.go +++ b/builder/virtualbox/iso/builder.go @@ -9,15 +9,15 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "mitchellh.virtualbox" diff --git a/builder/virtualbox/iso/builder_acc_test.go b/builder/virtualbox/iso/builder_acc_test.go index 10f80e6db..a9047d31d 100644 --- a/builder/virtualbox/iso/builder_acc_test.go +++ b/builder/virtualbox/iso/builder_acc_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/virtualbox/iso/builder_test.go b/builder/virtualbox/iso/builder_test.go index fceadf05e..41f25b711 100644 --- a/builder/virtualbox/iso/builder_test.go +++ b/builder/virtualbox/iso/builder_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" + packercommon "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/virtualbox/common" - packercommon "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/virtualbox/iso/step_create_disk.go b/builder/virtualbox/iso/step_create_disk.go index efeccd1c0..6b3c620dc 100644 --- a/builder/virtualbox/iso/step_create_disk.go +++ b/builder/virtualbox/iso/step_create_disk.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "path/filepath" "strconv" diff --git a/builder/virtualbox/iso/step_create_vm.go b/builder/virtualbox/iso/step_create_vm.go index 628cfacc2..15a049a12 100644 --- a/builder/virtualbox/iso/step_create_vm.go +++ b/builder/virtualbox/iso/step_create_vm.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // This step creates the actual virtual machine. diff --git a/builder/virtualbox/ovf/builder.go b/builder/virtualbox/ovf/builder.go index 63e57a70b..b6bffb100 100644 --- a/builder/virtualbox/ovf/builder.go +++ b/builder/virtualbox/ovf/builder.go @@ -6,11 +6,11 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // Builder implements packersdk.Builder and builds the actual VirtualBox diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go index c4bf0ebb9..59748d90a 100644 --- a/builder/virtualbox/ovf/config.go +++ b/builder/virtualbox/ovf/config.go @@ -6,13 +6,13 @@ package ovf import ( "fmt" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/virtualbox/ovf/config_test.go b/builder/virtualbox/ovf/config_test.go index 562e4ead9..b0bafeb1f 100644 --- a/builder/virtualbox/ovf/config_test.go +++ b/builder/virtualbox/ovf/config_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig(t *testing.T) map[string]interface{} { diff --git a/builder/virtualbox/ovf/step_import.go b/builder/virtualbox/ovf/step_import.go index 67a8659fe..41afc156b 100644 --- a/builder/virtualbox/ovf/step_import.go +++ b/builder/virtualbox/ovf/step_import.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // This step imports an OVF VM into VirtualBox. diff --git a/builder/virtualbox/ovf/step_import_test.go b/builder/virtualbox/ovf/step_import_test.go index 69c2d5462..ee16ad634 100644 --- a/builder/virtualbox/ovf/step_import_test.go +++ b/builder/virtualbox/ovf/step_import_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepImport_impl(t *testing.T) { diff --git a/builder/virtualbox/ovf/step_test.go b/builder/virtualbox/ovf/step_test.go index f54a47b4a..c32256c3b 100644 --- a/builder/virtualbox/ovf/step_test.go +++ b/builder/virtualbox/ovf/step_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/virtualbox/version/version.go b/builder/virtualbox/version/version.go index 7d745a93b..dfbfcd622 100644 --- a/builder/virtualbox/version/version.go +++ b/builder/virtualbox/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/virtualbox/vm/builder.go b/builder/virtualbox/vm/builder.go index e578a2e0b..cc93ae3ed 100644 --- a/builder/virtualbox/vm/builder.go +++ b/builder/virtualbox/vm/builder.go @@ -6,11 +6,11 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // Builder implements packersdk.Builder and builds the actual VirtualBox diff --git a/builder/virtualbox/vm/config.go b/builder/virtualbox/vm/config.go index c41a4bc76..2aa716f96 100644 --- a/builder/virtualbox/vm/config.go +++ b/builder/virtualbox/vm/config.go @@ -8,13 +8,13 @@ import ( "log" "time" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/virtualbox/vm/step_create_snapshot.go b/builder/virtualbox/vm/step_create_snapshot.go index 12bb0868b..354730298 100644 --- a/builder/virtualbox/vm/step_create_snapshot.go +++ b/builder/virtualbox/vm/step_create_snapshot.go @@ -5,9 +5,9 @@ import ( "fmt" "log" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepCreateSnapshot struct { diff --git a/builder/virtualbox/vm/step_import.go b/builder/virtualbox/vm/step_import.go index 6efdbe115..d21e796e0 100644 --- a/builder/virtualbox/vm/step_import.go +++ b/builder/virtualbox/vm/step_import.go @@ -3,7 +3,7 @@ package vm import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // This step imports an OVF VM into VirtualBox. diff --git a/builder/virtualbox/vm/step_set_snapshot.go b/builder/virtualbox/vm/step_set_snapshot.go index d594a4296..b3c9a49c2 100644 --- a/builder/virtualbox/vm/step_set_snapshot.go +++ b/builder/virtualbox/vm/step_set_snapshot.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepSetSnapshot struct { diff --git a/builder/vmware/common/artifact.go b/builder/vmware/common/artifact.go index 9ff3de78c..8f57d4cb4 100644 --- a/builder/vmware/common/artifact.go +++ b/builder/vmware/common/artifact.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const ( diff --git a/builder/vmware/common/artifact_test.go b/builder/vmware/common/artifact_test.go index 7d7a9d039..fb849c1bf 100644 --- a/builder/vmware/common/artifact_test.go +++ b/builder/vmware/common/artifact_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestLocalArtifact_impl(t *testing.T) { diff --git a/builder/vmware/common/disk_config.go b/builder/vmware/common/disk_config.go index 96fc8fe09..08e9b05ba 100644 --- a/builder/vmware/common/disk_config.go +++ b/builder/vmware/common/disk_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type DiskConfig struct { diff --git a/builder/vmware/common/driver.go b/builder/vmware/common/driver.go index db50a2889..f20a1bd7a 100644 --- a/builder/vmware/common/driver.go +++ b/builder/vmware/common/driver.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // A driver is able to talk to VMware, control virtual machines, etc. diff --git a/builder/vmware/common/driver_config.go b/builder/vmware/common/driver_config.go index 82fc0a23d..22746afab 100644 --- a/builder/vmware/common/driver_config.go +++ b/builder/vmware/common/driver_config.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type DriverConfig struct { diff --git a/builder/vmware/common/driver_config_test.go b/builder/vmware/common/driver_config_test.go index 6bba215a9..9f98185a2 100644 --- a/builder/vmware/common/driver_config_test.go +++ b/builder/vmware/common/driver_config_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestDriverConfigPrepare(t *testing.T) { diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go index f57d70e5f..277197e01 100644 --- a/builder/vmware/common/driver_esx5.go +++ b/builder/vmware/common/driver_esx5.go @@ -28,11 +28,11 @@ import ( "github.com/vmware/govmomi/vim25/types" "github.com/hashicorp/go-getter/v2" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - helperssh "github.com/hashicorp/packer/packer-plugin-sdk/communicator/ssh" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer-plugin-sdk/communicator" + helperssh "github.com/hashicorp/packer-plugin-sdk/communicator/ssh" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" ) diff --git a/builder/vmware/common/driver_esx5_test.go b/builder/vmware/common/driver_esx5_test.go index f49140bee..4fceb6a39 100644 --- a/builder/vmware/common/driver_esx5_test.go +++ b/builder/vmware/common/driver_esx5_test.go @@ -5,9 +5,9 @@ import ( "net" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/template/config" ) func TestESX5Driver_implDriver(t *testing.T) { diff --git a/builder/vmware/common/driver_fusion5.go b/builder/vmware/common/driver_fusion5.go index 57f2bbda5..0e4d4039f 100644 --- a/builder/vmware/common/driver_fusion5.go +++ b/builder/vmware/common/driver_fusion5.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // Fusion5Driver is a driver that can run VMware Fusion 5. diff --git a/builder/vmware/common/driver_mock.go b/builder/vmware/common/driver_mock.go index 66bac08af..59f0b4a20 100644 --- a/builder/vmware/common/driver_mock.go +++ b/builder/vmware/common/driver_mock.go @@ -4,7 +4,7 @@ import ( "net" "sync" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) type DriverMock struct { diff --git a/builder/vmware/common/driver_player5.go b/builder/vmware/common/driver_player5.go index 4ce3b5c7a..8ec5aadb7 100644 --- a/builder/vmware/common/driver_player5.go +++ b/builder/vmware/common/driver_player5.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // Player5Driver is a driver that can run VMware Player 5 on Linux. diff --git a/builder/vmware/common/driver_workstation9.go b/builder/vmware/common/driver_workstation9.go index a64543b2e..70ca1b331 100644 --- a/builder/vmware/common/driver_workstation9.go +++ b/builder/vmware/common/driver_workstation9.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // Workstation9Driver is a driver that can run VMware Workstation 9 diff --git a/builder/vmware/common/export_config.go b/builder/vmware/common/export_config.go index 505795041..34e8df2d9 100644 --- a/builder/vmware/common/export_config.go +++ b/builder/vmware/common/export_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type ExportConfig struct { diff --git a/builder/vmware/common/hw_config.go b/builder/vmware/common/hw_config.go index ecc764921..0498a9e69 100644 --- a/builder/vmware/common/hw_config.go +++ b/builder/vmware/common/hw_config.go @@ -8,7 +8,7 @@ import ( "runtime" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type HWConfig struct { diff --git a/builder/vmware/common/hw_config_test.go b/builder/vmware/common/hw_config_test.go index 46d1d6ff1..28ffb5111 100644 --- a/builder/vmware/common/hw_config_test.go +++ b/builder/vmware/common/hw_config_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestHWConfigPrepare(t *testing.T) { diff --git a/builder/vmware/common/output_config.go b/builder/vmware/common/output_config.go index e315b6012..7bc895059 100644 --- a/builder/vmware/common/output_config.go +++ b/builder/vmware/common/output_config.go @@ -5,8 +5,8 @@ package common import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/vmware/common/output_config_test.go b/builder/vmware/common/output_config_test.go index e2a95fd6c..dddf61561 100644 --- a/builder/vmware/common/output_config_test.go +++ b/builder/vmware/common/output_config_test.go @@ -3,8 +3,8 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestOutputConfigPrepare(t *testing.T) { diff --git a/builder/vmware/common/remote_driver.go b/builder/vmware/common/remote_driver.go index 2f35f4cd4..69aa7229e 100644 --- a/builder/vmware/common/remote_driver.go +++ b/builder/vmware/common/remote_driver.go @@ -1,7 +1,7 @@ package common import ( - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type RemoteDriver interface { diff --git a/builder/vmware/common/remote_driver_mock.go b/builder/vmware/common/remote_driver_mock.go index be5793932..02151ddb6 100644 --- a/builder/vmware/common/remote_driver_mock.go +++ b/builder/vmware/common/remote_driver_mock.go @@ -1,7 +1,7 @@ package common import ( - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type RemoteDriverMock struct { diff --git a/builder/vmware/common/run_config.go b/builder/vmware/common/run_config.go index 67d2da30d..00d59a9a2 100644 --- a/builder/vmware/common/run_config.go +++ b/builder/vmware/common/run_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // ~> **Note:** If [vnc_over_websocket](#vnc_over_websocket) is set to true, any other VNC configuration will be ignored. diff --git a/builder/vmware/common/run_config_test.go b/builder/vmware/common/run_config_test.go index 62ec61610..8c71938b3 100644 --- a/builder/vmware/common/run_config_test.go +++ b/builder/vmware/common/run_config_test.go @@ -7,8 +7,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestRunConfig_Prepare(t *testing.T) { diff --git a/builder/vmware/common/ssh.go b/builder/vmware/common/ssh.go index 5f093605f..6deac751e 100644 --- a/builder/vmware/common/ssh.go +++ b/builder/vmware/common/ssh.go @@ -6,7 +6,7 @@ import ( "log" "net" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func CommHost(config *SSHConfig) func(multistep.StateBag) (string, error) { diff --git a/builder/vmware/common/ssh_config.go b/builder/vmware/common/ssh_config.go index 791a018b1..5eebfa7e4 100644 --- a/builder/vmware/common/ssh_config.go +++ b/builder/vmware/common/ssh_config.go @@ -3,8 +3,8 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type SSHConfig struct { diff --git a/builder/vmware/common/ssh_config_test.go b/builder/vmware/common/ssh_config_test.go index ef3985976..d41781044 100644 --- a/builder/vmware/common/ssh_config_test.go +++ b/builder/vmware/common/ssh_config_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func testSSHConfig() *SSHConfig { diff --git a/builder/vmware/common/ssh_test.go b/builder/vmware/common/ssh_test.go index 5fa3ade9b..fef692e48 100644 --- a/builder/vmware/common/ssh_test.go +++ b/builder/vmware/common/ssh_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator" ) func TestCommHost(t *testing.T) { diff --git a/builder/vmware/common/step_clean_files.go b/builder/vmware/common/step_clean_files.go index ebdb4bd2f..b7224e7f1 100644 --- a/builder/vmware/common/step_clean_files.go +++ b/builder/vmware/common/step_clean_files.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // These are the extensions of files that are important for the function diff --git a/builder/vmware/common/step_clean_vmx.go b/builder/vmware/common/step_clean_vmx.go index b4720af4f..7f3921ac3 100644 --- a/builder/vmware/common/step_clean_vmx.go +++ b/builder/vmware/common/step_clean_vmx.go @@ -6,8 +6,8 @@ import ( "log" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step cleans up the VMX by removing or changing this prior to diff --git a/builder/vmware/common/step_clean_vmx_test.go b/builder/vmware/common/step_clean_vmx_test.go index 3ef263729..ac319e946 100644 --- a/builder/vmware/common/step_clean_vmx_test.go +++ b/builder/vmware/common/step_clean_vmx_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCleanVMX_impl(t *testing.T) { diff --git a/builder/vmware/common/step_compact_disk.go b/builder/vmware/common/step_compact_disk.go index be798fe59..d6fd6a623 100644 --- a/builder/vmware/common/step_compact_disk.go +++ b/builder/vmware/common/step_compact_disk.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step compacts the virtual disk for the VM unless the "skip_compaction" diff --git a/builder/vmware/common/step_compact_disk_test.go b/builder/vmware/common/step_compact_disk_test.go index 575cd869d..c4a2c8699 100644 --- a/builder/vmware/common/step_compact_disk_test.go +++ b/builder/vmware/common/step_compact_disk_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepCompactDisk_impl(t *testing.T) { diff --git a/builder/vmware/common/step_configure_vmx.go b/builder/vmware/common/step_configure_vmx.go index a915509b2..d7be6fde6 100644 --- a/builder/vmware/common/step_configure_vmx.go +++ b/builder/vmware/common/step_configure_vmx.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step configures a VMX by setting some default settings as well diff --git a/builder/vmware/common/step_configure_vmx_test.go b/builder/vmware/common/step_configure_vmx_test.go index 136931161..dce4cb7f4 100644 --- a/builder/vmware/common/step_configure_vmx_test.go +++ b/builder/vmware/common/step_configure_vmx_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/common/step_configure_vnc.go b/builder/vmware/common/step_configure_vnc.go index 498794757..23b683630 100644 --- a/builder/vmware/common/step_configure_vnc.go +++ b/builder/vmware/common/step_configure_vnc.go @@ -6,9 +6,9 @@ import ( "log" "math/rand" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/net" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/net" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step configures the VM to enable the VNC server. diff --git a/builder/vmware/common/step_create_disks.go b/builder/vmware/common/step_create_disks.go index 477ef540f..2db338b5c 100644 --- a/builder/vmware/common/step_create_disks.go +++ b/builder/vmware/common/step_create_disks.go @@ -6,8 +6,8 @@ import ( "log" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step creates the virtual disks for the VM. diff --git a/builder/vmware/common/step_create_disks_test.go b/builder/vmware/common/step_create_disks_test.go index 9791fc026..afe357df5 100644 --- a/builder/vmware/common/step_create_disks_test.go +++ b/builder/vmware/common/step_create_disks_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/common/step_export.go b/builder/vmware/common/step_export.go index 86b031774..87761e417 100644 --- a/builder/vmware/common/step_export.go +++ b/builder/vmware/common/step_export.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step exports a VM built on ESXi using ovftool diff --git a/builder/vmware/common/step_export_test.go b/builder/vmware/common/step_export_test.go index 93c3fc276..b462dd2b0 100644 --- a/builder/vmware/common/step_export_test.go +++ b/builder/vmware/common/step_export_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/common/step_http_ip_discover.go b/builder/vmware/common/step_http_ip_discover.go index 87041775b..1163feed3 100644 --- a/builder/vmware/common/step_http_ip_discover.go +++ b/builder/vmware/common/step_http_ip_discover.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // Step to discover the http ip diff --git a/builder/vmware/common/step_http_ip_discover_test.go b/builder/vmware/common/step_http_ip_discover_test.go index 009f61972..e0f5b6d59 100644 --- a/builder/vmware/common/step_http_ip_discover_test.go +++ b/builder/vmware/common/step_http_ip_discover_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/vmware/common/step_output_dir.go b/builder/vmware/common/step_output_dir.go index 495b3f582..6b59655a3 100644 --- a/builder/vmware/common/step_output_dir.go +++ b/builder/vmware/common/step_output_dir.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepOutputDir sets up the output directory by creating it if it does diff --git a/builder/vmware/common/step_output_dir_test.go b/builder/vmware/common/step_output_dir_test.go index 79610b7f7..9ede26abd 100644 --- a/builder/vmware/common/step_output_dir_test.go +++ b/builder/vmware/common/step_output_dir_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func testOutputDir(t *testing.T) string { diff --git a/builder/vmware/common/step_prepare_tools.go b/builder/vmware/common/step_prepare_tools.go index 3a1070070..1e035d206 100644 --- a/builder/vmware/common/step_prepare_tools.go +++ b/builder/vmware/common/step_prepare_tools.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) type StepPrepareTools struct { diff --git a/builder/vmware/common/step_prepare_tools_test.go b/builder/vmware/common/step_prepare_tools_test.go index 0e4db027b..99bc9ff45 100644 --- a/builder/vmware/common/step_prepare_tools_test.go +++ b/builder/vmware/common/step_prepare_tools_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepPrepareTools_impl(t *testing.T) { diff --git a/builder/vmware/common/step_register.go b/builder/vmware/common/step_register.go index 24dd1fd7b..058be5e9e 100644 --- a/builder/vmware/common/step_register.go +++ b/builder/vmware/common/step_register.go @@ -6,8 +6,8 @@ import ( "log" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type StepRegister struct { diff --git a/builder/vmware/common/step_register_test.go b/builder/vmware/common/step_register_test.go index 1d48f3486..50d615e9c 100644 --- a/builder/vmware/common/step_register_test.go +++ b/builder/vmware/common/step_register_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepRegister_impl(t *testing.T) { diff --git a/builder/vmware/common/step_remote_upload.go b/builder/vmware/common/step_remote_upload.go index abb9ae15a..ecb3dc61e 100644 --- a/builder/vmware/common/step_remote_upload.go +++ b/builder/vmware/common/step_remote_upload.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // stepRemoteUpload uploads some thing from the state bag to a remote driver diff --git a/builder/vmware/common/step_remote_upload_test.go b/builder/vmware/common/step_remote_upload_test.go index 518f4dd7e..5b4dea78b 100644 --- a/builder/vmware/common/step_remote_upload_test.go +++ b/builder/vmware/common/step_remote_upload_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepRemoteUpload_Cleanup(t *testing.T) { diff --git a/builder/vmware/common/step_run.go b/builder/vmware/common/step_run.go index 0cef4b60b..e205bd043 100644 --- a/builder/vmware/common/step_run.go +++ b/builder/vmware/common/step_run.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step runs the created virtual machine. diff --git a/builder/vmware/common/step_run_test.go b/builder/vmware/common/step_run_test.go index 176bdc8c5..5ee60d4a9 100644 --- a/builder/vmware/common/step_run_test.go +++ b/builder/vmware/common/step_run_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepRun_impl(t *testing.T) { diff --git a/builder/vmware/common/step_shutdown.go b/builder/vmware/common/step_shutdown.go index b78e355eb..26b0a6567 100644 --- a/builder/vmware/common/step_shutdown.go +++ b/builder/vmware/common/step_shutdown.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step shuts down the machine. It first attempts to do so gracefully, diff --git a/builder/vmware/common/step_shutdown_test.go b/builder/vmware/common/step_shutdown_test.go index 2d451914e..5559b3b61 100644 --- a/builder/vmware/common/step_shutdown_test.go +++ b/builder/vmware/common/step_shutdown_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testLocalOutputDir(t *testing.T) *LocalOutputDir { diff --git a/builder/vmware/common/step_suppress_messages.go b/builder/vmware/common/step_suppress_messages.go index f852237d8..501e3f7ea 100644 --- a/builder/vmware/common/step_suppress_messages.go +++ b/builder/vmware/common/step_suppress_messages.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step suppresses any messages that VMware product might show. diff --git a/builder/vmware/common/step_suppress_messages_test.go b/builder/vmware/common/step_suppress_messages_test.go index ff5d1d767..695f006cd 100644 --- a/builder/vmware/common/step_suppress_messages_test.go +++ b/builder/vmware/common/step_suppress_messages_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepSuppressMessages_impl(t *testing.T) { diff --git a/builder/vmware/common/step_test.go b/builder/vmware/common/step_test.go index cd46de03d..71cd088a5 100644 --- a/builder/vmware/common/step_test.go +++ b/builder/vmware/common/step_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/vmware/common/step_upload_tools.go b/builder/vmware/common/step_upload_tools.go index 8fafa6193..f8d173783 100644 --- a/builder/vmware/common/step_upload_tools.go +++ b/builder/vmware/common/step_upload_tools.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type toolsUploadPathTemplate struct { diff --git a/builder/vmware/common/step_upload_vmx.go b/builder/vmware/common/step_upload_vmx.go index ce162b0d9..8e7979876 100644 --- a/builder/vmware/common/step_upload_vmx.go +++ b/builder/vmware/common/step_upload_vmx.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This step upload the VMX to the remote host diff --git a/builder/vmware/common/step_vnc_boot_command.go b/builder/vmware/common/step_vnc_boot_command.go index e68d64774..48c5c3ec6 100644 --- a/builder/vmware/common/step_vnc_boot_command.go +++ b/builder/vmware/common/step_vnc_boot_command.go @@ -6,10 +6,10 @@ import ( "log" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/go-vnc" ) diff --git a/builder/vmware/common/step_vnc_connect.go b/builder/vmware/common/step_vnc_connect.go index 043236752..28cb04c86 100644 --- a/builder/vmware/common/step_vnc_connect.go +++ b/builder/vmware/common/step_vnc_connect.go @@ -8,8 +8,8 @@ import ( "net" "net/url" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/mitchellh/go-vnc" "golang.org/x/net/websocket" ) diff --git a/builder/vmware/common/tools_config.go b/builder/vmware/common/tools_config.go index 53cad2e00..e96766eb5 100644 --- a/builder/vmware/common/tools_config.go +++ b/builder/vmware/common/tools_config.go @@ -5,7 +5,7 @@ package common import ( "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type ToolsConfig struct { diff --git a/builder/vmware/common/tools_config_test.go b/builder/vmware/common/tools_config_test.go index 272671c14..4358fa33b 100644 --- a/builder/vmware/common/tools_config_test.go +++ b/builder/vmware/common/tools_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestToolsConfigPrepare_Empty(t *testing.T) { diff --git a/builder/vmware/common/vmx_config.go b/builder/vmware/common/vmx_config.go index 6c5b330d0..f8359116b 100644 --- a/builder/vmware/common/vmx_config.go +++ b/builder/vmware/common/vmx_config.go @@ -3,7 +3,7 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type VMXConfig struct { diff --git a/builder/vmware/common/vmx_config_test.go b/builder/vmware/common/vmx_config_test.go index a192d6d6a..f963d0b29 100644 --- a/builder/vmware/common/vmx_config_test.go +++ b/builder/vmware/common/vmx_config_test.go @@ -3,7 +3,7 @@ package common import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) func TestVMXConfigPrepare(t *testing.T) { diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go index 421187566..9ef6f6569 100644 --- a/builder/vmware/iso/builder.go +++ b/builder/vmware/iso/builder.go @@ -7,11 +7,11 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type Builder struct { diff --git a/builder/vmware/iso/builder_acc_test.go b/builder/vmware/iso/builder_acc_test.go index 10f80e6db..a9047d31d 100644 --- a/builder/vmware/iso/builder_acc_test.go +++ b/builder/vmware/iso/builder_acc_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) func TestBuilderAcc_basic(t *testing.T) { diff --git a/builder/vmware/iso/builder_test.go b/builder/vmware/iso/builder_test.go index 1fb06f673..63d3c088d 100644 --- a/builder/vmware/iso/builder_test.go +++ b/builder/vmware/iso/builder_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/vmware/iso/config.go b/builder/vmware/iso/config.go index 4b7267ea8..a2cecf4c5 100644 --- a/builder/vmware/iso/config.go +++ b/builder/vmware/iso/config.go @@ -9,14 +9,14 @@ import ( "os" "strings" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go index 749a6ce2f..12f4642da 100644 --- a/builder/vmware/iso/step_create_vmx.go +++ b/builder/vmware/iso/step_create_vmx.go @@ -9,11 +9,11 @@ import ( "strconv" "strings" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/tmp" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) type vmxTemplateData struct { diff --git a/builder/vmware/iso/step_create_vmx_test.go b/builder/vmware/iso/step_create_vmx_test.go index 051a49dc7..e91f70135 100644 --- a/builder/vmware/iso/step_create_vmx_test.go +++ b/builder/vmware/iso/step_create_vmx_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) const vmxTestTemplate string = `{"builders":[{%s}],"provisioners":[{%s}]}` diff --git a/builder/vmware/version/version.go b/builder/vmware/version/version.go index f4307b0c5..d0b8b6e63 100644 --- a/builder/vmware/version/version.go +++ b/builder/vmware/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go index 670445f2e..ce4aa4465 100644 --- a/builder/vmware/vmx/builder.go +++ b/builder/vmware/vmx/builder.go @@ -8,11 +8,11 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // Builder implements packersdk.Builder and builds the actual VMware diff --git a/builder/vmware/vmx/builder_test.go b/builder/vmware/vmx/builder_test.go index 48126aa96..3c302051b 100644 --- a/builder/vmware/vmx/builder_test.go +++ b/builder/vmware/vmx/builder_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilderPrepare_FloppyFiles(t *testing.T) { diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go index eb4f950fb..dbd0e8a81 100644 --- a/builder/vmware/vmx/config.go +++ b/builder/vmware/vmx/config.go @@ -7,14 +7,14 @@ import ( "fmt" "os" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/shutdowncommand" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) // Config is the configuration structure for the builder. diff --git a/builder/vmware/vmx/step_clone_vmx.go b/builder/vmware/vmx/step_clone_vmx.go index be55ec9bb..5569ef410 100644 --- a/builder/vmware/vmx/step_clone_vmx.go +++ b/builder/vmware/vmx/step_clone_vmx.go @@ -8,10 +8,10 @@ import ( "path/filepath" "regexp" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/tmp" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" ) // StepCloneVMX takes a VMX file and clones the VM into the output directory. diff --git a/builder/vmware/vmx/step_clone_vmx_test.go b/builder/vmware/vmx/step_clone_vmx_test.go index a3033c35b..8f3675fa1 100644 --- a/builder/vmware/vmx/step_clone_vmx_test.go +++ b/builder/vmware/vmx/step_clone_vmx_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" "github.com/stretchr/testify/assert" ) diff --git a/builder/vmware/vmx/step_test.go b/builder/vmware/vmx/step_test.go index 0d51de2a0..d0b84d44e 100644 --- a/builder/vmware/vmx/step_test.go +++ b/builder/vmware/vmx/step_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func testState(t *testing.T) multistep.StateBag { diff --git a/builder/vsphere/clone/builder.go b/builder/vsphere/clone/builder.go index c392f58a5..169f6b5f5 100644 --- a/builder/vsphere/clone/builder.go +++ b/builder/vsphere/clone/builder.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type Builder struct { diff --git a/builder/vsphere/clone/builder_acc_test.go b/builder/vsphere/clone/builder_acc_test.go index dfdd9ecb9..6797da495 100644 --- a/builder/vsphere/clone/builder_acc_test.go +++ b/builder/vsphere/clone/builder_acc_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/common" commonT "github.com/hashicorp/packer/builder/vsphere/common/testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/vmware/govmomi/vim25/types" ) diff --git a/builder/vsphere/clone/builder_test.go b/builder/vsphere/clone/builder_test.go index e72e9f10b..a3150f52b 100644 --- a/builder/vsphere/clone/builder_test.go +++ b/builder/vsphere/clone/builder_test.go @@ -3,7 +3,7 @@ package clone import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestCloneBuilder_ImplementsBuilder(t *testing.T) { diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go index 2cfeab4f2..8d2160577 100644 --- a/builder/vsphere/clone/config.go +++ b/builder/vsphere/clone/config.go @@ -4,13 +4,13 @@ package clone import ( + packerCommon "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/vsphere/common" - packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/vsphere/clone/step_clone.go b/builder/vsphere/clone/step_clone.go index f5f4f9f37..d29fefc61 100644 --- a/builder/vsphere/clone/step_clone.go +++ b/builder/vsphere/clone/step_clone.go @@ -8,10 +8,10 @@ import ( "fmt" "path" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type vAppConfig struct { diff --git a/builder/vsphere/clone/step_customize.go b/builder/vsphere/clone/step_customize.go index 9818f7765..0a48d0c24 100644 --- a/builder/vsphere/clone/step_customize.go +++ b/builder/vsphere/clone/step_customize.go @@ -8,10 +8,10 @@ import ( "io/ioutil" "net" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/vmware/govmomi/vim25/types" ) diff --git a/builder/vsphere/common/cleanup_vm.go b/builder/vsphere/common/cleanup_vm.go index 6e8dc5484..3e847a9ea 100644 --- a/builder/vsphere/common/cleanup_vm.go +++ b/builder/vsphere/common/cleanup_vm.go @@ -1,9 +1,9 @@ package common import ( + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func CleanupVM(state multistep.StateBag) { diff --git a/builder/vsphere/common/cleanup_vm_test.go b/builder/vsphere/common/cleanup_vm_test.go index 00775bbb2..d27f30a28 100644 --- a/builder/vsphere/common/cleanup_vm_test.go +++ b/builder/vsphere/common/cleanup_vm_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func cleanupTestState(mockVM driver.VirtualMachine) multistep.StateBag { diff --git a/builder/vsphere/common/common_test.go b/builder/vsphere/common/common_test.go index 000310299..74fdfa3f9 100644 --- a/builder/vsphere/common/common_test.go +++ b/builder/vsphere/common/common_test.go @@ -4,8 +4,8 @@ import ( "bytes" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func basicStateBag(errorBuffer *strings.Builder) *multistep.BasicStateBag { diff --git a/builder/vsphere/common/config_ssh.go b/builder/vsphere/common/config_ssh.go index db6c5ea4c..bb967a45f 100644 --- a/builder/vsphere/common/config_ssh.go +++ b/builder/vsphere/common/config_ssh.go @@ -1,7 +1,7 @@ package common import ( - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func CommHost(host string) func(multistep.StateBag) (string, error) { diff --git a/builder/vsphere/common/output_config.go b/builder/vsphere/common/output_config.go index 6f605d25a..1aef6cc30 100644 --- a/builder/vsphere/common/output_config.go +++ b/builder/vsphere/common/output_config.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type OutputConfig struct { diff --git a/builder/vsphere/common/step_add_cdrom.go b/builder/vsphere/common/step_add_cdrom.go index 8ac3d92fd..887bbc5f9 100644 --- a/builder/vsphere/common/step_add_cdrom.go +++ b/builder/vsphere/common/step_add_cdrom.go @@ -7,9 +7,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type CDRomConfig struct { diff --git a/builder/vsphere/common/step_add_cdrom_test.go b/builder/vsphere/common/step_add_cdrom_test.go index c5752fec7..bc50a9e3c 100644 --- a/builder/vsphere/common/step_add_cdrom_test.go +++ b/builder/vsphere/common/step_add_cdrom_test.go @@ -7,8 +7,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestCDRomConfig_Prepare(t *testing.T) { diff --git a/builder/vsphere/common/step_add_floppy.go b/builder/vsphere/common/step_add_floppy.go index 81016f5b5..a56671348 100644 --- a/builder/vsphere/common/step_add_floppy.go +++ b/builder/vsphere/common/step_add_floppy.go @@ -7,9 +7,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type FloppyConfig struct { diff --git a/builder/vsphere/common/step_add_floppy_test.go b/builder/vsphere/common/step_add_floppy_test.go index 63f742fae..d6533580a 100644 --- a/builder/vsphere/common/step_add_floppy_test.go +++ b/builder/vsphere/common/step_add_floppy_test.go @@ -7,8 +7,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepAddFloppy_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_boot_command.go b/builder/vsphere/common/step_boot_command.go index d1a4460d9..7a56f9e06 100644 --- a/builder/vsphere/common/step_boot_command.go +++ b/builder/vsphere/common/step_boot_command.go @@ -6,11 +6,11 @@ import ( "fmt" "time" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/bootcommand" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "golang.org/x/mobile/event/key" ) diff --git a/builder/vsphere/common/step_config_params.go b/builder/vsphere/common/step_config_params.go index 7e35a0e7d..9db5e12d3 100644 --- a/builder/vsphere/common/step_config_params.go +++ b/builder/vsphere/common/step_config_params.go @@ -9,9 +9,9 @@ import ( "github.com/vmware/govmomi/vim25/types" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type ConfigParamsConfig struct { diff --git a/builder/vsphere/common/step_connect.go b/builder/vsphere/common/step_connect.go index e67762976..6afec36d8 100644 --- a/builder/vsphere/common/step_connect.go +++ b/builder/vsphere/common/step_connect.go @@ -7,8 +7,8 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) type ConnectConfig struct { diff --git a/builder/vsphere/common/step_download.go b/builder/vsphere/common/step_download.go index da22eea12..93aafc726 100644 --- a/builder/vsphere/common/step_download.go +++ b/builder/vsphere/common/step_download.go @@ -5,9 +5,9 @@ import ( "fmt" "net/url" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // Defining this interface ensures that we use the common step download, or the diff --git a/builder/vsphere/common/step_download_test.go b/builder/vsphere/common/step_download_test.go index fd7a8a0ca..887868d99 100644 --- a/builder/vsphere/common/step_download_test.go +++ b/builder/vsphere/common/step_download_test.go @@ -5,8 +5,8 @@ import ( "net/url" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) /// create mock step diff --git a/builder/vsphere/common/step_export.go b/builder/vsphere/common/step_export.go index eba375ffd..d5dae8401 100644 --- a/builder/vsphere/common/step_export.go +++ b/builder/vsphere/common/step_export.go @@ -16,11 +16,11 @@ import ( "path/filepath" "strings" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/pkg/errors" "github.com/vmware/govmomi/nfc" "github.com/vmware/govmomi/vim25/soap" diff --git a/builder/vsphere/common/step_hardware.go b/builder/vsphere/common/step_hardware.go index 1ca1027dc..853f363eb 100644 --- a/builder/vsphere/common/step_hardware.go +++ b/builder/vsphere/common/step_hardware.go @@ -7,9 +7,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type HardwareConfig struct { diff --git a/builder/vsphere/common/step_hardware_test.go b/builder/vsphere/common/step_hardware_test.go index e3b965bfe..58b0e930a 100644 --- a/builder/vsphere/common/step_hardware_test.go +++ b/builder/vsphere/common/step_hardware_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestHardwareConfig_Prepare(t *testing.T) { diff --git a/builder/vsphere/common/step_http_ip_discover.go b/builder/vsphere/common/step_http_ip_discover.go index c0d6e8cd0..933cdbfe7 100644 --- a/builder/vsphere/common/step_http_ip_discover.go +++ b/builder/vsphere/common/step_http_ip_discover.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // Step to discover the http ip diff --git a/builder/vsphere/common/step_http_ip_discover_test.go b/builder/vsphere/common/step_http_ip_discover_test.go index 1f03353eb..f1ca79d3a 100644 --- a/builder/vsphere/common/step_http_ip_discover_test.go +++ b/builder/vsphere/common/step_http_ip_discover_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestStepHTTPIPDiscover_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_import_to_content_library.go b/builder/vsphere/common/step_import_to_content_library.go index dbd80f9fc..935fa750c 100644 --- a/builder/vsphere/common/step_import_to_content_library.go +++ b/builder/vsphere/common/step_import_to_content_library.go @@ -6,10 +6,10 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/vmware/govmomi/vapi/vcenter" ) diff --git a/builder/vsphere/common/step_remote_upload.go b/builder/vsphere/common/step_remote_upload.go index 44911c1c7..92728f5c8 100644 --- a/builder/vsphere/common/step_remote_upload.go +++ b/builder/vsphere/common/step_remote_upload.go @@ -6,9 +6,9 @@ import ( "log" "path/filepath" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepRemoteUpload struct { diff --git a/builder/vsphere/common/step_remote_upload_test.go b/builder/vsphere/common/step_remote_upload_test.go index c1f5ef7c9..dd9d8796f 100644 --- a/builder/vsphere/common/step_remote_upload_test.go +++ b/builder/vsphere/common/step_remote_upload_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoteUpload_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_remove_cdrom.go b/builder/vsphere/common/step_remove_cdrom.go index 0848aff76..71d88c004 100644 --- a/builder/vsphere/common/step_remove_cdrom.go +++ b/builder/vsphere/common/step_remove_cdrom.go @@ -6,9 +6,9 @@ package common import ( "context" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type RemoveCDRomConfig struct { diff --git a/builder/vsphere/common/step_remove_cdrom_test.go b/builder/vsphere/common/step_remove_cdrom_test.go index 2442ab796..0461256b2 100644 --- a/builder/vsphere/common/step_remove_cdrom_test.go +++ b/builder/vsphere/common/step_remove_cdrom_test.go @@ -7,8 +7,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoveCDRom_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_remove_floppy.go b/builder/vsphere/common/step_remove_floppy.go index d94e4672d..b48376bd0 100644 --- a/builder/vsphere/common/step_remove_floppy.go +++ b/builder/vsphere/common/step_remove_floppy.go @@ -3,9 +3,9 @@ package common import ( "context" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepRemoveFloppy struct { diff --git a/builder/vsphere/common/step_remove_floppy_test.go b/builder/vsphere/common/step_remove_floppy_test.go index 86a3e33b5..bf1a578d1 100644 --- a/builder/vsphere/common/step_remove_floppy_test.go +++ b/builder/vsphere/common/step_remove_floppy_test.go @@ -7,8 +7,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" ) func TestStepRemoveFloppy_Run(t *testing.T) { diff --git a/builder/vsphere/common/step_run.go b/builder/vsphere/common/step_run.go index 82ba25237..0f6bc0b56 100644 --- a/builder/vsphere/common/step_run.go +++ b/builder/vsphere/common/step_run.go @@ -7,9 +7,9 @@ import ( "context" "strings" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type RunConfig struct { diff --git a/builder/vsphere/common/step_shutdown.go b/builder/vsphere/common/step_shutdown.go index ae0137c41..685bf04c1 100644 --- a/builder/vsphere/common/step_shutdown.go +++ b/builder/vsphere/common/step_shutdown.go @@ -10,10 +10,10 @@ import ( "log" "time" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type ShutdownConfig struct { diff --git a/builder/vsphere/common/step_snapshot.go b/builder/vsphere/common/step_snapshot.go index af3afb8b9..a83efe521 100644 --- a/builder/vsphere/common/step_snapshot.go +++ b/builder/vsphere/common/step_snapshot.go @@ -3,9 +3,9 @@ package common import ( "context" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepCreateSnapshot struct { diff --git a/builder/vsphere/common/step_ssh_key_pair.go b/builder/vsphere/common/step_ssh_key_pair.go index fdcdb97a7..d339175cb 100644 --- a/builder/vsphere/common/step_ssh_key_pair.go +++ b/builder/vsphere/common/step_ssh_key_pair.go @@ -6,12 +6,12 @@ import ( "io/ioutil" "os" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/communicator/ssh" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator/ssh" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" ) // StepSshKeyPair executes the business logic for setting the SSH key pair in diff --git a/builder/vsphere/common/step_template.go b/builder/vsphere/common/step_template.go index 481a2056f..535729909 100644 --- a/builder/vsphere/common/step_template.go +++ b/builder/vsphere/common/step_template.go @@ -3,9 +3,9 @@ package common import ( "context" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type StepConvertToTemplate struct { diff --git a/builder/vsphere/common/step_wait_for_ip.go b/builder/vsphere/common/step_wait_for_ip.go index 263a0db6c..72a68e7a8 100644 --- a/builder/vsphere/common/step_wait_for_ip.go +++ b/builder/vsphere/common/step_wait_for_ip.go @@ -10,9 +10,9 @@ import ( "net" "time" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type WaitIpConfig struct { diff --git a/builder/vsphere/common/testing/utility.go b/builder/vsphere/common/testing/utility.go index c9ca66424..72bc8c3f5 100644 --- a/builder/vsphere/common/testing/utility.go +++ b/builder/vsphere/common/testing/utility.go @@ -8,9 +8,9 @@ import ( "testing" "time" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func NewVMName() string { diff --git a/builder/vsphere/driver/driver.go b/builder/vsphere/driver/driver.go index 472a82f5c..8fbab96e5 100644 --- a/builder/vsphere/driver/driver.go +++ b/builder/vsphere/driver/driver.go @@ -6,7 +6,7 @@ import ( "net/url" "time" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/vmware/govmomi" "github.com/vmware/govmomi/find" "github.com/vmware/govmomi/object" diff --git a/builder/vsphere/driver/driver_mock.go b/builder/vsphere/driver/driver_mock.go index 6a2380514..f8fd6ad79 100644 --- a/builder/vsphere/driver/driver_mock.go +++ b/builder/vsphere/driver/driver_mock.go @@ -3,7 +3,7 @@ package driver import ( "fmt" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/vmware/govmomi/vapi/library" "github.com/vmware/govmomi/vim25/types" ) diff --git a/builder/vsphere/driver/vm.go b/builder/vsphere/driver/vm.go index cc24fddac..ff4b8beb2 100644 --- a/builder/vsphere/driver/vm.go +++ b/builder/vsphere/driver/vm.go @@ -10,7 +10,7 @@ import ( "strings" "time" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/vmware/govmomi/find" "github.com/vmware/govmomi/nfc" "github.com/vmware/govmomi/object" diff --git a/builder/vsphere/iso/builder.go b/builder/vsphere/iso/builder.go index a6e10e06b..567046fa2 100644 --- a/builder/vsphere/iso/builder.go +++ b/builder/vsphere/iso/builder.go @@ -4,12 +4,12 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) type Builder struct { diff --git a/builder/vsphere/iso/builder_acc_test.go b/builder/vsphere/iso/builder_acc_test.go index 939a2f407..180ace74c 100644 --- a/builder/vsphere/iso/builder_acc_test.go +++ b/builder/vsphere/iso/builder_acc_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" commonT "github.com/hashicorp/packer/builder/vsphere/common/testing" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/vmware/govmomi/vim25/types" ) diff --git a/builder/vsphere/iso/common_test.go b/builder/vsphere/iso/common_test.go index da65dfd1a..f35c006a1 100644 --- a/builder/vsphere/iso/common_test.go +++ b/builder/vsphere/iso/common_test.go @@ -3,8 +3,8 @@ package iso import ( "bytes" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func basicStateBag() *multistep.BasicStateBag { diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go index a57df6254..f0edbde1d 100644 --- a/builder/vsphere/iso/config.go +++ b/builder/vsphere/iso/config.go @@ -4,13 +4,13 @@ package iso import ( + packerCommon "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/vsphere/common" - packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/vsphere/iso/step_create.go b/builder/vsphere/iso/step_create.go index ca2f3bd03..87f0fc12c 100644 --- a/builder/vsphere/iso/step_create.go +++ b/builder/vsphere/iso/step_create.go @@ -8,10 +8,10 @@ import ( "fmt" "path" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) // Defines a Network Adapter diff --git a/builder/vsphere/iso/step_create_test.go b/builder/vsphere/iso/step_create_test.go index db07af670..b05b0d1c6 100644 --- a/builder/vsphere/iso/step_create_test.go +++ b/builder/vsphere/iso/step_create_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/vsphere/common" "github.com/hashicorp/packer/builder/vsphere/driver" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func TestCreateConfig_Prepare(t *testing.T) { diff --git a/builder/vsphere/version/version.go b/builder/vsphere/version/version.go index 68d46181f..001eefe9c 100644 --- a/builder/vsphere/version/version.go +++ b/builder/vsphere/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/builder/yandex/access_config.go b/builder/yandex/access_config.go index a082a05fa..ec55bf260 100644 --- a/builder/yandex/access_config.go +++ b/builder/yandex/access_config.go @@ -7,8 +7,8 @@ import ( "fmt" "os" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/yandex-cloud/go-sdk/iamkey" ) diff --git a/builder/yandex/artifact_test.go b/builder/yandex/artifact_test.go index 28ded1178..8e79184ea 100644 --- a/builder/yandex/artifact_test.go +++ b/builder/yandex/artifact_test.go @@ -3,7 +3,7 @@ package yandex import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ) diff --git a/builder/yandex/builder.go b/builder/yandex/builder.go index 6934c69d3..d5f342e17 100644 --- a/builder/yandex/builder.go +++ b/builder/yandex/builder.go @@ -6,11 +6,11 @@ import ( "github.com/google/uuid" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" "github.com/yandex-cloud/go-sdk/pkg/requestid" diff --git a/builder/yandex/builder_acc_test.go b/builder/yandex/builder_acc_test.go index 3e99bc33f..99af96663 100644 --- a/builder/yandex/builder_acc_test.go +++ b/builder/yandex/builder_acc_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-resty/resty/v2" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" ) const InstanceMetadataAddr = "169.254.169.254" diff --git a/builder/yandex/builder_test.go b/builder/yandex/builder_test.go index bb9a4775b..8ac5d32ab 100644 --- a/builder/yandex/builder_test.go +++ b/builder/yandex/builder_test.go @@ -3,7 +3,7 @@ package yandex import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestBuilder_ImplementsBuilder(t *testing.T) { diff --git a/builder/yandex/common_config.go b/builder/yandex/common_config.go index 8ff19c69d..18259417b 100644 --- a/builder/yandex/common_config.go +++ b/builder/yandex/common_config.go @@ -9,9 +9,9 @@ import ( "regexp" "time" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) const ( diff --git a/builder/yandex/config.go b/builder/yandex/config.go index fb54bbcab..8653fddea 100644 --- a/builder/yandex/config.go +++ b/builder/yandex/config.go @@ -7,11 +7,11 @@ import ( "errors" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/builder/yandex/driver_yc.go b/builder/yandex/driver_yc.go index 8bcb44b4d..b0a741fd7 100644 --- a/builder/yandex/driver_yc.go +++ b/builder/yandex/driver_yc.go @@ -8,8 +8,8 @@ import ( "time" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/useragent" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/useragent" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/builder/yandex/ssh.go b/builder/yandex/ssh.go index b17232018..14aa2cb19 100644 --- a/builder/yandex/ssh.go +++ b/builder/yandex/ssh.go @@ -1,7 +1,7 @@ package yandex import ( - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func CommHost(state multistep.StateBag) (string, error) { diff --git a/builder/yandex/step_create_image.go b/builder/yandex/step_create_image.go index 234720c3e..66dcd144f 100644 --- a/builder/yandex/step_create_image.go +++ b/builder/yandex/step_create_image.go @@ -6,9 +6,9 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ycsdk "github.com/yandex-cloud/go-sdk" diff --git a/builder/yandex/step_create_instance.go b/builder/yandex/step_create_instance.go index 83898f43f..f77338919 100644 --- a/builder/yandex/step_create_instance.go +++ b/builder/yandex/step_create_instance.go @@ -7,10 +7,10 @@ import ( "io/ioutil" "github.com/c2h5oh/datasize" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/uuid" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" "github.com/yandex-cloud/go-genproto/yandex/cloud/vpc/v1" diff --git a/builder/yandex/step_create_instance_test.go b/builder/yandex/step_create_instance_test.go index 2aaf6a08a..7afa002f8 100644 --- a/builder/yandex/step_create_instance_test.go +++ b/builder/yandex/step_create_instance_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/builder/yandex/step_create_ssh_key.go b/builder/yandex/step_create_ssh_key.go index 95cf810da..a0432e91c 100644 --- a/builder/yandex/step_create_ssh_key.go +++ b/builder/yandex/step_create_ssh_key.go @@ -10,8 +10,8 @@ import ( "io/ioutil" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "golang.org/x/crypto/ssh" ) diff --git a/builder/yandex/step_instance_info.go b/builder/yandex/step_instance_info.go index 27191054a..03d32d4d5 100644 --- a/builder/yandex/step_instance_info.go +++ b/builder/yandex/step_instance_info.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ycsdk "github.com/yandex-cloud/go-sdk" diff --git a/builder/yandex/step_teardown_instance.go b/builder/yandex/step_teardown_instance.go index fc5189d02..9b477a22f 100644 --- a/builder/yandex/step_teardown_instance.go +++ b/builder/yandex/step_teardown_instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ycsdk "github.com/yandex-cloud/go-sdk" diff --git a/builder/yandex/util.go b/builder/yandex/util.go index d81873f0d..c8d39e2c5 100644 --- a/builder/yandex/util.go +++ b/builder/yandex/util.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "github.com/c2h5oh/datasize" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ycsdk "github.com/yandex-cloud/go-sdk" ) diff --git a/builder/yandex/version/version.go b/builder/yandex/version/version.go index 4421e7aa3..2f1236937 100644 --- a/builder/yandex/version/version.go +++ b/builder/yandex/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/checkpoint.go b/checkpoint.go index f1613154b..e1b519e91 100644 --- a/checkpoint.go +++ b/checkpoint.go @@ -6,8 +6,8 @@ import ( "path/filepath" "github.com/hashicorp/go-checkpoint" + "github.com/hashicorp/packer-plugin-sdk/pathing" "github.com/hashicorp/packer/command" - "github.com/hashicorp/packer/packer-plugin-sdk/pathing" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go b/cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go index 36b48168f..50c462acd 100644 --- a/cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go +++ b/cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go @@ -490,7 +490,7 @@ func getMapstructureSquashedStruct(topPkg *types.Package, utStruct *types.Struct switch f.String() { case "time.Duration": field = types.NewField(field.Pos(), field.Pkg(), field.Name(), types.NewPointer(types.Typ[types.String]), field.Embedded()) - case "github.com/hashicorp/packer/packer-plugin-sdk/template/config.Trilean": // TODO(azr): unhack this situation + case "github.com/hashicorp/packer-plugin-sdk/template/config.Trilean": // TODO(azr): unhack this situation field = types.NewField(field.Pos(), field.Pkg(), field.Name(), types.NewPointer(types.Typ[types.Bool]), field.Embedded()) case "github.com/hashicorp/packer/provisioner/powershell.ExecutionPolicy": // TODO(azr): unhack this situation field = types.NewField(field.Pos(), field.Pkg(), field.Name(), types.NewPointer(types.Typ[types.String]), field.Embedded()) diff --git a/cmd/packer-plugin-amazon/main.go b/cmd/packer-plugin-amazon/main.go index dcec7f4f8..245c56047 100644 --- a/cmd/packer-plugin-amazon/main.go +++ b/cmd/packer-plugin-amazon/main.go @@ -4,11 +4,11 @@ import ( "fmt" "os" + "github.com/hashicorp/packer-plugin-sdk/plugin" "github.com/hashicorp/packer/builder/amazon/ebs" "github.com/hashicorp/packer/builder/amazon/ebssurrogate" "github.com/hashicorp/packer/builder/amazon/ebsvolume" "github.com/hashicorp/packer/builder/osc/chroot" - "github.com/hashicorp/packer/packer-plugin-sdk/plugin" amazonimport "github.com/hashicorp/packer/post-processor/amazon-import" ) diff --git a/cmd/packer-plugin-check/main.go b/cmd/packer-plugin-check/main.go index f94f0ba3c..ff2d15dd4 100644 --- a/cmd/packer-plugin-check/main.go +++ b/cmd/packer-plugin-check/main.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/packer/plugin" ) diff --git a/cmd/ssh-keygen/main.go b/cmd/ssh-keygen/main.go index 31efa3c7c..1eca73d47 100644 --- a/cmd/ssh-keygen/main.go +++ b/cmd/ssh-keygen/main.go @@ -8,7 +8,7 @@ import ( "os/user" "path/filepath" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator/sshkey" + "github.com/hashicorp/packer-plugin-sdk/communicator/sshkey" ) type options struct { diff --git a/command/build.go b/command/build.go index 5a777c115..f49432c0c 100644 --- a/command/build.go +++ b/command/build.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclparse" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template" "github.com/hashicorp/packer/hcl2template" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/hashicorp/packer/version" "golang.org/x/sync/semaphore" diff --git a/command/build_parallel_test.go b/command/build_parallel_test.go index f07b2acd7..5f5beaa4f 100644 --- a/command/build_parallel_test.go +++ b/command/build_parallel_test.go @@ -12,9 +12,9 @@ import ( "golang.org/x/sync/errgroup" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/hashicorp/packer/provisioner/sleep" ) diff --git a/command/build_test.go b/command/build_test.go index fef620203..250f1686a 100644 --- a/command/build_test.go +++ b/command/build_test.go @@ -12,10 +12,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/builder/null" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/hashicorp/packer/post-processor/manifest" shell_local_pp "github.com/hashicorp/packer/post-processor/shell-local" filep "github.com/hashicorp/packer/provisioner/file" diff --git a/command/build_timeout_test.go b/command/build_timeout_test.go index 54cfa72c6..504882330 100644 --- a/command/build_timeout_test.go +++ b/command/build_timeout_test.go @@ -5,9 +5,9 @@ import ( "path/filepath" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" shell_local "github.com/hashicorp/packer/provisioner/shell-local" "github.com/hashicorp/packer/provisioner/sleep" ) diff --git a/command/command_test.go b/command/command_test.go index 833fe4074..d931d7708 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) const fixturesDir = "./test-fixtures" diff --git a/command/exec_test.go b/command/exec_test.go index 400a3fccb..a9453e2e2 100644 --- a/command/exec_test.go +++ b/command/exec_test.go @@ -8,11 +8,11 @@ import ( "runtime" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/amazon/ebs" "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/builder/null" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/hashicorp/packer/post-processor/manifest" shell_local_pp "github.com/hashicorp/packer/post-processor/shell-local" filep "github.com/hashicorp/packer/provisioner/file" diff --git a/command/fix.go b/command/fix.go index 6672d9035..33e2a970e 100644 --- a/command/fix.go +++ b/command/fix.go @@ -9,8 +9,8 @@ import ( "os" "strings" + "github.com/hashicorp/packer-plugin-sdk/template" "github.com/hashicorp/packer/fix" - "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/posener/complete" ) diff --git a/command/fix_test.go b/command/fix_test.go index fcc8ddd88..d4ae5ca07 100644 --- a/command/fix_test.go +++ b/command/fix_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" ) diff --git a/command/fmt_test.go b/command/fmt_test.go index c4a4cd91a..242845f38 100644 --- a/command/fmt_test.go +++ b/command/fmt_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" ) diff --git a/command/hcl2_upgrade.go b/command/hcl2_upgrade.go index 542c1729c..595a7f0df 100644 --- a/command/hcl2_upgrade.go +++ b/command/hcl2_upgrade.go @@ -12,8 +12,8 @@ import ( texttemplate "text/template" "github.com/hashicorp/hcl/v2/hclwrite" + "github.com/hashicorp/packer-plugin-sdk/template" hcl2shim "github.com/hashicorp/packer/hcl2template/shim" - "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/posener/complete" "github.com/zclconf/go-cty/cty" ) diff --git a/command/meta.go b/command/meta.go index 60cae4c20..53b5dabd2 100644 --- a/command/meta.go +++ b/command/meta.go @@ -6,11 +6,11 @@ import ( "io" "os" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template" kvflag "github.com/hashicorp/packer/command/flag-kv" "github.com/hashicorp/packer/helper/wrappedstreams" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template" ) // FlagSetFlags is an enum to define what flags are present in the diff --git a/command/plugin.go b/command/plugin.go index 068419ede..a8db6fccf 100644 --- a/command/plugin.go +++ b/command/plugin.go @@ -10,8 +10,8 @@ import ( "regexp" "strings" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/plugin" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/plugin" alicloudecsbuilder "github.com/hashicorp/packer/builder/alicloud/ecs" amazonchrootbuilder "github.com/hashicorp/packer/builder/amazon/chroot" diff --git a/command/signal.go b/command/signal.go index 091509026..f8eb2b18d 100644 --- a/command/signal.go +++ b/command/signal.go @@ -7,7 +7,7 @@ import ( "os/signal" "syscall" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func handleTermInterrupt(ui packersdk.Ui) (context.Context, func()) { diff --git a/config.go b/config.go index 8b1dba2f4..d2be1686e 100644 --- a/config.go +++ b/config.go @@ -11,8 +11,8 @@ import ( "sort" "strings" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/command" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/hashicorp/packer/packer/plugin" ) diff --git a/config_test.go b/config_test.go index b6b0beefc..d0e2f18a4 100644 --- a/config_test.go +++ b/config_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestDecodeConfig(t *testing.T) { diff --git a/hcl2template/common_test.go b/hcl2template/common_test.go index 0408f7738..ff0d36357 100644 --- a/hcl2template/common_test.go +++ b/hcl2template/common_test.go @@ -9,11 +9,11 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclparse" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/builder/null" . "github.com/hashicorp/packer/hcl2template/internal" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl2template/function/Consul.go b/hcl2template/function/Consul.go index 7690759b8..ae22404d8 100644 --- a/hcl2template/function/Consul.go +++ b/hcl2template/function/Consul.go @@ -4,7 +4,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" - commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template" + commontpl "github.com/hashicorp/packer-plugin-sdk/template" ) // ConsulFunc constructs a function that retrieves KV secrets from HC vault diff --git a/hcl2template/function/aws_secretetkey.go b/hcl2template/function/aws_secretetkey.go index 24ec6053f..e5bec51b2 100644 --- a/hcl2template/function/aws_secretetkey.go +++ b/hcl2template/function/aws_secretetkey.go @@ -4,7 +4,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" - commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template" + commontpl "github.com/hashicorp/packer-plugin-sdk/template" ) // AWSSecret constructs a function that retrieves secrets from aws secrets diff --git a/hcl2template/function/vault.go b/hcl2template/function/vault.go index baedf2c37..a62fa33cc 100644 --- a/hcl2template/function/vault.go +++ b/hcl2template/function/vault.go @@ -4,7 +4,7 @@ import ( "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" - commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template" + commontpl "github.com/hashicorp/packer-plugin-sdk/template" ) // VaultFunc constructs a function that retrieves KV secrets from HC vault diff --git a/hcl2template/internal/mock.go b/hcl2template/internal/mock.go index c6d7bcce8..89c5e3d4b 100644 --- a/hcl2template/internal/mock.go +++ b/hcl2template/internal/mock.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/json" ) diff --git a/hcl2template/parser.go b/hcl2template/parser.go index 28e7fe9a6..9dab0dbe6 100644 --- a/hcl2template/parser.go +++ b/hcl2template/parser.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/ext/dynblock" "github.com/hashicorp/hcl/v2/hclparse" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl2template/types.build.post-processor.go b/hcl2template/types.build.post-processor.go index 4b91f2533..d3eca0124 100644 --- a/hcl2template/types.build.post-processor.go +++ b/hcl2template/types.build.post-processor.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/gohcl" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // ProvisionerBlock references a detected but unparsed post processor diff --git a/hcl2template/types.build.provisioners.go b/hcl2template/types.build.provisioners.go index da3253ba7..1d50552f9 100644 --- a/hcl2template/types.build.provisioners.go +++ b/hcl2template/types.build.provisioners.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/gohcl" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" hcl2shim "github.com/hashicorp/packer/hcl2template/shim" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl2template/types.build_test.go b/hcl2template/types.build_test.go index 4a8966983..e9f820f24 100644 --- a/hcl2template/types.build_test.go +++ b/hcl2template/types.build_test.go @@ -4,9 +4,9 @@ import ( "path/filepath" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" . "github.com/hashicorp/packer/hcl2template/internal" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" ) func TestParse_build(t *testing.T) { diff --git a/hcl2template/types.hcl_post-processor.go b/hcl2template/types.hcl_post-processor.go index ce279b72f..0a703c594 100644 --- a/hcl2template/types.hcl_post-processor.go +++ b/hcl2template/types.hcl_post-processor.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl2template/types.hcl_provisioner.go b/hcl2template/types.hcl_provisioner.go index c52fb31be..daf06c65a 100644 --- a/hcl2template/types.hcl_provisioner.go +++ b/hcl2template/types.hcl_provisioner.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl2template/types.packer_config.go b/hcl2template/types.packer_config.go index dcf73f0be..ba8fd7649 100644 --- a/hcl2template/types.packer_config.go +++ b/hcl2template/types.packer_config.go @@ -8,9 +8,9 @@ import ( "github.com/gobwas/glob" "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" pkrfunction "github.com/hashicorp/packer/hcl2template/function" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/function" ) diff --git a/hcl2template/types.packer_config_test.go b/hcl2template/types.packer_config_test.go index edba6762e..7c3cffd71 100644 --- a/hcl2template/types.packer_config_test.go +++ b/hcl2template/types.packer_config_test.go @@ -3,9 +3,9 @@ package hcl2template import ( "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" . "github.com/hashicorp/packer/hcl2template/internal" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl2template/types.source.go b/hcl2template/types.source.go index 3a8be02fe..da6829058 100644 --- a/hcl2template/types.source.go +++ b/hcl2template/types.source.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/gohcl" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/zclconf/go-cty/cty" ) diff --git a/hcl2template/types.source_test.go b/hcl2template/types.source_test.go index b6e4eb0e4..90d40a1f0 100644 --- a/hcl2template/types.source_test.go +++ b/hcl2template/types.source_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestParse_source(t *testing.T) { diff --git a/hcl2template/types.variables_test.go b/hcl2template/types.variables_test.go index f67259453..a5a0d3b93 100644 --- a/hcl2template/types.variables_test.go +++ b/hcl2template/types.variables_test.go @@ -7,10 +7,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/hcl/v2" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/null" . "github.com/hashicorp/packer/hcl2template/internal" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/zclconf/go-cty/cty" "github.com/zclconf/go-cty/cty/convert" ) diff --git a/main.go b/main.go index d22d4f30d..46f1b0cf6 100644 --- a/main.go +++ b/main.go @@ -16,12 +16,12 @@ import ( "time" "github.com/hashicorp/go-uuid" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/pathing" + pluginsdk "github.com/hashicorp/packer-plugin-sdk/plugin" + "github.com/hashicorp/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/command" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/pathing" - pluginsdk "github.com/hashicorp/packer/packer-plugin-sdk/plugin" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/packer/plugin" "github.com/hashicorp/packer/version" "github.com/mitchellh/cli" diff --git a/packer-plugin-sdk/Makefile b/packer-plugin-sdk/Makefile deleted file mode 100644 index 5ec88be4b..000000000 --- a/packer-plugin-sdk/Makefile +++ /dev/null @@ -1,108 +0,0 @@ -TEST?=$(shell go list ./...) -COUNT?=1 -VET?=$(shell go list ./...) -# Get the current full sha from git -GOPATH=$(shell go env GOPATH) - -default: install-build-deps install-gen-deps generate - -ci: testrace ## Test in continuous integration - -install-gen-deps: ## Install dependencies for code generation - # to avoid having to tidy our go deps, we `go get` our binaries from a temp - # dir. `go get` will change our deps and the following deps are not part of - # out code dependencies; so a go mod tidy will remove them again. `go - # install` seems to install the last tagged version and we want to install - # master. - @(cd $(TEMPDIR) && GO111MODULE=on go get github.com/mna/@master) - @(cd $(TEMPDIR) && GO111MODULE=on go get github.com/alvaroloes/enumer@master) - - # grab files from github and install them using go install, then remove files again. - @mkdir cmd - @mkdir cmd/struct-markdown - @curl -sSfL -q https://raw.githubusercontent.com/hashicorp/packer/master/cmd/struct-markdown/main.go -o cmd/struct-markdown/main.go - @curl -sSfL -q https://raw.githubusercontent.com/hashicorp/packer/master/cmd/struct-markdown/template.go -o cmd/struct-markdown/template.go - @go install ./cmd/struct-markdown # in the packer repo - - @mkdir cmd/mapstructure-to-hcl2 - @curl -sSfL -q https://raw.githubusercontent.com/hashicorp/packer/master/cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go -o cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go - @go install ./cmd/mapstructure-to-hcl2 # in the packer repo - - @rm -rf cmd - -install-lint-deps: ## Install linter dependencies - # Pinning golangci-lint at v1.23.8 as --new-from-rev seems to work properly; the latest 1.24.0 has caused issues with memory consumption - @echo "==> Updating linter dependencies..." - @curl -sSfL -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.23.8 - -lint: install-lint-deps ## Lint Go code - @if [ ! -z $(PKG_NAME) ]; then \ - echo "golangci-lint run ./$(PKG_NAME)/..."; \ - golangci-lint run ./$(PKG_NAME)/...; \ - else \ - echo "golangci-lint run ./..."; \ - golangci-lint run ./...; \ - fi - -ci-lint: install-lint-deps ## On ci only lint newly added Go source files - @echo "==> Running linter on newly added Go source files..." - GO111MODULE=on golangci-lint run --new-from-rev=$(shell git merge-base origin/master HEAD) ./... - -fmt: ## Format Go code - @go fmt ./... - -fmt-check: fmt ## Check go code formatting - @echo "==> Checking that code complies with go fmt requirements..." - @git diff --exit-code; if [ $$? -eq 1 ]; then \ - echo "Found files that are not fmt'ed."; \ - echo "You can use the command: \`make fmt\` to reformat code."; \ - exit 1; \ - fi - -fmt-docs: - @find ./website/pages/docs -name "*.md" -exec pandoc --wrap auto --columns 79 --atx-headers -s -f "markdown_github+yaml_metadata_block" -t "markdown_github+yaml_metadata_block" {} -o {} \; - -# Install js-beautify with npm install -g js-beautify -fmt-examples: - find examples -name *.json | xargs js-beautify -r -s 2 -n -eol "\n" - -# generate runs `go generate` to build the dynamically generated -# source files. -generate: install-gen-deps ## Generate dynamically generated code - @echo "==> removing autogenerated markdown..." - @find website/pages/ -type f | xargs grep -l '^ - -package config - -var DeprecatedOptions = map[string][]string{ - "*": []string{"iso_md5", "ssh_key_path", "ssh_disable_agent", "ssh_host_port_min", "ssh_host_port_max", "ssh_skip_nat_mapping", "ssh_wait_timeout", "iso_checksum_url", "iso_checksum_type"}, - "*amazon*": []string{"shutdown_behaviour", "enhanced_networking", "ssh_private_ip", "temporary_security_group_source_cidr", "clean_ami_name", "spot_price_auto_product"}, - "Azure*": []string{"clean_image_name", "exlude_from_latest"}, - "MSOpenTech.hyperv": []string{"vhd_temp_path", "clone_from_vmxc_path", "cpu", "ram_size"}, - "ansible": []string{"galaxycommand"}, - "hashicorp.scaleway": []string{"access_key"}, - "jetbrains.vsphere": []string{"network_card", "network", "networkCard", "disk_size", "disk_thin_provisioned", "disk_eagerly_scrub"}, - "mitchellh.virtualbox": []string{"guest_additions_attach"}, - "packer.docker": []string{"login_email"}, - "packer.googlecompute": []string{"clean_image_name"}, - "packer.parallels": []string{"headless", "parallels_tools_host_path", "guest_os_distribution"}, - "packer.post-processor.docker-import": []string{"login_email"}, - "packer.post-processor.docker-tag": []string{"tag"}, - "packer.post-processor.manifest": []string{"filename"}, - "transcend.qemu": []string{"ssh_host_port_max", "ssh_host_port_min"}, -} diff --git a/packer-plugin-sdk/template/doc.go b/packer-plugin-sdk/template/doc.go deleted file mode 100644 index 355460e5b..000000000 --- a/packer-plugin-sdk/template/doc.go +++ /dev/null @@ -1,44 +0,0 @@ -/* -Package template helps plugins parse the Packer template into golang structures. - -This package should be imported and used by all plugins. It implements the -golang template engines that Packer documentes on its website, along with input -validation, custom type decoding, and template variable interpolation. - -A simple usage example that defines a config and then unpacks a user-provided -json template into the provided config: - - import ( - // ... - "github.com/hashicorp/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer-plugin-sdk/template/interpolate" - ) - - type Config struct { - Field1 string `mapstructure:"field_1"` - Field2 bool `mapstructure:"field_2"` - Field3 bool `mapstructure:"field_3"` - - ctx interpolate.Context - } - - type Provisioner struct { - config Config - } - - func (p *CommentProvisioner) Prepare(raws ...interface{}) error { - err := config.Decode(&p.config, &config.DecodeOpts{ - Interpolate: true, - InterpolateContext: &p.config.ctx, - }, raws...) - if err != nil { - return err - } - - return nil - } - -More implementation details for plugins can be found in the -[extending packer](https://www.packer.io/docs/extending) section of the website. -*/ -package template diff --git a/packer-plugin-sdk/template/funcs.go b/packer-plugin-sdk/template/funcs.go deleted file mode 100644 index 5c89553c0..000000000 --- a/packer-plugin-sdk/template/funcs.go +++ /dev/null @@ -1,115 +0,0 @@ -package template - -import ( - "errors" - "fmt" - "log" - "os" - "strings" - "sync" - - consulapi "github.com/hashicorp/consul/api" - awssmapi "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate/aws/secretsmanager" - vaultapi "github.com/hashicorp/vault/api" -) - -// DeprecatedTemplateFunc wraps a template func to warn users that it's -// deprecated. The deprecation warning is called only once. -func DeprecatedTemplateFunc(funcName, useInstead string, deprecated func(string) string) func(string) string { - once := sync.Once{} - return func(in string) string { - once.Do(func() { - log.Printf("[WARN]: the `%s` template func is deprecated, please use %s instead", - funcName, useInstead) - }) - return deprecated(in) - } -} - -// Vault retrieves a secret from a HashiCorp Vault KV store. -// It assumes the necessary environment variables are set. -func Vault(path string, key string) (string, error) { - - if token := os.Getenv("VAULT_TOKEN"); token == "" { - return "", errors.New("Must set VAULT_TOKEN env var in order to use vault template function") - } - - vaultConfig := vaultapi.DefaultConfig() - cli, err := vaultapi.NewClient(vaultConfig) - if err != nil { - return "", fmt.Errorf("Error getting Vault client: %s", err) - } - secret, err := cli.Logical().Read(path) - if err != nil { - return "", fmt.Errorf("Error reading vault secret: %s", err) - } - if secret == nil { - return "", errors.New("Vault Secret does not exist at the given path") - } - - data, ok := secret.Data["data"] - if !ok { - // maybe ths is v1, not v2 kv store - value, ok := secret.Data[key] - if ok { - return value.(string), nil - } - - // neither v1 nor v2 proudced a valid value - return "", fmt.Errorf("Vault data was empty at the given path. Warnings: %s", strings.Join(secret.Warnings, "; ")) - } - - if val, ok := data.(map[string]interface{})[key]; ok { - return val.(string), nil - } - return "", errors.New("Vault path does not contain the requested key") -} - -// Consul retrieves a value from a HashiCorp Consul KV store. -// It assumes the necessary environment variables are set. -func Consul(k string) (string, error) { - consulConfig := consulapi.DefaultConfig() - client, err := consulapi.NewClient(consulConfig) - if err != nil { - return "", fmt.Errorf("error getting consul client: %s", err) - } - - q := &consulapi.QueryOptions{} - kv, _, err := client.KV().Get(k, q) - if err != nil { - return "", fmt.Errorf("error reading consul key: %s", err) - } - if kv == nil { - return "", fmt.Errorf("key does not exist at the given path: %s", k) - } - - value := string(kv.Value) - if value == "" { - return "", fmt.Errorf("value is empty at path %s", k) - } - - return value, nil -} - -// GetAwsSecret retrieves a value from an AWS Secrets Manager. -// It assumes that credentials are properly set in the AWS SDK's credential -// chain. -func GetAWSSecret(name, key string) (string, error) { - // Check if at least 1 parameter has been used - if len(name) == 0 { - return "", errors.New("At least one secret name must be provided") - } - // client uses AWS SDK CredentialChain method. So,credentials can - // be loaded from credential file, environment variables, or IAM - // roles. - client := awssmapi.New( - &awssmapi.AWSConfig{}, - ) - - spec := &awssmapi.SecretSpec{ - Name: name, - Key: key, - } - - return client.GetSecret(spec) -} diff --git a/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go deleted file mode 100644 index 67ec3b90b..000000000 --- a/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go +++ /dev/null @@ -1,108 +0,0 @@ -// Package secretsmanager provide methods to get data from -// AWS Secret Manager -package secretsmanager - -import ( - "encoding/json" - "errors" - "fmt" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/service/secretsmanager" - "github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface" -) - -// Client represents an AWS Secrets Manager client -type Client struct { - config *AWSConfig - api secretsmanageriface.SecretsManagerAPI -} - -// New creates an AWS Session Manager Client -func New(config *AWSConfig) *Client { - c := &Client{ - config: config, - } - - s := c.newSession(config) - c.api = secretsmanager.New(s) - return c -} - -func (c *Client) newSession(config *AWSConfig) *session.Session { - // Initialize config with error verbosity - sessConfig := aws.NewConfig().WithCredentialsChainVerboseErrors(true) - - if config.Region != "" { - sessConfig = sessConfig.WithRegion(config.Region) - } - - opts := session.Options{ - SharedConfigState: session.SharedConfigEnable, - Config: *sessConfig, - } - - return session.Must(session.NewSessionWithOptions(opts)) -} - -// GetSecret return an AWS Secret Manager secret -// in plain text from a given secret name -func (c *Client) GetSecret(spec *SecretSpec) (string, error) { - params := &secretsmanager.GetSecretValueInput{ - SecretId: aws.String(spec.Name), - VersionStage: aws.String("AWSCURRENT"), - } - - resp, err := c.api.GetSecretValue(params) - if err != nil { - return "", err - } - - if resp.SecretString == nil { - return "", errors.New("Secret is not string") - } - - secret := SecretString{ - Name: *resp.Name, - SecretString: *resp.SecretString, - } - value, err := getSecretValue(&secret, spec) - if err != nil { - return "", err - } - - return value, nil -} - -func getSecretValue(s *SecretString, spec *SecretSpec) (string, error) { - var secretValue map[string]string - blob := []byte(s.SecretString) - - //For those plaintext secrets just return the value - if json.Valid(blob) != true { - return s.SecretString, nil - } - - err := json.Unmarshal(blob, &secretValue) - if err != nil { - return "", err - } - - // If key is not set and secret has multiple keys, return error - if spec.Key == "" && len(secretValue) > 1 { - return "", errors.New("Secret has multiple values and no key was set") - } - - if spec.Key == "" { - for _, v := range secretValue { - return v, nil - } - } - - if v, ok := secretValue[spec.Key]; ok { - return v, nil - } - - return "", fmt.Errorf("No secret found for key %q", spec.Key) -} diff --git a/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager_test.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager_test.go deleted file mode 100644 index 31cb3e085..000000000 --- a/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager_test.go +++ /dev/null @@ -1,140 +0,0 @@ -package secretsmanager - -import ( - "testing" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/secretsmanager" - "github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface" -) - -type mockedSecret struct { - secretsmanageriface.SecretsManagerAPI - Resp secretsmanager.GetSecretValueOutput -} - -// GetSecret return mocked secret value -func (m mockedSecret) GetSecretValue(in *secretsmanager.GetSecretValueInput) (*secretsmanager.GetSecretValueOutput, error) { - return &m.Resp, nil -} - -func TestGetSecret(t *testing.T) { - testCases := []struct { - description string - arg *SecretSpec - mock secretsmanager.GetSecretValueOutput - want string - ok bool - }{ - { - description: "input has valid secret name, secret has single key", - arg: &SecretSpec{Name: "test/secret"}, - mock: secretsmanager.GetSecretValueOutput{ - Name: aws.String("test/secret"), - SecretString: aws.String(`{"key": "test"}`), - }, - want: "test", - ok: true, - }, - { - description: "input has valid secret name and key, secret has single key", - arg: &SecretSpec{ - Name: "test/secret", - Key: "key", - }, - mock: secretsmanager.GetSecretValueOutput{ - Name: aws.String("test/secret"), - SecretString: aws.String(`{"key": "test"}`), - }, - want: "test", - ok: true, - }, - { - description: "input has valid secret name and key, secret has multiple keys", - arg: &SecretSpec{ - Name: "test/secret", - Key: "second_key", - }, - mock: secretsmanager.GetSecretValueOutput{ - Name: aws.String("test/secret"), - SecretString: aws.String(`{"first_key": "first_val", "second_key": "second_val"}`), - }, - want: "second_val", - ok: true, - }, - { - description: "input has valid secret name and no key, secret has multiple keys", - arg: &SecretSpec{ - Name: "test/secret", - }, - mock: secretsmanager.GetSecretValueOutput{ - Name: aws.String("test/secret"), - SecretString: aws.String(`{"first_key": "first_val", "second_key": "second_val"}`), - }, - ok: false, - }, - { - description: "input has valid secret name and invalid key, secret has single key", - arg: &SecretSpec{ - Name: "test/secret", - Key: "nonexistent", - }, - mock: secretsmanager.GetSecretValueOutput{ - Name: aws.String("test/secret"), - SecretString: aws.String(`{"key": "test"}`), - }, - ok: false, - }, - { - description: "input has valid secret name and invalid key, secret has multiple keys", - arg: &SecretSpec{ - Name: "test/secret", - Key: "nonexistent", - }, - mock: secretsmanager.GetSecretValueOutput{ - Name: aws.String("test/secret"), - SecretString: aws.String(`{"first_key": "first_val", "second_key": "second_val"}`), - }, - ok: false, - }, - { - description: "input has secret and key, secret is empty", - arg: &SecretSpec{ - Name: "test/secret", - Key: "nonexistent", - }, - mock: secretsmanager.GetSecretValueOutput{}, - ok: false, - }, - { - description: "input has secret stored as plaintext", - arg: &SecretSpec{ - Name: "test", - }, - mock: secretsmanager.GetSecretValueOutput{ - Name: aws.String("test"), - SecretString: aws.String("ThisIsThePassword"), - }, - want: "ThisIsThePassword", - ok: true, - }, - } - - for _, test := range testCases { - c := &Client{ - api: mockedSecret{Resp: test.mock}, - } - got, err := c.GetSecret(test.arg) - if test.ok { - if got != test.want { - t.Fatalf("want %v, got %v, error %v, using arg %v", test.want, got, err, test.arg) - } - } - if !test.ok { - if err == nil { - t.Fatalf("error expected but got %q, using arg %v", err, test.arg) - } - } - t.Logf("arg (%v), want %v, got %v, err %v", test.arg, test.want, got, err) - } -} diff --git a/packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go deleted file mode 100644 index 6cd1dc46e..000000000 --- a/packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go +++ /dev/null @@ -1,22 +0,0 @@ -package secretsmanager - -// AWSConfig store configuration used to initialize -// secrets manager client. -type AWSConfig struct { - Region string -} - -// SecretSpec represent specs of secret to be searched -// If Key field is not set then package will return first -// secret key stored in secret name. -type SecretSpec struct { - Name string - Key string -} - -// SecretString is a concret representation -// of an AWS Secrets Manager Secret String -type SecretString struct { - Name string - SecretString string -} diff --git a/packer-plugin-sdk/template/interpolate/funcs.go b/packer-plugin-sdk/template/interpolate/funcs.go deleted file mode 100644 index d8b6e13f5..000000000 --- a/packer-plugin-sdk/template/interpolate/funcs.go +++ /dev/null @@ -1,312 +0,0 @@ -package interpolate - -import ( - "errors" - "fmt" - "os" - "path/filepath" - "strconv" - "strings" - "text/template" - "time" - - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" - strftime "github.com/jehiah/go-strftime" -) - -// InitTime is the UTC time when this package was initialized. It is -// used as the timestamp for all configuration templates so that they -// match for a single build. -var InitTime time.Time - -func init() { - InitTime = time.Now().UTC() -} - -// Funcs are the interpolation funcs that are available within interpolations. -var FuncGens = map[string]interface{}{ - "build_name": funcGenBuildName, - "build_type": funcGenBuildType, - "env": funcGenEnv, - "isotime": funcGenIsotime, - "strftime": funcGenStrftime, - "pwd": funcGenPwd, - "split": funcGenSplitter, - "template_dir": funcGenTemplateDir, - "timestamp": funcGenTimestamp, - "uuid": funcGenUuid, - "user": funcGenUser, - "packer_version": funcGenPackerVersion, - "consul_key": funcGenConsul, - "vault": funcGenVault, - "sed": funcGenSed, - "build": funcGenBuild, - "aws_secretsmanager": funcGenAwsSecrets, - - "replace": replace, - "replace_all": replace_all, - - "upper": strings.ToUpper, - "lower": strings.ToLower, -} - -var ErrVariableNotSetString = "Error: variable not set:" - -// FuncGenerator is a function that given a context generates a template -// function for the template. -type FuncGenerator func(*Context) interface{} - -// Funcs returns the functions that can be used for interpolation given -// a context. -func Funcs(ctx *Context) template.FuncMap { - result := make(map[string]interface{}) - for k, v := range FuncGens { - switch v := v.(type) { - case func(*Context) interface{}: - result[k] = v(ctx) - default: - result[k] = v - } - } - if ctx != nil { - for k, v := range ctx.Funcs { - result[k] = v - } - } - - return template.FuncMap(result) -} - -func funcGenSplitter(ctx *Context) interface{} { - return func(k string, s string, i int) (string, error) { - // return func(s string) (string, error) { - split := strings.Split(k, s) - if len(split) <= i { - return "", fmt.Errorf("the substring %d was unavailable using the separator value, %s, only %d values were found", i, s, len(split)) - } - return split[i], nil - } -} - -func funcGenBuildName(ctx *Context) interface{} { - return func() (string, error) { - if ctx == nil || ctx.BuildName == "" { - return "", errors.New("build_name not available") - } - - return ctx.BuildName, nil - } -} - -func funcGenBuildType(ctx *Context) interface{} { - return func() (string, error) { - if ctx == nil || ctx.BuildType == "" { - return "", errors.New("build_type not available") - } - - return ctx.BuildType, nil - } -} - -func funcGenEnv(ctx *Context) interface{} { - return func(k string) (string, error) { - if !ctx.EnableEnv { - // The error message doesn't have to be that detailed since - // semantic checks should catch this. - return "", errors.New("env vars are not allowed here") - } - - return os.Getenv(k), nil - } -} - -func funcGenIsotime(ctx *Context) interface{} { - return func(format ...string) (string, error) { - if len(format) == 0 { - return InitTime.Format(time.RFC3339), nil - } - - if len(format) > 1 { - return "", fmt.Errorf("too many values, 1 needed: %v", format) - } - - return InitTime.Format(format[0]), nil - } -} - -func funcGenStrftime(ctx *Context) interface{} { - return func(format string) string { - return strftime.Format(format, InitTime) - } -} - -func funcGenPwd(ctx *Context) interface{} { - return func() (string, error) { - return os.Getwd() - } -} - -func funcGenTemplateDir(ctx *Context) interface{} { - return func() (string, error) { - if ctx == nil || ctx.TemplatePath == "" { - return "", errors.New("template path not available") - } - - path, err := filepath.Abs(filepath.Dir(ctx.TemplatePath)) - if err != nil { - return "", err - } - - return path, nil - } -} - -func passthroughOrInterpolate(data map[interface{}]interface{}, s string) (string, error) { - if heldPlace, ok := data[s]; ok { - if hp, ok := heldPlace.(string); ok { - // If we're in the first interpolation pass, the goal is to - // make sure that we pass the value through. - // TODO match against an actual string constant - if strings.Contains(hp, packerbuilderdata.PlaceholderMsg) { - return fmt.Sprintf("{{.%s}}", s), nil - } else { - return hp, nil - } - } - } - return "", fmt.Errorf("loaded data, but couldnt find %s in it.", s) - -} -func funcGenBuild(ctx *Context) interface{} { - // Depending on where the context data is coming from, it could take a few - // different map types. The following switch standardizes the map types - // so we can act on them correctly. - return func(s string) (string, error) { - switch data := ctx.Data.(type) { - case map[interface{}]interface{}: - return passthroughOrInterpolate(data, s) - case map[string]interface{}: - // convert to a map[interface{}]interface{} so we can use same - // parsing on it - passed := make(map[interface{}]interface{}, len(data)) - for k, v := range data { - passed[k] = v - } - return passthroughOrInterpolate(passed, s) - case map[string]string: - // convert to a map[interface{}]interface{} so we can use same - // parsing on it - passed := make(map[interface{}]interface{}, len(data)) - for k, v := range data { - passed[k] = v - } - return passthroughOrInterpolate(passed, s) - default: - return "", fmt.Errorf("Error validating build variable: the given "+ - "variable %s will not be passed into your plugin.", s) - } - } -} - -func funcGenTimestamp(ctx *Context) interface{} { - return func() string { - return strconv.FormatInt(InitTime.Unix(), 10) - } -} - -func funcGenUser(ctx *Context) interface{} { - return func(k string) (string, error) { - if ctx == nil || ctx.UserVariables == nil { - return "", errors.New("test") - } - - val, ok := ctx.UserVariables[k] - if ctx.EnableEnv { - // error and retry if we're interpolating UserVariables. But if - // we're elsewhere in the template, just return the empty string. - if !ok { - return "", fmt.Errorf("%s %s", ErrVariableNotSetString, k) - } - } - return val, nil - } -} - -func funcGenUuid(ctx *Context) interface{} { - return func() string { - return uuid.TimeOrderedUUID() - } -} - -func funcGenPackerVersion(ctx *Context) interface{} { - return func() (string, error) { - if ctx == nil || ctx.CorePackerVersionString == "" { - return "", errors.New("packer_version not available") - } - - return ctx.CorePackerVersionString, nil - } -} - -func funcGenConsul(ctx *Context) interface{} { - return func(key string) (string, error) { - if !ctx.EnableEnv { - // The error message doesn't have to be that detailed since - // semantic checks should catch this. - return "", errors.New("consul_key is not allowed here") - } - - return commontpl.Consul(key) - } -} - -func funcGenVault(ctx *Context) interface{} { - return func(path string, key string) (string, error) { - // Only allow interpolation from Vault when env vars are being read. - if !ctx.EnableEnv { - // The error message doesn't have to be that detailed since - // semantic checks should catch this. - return "", errors.New("Vault vars are only allowed in the variables section") - } - - return commontpl.Vault(path, key) - } -} - -func funcGenAwsSecrets(ctx *Context) interface{} { - return func(secret ...string) (string, error) { - if !ctx.EnableEnv { - // The error message doesn't have to be that detailed since - // semantic checks should catch this. - return "", errors.New("AWS Secrets Manager is only allowed in the variables section") - } - switch len(secret) { - case 0: - return "", errors.New("secret name must be provided") - case 1: - return commontpl.GetAWSSecret(secret[0], "") - case 2: - return commontpl.GetAWSSecret(secret[0], secret[1]) - default: - return "", errors.New("only secret name and optional secret key can be provided.") - } - } -} - -func funcGenSed(ctx *Context) interface{} { - return func(expression string, inputString string) (string, error) { - return "", errors.New("template function `sed` is deprecated " + - "use `replace` or `replace_all` instead." + - "Documentation: https://www.packer.io/docs/templates/engine") - } -} - -func replace_all(old, new, src string) string { - return strings.ReplaceAll(src, old, new) -} - -func replace(old, new string, n int, src string) string { - return strings.Replace(src, old, new, n) -} diff --git a/packer-plugin-sdk/template/interpolate/funcs_test.go b/packer-plugin-sdk/template/interpolate/funcs_test.go deleted file mode 100644 index 7de9b4707..000000000 --- a/packer-plugin-sdk/template/interpolate/funcs_test.go +++ /dev/null @@ -1,475 +0,0 @@ -package interpolate - -import ( - "os" - "path/filepath" - "strconv" - "strings" - "testing" - "time" - - "github.com/google/go-cmp/cmp" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" -) - -func TestFuncBuildName(t *testing.T) { - cases := []struct { - Input string - Output string - }{ - { - `{{build_name}}`, - "foo", - }, - } - - ctx := &Context{BuildName: "foo"} - for _, tc := range cases { - i := &I{Value: tc.Input} - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("Input: %s\n\nerr: %s", tc.Input, err) - } - - if result != tc.Output { - t.Fatalf("Input: %s\n\nGot: %s", tc.Input, result) - } - } -} - -func TestFuncBuildType(t *testing.T) { - cases := []struct { - Input string - Output string - }{ - { - `{{build_type}}`, - "foo", - }, - } - - ctx := &Context{BuildType: "foo"} - for _, tc := range cases { - i := &I{Value: tc.Input} - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("Input: %s\n\nerr: %s", tc.Input, err) - } - - if result != tc.Output { - t.Fatalf("Input: %s\n\nGot: %s", tc.Input, result) - } - } -} - -func TestFuncEnv(t *testing.T) { - cases := []struct { - Input string - Output string - }{ - { - `{{env "PACKER_TEST_ENV"}}`, - `foo`, - }, - - { - `{{env "PACKER_TEST_ENV_NOPE"}}`, - ``, - }, - } - - os.Setenv("PACKER_TEST_ENV", "foo") - defer os.Setenv("PACKER_TEST_ENV", "") - - ctx := &Context{EnableEnv: true} - for _, tc := range cases { - i := &I{Value: tc.Input} - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("Input: %s\n\nerr: %s", tc.Input, err) - } - - if result != tc.Output { - t.Fatalf("Input: %s\n\nGot: %s", tc.Input, result) - } - } -} - -func TestFuncEnv_disable(t *testing.T) { - cases := []struct { - Input string - Output string - Error bool - }{ - { - `{{env "PACKER_TEST_ENV"}}`, - "", - true, - }, - } - - ctx := &Context{EnableEnv: false} - for _, tc := range cases { - i := &I{Value: tc.Input} - result, err := i.Render(ctx) - if (err != nil) != tc.Error { - t.Fatalf("Input: %s\n\nerr: %s", tc.Input, err) - } - - if result != tc.Output { - t.Fatalf("Input: %s\n\nGot: %s", tc.Input, result) - } - } -} - -func TestFuncIsotime(t *testing.T) { - ctx := &Context{} - i := &I{Value: "{{isotime}}"} - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("err: %s", err) - } - - val, err := time.Parse(time.RFC3339, result) - if err != nil { - t.Fatalf("err: %s", err) - } - - currentTime := time.Now().UTC() - if currentTime.Sub(val) > 2*time.Second { - t.Fatalf("val: %v (current: %v)", val, currentTime) - } -} - -func TestFuncStrftime(t *testing.T) { - ctx := &Context{} - i := &I{Value: "{{strftime \"%Y-%m-%dT%H:%M:%S%z\"}}"} - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("err: %s", err) - } - - val, err := time.Parse("2006-01-02T15:04:05-0700", result) - if err != nil { - t.Fatalf("err: %s", err) - } - - currentTime := time.Now().UTC() - if currentTime.Sub(val) > 2*time.Second { - t.Fatalf("val: %v (current: %v)", val, currentTime) - } -} - -func TestFuncPwd(t *testing.T) { - wd, err := os.Getwd() - if err != nil { - t.Fatalf("err: %s", err) - } - - cases := []struct { - Input string - Output string - }{ - { - `{{pwd}}`, - wd, - }, - } - - ctx := &Context{} - for _, tc := range cases { - i := &I{Value: tc.Input} - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("Input: %s\n\nerr: %s", tc.Input, err) - } - - if result != tc.Output { - t.Fatalf("Input: %s\n\nGot: %s", tc.Input, result) - } - } -} - -func TestFuncTemplatePath(t *testing.T) { - path := "foo/bar" - expected, _ := filepath.Abs(filepath.Dir(path)) - - cases := []struct { - Input string - Output string - }{ - { - `{{template_dir}}`, - expected, - }, - } - - ctx := &Context{ - TemplatePath: path, - } - for _, tc := range cases { - i := &I{Value: tc.Input} - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("Input: %s\n\nerr: %s", tc.Input, err) - } - - if result != tc.Output { - t.Fatalf("Input: %s\n\nGot: %s", tc.Input, result) - } - } -} - -func TestFuncSplit(t *testing.T) { - cases := []struct { - Input string - Output string - ErrorExpected bool - }{ - { - `{{split build_name "-" 0}}`, - "foo", - false, - }, - { - `{{split build_name "-" 1}}`, - "bar", - false, - }, - { - `{{split build_name "-" 2}}`, - "", - true, - }, - } - - ctx := &Context{BuildName: "foo-bar"} - for _, tc := range cases { - i := &I{Value: tc.Input} - result, err := i.Render(ctx) - if (err == nil) == tc.ErrorExpected { - t.Fatalf("Input: %s\n\nerr: %s", tc.Input, err) - } - - if result != tc.Output { - t.Fatalf("Input: %s\n\nGot: %s", tc.Input, result) - } - } -} - -func TestFuncTimestamp(t *testing.T) { - expected := strconv.FormatInt(InitTime.Unix(), 10) - - cases := []struct { - Input string - Output string - }{ - { - `{{timestamp}}`, - expected, - }, - } - - ctx := &Context{} - for _, tc := range cases { - i := &I{Value: tc.Input} - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("Input: %s\n\nerr: %s", tc.Input, err) - } - - if result != tc.Output { - t.Fatalf("Input: %s\n\nGot: %s", tc.Input, result) - } - } -} - -func TestFuncUser(t *testing.T) { - cases := []struct { - Input string - Output string - }{ - { - `{{user "foo"}}`, - `foo`, - }, - - { - `{{user "what"}}`, - ``, - }, - } - - ctx := &Context{ - UserVariables: map[string]string{ - "foo": "foo", - }, - } - for _, tc := range cases { - i := &I{Value: tc.Input} - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("Input: %s\n\nerr: %s", tc.Input, err) - } - - if result != tc.Output { - t.Fatalf("Input: %s\n\nGot: %s", tc.Input, result) - } - } -} - -func TestFuncPackerBuild(t *testing.T) { - type cases struct { - DataMap interface{} - ErrExpected bool - Template string - OutVal string - } - - testCases := []cases{ - // Data map is empty; there should be an error. - { - DataMap: nil, - ErrExpected: true, - Template: "{{ build `PartyVar` }}", - OutVal: "", - }, - // Data map is a map[string]string and contains value - { - DataMap: map[string]string{"PartyVar": "PartyVal"}, - ErrExpected: false, - Template: "{{ build `PartyVar` }}", - OutVal: "PartyVal", - }, - // Data map is a map[string]string and contains value - { - DataMap: map[string]string{"PartyVar": "PartyVal"}, - ErrExpected: false, - Template: "{{ build `PartyVar` }}", - OutVal: "PartyVal", - }, - // Data map is a map[string]string and contains value with placeholder. - { - DataMap: map[string]string{"PartyVar": "PartyVal" + packerbuilderdata.PlaceholderMsg}, - ErrExpected: false, - Template: "{{ build `PartyVar` }}", - OutVal: "{{.PartyVar}}", - }, - // Data map is a map[interface{}]interface{} and contains value - { - DataMap: map[interface{}]interface{}{"PartyVar": "PartyVal"}, - ErrExpected: false, - Template: "{{ build `PartyVar` }}", - OutVal: "PartyVal", - }, - // Data map is a map[interface{}]interface{} and contains value - { - DataMap: map[interface{}]interface{}{"PartyVar": "PartyVal"}, - ErrExpected: false, - Template: "{{ build `PartyVar` }}", - OutVal: "PartyVal", - }, - // Data map is a map[interface{}]interface{} and contains value with placeholder. - { - DataMap: map[interface{}]interface{}{"PartyVar": "PartyVal" + packerbuilderdata.PlaceholderMsg}, - ErrExpected: false, - Template: "{{ build `PartyVar` }}", - OutVal: "{{.PartyVar}}", - }, - // Data map is a map[interface{}]interface{} and doesn't have value. - { - DataMap: map[interface{}]interface{}{"BadVar": "PartyVal" + packerbuilderdata.PlaceholderMsg}, - ErrExpected: true, - Template: "{{ build `MissingVar` }}", - OutVal: "", - }, - // Data map is a map[string]interface and contains value - { - DataMap: map[string]interface{}{"PartyVar": "PartyVal"}, - ErrExpected: false, - Template: "{{ build `PartyVar` }}", - OutVal: "PartyVal", - }, - } - - for _, tc := range testCases { - ctx := &Context{} - ctx.Data = tc.DataMap - i := &I{Value: tc.Template} - - result, err := i.Render(ctx) - if (err != nil) != tc.ErrExpected { - t.Fatalf("Input: %s\n\nerr: %s", tc.Template, err) - } - - if ok := strings.Compare(result, tc.OutVal); ok != 0 { - t.Fatalf("Expected input to include: %s\n\nGot: %s", - tc.OutVal, result) - } - } -} - -func TestFuncPackerVersion(t *testing.T) { - template := `{{packer_version}}` - - ctx := &Context{ - CorePackerVersionString: "1.4.3-dev [DEADC0DE]", - } - i := &I{Value: template} - - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("Input: %s\n\nerr: %s", template, err) - } - - // Only match the X.Y.Z portion of the whole version string. - if !strings.HasPrefix(result, "1.4.3-dev [DEADC0DE]") { - t.Fatalf("Expected input to include: %s\n\nGot: %s", - "1.4.3-dev [DEADC0DE]", result) - } -} - -func TestReplaceFuncs(t *testing.T) { - cases := []struct { - Input string - Output string - }{ - - { - `{{ "foo-bar-baz" | replace "-" "/" 1}}`, - `foo/bar-baz`, - }, - - { - `{{ replace "-" "/" 1 "foo-bar-baz" }}`, - `foo/bar-baz`, - }, - - { - `{{ "I Am Henry VIII" | replace_all " " "-" }}`, - `I-Am-Henry-VIII`, - }, - - { - `{{ replace_all " " "-" "I Am Henry VIII" }}`, - `I-Am-Henry-VIII`, - }, - } - - ctx := &Context{ - UserVariables: map[string]string{ - "fee": "-foo-", - }, - } - for _, tc := range cases { - i := &I{Value: tc.Input} - result, err := i.Render(ctx) - if err != nil { - t.Fatalf("Input: %s\n\nerr: %s", tc.Input, err) - } - - if diff := cmp.Diff(tc.Output, result); diff != "" { - t.Fatalf("Unexpected output: %s", diff) - } - } -} diff --git a/packer-plugin-sdk/template/interpolate/i.go b/packer-plugin-sdk/template/interpolate/i.go deleted file mode 100644 index 8ad4e50df..000000000 --- a/packer-plugin-sdk/template/interpolate/i.go +++ /dev/null @@ -1,133 +0,0 @@ -package interpolate - -import ( - "bytes" - "regexp" - "strings" - "text/template" - - "github.com/google/uuid" -) - -// Context is the context that an interpolation is done in. This defines -// things such as available variables. -type Context struct { - // Data is the data for the template that is available - Data interface{} - - // Funcs are extra functions available in the template - Funcs map[string]interface{} - - // UserVariables is the mapping of user variables that the - // "user" function reads from. - UserVariables map[string]string - - // SensitiveVariables is a list of variables to sanitize. - SensitiveVariables []string - - // EnableEnv enables the env function - EnableEnv bool - - // All the fields below are used for built-in functions. - // - // BuildName and BuildType are the name and type, respectively, - // of the builder being used. - // - // TemplatePath is the path to the template that this is being - // rendered within. - BuildName string - BuildType string - CorePackerVersionString string - TemplatePath string -} - -// NewContext returns an initialized empty context. -func NewContext() *Context { - return &Context{} -} - -// RenderOnce is shorthand for constructing an I and calling Render one time. -func RenderOnce(v string, ctx *Context) (string, error) { - return (&I{Value: v}).Render(ctx) -} - -// Render is shorthand for constructing an I and calling Render until all variables are rendered. -func Render(v string, ctx *Context) (rendered string, err error) { - // Keep interpolating until all variables are done - // Sometimes a variable can been inside another one - for { - rendered, err = (&I{Value: v}).Render(ctx) - if err != nil || rendered == v { - break - } - v = rendered - } - return -} - -// Render is shorthand for constructing an I and calling Render. -// Use regex to filter variables that are not supposed to be interpolated now -func RenderRegex(v string, ctx *Context, regex string) (string, error) { - re := regexp.MustCompile(regex) - matches := re.FindAllStringSubmatch(v, -1) - - // Replace variables to be excluded with a unique UUID - excluded := make(map[string]string) - for _, value := range matches { - id := uuid.New().String() - excluded[id] = value[0] - v = strings.ReplaceAll(v, value[0], id) - } - - rendered, err := (&I{Value: v}).Render(ctx) - if err != nil { - return rendered, err - } - - // Replace back by the UUID the previously excluded values - for id, value := range excluded { - rendered = strings.ReplaceAll(rendered, id, value) - } - - return rendered, nil -} - -// Validate is shorthand for constructing an I and calling Validate. -func Validate(v string, ctx *Context) error { - return (&I{Value: v}).Validate(ctx) -} - -// I stands for "interpolation" and is the main interpolation struct -// in order to render values. -type I struct { - Value string -} - -// Render renders the interpolation with the given context. -func (i *I) Render(ictx *Context) (string, error) { - tpl, err := i.template(ictx) - if err != nil { - return "", err - } - - var result bytes.Buffer - var data interface{} - if ictx != nil { - data = ictx.Data - } - if err := tpl.Execute(&result, data); err != nil { - return "", err - } - - return result.String(), nil -} - -// Validate validates that the template is syntactically valid. -func (i *I) Validate(ctx *Context) error { - _, err := i.template(ctx) - return err -} - -func (i *I) template(ctx *Context) (*template.Template, error) { - return template.New("root").Funcs(Funcs(ctx)).Parse(i.Value) -} diff --git a/packer-plugin-sdk/template/interpolate/i_test.go b/packer-plugin-sdk/template/interpolate/i_test.go deleted file mode 100644 index a678afbc4..000000000 --- a/packer-plugin-sdk/template/interpolate/i_test.go +++ /dev/null @@ -1,32 +0,0 @@ -package interpolate - -import ( - "testing" -) - -func TestIRender(t *testing.T) { - cases := map[string]struct { - Ctx *Context - Value string - Result string - }{ - "basic": { - nil, - "foo", - "foo", - }, - } - - for k, tc := range cases { - i := &I{Value: tc.Value} - result, err := i.Render(tc.Ctx) - if err != nil { - t.Fatalf("%s\n\ninput: %s\n\nerr: %s", k, tc.Value, err) - } - if result != tc.Result { - t.Fatalf( - "%s\n\ninput: %s\n\nexpected: %s\n\ngot: %s", - k, tc.Value, tc.Result, result) - } - } -} diff --git a/packer-plugin-sdk/template/interpolate/parse.go b/packer-plugin-sdk/template/interpolate/parse.go deleted file mode 100644 index b18079510..000000000 --- a/packer-plugin-sdk/template/interpolate/parse.go +++ /dev/null @@ -1,42 +0,0 @@ -package interpolate - -import ( - "fmt" - "text/template" - "text/template/parse" -) - -// functionsCalled returns a map (to be used as a set) of the functions -// that are called from the given text template. -func functionsCalled(t *template.Template) map[string]struct{} { - result := make(map[string]struct{}) - functionsCalledWalk(t.Tree.Root, result) - return result -} - -func functionsCalledWalk(raw parse.Node, r map[string]struct{}) { - switch node := raw.(type) { - case *parse.ActionNode: - functionsCalledWalk(node.Pipe, r) - case *parse.CommandNode: - if in, ok := node.Args[0].(*parse.IdentifierNode); ok { - r[in.Ident] = struct{}{} - } - - for _, n := range node.Args[1:] { - functionsCalledWalk(n, r) - } - case *parse.ListNode: - for _, n := range node.Nodes { - functionsCalledWalk(n, r) - } - case *parse.PipeNode: - for _, n := range node.Cmds { - functionsCalledWalk(n, r) - } - case *parse.StringNode, *parse.TextNode: - // Ignore - default: - panic(fmt.Sprintf("unknown type: %T", node)) - } -} diff --git a/packer-plugin-sdk/template/interpolate/parse_test.go b/packer-plugin-sdk/template/interpolate/parse_test.go deleted file mode 100644 index abe499e54..000000000 --- a/packer-plugin-sdk/template/interpolate/parse_test.go +++ /dev/null @@ -1,39 +0,0 @@ -package interpolate - -import ( - "reflect" - "testing" - "text/template" -) - -func TestFunctionsCalled(t *testing.T) { - cases := []struct { - Input string - Result map[string]struct{} - }{ - { - "foo", - map[string]struct{}{}, - }, - - { - "foo {{user `bar`}}", - map[string]struct{}{ - "user": {}, - }, - }, - } - - funcs := Funcs(&Context{}) - for _, tc := range cases { - tpl, err := template.New("root").Funcs(funcs).Parse(tc.Input) - if err != nil { - t.Fatalf("err parsing: %v\n\n%s", tc.Input, err) - } - - actual := functionsCalled(tpl) - if !reflect.DeepEqual(actual, tc.Result) { - t.Fatalf("bad: %v\n\ngot: %#v", tc.Input, actual) - } - } -} diff --git a/packer-plugin-sdk/template/interpolate/render.go b/packer-plugin-sdk/template/interpolate/render.go deleted file mode 100644 index 7893e8745..000000000 --- a/packer-plugin-sdk/template/interpolate/render.go +++ /dev/null @@ -1,282 +0,0 @@ -package interpolate - -import ( - "fmt" - "reflect" - "strings" - "sync" - - "github.com/mitchellh/mapstructure" - "github.com/mitchellh/reflectwalk" -) - -// RenderFilter is an option for filtering what gets rendered and -// doesn't within an interface. -type RenderFilter struct { - Include []string - Exclude []string - - once sync.Once - excludeSet map[string]struct{} - includeSet map[string]struct{} -} - -// RenderMap renders all the strings in the given interface. The -// interface must decode into a map[string]interface{}, but is left -// as an interface{} type to ease backwards compatibility with the way -// arguments are passed around in Packer. -func RenderMap(v interface{}, ctx *Context, f *RenderFilter) (map[string]interface{}, error) { - // First decode it into the map - var m map[string]interface{} - if err := mapstructure.Decode(v, &m); err != nil { - return nil, err - } - - // Now go through each value and render it - for k, raw := range m { - // Always validate every field - if err := ValidateInterface(raw, ctx); err != nil { - return nil, fmt.Errorf("invalid '%s': %s", k, err) - } - - if !f.include(k) { - continue - } - - raw, err := RenderInterface(raw, ctx) - if err != nil { - return nil, fmt.Errorf("render '%s': %s", k, err) - } - - m[k] = raw - } - - return m, nil -} - -// RenderInterface renders any value and returns the resulting value. -func RenderInterface(v interface{}, ctx *Context) (interface{}, error) { - f := func(v string) (string, error) { - return RenderOnce(v, ctx) - } - - walker := &renderWalker{ - F: f, - Replace: true, - } - err := reflectwalk.Walk(v, walker) - if err != nil { - return nil, err - } - - if walker.Top != nil { - v = walker.Top - } - return v, nil -} - -// ValidateInterface renders any value and returns the resulting value. -func ValidateInterface(v interface{}, ctx *Context) error { - f := func(v string) (string, error) { - return v, Validate(v, ctx) - } - - walker := &renderWalker{ - F: f, - Replace: false, - } - err := reflectwalk.Walk(v, walker) - if err != nil { - return err - } - - return nil -} - -// Include checks whether a key should be included. -func (f *RenderFilter) include(k string) bool { - if f == nil { - return true - } - - k = strings.ToLower(k) - - f.once.Do(f.init) - if len(f.includeSet) > 0 { - _, ok := f.includeSet[k] - return ok - } - if len(f.excludeSet) > 0 { - _, ok := f.excludeSet[k] - return !ok - } - - return true -} - -func (f *RenderFilter) init() { - f.includeSet = make(map[string]struct{}) - for _, v := range f.Include { - f.includeSet[strings.ToLower(v)] = struct{}{} - } - - f.excludeSet = make(map[string]struct{}) - for _, v := range f.Exclude { - f.excludeSet[strings.ToLower(v)] = struct{}{} - } -} - -// renderWalker implements interfaces for the reflectwalk package -// (github.com/mitchellh/reflectwalk) that can be used to automatically -// execute a callback for an interpolation. -type renderWalker struct { - // F is the function to call for every interpolation. It can be nil. - // - // If Replace is true, then the return value of F will be used to - // replace the interpolation. - F renderWalkerFunc - Replace bool - - // ContextF is an advanced version of F that also receives the - // location of where it is in the structure. This lets you do - // context-aware validation. - ContextF renderWalkerContextFunc - - // Top is the top value of the walk. This might get replaced if the - // top value needs to be modified. It is valid to read after any walk. - // If it is nil, it means the top wasn't replaced. - Top interface{} - - key []string - lastValue reflect.Value - loc reflectwalk.Location - cs []reflect.Value - csKey []reflect.Value - csData interface{} - sliceIndex int -} - -// renderWalkerFunc is the callback called by interpolationWalk. -// It is called with any interpolation found. It should return a value -// to replace the interpolation with, along with any errors. -// -// If Replace is set to false in renderWalker, then the replace -// value can be anything as it will have no effect. -type renderWalkerFunc func(string) (string, error) - -// renderWalkerContextFunc is called by interpolationWalk if -// ContextF is set. This receives both the interpolation and the location -// where the interpolation is. -// -// This callback can be used to validate the location of the interpolation -// within the configuration. -type renderWalkerContextFunc func(reflectwalk.Location, string) - -func (w *renderWalker) Enter(loc reflectwalk.Location) error { - w.loc = loc - return nil -} - -func (w *renderWalker) Exit(loc reflectwalk.Location) error { - w.loc = reflectwalk.None - - switch loc { - case reflectwalk.Map: - w.cs = w.cs[:len(w.cs)-1] - case reflectwalk.MapValue: - w.key = w.key[:len(w.key)-1] - w.csKey = w.csKey[:len(w.csKey)-1] - case reflectwalk.Slice: - // Split any values that need to be split - w.cs = w.cs[:len(w.cs)-1] - case reflectwalk.SliceElem: - w.csKey = w.csKey[:len(w.csKey)-1] - } - - return nil -} - -func (w *renderWalker) Map(m reflect.Value) error { - w.cs = append(w.cs, m) - return nil -} - -func (w *renderWalker) MapElem(m, k, v reflect.Value) error { - w.csData = k - w.csKey = append(w.csKey, k) - w.key = append(w.key, k.String()) - w.lastValue = v - return nil -} - -func (w *renderWalker) Slice(s reflect.Value) error { - w.cs = append(w.cs, s) - return nil -} - -func (w *renderWalker) SliceElem(i int, elem reflect.Value) error { - w.csKey = append(w.csKey, reflect.ValueOf(i)) - w.sliceIndex = i - return nil -} - -func (w *renderWalker) Primitive(v reflect.Value) error { - setV := v - - // We only care about strings - if v.Kind() == reflect.Interface { - setV = v - v = v.Elem() - } - if v.Kind() != reflect.String { - return nil - } - - strV := v.String() - if w.ContextF != nil { - w.ContextF(w.loc, strV) - } - - if w.F == nil { - return nil - } - - replaceVal, err := w.F(strV) - if err != nil { - return fmt.Errorf( - "%s in:\n\n%s", - err, v.String()) - } - - if w.Replace { - resultVal := reflect.ValueOf(replaceVal) - switch w.loc { - case reflectwalk.MapKey: - m := w.cs[len(w.cs)-1] - - // Delete the old value - var zero reflect.Value - m.SetMapIndex(w.csData.(reflect.Value), zero) - - // Set the new key with the existing value - m.SetMapIndex(resultVal, w.lastValue) - - // Set the key to be the new key - w.csData = resultVal - case reflectwalk.MapValue: - // If we're in a map, then the only way to set a map value is - // to set it directly. - m := w.cs[len(w.cs)-1] - mk := w.csData.(reflect.Value) - m.SetMapIndex(mk, resultVal) - case reflectwalk.WalkLoc: - // At the root element, we can't write that, so we just save it - w.Top = resultVal.Interface() - default: - // Otherwise, we should be addressable - setV.Set(resultVal) - } - } - - return nil -} diff --git a/packer-plugin-sdk/template/interpolate/render_test.go b/packer-plugin-sdk/template/interpolate/render_test.go deleted file mode 100644 index ae9ff2474..000000000 --- a/packer-plugin-sdk/template/interpolate/render_test.go +++ /dev/null @@ -1,155 +0,0 @@ -package interpolate - -import ( - "reflect" - "testing" -) - -func TestRenderInterface(t *testing.T) { - type Test struct { - Foo string - } - - cases := map[string]struct { - Input interface{} - Output interface{} - }{ - "basic": { - map[string]interface{}{ - "foo": "{{upper `bar`}}", - }, - map[string]interface{}{ - "foo": "BAR", - }, - }, - - "struct": { - &Test{ - Foo: "{{upper `bar`}}", - }, - &Test{ - Foo: "BAR", - }, - }, - } - - ctx := &Context{} - for k, tc := range cases { - actual, err := RenderInterface(tc.Input, ctx) - if err != nil { - t.Fatalf("err: %s\n\n%s", k, err) - } - - if !reflect.DeepEqual(actual, tc.Output) { - t.Fatalf("err: %s\n\n%#v\n\n%#v", k, actual, tc.Output) - } - } -} - -func TestRenderMap(t *testing.T) { - cases := map[string]struct { - Input interface{} - Output interface{} - Filter *RenderFilter - }{ - "basic": { - map[string]interface{}{ - "foo": "{{upper `bar`}}", - }, - map[string]interface{}{ - "foo": "BAR", - }, - nil, - }, - - "map keys shouldn't be interpolated": { - map[string]interface{}{ - "{{foo}}": "{{upper `bar`}}", - }, - map[string]interface{}{ - "{{foo}}": "BAR", - }, - nil, - }, - - "nested values": { - map[string]interface{}{ - "foo": map[string]string{ - "bar": "{{upper `baz`}}", - }, - }, - map[string]interface{}{ - "foo": map[string]string{ - "bar": "BAZ", - }, - }, - nil, - }, - - // this test fails if you get github.com/mitchellh/reflectwalk@v1.0.1 - // the fail is caused by - // https://github.com/mitchellh/reflectwalk/pull/22/commits/51d4c99fad9e9aa269e874bc3ad60313a574799f - // TODO: open a PR to fix it. - "nested value keys": { - map[string]interface{}{ - "foo": map[string]string{ - "{{upper `bar`}}": "{{upper `baz`}}", - }, - }, - map[string]interface{}{ - "foo": map[string]string{ - "BAR": "BAZ", - }, - }, - nil, - }, - - "filter": { - map[string]interface{}{ - "bar": "{{upper `baz`}}", - "foo": map[string]string{ - "{{upper `bar`}}": "{{upper `baz`}}", - }, - }, - map[string]interface{}{ - "bar": "BAZ", - "foo": map[string]string{ - "{{upper `bar`}}": "{{upper `baz`}}", - }, - }, - &RenderFilter{ - Include: []string{"bar"}, - }, - }, - - "filter case-insensitive": { - map[string]interface{}{ - "bar": "{{upper `baz`}}", - "foo": map[string]string{ - "{{upper `bar`}}": "{{upper `baz`}}", - }, - }, - map[string]interface{}{ - "bar": "BAZ", - "foo": map[string]string{ - "{{upper `bar`}}": "{{upper `baz`}}", - }, - }, - &RenderFilter{ - Include: []string{"baR"}, - }, - }, - } - - ctx := &Context{} - for k, tc := range cases { - actual, err := RenderMap(tc.Input, ctx, tc.Filter) - if err != nil { - t.Fatalf("err: %s\n\n%s", k, err) - } - - if !reflect.DeepEqual(actual, tc.Output) { - t.Fatalf("err: %s\n\n%#v\n\n%#v", k, actual, tc.Output) - } - } -} diff --git a/packer-plugin-sdk/template/parse.go b/packer-plugin-sdk/template/parse.go deleted file mode 100644 index b96ec9d46..000000000 --- a/packer-plugin-sdk/template/parse.go +++ /dev/null @@ -1,578 +0,0 @@ -package template - -import ( - "bufio" - "bytes" - "encoding/json" - "fmt" - "io" - "os" - "path/filepath" - "sort" - "strings" - - multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" - "github.com/mitchellh/mapstructure" -) - -// rawTemplate is the direct JSON document format of the template file. -// This is what is decoded directly from the file, and then it is turned -// into a Template object thereafter. -type rawTemplate struct { - MinVersion string `mapstructure:"min_packer_version" json:"min_packer_version,omitempty"` - Description string `json:"description,omitempty"` - - Builders []interface{} `mapstructure:"builders" json:"builders,omitempty"` - Comments []map[string]string `json:"comments,omitempty"` - Push map[string]interface{} `json:"push,omitempty"` - PostProcessors []interface{} `mapstructure:"post-processors" json:"post-processors,omitempty"` - Provisioners []interface{} `json:"provisioners,omitempty"` - CleanupProvisioner interface{} `mapstructure:"error-cleanup-provisioner" json:"error-cleanup-provisioner,omitempty"` - Variables map[string]interface{} `json:"variables,omitempty"` - SensitiveVariables []string `mapstructure:"sensitive-variables" json:"sensitive-variables,omitempty"` - - RawContents []byte `json:"-"` -} - -// MarshalJSON conducts the necessary flattening of the rawTemplate struct -// to provide valid Packer template JSON -func (r *rawTemplate) MarshalJSON() ([]byte, error) { - // Avoid recursion - type rawTemplate_ rawTemplate - out, _ := json.Marshal(rawTemplate_(*r)) - - var m map[string]json.RawMessage - _ = json.Unmarshal(out, &m) - - // Flatten Comments - delete(m, "comments") - for _, comment := range r.Comments { - for k, v := range comment { - out, _ = json.Marshal(v) - m[k] = out - } - } - - return json.Marshal(m) -} - -func (r *rawTemplate) decodeProvisioner(raw interface{}) (Provisioner, error) { - var p Provisioner - if err := r.weakDecoder(&p, nil).Decode(raw); err != nil { - return p, fmt.Errorf("Error decoding provisioner: %s", err) - - } - - // Type is required before any richer validation - if p.Type == "" { - return p, fmt.Errorf("Provisioner missing 'type'") - } - - // Set the raw configuration and delete any special keys - p.Config = raw.(map[string]interface{}) - - delete(p.Config, "except") - delete(p.Config, "only") - delete(p.Config, "override") - delete(p.Config, "pause_before") - delete(p.Config, "max_retries") - delete(p.Config, "type") - delete(p.Config, "timeout") - - if len(p.Config) == 0 { - p.Config = nil - } - return p, nil -} - -// Template returns the actual Template object built from this raw -// structure. -func (r *rawTemplate) Template() (*Template, error) { - var result Template - var errs error - - // Copy some literals - result.Description = r.Description - result.MinVersion = r.MinVersion - result.RawContents = r.RawContents - - // Gather the comments - if len(r.Comments) > 0 { - result.Comments = make(map[string]string, len(r.Comments)) - - for _, c := range r.Comments { - for k, v := range c { - result.Comments[k] = v - } - } - } - - // Gather the variables - if len(r.Variables) > 0 { - result.Variables = make(map[string]*Variable, len(r.Variables)) - } - - for k, rawV := range r.Variables { - var v Variable - v.Key = k - - // Variable is required if the value is exactly nil - v.Required = rawV == nil - - // Weak decode the default if we have one - if err := r.decoder(&v.Default, nil).Decode(rawV); err != nil { - errs = multierror.Append(errs, fmt.Errorf( - "variable %s: %s", k, err)) - continue - } - - for _, sVar := range r.SensitiveVariables { - if sVar == k { - result.SensitiveVariables = append(result.SensitiveVariables, &v) - } - } - - result.Variables[k] = &v - } - - // Let's start by gathering all the builders - if len(r.Builders) > 0 { - result.Builders = make(map[string]*Builder, len(r.Builders)) - } - for i, rawB := range r.Builders { - var b Builder - if err := mapstructure.WeakDecode(rawB, &b); err != nil { - errs = multierror.Append(errs, fmt.Errorf( - "builder %d: %s", i+1, err)) - continue - } - - // Set the raw configuration and delete any special keys - b.Config = rawB.(map[string]interface{}) - - delete(b.Config, "name") - delete(b.Config, "type") - - if len(b.Config) == 0 { - b.Config = nil - } - - // If there is no type set, it is an error - if b.Type == "" { - errs = multierror.Append(errs, fmt.Errorf( - "builder %d: missing 'type'", i+1)) - continue - } - - // The name defaults to the type if it isn't set - if b.Name == "" { - b.Name = b.Type - } - - // If this builder already exists, it is an error - if _, ok := result.Builders[b.Name]; ok { - errs = multierror.Append(errs, fmt.Errorf( - "builder %d: builder with name '%s' already exists", - i+1, b.Name)) - continue - } - - // Append the builders - result.Builders[b.Name] = &b - } - - // Gather all the post-processors - if len(r.PostProcessors) > 0 { - result.PostProcessors = make([][]*PostProcessor, 0, len(r.PostProcessors)) - } - for i, v := range r.PostProcessors { - // Parse the configurations. We need to do this because post-processors - // can take three different formats. - configs, err := r.parsePostProcessor(i, v) - if err != nil { - errs = multierror.Append(errs, err) - continue - } - - // Parse the PostProcessors out of the configs - pps := make([]*PostProcessor, 0, len(configs)) - for j, c := range configs { - var pp PostProcessor - if err := r.decoder(&pp, nil).Decode(c); err != nil { - errs = multierror.Append(errs, fmt.Errorf( - "post-processor %d.%d: %s", i+1, j+1, err)) - continue - } - - // Type is required - if pp.Type == "" { - errs = multierror.Append(errs, fmt.Errorf( - "post-processor %d.%d: type is required", i+1, j+1)) - continue - } - - // Set the raw configuration and delete any special keys - pp.Config = c - - // The name defaults to the type if it isn't set - if pp.Name == "" { - pp.Name = pp.Type - } - - delete(pp.Config, "except") - delete(pp.Config, "only") - delete(pp.Config, "keep_input_artifact") - delete(pp.Config, "type") - delete(pp.Config, "name") - - if len(pp.Config) == 0 { - pp.Config = nil - } - - pps = append(pps, &pp) - } - - result.PostProcessors = append(result.PostProcessors, pps) - } - - // Gather all the provisioners - if len(r.Provisioners) > 0 { - result.Provisioners = make([]*Provisioner, 0, len(r.Provisioners)) - } - for i, v := range r.Provisioners { - p, err := r.decodeProvisioner(v) - if err != nil { - errs = multierror.Append(errs, fmt.Errorf( - "provisioner %d: %s", i+1, err)) - continue - } - - result.Provisioners = append(result.Provisioners, &p) - } - - // Gather the error-cleanup-provisioner - if r.CleanupProvisioner != nil { - p, err := r.decodeProvisioner(r.CleanupProvisioner) - if err != nil { - errs = multierror.Append(errs, - fmt.Errorf("On Error Cleanup Provisioner error: %s", err)) - } - - result.CleanupProvisioner = &p - } - - // If we have errors, return those with a nil result - if errs != nil { - return nil, errs - } - - return &result, nil -} - -func (r *rawTemplate) decoder( - result interface{}, - md *mapstructure.Metadata) *mapstructure.Decoder { - d, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{ - DecodeHook: mapstructure.StringToTimeDurationHookFunc(), - Metadata: md, - Result: result, - }) - if err != nil { - // This really shouldn't happen since we have firm control over - // all the arguments and they're all unit tested. So we use a - // panic here to note this would definitely be a bug. - panic(err) - } - return d -} - -func (r *rawTemplate) weakDecoder( - result interface{}, - md *mapstructure.Metadata) *mapstructure.Decoder { - d, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{ - WeaklyTypedInput: true, - DecodeHook: mapstructure.StringToTimeDurationHookFunc(), - Metadata: md, - Result: result, - }) - if err != nil { - // This really shouldn't happen since we have firm control over - // all the arguments and they're all unit tested. So we use a - // panic here to note this would definitely be a bug. - panic(err) - } - return d -} - -func (r *rawTemplate) parsePostProcessor( - i int, raw interface{}) ([]map[string]interface{}, error) { - switch v := raw.(type) { - case string: - return []map[string]interface{}{ - {"type": v}, - }, nil - case map[string]interface{}: - return []map[string]interface{}{v}, nil - case []interface{}: - var err error - result := make([]map[string]interface{}, len(v)) - for j, innerRaw := range v { - switch innerV := innerRaw.(type) { - case string: - result[j] = map[string]interface{}{"type": innerV} - case map[string]interface{}: - result[j] = innerV - case []interface{}: - err = multierror.Append(err, fmt.Errorf( - "post-processor %d.%d: sequence not allowed to be nested in a sequence", - i+1, j+1)) - default: - err = multierror.Append(err, fmt.Errorf( - "post-processor %d.%d: unknown format", - i+1, j+1)) - } - } - - if err != nil { - return nil, err - } - - return result, nil - default: - return nil, fmt.Errorf("post-processor %d: bad format", i+1) - } -} - -// Parse takes the given io.Reader and parses a Template object out of it. -func Parse(r io.Reader) (*Template, error) { - // First, decode the object into an interface{} and search for duplicate fields. - // We do this instead of the rawTemplate directly because we'd rather use mapstructure to - // decode since it has richer errors. - var raw interface{} - buf, err := jsonUnmarshal(r, &raw) - if err != nil { - return nil, err - } - - // Create our decoder - var md mapstructure.Metadata - var rawTpl rawTemplate - rawTpl.RawContents = buf.Bytes() - decoder, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{ - Metadata: &md, - Result: &rawTpl, - }) - if err != nil { - return nil, err - } - - // Do the actual decode into our structure - if err := decoder.Decode(raw); err != nil { - return nil, err - } - - // Build an error if there are unused root level keys - if len(md.Unused) > 0 { - sort.Strings(md.Unused) - - unusedMap, ok := raw.(map[string]interface{}) - if !ok { - return nil, fmt.Errorf("Failed to convert unused root level keys to map") - } - - for _, unused := range md.Unused { - if unused[0] == '_' { - commentVal, ok := unusedMap[unused].(string) - if !ok { - return nil, fmt.Errorf("Failed to cast root level comment value in comment \"%s\" to string.", unused) - } - - comment := map[string]string{ - unused: commentVal, - } - - rawTpl.Comments = append(rawTpl.Comments, comment) - continue - } - - err = multierror.Append(err, fmt.Errorf( - "Unknown root level key in template: '%s'", unused)) - } - } - if err != nil { - return nil, err - } - - // Return the template parsed from the raw structure - return rawTpl.Template() -} - -func jsonUnmarshal(r io.Reader, raw *interface{}) (bytes.Buffer, error) { - // Create a buffer to copy what we read - var buf bytes.Buffer - if _, err := buf.ReadFrom(r); err != nil { - return buf, err - } - - // Decode the object into an interface{} - if err := json.Unmarshal(buf.Bytes(), raw); err != nil { - return buf, err - } - - // If Json is valid, check for duplicate fields to avoid silent unwanted override - jsonDecoder := json.NewDecoder(strings.NewReader(buf.String())) - if err := checkForDuplicateFields(jsonDecoder); err != nil { - return buf, err - } - - return buf, nil -} - -func checkForDuplicateFields(d *json.Decoder) error { - // Get next token from JSON - t, err := d.Token() - if err != nil { - return err - } - - delim, ok := t.(json.Delim) - // Do nothing if it's not a delimiter - if !ok { - return nil - } - - // Check for duplicates inside of a delimiter {} or [] - switch delim { - case '{': - keys := make(map[string]bool) - for d.More() { - // Get attribute key - t, err := d.Token() - if err != nil { - return err - } - key := t.(string) - - // Check for duplicates - if keys[key] { - return fmt.Errorf("template has duplicate field: %s", key) - } - keys[key] = true - - // Check value to find duplicates in nested blocks - if err := checkForDuplicateFields(d); err != nil { - return err - } - } - case '[': - for d.More() { - if err := checkForDuplicateFields(d); err != nil { - return err - } - } - } - - // consume closing delimiter } or ] - if _, err := d.Token(); err != nil { - return err - } - - return nil -} - -// ParseFile is the same as Parse but is a helper to automatically open -// a file for parsing. -func ParseFile(path string) (*Template, error) { - var f *os.File - var err error - if path == "-" { - // Create a temp file for stdin in case of errors - f, err = tmp.File("parse") - if err != nil { - return nil, err - } - defer os.Remove(f.Name()) - defer f.Close() - if _, err = io.Copy(f, os.Stdin); err != nil { - return nil, err - } - if _, err = f.Seek(0, io.SeekStart); err != nil { - return nil, err - } - } else { - f, err = os.Open(path) - if err != nil { - return nil, err - } - defer f.Close() - } - tpl, err := Parse(f) - if err != nil { - syntaxErr, ok := err.(*json.SyntaxError) - if !ok { - return nil, err - } - // Rewind the file and get a better error - if _, err := f.Seek(0, io.SeekStart); err != nil { - return nil, err - } - // Grab the error location, and return a string to point to offending syntax error - line, col, highlight := highlightPosition(f, syntaxErr.Offset) - err = fmt.Errorf("Error parsing JSON: %s\nAt line %d, column %d (offset %d):\n%s", err, line, col, syntaxErr.Offset, highlight) - return nil, err - } - - if !filepath.IsAbs(path) { - path, err = filepath.Abs(path) - if err != nil { - return nil, err - } - } - - tpl.Path = path - return tpl, nil -} - -// Takes a file and the location in bytes of a parse error -// from json.SyntaxError.Offset and returns the line, column, -// and pretty-printed context around the error with an arrow indicating the exact -// position of the syntax error. -func highlightPosition(f *os.File, pos int64) (line, col int, highlight string) { - // Modified version of the function in Camlistore by Brad Fitzpatrick - // https://github.com/camlistore/camlistore/blob/4b5403dd5310cf6e1ae8feb8533fd59262701ebc/vendor/go4.org/errorutil/highlight.go - line = 1 - // New io.Reader for file - br := bufio.NewReader(f) - // Initialize lines - lastLine := "" - thisLine := new(bytes.Buffer) - // Loop through template to find line, column - for n := int64(0); n < pos; n++ { - // read byte from io.Reader - b, err := br.ReadByte() - if err != nil { - break - } - // If end of line, save line as previous line in case next line is offender - if b == '\n' { - lastLine = thisLine.String() - thisLine.Reset() - line++ - col = 1 - } else { - // Write current line, until line is safe, or error point is encountered - col++ - thisLine.WriteByte(b) - } - } - - // Populate highlight string to place a '^' char at offending column - if line > 1 { - highlight += fmt.Sprintf("%5d: %s\n", line-1, lastLine) - } - - highlight += fmt.Sprintf("%5d: %s\n", line, thisLine.String()) - highlight += fmt.Sprintf("%s^\n", strings.Repeat(" ", col+5)) - return -} diff --git a/packer-plugin-sdk/template/parse_test.go b/packer-plugin-sdk/template/parse_test.go deleted file mode 100644 index 2dc7acde9..000000000 --- a/packer-plugin-sdk/template/parse_test.go +++ /dev/null @@ -1,594 +0,0 @@ -// +build !windows - -package template - -import ( - "bytes" - "encoding/json" - "path/filepath" - "reflect" - "strings" - "testing" - "time" - - "github.com/google/go-cmp/cmp" -) - -func boolPointer(tf bool) *bool { - return &tf -} - -func TestParse(t *testing.T) { - cases := []struct { - File string - Result *Template - Err bool - }{ - /* - * Builders - */ - { - "parse-basic.json", - &Template{ - Builders: map[string]*Builder{ - "something": { - Name: "something", - Type: "something", - }, - }, - }, - false, - }, - { - "parse-basic-config.json", - &Template{ - Builders: map[string]*Builder{ - "something": { - Name: "something", - Type: "something", - Config: map[string]interface{}{ - "foo": "bar", - }, - }, - }, - }, - false, - }, - { - "parse-builder-no-type.json", - nil, - true, - }, - { - "parse-builder-repeat.json", - nil, - true, - }, - - /* - * Provisioners - */ - { - "parse-provisioner-basic.json", - &Template{ - Provisioners: []*Provisioner{ - { - Type: "something", - }, - }, - }, - false, - }, - { - "parse-provisioner-config.json", - &Template{ - Provisioners: []*Provisioner{ - { - Type: "something", - Config: map[string]interface{}{ - "inline": "echo 'foo'", - }, - }, - }, - }, - false, - }, - { - "parse-provisioner-pause-before.json", - &Template{ - Provisioners: []*Provisioner{ - { - Type: "something", - PauseBefore: 1 * time.Second, - }, - }, - }, - false, - }, - - { - "parse-provisioner-retry.json", - &Template{ - Provisioners: []*Provisioner{ - { - Type: "something", - MaxRetries: "5", - }, - }, - }, - false, - }, - - { - "parse-provisioner-timeout.json", - &Template{ - Provisioners: []*Provisioner{ - { - Type: "something", - Timeout: 5 * time.Minute, - }, - }, - }, - false, - }, - - { - "parse-provisioner-only.json", - &Template{ - Provisioners: []*Provisioner{ - { - Type: "something", - OnlyExcept: OnlyExcept{ - Only: []string{"foo"}, - }, - }, - }, - }, - false, - }, - - { - "parse-provisioner-except.json", - &Template{ - Provisioners: []*Provisioner{ - { - Type: "something", - OnlyExcept: OnlyExcept{ - Except: []string{"foo"}, - }, - }, - }, - }, - false, - }, - - { - "parse-provisioner-override.json", - &Template{ - Provisioners: []*Provisioner{ - { - Type: "something", - Override: map[string]interface{}{ - "foo": map[string]interface{}{}, - }, - }, - }, - }, - false, - }, - - { - "parse-provisioner-no-type.json", - nil, - true, - }, - - { - "parse-variable-default.json", - &Template{ - Variables: map[string]*Variable{ - "foo": { - Default: "foo", - Key: "foo", - }, - }, - }, - false, - }, - - { - "parse-variable-required.json", - &Template{ - Variables: map[string]*Variable{ - "foo": { - Required: true, - Key: "foo", - }, - }, - }, - false, - }, - - { - "parse-pp-basic.json", - &Template{ - PostProcessors: [][]*PostProcessor{ - { - { - Name: "foo", - Type: "foo", - Config: map[string]interface{}{ - "foo": "bar", - }, - }, - }, - }, - }, - false, - }, - - { - "parse-pp-keep.json", - &Template{ - PostProcessors: [][]*PostProcessor{ - { - { - Name: "foo", - Type: "foo", - KeepInputArtifact: boolPointer(true), - }, - }, - }, - }, - false, - }, - - { - "parse-pp-only.json", - &Template{ - PostProcessors: [][]*PostProcessor{ - { - { - Name: "foo", - Type: "foo", - OnlyExcept: OnlyExcept{ - Only: []string{"bar"}, - }, - }, - }, - }, - }, - false, - }, - - { - "parse-pp-except.json", - &Template{ - PostProcessors: [][]*PostProcessor{ - { - { - Name: "foo", - Type: "foo", - OnlyExcept: OnlyExcept{ - Except: []string{"bar"}, - }, - }, - }, - }, - }, - false, - }, - - { - "parse-pp-string.json", - &Template{ - PostProcessors: [][]*PostProcessor{ - { - { - Name: "foo", - Type: "foo", - }, - }, - }, - }, - false, - }, - - { - "parse-pp-map.json", - &Template{ - PostProcessors: [][]*PostProcessor{ - { - { - Name: "foo", - Type: "foo", - }, - }, - }, - }, - false, - }, - - { - "parse-pp-slice.json", - &Template{ - PostProcessors: [][]*PostProcessor{ - { - { - Name: "foo", - Type: "foo", - }, - }, - { - { - Name: "bar", - Type: "bar", - }, - }, - }, - }, - false, - }, - - { - "parse-pp-multi.json", - &Template{ - PostProcessors: [][]*PostProcessor{ - { - { - Name: "foo", - Type: "foo", - }, - { - Name: "bar", - Type: "bar", - }, - }, - }, - }, - false, - }, - - { - "parse-pp-no-type.json", - nil, - true, - }, - - { - "parse-description.json", - &Template{ - Description: "foo", - }, - false, - }, - - { - "parse-min-version.json", - &Template{ - MinVersion: "1.2", - }, - false, - }, - - { - "parse-comment.json", - &Template{ - Builders: map[string]*Builder{ - "something": { - Name: "something", - Type: "something", - }, - }, - Comments: map[string]string{ - "_info": "foo", - }, - }, - false, - }, - { - "parse-monolithic.json", - &Template{ - Comments: map[string]string{ - "_comment": "comment", - }, - Description: "Description Test", - MinVersion: "1.3.0", - SensitiveVariables: []*Variable{ - { - Required: false, - Key: "one", - Default: "1", - }, - }, - Variables: map[string]*Variable{ - "one": { - Required: false, - Key: "one", - Default: "1", - }, - "two": { - Required: false, - Key: "two", - Default: "2", - }, - "three": { - Required: true, - Key: "three", - Default: "", - }, - }, - Builders: map[string]*Builder{ - "amazon-ebs": { - Name: "amazon-ebs", - Type: "amazon-ebs", - Config: map[string]interface{}{ - "ami_name": "AMI Name", - "instance_type": "t2.micro", - "ssh_username": "ec2-user", - "source_ami": "ami-aaaaaaaaaaaaaa", - }, - }, - "docker": { - Name: "docker", - Type: "docker", - Config: map[string]interface{}{ - "image": "ubuntu", - "export_path": "image.tar", - }, - }, - }, - Provisioners: []*Provisioner{ - { - Type: "shell", - Config: map[string]interface{}{ - "script": "script.sh", - }, - }, - { - Type: "shell", - Config: map[string]interface{}{ - "script": "script.sh", - }, - Override: map[string]interface{}{ - "docker": map[string]interface{}{ - "execute_command": "echo 'override'", - }, - }, - }, - }, - PostProcessors: [][]*PostProcessor{ - { - { - Name: "compress", - Type: "compress", - }, - { - Name: "vagrant", - Type: "vagrant", - OnlyExcept: OnlyExcept{ - Only: []string{"docker"}, - }, - }, - }, - { - { - Name: "shell-local", - Type: "shell-local", - Config: map[string]interface{}{ - "inline": []interface{}{"echo foo"}, - }, - OnlyExcept: OnlyExcept{ - Except: []string{"amazon-ebs"}, - }, - }, - }, - }, - }, - false, - }, - } - - for i, tc := range cases { - path, _ := filepath.Abs(fixtureDir(tc.File)) - tpl, err := ParseFile(fixtureDir(tc.File)) - if (err != nil) != tc.Err { - t.Fatalf("%s\n\nerr: %s", tc.File, err) - } - - if tc.Result != nil { - tc.Result.Path = path - } - if tpl != nil { - tpl.RawContents = nil - } - if diff := cmp.Diff(tpl, tc.Result); diff != "" { - t.Fatalf("[%d]bad: %s\n%v", i, tc.File, diff) - } - - // Only test template writing if the template is valid - if tc.Err == false { - // Get rawTemplate - raw, err := tpl.Raw() - if err != nil { - t.Fatalf("Failed to convert back to raw template: %s\n\n%v\n\n%s", tc.File, tpl, err) - } - - out, _ := json.MarshalIndent(raw, "", " ") - if err != nil { - t.Fatalf("Failed to marshal raw template: %s\n\n%v\n\n%s", tc.File, raw, err) - } - - // Write JSON to a buffer (emulates filesystem write without dirtying the workspace) - fileBuf := bytes.NewBuffer(out) - - // Parse the JSON template we wrote to our buffer - tplRewritten, err := Parse(fileBuf) - if err != nil { - t.Fatalf("Failed to re-read marshalled template: %s\n\n%v\n\n%s\n\n%s", tc.File, tpl, out, err) - } - - // Override the metadata we don't care about (file path, raw file contents) - tplRewritten.Path = path - tplRewritten.RawContents = nil - - // Test that our output raw template is functionally equal - if !reflect.DeepEqual(tpl, tplRewritten) { - t.Fatalf("Data lost when writing template to file: %s\n\n%v\n\n%v\n\n%s", tc.File, tpl, tplRewritten, out) - } - } - } -} - -func TestParse_contents(t *testing.T) { - tpl, err := ParseFile(fixtureDir("parse-contents.json")) - if err != nil { - t.Fatalf("err: %s", err) - } - - actual := strings.TrimSpace(string(tpl.RawContents)) - expected := `{"builders":[{"type":"test"}]}` - if actual != expected { - t.Fatalf("bad: %s\n\n%s", actual, expected) - } -} - -func TestParse_bad(t *testing.T) { - cases := []struct { - File string - Expected string - }{ - {"error-beginning.json", "line 1, column 1 (offset 1)"}, - {"error-middle.json", "line 5, column 6 (offset 50)"}, - {"error-end.json", "line 1, column 30 (offset 30)"}, - {"malformed.json", "line 16, column 3 (offset 433)"}, - } - for _, tc := range cases { - _, err := ParseFile(fixtureDir(tc.File)) - if err == nil { - t.Fatalf("expected error") - } - if !strings.Contains(err.Error(), tc.Expected) { - t.Fatalf("file: %s\nExpected: %s\n%s\n", tc.File, tc.Expected, err.Error()) - } - } -} - -func TestParse_checkForDuplicateFields(t *testing.T) { - cases := []struct { - File string - Expected string - }{ - {"error-duplicate-variables.json", "template has duplicate field: variables"}, - {"error-duplicate-config.json", "template has duplicate field: foo"}, - } - for _, tc := range cases { - _, err := ParseFile(fixtureDir(tc.File)) - if err == nil { - t.Fatalf("expected error") - } - if !strings.Contains(err.Error(), tc.Expected) { - t.Fatalf("file: %s\nExpected: %s\n%s\n", tc.File, tc.Expected, err.Error()) - } - } -} diff --git a/packer-plugin-sdk/template/template.go b/packer-plugin-sdk/template/template.go deleted file mode 100644 index decd2d23c..000000000 --- a/packer-plugin-sdk/template/template.go +++ /dev/null @@ -1,323 +0,0 @@ -//go:generate mapstructure-to-hcl2 -type Provisioner - -package template - -import ( - "encoding/json" - "errors" - "fmt" - "time" - - multierror "github.com/hashicorp/go-multierror" -) - -// Template represents the parsed template that is used to configure -// Packer builds. -type Template struct { - // Path is the path to the template. This will be blank if Parse is - // used, but will be automatically populated by ParseFile. - Path string - - Description string - MinVersion string - - Comments map[string]string - Variables map[string]*Variable - SensitiveVariables []*Variable - Builders map[string]*Builder - Provisioners []*Provisioner - CleanupProvisioner *Provisioner - PostProcessors [][]*PostProcessor - - // RawContents is just the raw data for this template - RawContents []byte -} - -// Raw converts a Template struct back into the raw Packer template structure -func (t *Template) Raw() (*rawTemplate, error) { - var out rawTemplate - - out.MinVersion = t.MinVersion - out.Description = t.Description - - for k, v := range t.Comments { - out.Comments = append(out.Comments, map[string]string{k: v}) - } - - for _, b := range t.Builders { - out.Builders = append(out.Builders, b) - } - - for _, p := range t.Provisioners { - out.Provisioners = append(out.Provisioners, p) - } - - for _, pp := range t.PostProcessors { - out.PostProcessors = append(out.PostProcessors, pp) - } - - for _, v := range t.SensitiveVariables { - out.SensitiveVariables = append(out.SensitiveVariables, v.Key) - } - - for k, v := range t.Variables { - if out.Variables == nil { - out.Variables = make(map[string]interface{}) - } - - out.Variables[k] = v - } - - return &out, nil -} - -// Builder represents a builder configured in the template -type Builder struct { - Name string `json:"name,omitempty"` - Type string `json:"type"` - Config map[string]interface{} `json:"config,omitempty"` -} - -// MarshalJSON conducts the necessary flattening of the Builder struct -// to provide valid Packer template JSON -func (b *Builder) MarshalJSON() ([]byte, error) { - // Avoid recursion - type Builder_ Builder - out, _ := json.Marshal(Builder_(*b)) - - var m map[string]json.RawMessage - _ = json.Unmarshal(out, &m) - - // Flatten Config - delete(m, "config") - for k, v := range b.Config { - out, _ = json.Marshal(v) - m[k] = out - } - - return json.Marshal(m) -} - -// PostProcessor represents a post-processor within the template. -type PostProcessor struct { - OnlyExcept `mapstructure:",squash" json:",omitempty"` - - Name string `json:"name,omitempty"` - Type string `json:"type"` - KeepInputArtifact *bool `mapstructure:"keep_input_artifact" json:"keep_input_artifact,omitempty"` - Config map[string]interface{} `json:"config,omitempty"` -} - -// MarshalJSON conducts the necessary flattening of the PostProcessor struct -// to provide valid Packer template JSON -func (p *PostProcessor) MarshalJSON() ([]byte, error) { - // Early exit for simple definitions - if len(p.Config) == 0 && len(p.OnlyExcept.Only) == 0 && len(p.OnlyExcept.Except) == 0 && p.KeepInputArtifact == nil { - return json.Marshal(p.Type) - } - - // Avoid recursion - type PostProcessor_ PostProcessor - out, _ := json.Marshal(PostProcessor_(*p)) - - var m map[string]json.RawMessage - _ = json.Unmarshal(out, &m) - - // Flatten Config - delete(m, "config") - for k, v := range p.Config { - out, _ = json.Marshal(v) - m[k] = out - } - - return json.Marshal(m) -} - -// Provisioner represents a provisioner within the template. -type Provisioner struct { - OnlyExcept `mapstructure:",squash" json:",omitempty"` - - Type string `json:"type"` - Config map[string]interface{} `json:"config,omitempty"` - Override map[string]interface{} `json:"override,omitempty"` - PauseBefore time.Duration `mapstructure:"pause_before" json:"pause_before,omitempty"` - MaxRetries string `mapstructure:"max_retries" json:"max_retries,omitempty"` - Timeout time.Duration `mapstructure:"timeout" json:"timeout,omitempty"` -} - -// MarshalJSON conducts the necessary flattening of the Provisioner struct -// to provide valid Packer template JSON -func (p *Provisioner) MarshalJSON() ([]byte, error) { - // Avoid recursion - type Provisioner_ Provisioner - out, _ := json.Marshal(Provisioner_(*p)) - - var m map[string]json.RawMessage - _ = json.Unmarshal(out, &m) - - // Flatten Config - delete(m, "config") - for k, v := range p.Config { - out, _ = json.Marshal(v) - m[k] = out - } - - return json.Marshal(m) -} - -// Push represents the configuration for pushing the template to Atlas. -type Push struct { - Name string - Address string - BaseDir string `mapstructure:"base_dir"` - Include []string - Exclude []string - Token string - VCS bool -} - -// Variable represents a variable within the template -type Variable struct { - Key string - Default string - Required bool -} - -func (v *Variable) MarshalJSON() ([]byte, error) { - if v.Required { - // We use a nil pointer to coax Go into marshalling it as a JSON null - var ret *string - return json.Marshal(ret) - } - - return json.Marshal(v.Default) -} - -// OnlyExcept is a struct that is meant to be embedded that contains the -// logic required for "only" and "except" meta-parameters. -type OnlyExcept struct { - Only []string `json:"only,omitempty"` - Except []string `json:"except,omitempty"` -} - -//------------------------------------------------------------------- -// Functions -//------------------------------------------------------------------- - -// Validate does some basic validation of the template on top of the -// validation that occurs while parsing. If possible, we try to defer -// validation to here. The validation errors that occur during parsing -// are the minimal necessary to make sure parsing builds a reasonable -// Template structure. -func (t *Template) Validate() error { - var err error - - // At least one builder must be defined - if len(t.Builders) == 0 { - err = multierror.Append(err, errors.New( - "at least one builder must be defined")) - } - - // Verify that the provisioner overrides target builders that exist - for i, p := range t.Provisioners { - // Validate only/except - if verr := p.OnlyExcept.Validate(t); verr != nil { - for _, e := range multierror.Append(verr).Errors { - err = multierror.Append(err, fmt.Errorf( - "provisioner %d: %s", i+1, e)) - } - } - - // Validate overrides - for name := range p.Override { - if _, ok := t.Builders[name]; !ok { - err = multierror.Append(err, fmt.Errorf( - "provisioner %d: override '%s' doesn't exist", - i+1, name)) - } - } - } - - // Verify post-processors - for i, chain := range t.PostProcessors { - for j, p := range chain { - // Validate only/except - if verr := p.OnlyExcept.Validate(t); verr != nil { - for _, e := range multierror.Append(verr).Errors { - err = multierror.Append(err, fmt.Errorf( - "post-processor %d.%d: %s", i+1, j+1, e)) - } - } - } - } - - return err -} - -// Skip says whether or not to skip the build with the given name. -func (o *OnlyExcept) Skip(n string) bool { - if len(o.Only) > 0 { - for _, v := range o.Only { - if v == n { - return false - } - } - - return true - } - - if len(o.Except) > 0 { - for _, v := range o.Except { - if v == n { - return true - } - } - - return false - } - - return false -} - -// Validate validates that the OnlyExcept settings are correct for a thing. -func (o *OnlyExcept) Validate(t *Template) error { - if len(o.Only) > 0 && len(o.Except) > 0 { - return errors.New("only one of 'only' or 'except' may be specified") - } - - var err error - for _, n := range o.Only { - if _, ok := t.Builders[n]; !ok { - err = multierror.Append(err, fmt.Errorf( - "'only' specified builder '%s' not found", n)) - } - } - for _, n := range o.Except { - if _, ok := t.Builders[n]; !ok { - err = multierror.Append(err, fmt.Errorf( - "'except' specified builder '%s' not found", n)) - } - } - - return err -} - -//------------------------------------------------------------------- -// GoStringer -//------------------------------------------------------------------- - -func (b *Builder) GoString() string { - return fmt.Sprintf("*%#v", *b) -} - -func (p *Provisioner) GoString() string { - return fmt.Sprintf("*%#v", *p) -} - -func (p *PostProcessor) GoString() string { - return fmt.Sprintf("*%#v", *p) -} - -func (v *Variable) GoString() string { - return fmt.Sprintf("*%#v", *v) -} diff --git a/packer-plugin-sdk/template/template.hcl2spec.go b/packer-plugin-sdk/template/template.hcl2spec.go deleted file mode 100644 index 0eb054099..000000000 --- a/packer-plugin-sdk/template/template.hcl2spec.go +++ /dev/null @@ -1,45 +0,0 @@ -// Code generated by "mapstructure-to-hcl2 -type Provisioner"; DO NOT EDIT. - -package template - -import ( - "github.com/hashicorp/hcl/v2/hcldec" - "github.com/zclconf/go-cty/cty" -) - -// FlatProvisioner is an auto-generated flat version of Provisioner. -// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up. -type FlatProvisioner struct { - Only []string `json:"only,omitempty" cty:"only" hcl:"only"` - Except []string `json:"except,omitempty" cty:"except" hcl:"except"` - Type *string `json:"type" cty:"type" hcl:"type"` - Config map[string]interface{} `json:"config,omitempty" cty:"config" hcl:"config"` - Override map[string]interface{} `json:"override,omitempty" cty:"override" hcl:"override"` - PauseBefore *string `mapstructure:"pause_before" json:"pause_before,omitempty" cty:"pause_before" hcl:"pause_before"` - MaxRetries *string `mapstructure:"max_retries" json:"max_retries,omitempty" cty:"max_retries" hcl:"max_retries"` - Timeout *string `mapstructure:"timeout" json:"timeout,omitempty" cty:"timeout" hcl:"timeout"` -} - -// FlatMapstructure returns a new FlatProvisioner. -// FlatProvisioner is an auto-generated flat version of Provisioner. -// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up. -func (*Provisioner) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } { - return new(FlatProvisioner) -} - -// HCL2Spec returns the hcl spec of a Provisioner. -// This spec is used by HCL to read the fields of Provisioner. -// The decoded values from this spec will then be applied to a FlatProvisioner. -func (*FlatProvisioner) HCL2Spec() map[string]hcldec.Spec { - s := map[string]hcldec.Spec{ - "only": &hcldec.AttrSpec{Name: "only", Type: cty.List(cty.String), Required: false}, - "except": &hcldec.AttrSpec{Name: "except", Type: cty.List(cty.String), Required: false}, - "type": &hcldec.AttrSpec{Name: "type", Type: cty.String, Required: false}, - "config": &hcldec.AttrSpec{Name: "config", Type: cty.Map(cty.String), Required: false}, - "override": &hcldec.AttrSpec{Name: "override", Type: cty.Map(cty.String), Required: false}, - "pause_before": &hcldec.AttrSpec{Name: "pause_before", Type: cty.String, Required: false}, - "max_retries": &hcldec.AttrSpec{Name: "max_retries", Type: cty.String, Required: false}, - "timeout": &hcldec.AttrSpec{Name: "timeout", Type: cty.String, Required: false}, - } - return s -} diff --git a/packer-plugin-sdk/template/template_test.go b/packer-plugin-sdk/template/template_test.go deleted file mode 100644 index 7dc5b87d6..000000000 --- a/packer-plugin-sdk/template/template_test.go +++ /dev/null @@ -1,142 +0,0 @@ -package template - -import ( - "os" - "path/filepath" - "testing" -) - -const FixturesDir = "./test-fixtures" - -// fixtureDir returns the path to a test fixtures directory -func fixtureDir(n string) string { - return filepath.Join(FixturesDir, n) -} - -func TestTemplateValidate(t *testing.T) { - cases := []struct { - File string - Err bool - }{ - { - "validate-good-prov-timeout.json", - false, - }, - - { - "validate-no-builders.json", - true, - }, - - { - "validate-bad-override.json", - true, - }, - - { - "validate-good-override.json", - false, - }, - - { - "validate-bad-prov-only.json", - true, - }, - - { - "validate-good-prov-only.json", - false, - }, - - { - "validate-bad-prov-except.json", - true, - }, - - { - "validate-good-prov-except.json", - false, - }, - - { - "validate-bad-pp-only.json", - true, - }, - - { - "validate-good-pp-only.json", - false, - }, - - { - "validate-bad-pp-except.json", - true, - }, - - { - "validate-good-pp-except.json", - false, - }, - } - - for _, tc := range cases { - f, err := os.Open(fixtureDir(tc.File)) - if err != nil { - t.Fatalf("err: %s", err) - } - - tpl, err := Parse(f) - f.Close() - if err != nil { - t.Fatalf("err: %s\n\n%s", tc.File, err) - } - - err = tpl.Validate() - if (err != nil) != tc.Err { - t.Fatalf("err: %s\n\n%s", tc.File, err) - } - } -} - -func TestOnlyExceptSkip(t *testing.T) { - cases := []struct { - Only, Except []string - Input string - Result bool - }{ - { - []string{"foo"}, - nil, - "foo", - false, - }, - - { - nil, - []string{"foo"}, - "foo", - true, - }, - - { - nil, - nil, - "foo", - false, - }, - } - - for _, tc := range cases { - oe := &OnlyExcept{ - Only: tc.Only, - Except: tc.Except, - } - - actual := oe.Skip(tc.Input) - if actual != tc.Result { - t.Fatalf( - "bad: %#v\n\n%#v\n\n%#v\n\n%#v", - actual, tc.Only, tc.Except, tc.Input) - } - } -} diff --git a/packer-plugin-sdk/template/test-fixtures/error-beginning.json b/packer-plugin-sdk/template/test-fixtures/error-beginning.json deleted file mode 100644 index eb9a1aa6f..000000000 --- a/packer-plugin-sdk/template/test-fixtures/error-beginning.json +++ /dev/null @@ -1 +0,0 @@ -*"builders": [ { "type":"test", }]} diff --git a/packer-plugin-sdk/template/test-fixtures/error-duplicate-config.json b/packer-plugin-sdk/template/test-fixtures/error-duplicate-config.json deleted file mode 100644 index 19d2beeec..000000000 --- a/packer-plugin-sdk/template/test-fixtures/error-duplicate-config.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "variables": { - "var": "value" - }, - "builders": [ - { - "foo": "something", - "foo": "something" - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/error-duplicate-variables.json b/packer-plugin-sdk/template/test-fixtures/error-duplicate-variables.json deleted file mode 100644 index c603b7fe0..000000000 --- a/packer-plugin-sdk/template/test-fixtures/error-duplicate-variables.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variables": { - "var": "value" - }, - "variables": { - "var": "value" - }, - "builders": [ - { - "foo": "something" - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/error-end.json b/packer-plugin-sdk/template/test-fixtures/error-end.json deleted file mode 100644 index 95755d9eb..000000000 --- a/packer-plugin-sdk/template/test-fixtures/error-end.json +++ /dev/null @@ -1 +0,0 @@ -{"builders":[{"type":"test"}]* diff --git a/packer-plugin-sdk/template/test-fixtures/error-middle.json b/packer-plugin-sdk/template/test-fixtures/error-middle.json deleted file mode 100644 index 65cda6ea3..000000000 --- a/packer-plugin-sdk/template/test-fixtures/error-middle.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "builders": [ - { - "type":"test", - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/malformed.json b/packer-plugin-sdk/template/test-fixtures/malformed.json deleted file mode 100644 index 0c397593b..000000000 --- a/packer-plugin-sdk/template/test-fixtures/malformed.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "variables": { - "access_key": "{{env `AWS_ACCESS_KEY_ID`}}", - "secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}" - }, - "builders": [{ - "type": "amazon-ebs", - "access_key": "{{user `access_key`}}", - "secret_key": "{{user `secret_key`}}", - "region": "us-east-1", - "source_ami": "ami-fce3c696,", - "instance_type": "t2.micro", - "ssh_username": "ubuntu", - "ami_name": "packer-example {{timestamp}}" - }] -}] - - "provisioners": [{ - "type": "shell", - "inline": [ - "sleep 15", - "sudo yum update -y" - ] - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-basic-config.json b/packer-plugin-sdk/template/test-fixtures/parse-basic-config.json deleted file mode 100644 index ee7695bd9..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-basic-config.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "builders": [{"type": "something", "foo": "bar"}] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-basic.json deleted file mode 100644 index 43b7a7898..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-basic.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "builders": [{"type": "something"}] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-builder-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-builder-no-type.json deleted file mode 100644 index 1729d0827..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-builder-no-type.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "builders": [{"foo": "something"}] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-builder-repeat.json b/packer-plugin-sdk/template/test-fixtures/parse-builder-repeat.json deleted file mode 100644 index 258b75883..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-builder-repeat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "builders": [ - {"type": "something"}, - {"type": "something"} - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-comment.json b/packer-plugin-sdk/template/test-fixtures/parse-comment.json deleted file mode 100644 index d3bb95a3b..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-comment.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "_info": "foo", - "builders": [{"type": "something"}] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-contents.json b/packer-plugin-sdk/template/test-fixtures/parse-contents.json deleted file mode 100644 index edd70c12a..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-contents.json +++ /dev/null @@ -1 +0,0 @@ -{"builders":[{"type":"test"}]} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-description.json b/packer-plugin-sdk/template/test-fixtures/parse-description.json deleted file mode 100644 index c72a24eb8..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-description.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "foo" -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-min-version.json b/packer-plugin-sdk/template/test-fixtures/parse-min-version.json deleted file mode 100644 index f98101efb..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-min-version.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "min_packer_version": "1.2" -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-monolithic.json b/packer-plugin-sdk/template/test-fixtures/parse-monolithic.json deleted file mode 100644 index a04f1392d..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-monolithic.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "_comment": "comment", - "description": "Description Test", - "min_packer_version": "1.3.0", - "variables": { - "one": "1", - "two": "2", - "three": null - }, - "sensitive-variables": ["one"], - "builders": [ - { - "type": "amazon-ebs", - - "ami_name": "AMI Name", - "instance_type": "t2.micro", - "ssh_username": "ec2-user", - "source_ami": "ami-aaaaaaaaaaaaaa" - }, - { - "type": "docker", - - "image": "ubuntu", - "export_path": "image.tar" - } - ], - "provisioners": [ - { - "type": "shell", - "script": "script.sh" - }, - { - "type": "shell", - "script": "script.sh", - "override": { - "docker": { - "execute_command": "echo 'override'" - } - } - } - ], - "post-processors": [ - [ - "compress", - { - "type": "vagrant", - "only": ["docker"] - } - ], - [ - { - "type": "shell-local", - "inline": ["echo foo"], - "except": ["amazon-ebs"] - } - ] - ], - "push": { - "name": "push test" - } -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-pp-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-basic.json deleted file mode 100644 index 56a1145e6..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-pp-basic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "post-processors": [{ - "type": "foo", - "foo": "bar" - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-pp-except.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-except.json deleted file mode 100644 index dea70d3d3..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-pp-except.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "post-processors": [ - { - "type": "foo", - "except": ["bar"] - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-pp-keep.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-keep.json deleted file mode 100644 index d0bd513e5..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-pp-keep.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "post-processors": [{ - "type": "foo", - "keep_input_artifact": true - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-pp-map.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-map.json deleted file mode 100644 index 43cc6abb8..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-pp-map.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "post-processors": [{ - "type": "foo" - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-pp-multi.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-multi.json deleted file mode 100644 index 32a60fa34..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-pp-multi.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "post-processors": [[{ - "type": "foo" - }, "bar"]] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-pp-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-no-type.json deleted file mode 100644 index f4dda63e8..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-pp-no-type.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "post-processors": [{ - "keep_input_artifact": true - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-pp-only.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-only.json deleted file mode 100644 index d2dbe07c6..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-pp-only.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "post-processors": [ - { - "type": "foo", - "only": ["bar"] - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-pp-slice.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-slice.json deleted file mode 100644 index 94c3a5247..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-pp-slice.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "post-processors": [{ - "type": "foo" - }, "bar"] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-pp-string.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-string.json deleted file mode 100644 index 8e77358ea..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-pp-string.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "post-processors": ["foo"] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-basic.json deleted file mode 100644 index bf0d8d910..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-basic.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "provisioners": [ - {"type": "something"} - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-config.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-config.json deleted file mode 100644 index 24cd0fe93..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "provisioners": [ - {"type": "something","inline":"echo 'foo'"} - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-except.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-except.json deleted file mode 100644 index 8c7f0c8f5..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-except.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "provisioners": [ - { - "type": "something", - "except": ["foo"] - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-no-type.json deleted file mode 100644 index 40bc214d2..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-no-type.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "provisioners": [ - {"foo": "something"} - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-only.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-only.json deleted file mode 100644 index 3bbb534b2..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-only.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "provisioners": [ - { - "type": "something", - "only": ["foo"] - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-override.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-override.json deleted file mode 100644 index 5b55099ba..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-override.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "provisioners": [ - { - "type": "something", - "override": { - "foo": {} - } - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-pause-before.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-pause-before.json deleted file mode 100644 index 70640847b..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-pause-before.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "provisioners": [ - { - "type": "something", - "pause_before": "1s" - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-retry.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-retry.json deleted file mode 100644 index 3fdc3aff3..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-retry.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "provisioners": [ - { - "type": "something", - "max_retries": 5 - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-timeout.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-timeout.json deleted file mode 100644 index ed9853595..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-provisioner-timeout.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "provisioners": [ - { - "type": "something", - "timeout": "5m" - } - ] -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-variable-default.json b/packer-plugin-sdk/template/test-fixtures/parse-variable-default.json deleted file mode 100644 index 05192b64d..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-variable-default.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variables": { - "foo": "foo" - } -} diff --git a/packer-plugin-sdk/template/test-fixtures/parse-variable-required.json b/packer-plugin-sdk/template/test-fixtures/parse-variable-required.json deleted file mode 100644 index ca6458aaa..000000000 --- a/packer-plugin-sdk/template/test-fixtures/parse-variable-required.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variables": { - "foo": null - } -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-bad-override.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-override.json deleted file mode 100644 index 7f6c64588..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-bad-override.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "provisioners": [{ - "type": "bar", - "override": { - "bar": {} - } - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-except.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-except.json deleted file mode 100644 index 3f66cd8ca..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-except.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "post-processors": [{ - "type": "bar", - "except": ["bar"] - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-only.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-only.json deleted file mode 100644 index a79edcb80..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-only.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "post-processors": [{ - "type": "bar", - "only": ["bar"] - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-except.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-except.json deleted file mode 100644 index 0a24bf58e..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-except.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "provisioners": [{ - "type": "bar", - "except": ["bar"] - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-only.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-only.json deleted file mode 100644 index fa8c9ccab..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-only.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "provisioners": [{ - "type": "bar", - "only": ["bar"] - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-good-override.json b/packer-plugin-sdk/template/test-fixtures/validate-good-override.json deleted file mode 100644 index 4d7e0f757..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-good-override.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "provisioners": [{ - "type": "bar", - "override": { - "foo": {} - } - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-good-pp-except.json b/packer-plugin-sdk/template/test-fixtures/validate-good-pp-except.json deleted file mode 100644 index 79a1b2a24..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-good-pp-except.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "post-processors": [{ - "type": "bar", - "except": ["foo"] - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-good-pp-only.json b/packer-plugin-sdk/template/test-fixtures/validate-good-pp-only.json deleted file mode 100644 index 24ef7c95d..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-good-pp-only.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "post-processors": [{ - "type": "bar", - "only": ["foo"] - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-good-prov-except.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-except.json deleted file mode 100644 index e075d09ca..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-good-prov-except.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "provisioners": [{ - "type": "bar", - "except": ["foo"] - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-good-prov-only.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-only.json deleted file mode 100644 index db162fa28..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-good-prov-only.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "provisioners": [{ - "type": "bar", - "only": ["foo"] - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-good-prov-timeout.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-timeout.json deleted file mode 100644 index 6343debd4..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-good-prov-timeout.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "builders": [{ - "type": "foo" - }], - - "provisioners": [{ - "timeout": "5m", - "type": "bar", - "only": ["foo"] - }] -} diff --git a/packer-plugin-sdk/template/test-fixtures/validate-no-builders.json b/packer-plugin-sdk/template/test-fixtures/validate-no-builders.json deleted file mode 100644 index 0967ef424..000000000 --- a/packer-plugin-sdk/template/test-fixtures/validate-no-builders.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/packer-plugin-sdk/test-fixtures/SomeDir/myfile.txt b/packer-plugin-sdk/test-fixtures/SomeDir/myfile.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/decompress-tar/outside_parent.tar b/packer-plugin-sdk/test-fixtures/decompress-tar/outside_parent.tar deleted file mode 100644 index f08df1e65..000000000 Binary files a/packer-plugin-sdk/test-fixtures/decompress-tar/outside_parent.tar and /dev/null differ diff --git a/packer-plugin-sdk/test-fixtures/floppies/bar.bat b/packer-plugin-sdk/test-fixtures/floppies/bar.bat deleted file mode 100644 index 0d6a4f32d..000000000 --- a/packer-plugin-sdk/test-fixtures/floppies/bar.bat +++ /dev/null @@ -1 +0,0 @@ -Echo I am a floppy with a batch file \ No newline at end of file diff --git a/packer-plugin-sdk/test-fixtures/floppies/foo.ps1 b/packer-plugin-sdk/test-fixtures/floppies/foo.ps1 deleted file mode 100644 index 672daeb89..000000000 --- a/packer-plugin-sdk/test-fixtures/floppies/foo.ps1 +++ /dev/null @@ -1 +0,0 @@ -Write-Host "I am a floppy with some Powershell" \ No newline at end of file diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file1 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file2 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file3 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file3 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file1 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file2 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file3 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file3 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/file1 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 deleted file mode 100644 index e69de29bb..000000000 diff --git a/packer-plugin-sdk/tmp/tmp.go b/packer-plugin-sdk/tmp/tmp.go deleted file mode 100644 index 147673b9f..000000000 --- a/packer-plugin-sdk/tmp/tmp.go +++ /dev/null @@ -1,46 +0,0 @@ -// Package tmp provides temporary directory helpers. -// -// tmp stores temporary items in the system's -// temporary directory unless a corresponding -// environment variable is set ( see os.TempDir ). -// -// On Unix systems, it uses $TMPDIR if non-empty, else /tmp. -// On Windows, it uses GetTempPath, returning the first non-empty -// value from %TMP%, %TEMP%, %USERPROFILE%, or the Windows directory. -// On Plan 9, it returns /tmp. -// -// The directory is neither guaranteed to exist nor have accessible -// permissions. -package tmp - -import ( - "io/ioutil" - "os" -) - -var tmpDir = os.TempDir() - -// Dir creates a new temporary directory in the system temporary -// directory with a name beginning with prefix and returns the path -// of the new directory. -// Multiple programs calling Dir simultaneously -// will not choose the same directory. -// It is the caller's responsibility -// to remove the file when no longer needed. -func Dir(prefix string) (string, error) { - return ioutil.TempDir(tmpDir, prefix) -} - -// File creates a new temporary file in the system temporary -// directory, opens the file for reading and writing, and -// returns the resulting *os.File. -// The filename is generated by taking pattern and adding a random -// string to the end. If pattern includes a "*", the random string -// replaces the last "*". -// Multiple programs calling File simultaneously -// will not choose the same file. The caller can use f.Name() -// to find the pathname of the file. It is the caller's responsibility -// to remove the file when no longer needed. -func File(pattern string) (*os.File, error) { - return ioutil.TempFile(tmpDir, pattern) -} diff --git a/packer-plugin-sdk/useragent/useragent.go b/packer-plugin-sdk/useragent/useragent.go deleted file mode 100644 index bbb72f47b..000000000 --- a/packer-plugin-sdk/useragent/useragent.go +++ /dev/null @@ -1,28 +0,0 @@ -// Package useragent creates a user agent for builders to use when calling out -// to cloud APIs or other addresses. -package useragent - -import ( - "fmt" - "runtime" -) - -var ( - // projectURL is the project URL. - projectURL = "https://www.packer.io/" - - // rt is the runtime - variable for tests. - rt = runtime.Version() - - // goos is the os - variable for tests. - goos = runtime.GOOS - - // goarch is the architecture - variable for tests. - goarch = runtime.GOARCH -) - -// String returns the consistent user-agent string for Packer. -func String(packerVersion string) string { - return fmt.Sprintf("Packer/%s (+%s; %s; %s/%s)", - packerVersion, projectURL, rt, goos, goarch) -} diff --git a/packer-plugin-sdk/useragent/useragent_test.go b/packer-plugin-sdk/useragent/useragent_test.go deleted file mode 100644 index 639e1b4fb..000000000 --- a/packer-plugin-sdk/useragent/useragent_test.go +++ /dev/null @@ -1,19 +0,0 @@ -package useragent - -import ( - "testing" -) - -func TestUserAgent(t *testing.T) { - projectURL = "https://packer-test.com" - rt = "go5.0" - goos = "linux" - goarch = "amd64" - - act := String("1.2.3") - - exp := "Packer/1.2.3 (+https://packer-test.com; go5.0; linux/amd64)" - if exp != act { - t.Errorf("expected %q to be %q", act, exp) - } -} diff --git a/packer-plugin-sdk/uuid/uuid.go b/packer-plugin-sdk/uuid/uuid.go deleted file mode 100644 index bf5d922ab..000000000 --- a/packer-plugin-sdk/uuid/uuid.go +++ /dev/null @@ -1,25 +0,0 @@ -// Package uuid provides helper functions for creating time-ordered UUIDs. -package uuid - -import ( - "crypto/rand" - "fmt" - "time" -) - -// Generates a time ordered UUID. Top 32 bits are a timestamp, -// bottom 96 are random. -func TimeOrderedUUID() string { - unix := uint32(time.Now().UTC().Unix()) - - b := make([]byte, 12) - n, err := rand.Read(b) - if n != len(b) { - err = fmt.Errorf("Not enough entropy available") - } - if err != nil { - panic(err) - } - return fmt.Sprintf("%08x-%04x-%04x-%04x-%04x%08x", - unix, b[0:2], b[2:4], b[4:6], b[6:8], b[8:]) -} diff --git a/packer-plugin-sdk/uuid/uuid_test.go b/packer-plugin-sdk/uuid/uuid_test.go deleted file mode 100644 index 8a853f1be..000000000 --- a/packer-plugin-sdk/uuid/uuid_test.go +++ /dev/null @@ -1,12 +0,0 @@ -package uuid - -import ( - "testing" -) - -func TestTimeOrderedUuid(t *testing.T) { - uuid := TimeOrderedUUID() - if len(uuid) != 36 { - t.Fatalf("bad: %s", uuid) - } -} diff --git a/packer-plugin-sdk/version/version.go b/packer-plugin-sdk/version/version.go deleted file mode 100644 index 345530638..000000000 --- a/packer-plugin-sdk/version/version.go +++ /dev/null @@ -1,81 +0,0 @@ -// Package version helps plugin creators set and track the plugin version using -// the same convenience functions used by the Packer core. -package version - -import ( - "bytes" - "fmt" - - "github.com/hashicorp/go-version" -) - -// The git commit that was compiled. This will be filled in by the compiler. -var GitCommit string - -// InitializePluginVersion initializes the SemVer and returns a version var. -// If the provided "version" string is not valid, the call to version.Must -// will panic. Therefore, this function should always be called in a package -// init() function to make sure that plugins are following proper semantic -// versioning and to make sure that plugins which aren't following proper -// semantic versioning crash immediately rather than later. -func InitializePluginVersion(vers, versionPrerelease string) *PluginVersion { - pv := PluginVersion{ - version: vers, - versionPrerelease: versionPrerelease, - } - // This call initializes the SemVer to make sure that if Packer crashes due - // to an invalid SemVer it's at the very beginning of the Packer run. - pv.semVer = version.Must(version.NewVersion(vers)) - return &pv -} - -type PluginVersion struct { - // The main version number that is being run at the moment. - version string - // A pre-release marker for the version. If this is "" (empty string) - // then it means that it is a final release. Otherwise, this is a pre-release - // such as "dev" (in development), "beta", "rc1", etc. - versionPrerelease string - // The Semantic Version of the plugin. Used for version constraint comparisons - semVer *version.Version -} - -func (p *PluginVersion) FormattedVersion() string { - var versionString bytes.Buffer - fmt.Fprintf(&versionString, "%s", p.version) - if p.versionPrerelease != "" { - fmt.Fprintf(&versionString, "-%s", p.versionPrerelease) - - if GitCommit != "" { - fmt.Fprintf(&versionString, " (%s)", GitCommit) - } - } - - return versionString.String() -} - -func (p *PluginVersion) SemVer() *version.Version { - if p.semVer != nil { - // SemVer is an instance of version.Version. This has the secondary - // benefit of verifying during tests and init time that our version is a - // proper semantic version, which should always be the case. - p.semVer = version.Must(version.NewVersion(p.version)) - } - return p.semVer -} - -func (p *PluginVersion) GetVersion() string { - return p.version -} - -func (p *PluginVersion) GetVersionPrerelease() string { - return p.versionPrerelease -} - -// String returns the complete version string, including prerelease -func (p *PluginVersion) String() string { - if p.versionPrerelease != "" { - return fmt.Sprintf("%s-%s", p.version, p.versionPrerelease) - } - return p.version -} diff --git a/packer/build.go b/packer/build.go index 9fc068255..a1551d952 100644 --- a/packer/build.go +++ b/packer/build.go @@ -6,9 +6,9 @@ import ( "log" "sync" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/version" ) diff --git a/packer/build_test.go b/packer/build_test.go index 630b1e2bf..9b4812b35 100644 --- a/packer/build_test.go +++ b/packer/build_test.go @@ -5,9 +5,9 @@ import ( "reflect" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" "github.com/hashicorp/packer/version" ) diff --git a/packer/core.go b/packer/core.go index 079d70a28..98942ec7e 100644 --- a/packer/core.go +++ b/packer/core.go @@ -15,9 +15,9 @@ import ( multierror "github.com/hashicorp/go-multierror" version "github.com/hashicorp/go-version" "github.com/hashicorp/hcl/v2" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // Core is the main executor of Packer. If Packer is being used as a diff --git a/packer/core_test.go b/packer/core_test.go index 2a2d0484b..1dbdacfd3 100644 --- a/packer/core_test.go +++ b/packer/core_test.go @@ -8,9 +8,9 @@ import ( "reflect" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template" - configHelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template" + configHelper "github.com/hashicorp/packer-plugin-sdk/template/config" ) func TestCoreBuildNames(t *testing.T) { diff --git a/packer/plugin/builder.go b/packer/plugin/builder.go index 615437b8a..2db14fda7 100644 --- a/packer/plugin/builder.go +++ b/packer/plugin/builder.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type cmdBuilder struct { diff --git a/packer/plugin/client.go b/packer/plugin/client.go index 923c9282f..9a4141688 100644 --- a/packer/plugin/client.go +++ b/packer/plugin/client.go @@ -16,9 +16,9 @@ import ( "time" "unicode" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - pluginsdk "github.com/hashicorp/packer/packer-plugin-sdk/plugin" - packerrpc "github.com/hashicorp/packer/packer-plugin-sdk/rpc" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + pluginsdk "github.com/hashicorp/packer-plugin-sdk/plugin" + packerrpc "github.com/hashicorp/packer-plugin-sdk/rpc" ) // If this is true, then the "unexpected EOF" panic will not be diff --git a/packer/plugin/discover.go b/packer/plugin/discover.go index bac304e00..f38083b20 100644 --- a/packer/plugin/discover.go +++ b/packer/plugin/discover.go @@ -10,9 +10,9 @@ import ( "sort" "strings" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/pathing" - pluginsdk "github.com/hashicorp/packer/packer-plugin-sdk/plugin" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/pathing" + pluginsdk "github.com/hashicorp/packer-plugin-sdk/plugin" ) // PACKERSPACE is used to represent the spaces that separate args for a command diff --git a/packer/plugin/discover_test.go b/packer/plugin/discover_test.go index 2f33d14b0..0ef2fc7e8 100644 --- a/packer/plugin/discover_test.go +++ b/packer/plugin/discover_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/packer" - pluginsdk "github.com/hashicorp/packer/packer-plugin-sdk/plugin" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/packer" + pluginsdk "github.com/hashicorp/packer-plugin-sdk/plugin" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) func newConfig() Config { diff --git a/packer/plugin/hook.go b/packer/plugin/hook.go index 808b67f75..327c4c689 100644 --- a/packer/plugin/hook.go +++ b/packer/plugin/hook.go @@ -4,7 +4,7 @@ import ( "context" "log" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type cmdHook struct { diff --git a/packer/plugin/plugin_test.go b/packer/plugin/plugin_test.go index b3422f312..02f8a32ea 100644 --- a/packer/plugin/plugin_test.go +++ b/packer/plugin/plugin_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - pluginsdk "github.com/hashicorp/packer/packer-plugin-sdk/plugin" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + pluginsdk "github.com/hashicorp/packer-plugin-sdk/plugin" ) func helperProcess(s ...string) *exec.Cmd { diff --git a/packer/plugin/post_processor.go b/packer/plugin/post_processor.go index 68706863e..77fe946f7 100644 --- a/packer/plugin/post_processor.go +++ b/packer/plugin/post_processor.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type cmdPostProcessor struct { diff --git a/packer/plugin/post_processor_test.go b/packer/plugin/post_processor_test.go index af67d4003..33461ab5d 100644 --- a/packer/plugin/post_processor_test.go +++ b/packer/plugin/post_processor_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type helperPostProcessor byte diff --git a/packer/plugin/provisioner.go b/packer/plugin/provisioner.go index 00b5e88e4..5b1f13389 100644 --- a/packer/plugin/provisioner.go +++ b/packer/plugin/provisioner.go @@ -5,7 +5,7 @@ import ( "log" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type cmdProvisioner struct { diff --git a/packer/post_processor_mock.go b/packer/post_processor_mock.go index 8a65be5fb..0491a031e 100644 --- a/packer/post_processor_mock.go +++ b/packer/post_processor_mock.go @@ -5,7 +5,7 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // MockPostProcessor is an implementation of PostProcessor that can be diff --git a/packer/post_processor_mock.hcl2spec.go b/packer/post_processor_mock.hcl2spec.go index 2e9c56ad3..faf66821f 100644 --- a/packer/post_processor_mock.hcl2spec.go +++ b/packer/post_processor_mock.hcl2spec.go @@ -4,7 +4,7 @@ package packer import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/zclconf/go-cty/cty" ) diff --git a/packer/progressbar_solaris.go b/packer/progressbar_solaris.go index 28f989f1a..1f8871680 100644 --- a/packer/progressbar_solaris.go +++ b/packer/progressbar_solaris.go @@ -1,7 +1,7 @@ package packer import ( - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type UiProgressBar = packersdk.NoopProgressTracker diff --git a/packer/provisioner.go b/packer/provisioner.go index 3a7449027..8d8c54a9b 100644 --- a/packer/provisioner.go +++ b/packer/provisioner.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" ) // A HookedProvisioner represents a provisioner and information describing it diff --git a/packer/provisioner_test.go b/packer/provisioner_test.go index ae193454d..4fad60b23 100644 --- a/packer/provisioner_test.go +++ b/packer/provisioner_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestProvisionHook_Impl(t *testing.T) { diff --git a/packer/provisioner_timeout.go b/packer/provisioner_timeout.go index 57e96ada7..627333e8b 100644 --- a/packer/provisioner_timeout.go +++ b/packer/provisioner_timeout.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // TimeoutProvisioner is a Provisioner implementation that can timeout after a diff --git a/packer/run_interfaces.go b/packer/run_interfaces.go index 708e31d1e..1bda138f1 100644 --- a/packer/run_interfaces.go +++ b/packer/run_interfaces.go @@ -2,7 +2,7 @@ package packer import ( "github.com/hashicorp/hcl/v2" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type GetBuildsOptions struct { diff --git a/packer/telemetry.go b/packer/telemetry.go index 6ab8a3420..92711d6a3 100644 --- a/packer/telemetry.go +++ b/packer/telemetry.go @@ -9,7 +9,7 @@ import ( "time" checkpoint "github.com/hashicorp/go-checkpoint" - "github.com/hashicorp/packer/packer-plugin-sdk/pathing" + "github.com/hashicorp/packer-plugin-sdk/pathing" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/packer/testing.go b/packer/testing.go index d6db88daa..fb54acc92 100644 --- a/packer/testing.go +++ b/packer/testing.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestCoreConfig(t *testing.T) *CoreConfig { diff --git a/packer/ui.go b/packer/ui.go index 05a947df6..1c6033ef4 100644 --- a/packer/ui.go +++ b/packer/ui.go @@ -14,7 +14,7 @@ import ( "unicode" getter "github.com/hashicorp/go-getter/v2" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) var ErrInterrupted = errors.New("interrupted") diff --git a/packer/ui_test.go b/packer/ui_test.go index 201a57aca..a21824440 100644 --- a/packer/ui_test.go +++ b/packer/ui_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // This reads the output from the bytes.Buffer in our test object diff --git a/post-processor/alicloud-import/post-processor.go b/post-processor/alicloud-import/post-processor.go index e3f673071..f1e351657 100644 --- a/post-processor/alicloud-import/post-processor.go +++ b/post-processor/alicloud-import/post-processor.go @@ -18,10 +18,10 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/services/ram" "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/hashicorp/hcl/v2/hcldec" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" packerecs "github.com/hashicorp/packer/builder/alicloud/ecs" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const ( diff --git a/post-processor/alicloud-import/post-processor.hcl2spec.go b/post-processor/alicloud-import/post-processor.hcl2spec.go index 37d95572b..ddc4fb651 100644 --- a/post-processor/alicloud-import/post-processor.hcl2spec.go +++ b/post-processor/alicloud-import/post-processor.hcl2spec.go @@ -4,8 +4,8 @@ package alicloudimport import ( "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/builder/alicloud/ecs" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/zclconf/go-cty/cty" ) diff --git a/post-processor/alicloud-import/version/version.go b/post-processor/alicloud-import/version/version.go index 4fc90d414..e0aa46d60 100644 --- a/post-processor/alicloud-import/version/version.go +++ b/post-processor/alicloud-import/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/amazon-import/post-processor.go b/post-processor/amazon-import/post-processor.go index 4bfc5d38c..49af07ba3 100644 --- a/post-processor/amazon-import/post-processor.go +++ b/post-processor/amazon-import/post-processor.go @@ -15,12 +15,12 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3/s3manager" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" awscommon "github.com/hashicorp/packer/builder/amazon/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "packer.post-processor.amazon-import" diff --git a/post-processor/amazon-import/version/version.go b/post-processor/amazon-import/version/version.go index aba836a09..695b1d778 100644 --- a/post-processor/amazon-import/version/version.go +++ b/post-processor/amazon-import/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/artifice/post-processor.go b/post-processor/artifice/post-processor.go index 5936e0d6a..a18ee9488 100644 --- a/post-processor/artifice/post-processor.go +++ b/post-processor/artifice/post-processor.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // The artifact-override post-processor allows you to specify arbitrary files as diff --git a/post-processor/artifice/version/version.go b/post-processor/artifice/version/version.go index ced113f66..85e9772b6 100644 --- a/post-processor/artifice/version/version.go +++ b/post-processor/artifice/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/checksum/post-processor.go b/post-processor/checksum/post-processor.go index 9143b330d..63d44ae14 100644 --- a/post-processor/checksum/post-processor.go +++ b/post-processor/checksum/post-processor.go @@ -15,10 +15,10 @@ import ( "path/filepath" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/post-processor/checksum/post-processor_test.go b/post-processor/checksum/post-processor_test.go index 430583ad2..8c388e3ac 100644 --- a/post-processor/checksum/post-processor_test.go +++ b/post-processor/checksum/post-processor_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template" "github.com/hashicorp/packer/builder/file" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template" ) const expectedFileContents = "Hello world!" diff --git a/post-processor/checksum/version/version.go b/post-processor/checksum/version/version.go index 9fd9352ac..be8fc4ac1 100644 --- a/post-processor/checksum/version/version.go +++ b/post-processor/checksum/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/compress/artifact_test.go b/post-processor/compress/artifact_test.go index 86ee6c664..cba4ecb51 100644 --- a/post-processor/compress/artifact_test.go +++ b/post-processor/compress/artifact_test.go @@ -3,7 +3,7 @@ package compress import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_ImplementsArtifact(t *testing.T) { diff --git a/post-processor/compress/post-processor.go b/post-processor/compress/post-processor.go index c4edbfe42..430e43689 100644 --- a/post-processor/compress/post-processor.go +++ b/post-processor/compress/post-processor.go @@ -15,10 +15,10 @@ import ( "github.com/biogo/hts/bgzf" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/klauspost/pgzip" "github.com/pierrec/lz4" "github.com/ulikunitz/xz" diff --git a/post-processor/compress/post-processor_test.go b/post-processor/compress/post-processor_test.go index d30bca9b6..18a1cbe4e 100644 --- a/post-processor/compress/post-processor_test.go +++ b/post-processor/compress/post-processor_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template" "github.com/hashicorp/packer/builder/file" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template" ) func TestDetectFilename(t *testing.T) { diff --git a/post-processor/compress/version/version.go b/post-processor/compress/version/version.go index 1b6e2b9c9..08eb1da41 100644 --- a/post-processor/compress/version/version.go +++ b/post-processor/compress/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/digitalocean-import/post-processor.go b/post-processor/digitalocean-import/post-processor.go index 42ff238bf..8d814bb1d 100644 --- a/post-processor/digitalocean-import/post-processor.go +++ b/post-processor/digitalocean-import/post-processor.go @@ -20,11 +20,11 @@ import ( "github.com/digitalocean/godo" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/digitalocean" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" ) const BuilderId = "packer.post-processor.digitalocean-import" diff --git a/post-processor/digitalocean-import/post-processor_test.go b/post-processor/digitalocean-import/post-processor_test.go index 23f664d90..699385d45 100644 --- a/post-processor/digitalocean-import/post-processor_test.go +++ b/post-processor/digitalocean-import/post-processor_test.go @@ -3,7 +3,7 @@ package digitaloceanimport import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestPostProcessor_ImplementsPostProcessor(t *testing.T) { diff --git a/post-processor/digitalocean-import/version/version.go b/post-processor/digitalocean-import/version/version.go index 921da1ce0..107e46440 100644 --- a/post-processor/digitalocean-import/version/version.go +++ b/post-processor/digitalocean-import/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/docker-import/post-processor.go b/post-processor/docker-import/post-processor.go index 7eef23e69..c5fe3d496 100644 --- a/post-processor/docker-import/post-processor.go +++ b/post-processor/docker-import/post-processor.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/docker" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" ) diff --git a/post-processor/docker-import/post-processor_test.go b/post-processor/docker-import/post-processor_test.go index 601788af5..d83b9e3a4 100644 --- a/post-processor/docker-import/post-processor_test.go +++ b/post-processor/docker-import/post-processor_test.go @@ -3,7 +3,7 @@ package dockerimport import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestPostProcessor_ImplementsPostProcessor(t *testing.T) { diff --git a/post-processor/docker-import/version/version.go b/post-processor/docker-import/version/version.go index cf475f281..cd350064b 100644 --- a/post-processor/docker-import/version/version.go +++ b/post-processor/docker-import/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go index c8d46d3d7..8bb0763f3 100644 --- a/post-processor/docker-push/post-processor.go +++ b/post-processor/docker-push/post-processor.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/docker" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" dockertag "github.com/hashicorp/packer/post-processor/docker-tag" ) diff --git a/post-processor/docker-push/post-processor_test.go b/post-processor/docker-push/post-processor_test.go index 94c6e03b8..5f85c3d41 100644 --- a/post-processor/docker-push/post-processor_test.go +++ b/post-processor/docker-push/post-processor_test.go @@ -5,8 +5,8 @@ import ( "context" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/docker" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" ) diff --git a/post-processor/docker-push/version/version.go b/post-processor/docker-push/version/version.go index 46293bdd7..4771f65cc 100644 --- a/post-processor/docker-push/version/version.go +++ b/post-processor/docker-push/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/docker-save/post-processor.go b/post-processor/docker-save/post-processor.go index e3a7a3d7c..f1a1b49e9 100644 --- a/post-processor/docker-save/post-processor.go +++ b/post-processor/docker-save/post-processor.go @@ -8,11 +8,11 @@ import ( "os" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/docker" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" dockertag "github.com/hashicorp/packer/post-processor/docker-tag" ) diff --git a/post-processor/docker-save/post-processor_test.go b/post-processor/docker-save/post-processor_test.go index 206102502..7a7ffbe90 100644 --- a/post-processor/docker-save/post-processor_test.go +++ b/post-processor/docker-save/post-processor_test.go @@ -3,7 +3,7 @@ package dockersave import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestPostProcessor_ImplementsPostProcessor(t *testing.T) { diff --git a/post-processor/docker-save/version/version.go b/post-processor/docker-save/version/version.go index 3d28839a8..b561d49ee 100644 --- a/post-processor/docker-save/version/version.go +++ b/post-processor/docker-save/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/docker-tag/post-processor.go b/post-processor/docker-tag/post-processor.go index 8344c6e6a..d29769d56 100644 --- a/post-processor/docker-tag/post-processor.go +++ b/post-processor/docker-tag/post-processor.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/docker" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" ) diff --git a/post-processor/docker-tag/post-processor_test.go b/post-processor/docker-tag/post-processor_test.go index df3e2baca..f9fe4aa74 100644 --- a/post-processor/docker-tag/post-processor_test.go +++ b/post-processor/docker-tag/post-processor_test.go @@ -5,8 +5,8 @@ import ( "context" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/docker" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" dockerimport "github.com/hashicorp/packer/post-processor/docker-import" "github.com/stretchr/testify/assert" ) diff --git a/post-processor/docker-tag/version/version.go b/post-processor/docker-tag/version/version.go index 49b18e987..c7506f136 100644 --- a/post-processor/docker-tag/version/version.go +++ b/post-processor/docker-tag/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/exoscale-import/post-processor.go b/post-processor/exoscale-import/post-processor.go index ed088398b..1045bf906 100644 --- a/post-processor/exoscale-import/post-processor.go +++ b/post-processor/exoscale-import/post-processor.go @@ -18,11 +18,11 @@ import ( "github.com/aws/aws-sdk-go/service/s3/s3manager" "github.com/exoscale/egoscale" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/builder/qemu" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/exoscale-import/version" ) diff --git a/post-processor/exoscale-import/version/version.go b/post-processor/exoscale-import/version/version.go index 14ef05ee9..0da76884d 100644 --- a/post-processor/exoscale-import/version/version.go +++ b/post-processor/exoscale-import/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go index 95a566722..85e43b863 100644 --- a/post-processor/googlecompute-export/post-processor.go +++ b/post-processor/googlecompute-export/post-processor.go @@ -10,14 +10,14 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/googlecompute" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" ) diff --git a/post-processor/googlecompute-export/version/version.go b/post-processor/googlecompute-export/version/version.go index 5c850a0cb..ed73e64c4 100644 --- a/post-processor/googlecompute-export/version/version.go +++ b/post-processor/googlecompute-export/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/googlecompute-import/artifact_test.go b/post-processor/googlecompute-import/artifact_test.go index d27f24aa3..67acb3f88 100644 --- a/post-processor/googlecompute-import/artifact_test.go +++ b/post-processor/googlecompute-import/artifact_test.go @@ -3,7 +3,7 @@ package googlecomputeimport import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_ImplementsArtifact(t *testing.T) { diff --git a/post-processor/googlecompute-import/post-processor.go b/post-processor/googlecompute-import/post-processor.go index 83e5aeeeb..6e9227316 100644 --- a/post-processor/googlecompute-import/post-processor.go +++ b/post-processor/googlecompute-import/post-processor.go @@ -19,11 +19,11 @@ import ( "google.golang.org/api/storage/v1" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/googlecompute" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/compress" ) diff --git a/post-processor/googlecompute-import/version/version.go b/post-processor/googlecompute-import/version/version.go index 035e0c4e1..6b33d609f 100644 --- a/post-processor/googlecompute-import/version/version.go +++ b/post-processor/googlecompute-import/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/manifest/post-processor.go b/post-processor/manifest/post-processor.go index 48c266f5b..8edbf9fcd 100644 --- a/post-processor/manifest/post-processor.go +++ b/post-processor/manifest/post-processor.go @@ -14,10 +14,10 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/post-processor/manifest/version/version.go b/post-processor/manifest/version/version.go index 87d2036b7..a4ded4309 100644 --- a/post-processor/manifest/version/version.go +++ b/post-processor/manifest/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/shell-local/post-processor.go b/post-processor/shell-local/post-processor.go index 3909cbb0c..8748e16ca 100644 --- a/post-processor/shell-local/post-processor.go +++ b/post-processor/shell-local/post-processor.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + sl "github.com/hashicorp/packer-plugin-sdk/shell-local" ) type PostProcessor struct { diff --git a/post-processor/shell-local/post-processor_test.go b/post-processor/shell-local/post-processor_test.go index fe4e67063..4007584cd 100644 --- a/post-processor/shell-local/post-processor_test.go +++ b/post-processor/shell-local/post-processor_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" ) diff --git a/post-processor/shell-local/version/version.go b/post-processor/shell-local/version/version.go index 6d79d7f3e..53f0562e8 100644 --- a/post-processor/shell-local/version/version.go +++ b/post-processor/shell-local/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/ucloud-import/post-processor.go b/post-processor/ucloud-import/post-processor.go index 1380afaf9..b96b5a5f6 100644 --- a/post-processor/ucloud-import/post-processor.go +++ b/post-processor/ucloud-import/post-processor.go @@ -12,12 +12,12 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/ucloud/ucloud-sdk-go/services/ufile" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" diff --git a/post-processor/ucloud-import/version/version.go b/post-processor/ucloud-import/version/version.go index ee2a0e653..07cdf5e21 100644 --- a/post-processor/ucloud-import/version/version.go +++ b/post-processor/ucloud-import/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/vagrant-cloud/artifact_test.go b/post-processor/vagrant-cloud/artifact_test.go index 2a3d5c735..1a3d7ea8b 100644 --- a/post-processor/vagrant-cloud/artifact_test.go +++ b/post-processor/vagrant-cloud/artifact_test.go @@ -3,7 +3,7 @@ package vagrantcloud import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_ImplementsArtifact(t *testing.T) { diff --git a/post-processor/vagrant-cloud/client.go b/post-processor/vagrant-cloud/client.go index b2df04035..2c36f25e3 100644 --- a/post-processor/vagrant-cloud/client.go +++ b/post-processor/vagrant-cloud/client.go @@ -11,7 +11,7 @@ import ( "os" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/net" + "github.com/hashicorp/packer-plugin-sdk/net" ) type VagrantCloudClient struct { diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go index 32b4e4fc1..53ff8c205 100644 --- a/post-processor/vagrant-cloud/post-processor.go +++ b/post-processor/vagrant-cloud/post-processor.go @@ -19,12 +19,12 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) var builtins = map[string]string{ diff --git a/post-processor/vagrant-cloud/post-processor_test.go b/post-processor/vagrant-cloud/post-processor_test.go index 0ff209a1d..298398154 100644 --- a/post-processor/vagrant-cloud/post-processor_test.go +++ b/post-processor/vagrant-cloud/post-processor_test.go @@ -13,7 +13,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" ) diff --git a/post-processor/vagrant-cloud/step_confirm_upload.go b/post-processor/vagrant-cloud/step_confirm_upload.go index a5463cc0a..fcb8e02ca 100644 --- a/post-processor/vagrant-cloud/step_confirm_upload.go +++ b/post-processor/vagrant-cloud/step_confirm_upload.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepConfirmUpload struct { diff --git a/post-processor/vagrant-cloud/step_create_provider.go b/post-processor/vagrant-cloud/step_create_provider.go index add13f5c0..5b6395110 100644 --- a/post-processor/vagrant-cloud/step_create_provider.go +++ b/post-processor/vagrant-cloud/step_create_provider.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type Provider struct { diff --git a/post-processor/vagrant-cloud/step_create_version.go b/post-processor/vagrant-cloud/step_create_version.go index 9333dd9e2..b6cbd94ec 100644 --- a/post-processor/vagrant-cloud/step_create_version.go +++ b/post-processor/vagrant-cloud/step_create_version.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type Version struct { diff --git a/post-processor/vagrant-cloud/step_prepare_upload.go b/post-processor/vagrant-cloud/step_prepare_upload.go index 85b4a9b5a..4f5efcb5a 100644 --- a/post-processor/vagrant-cloud/step_prepare_upload.go +++ b/post-processor/vagrant-cloud/step_prepare_upload.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type Upload struct { diff --git a/post-processor/vagrant-cloud/step_release_version.go b/post-processor/vagrant-cloud/step_release_version.go index d66a9e38e..53614ea80 100644 --- a/post-processor/vagrant-cloud/step_release_version.go +++ b/post-processor/vagrant-cloud/step_release_version.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type stepReleaseVersion struct { diff --git a/post-processor/vagrant-cloud/step_upload.go b/post-processor/vagrant-cloud/step_upload.go index 18c90b6ca..953bdca87 100644 --- a/post-processor/vagrant-cloud/step_upload.go +++ b/post-processor/vagrant-cloud/step_upload.go @@ -7,9 +7,9 @@ import ( "net/http" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" ) type stepUpload struct { diff --git a/post-processor/vagrant-cloud/step_verify_box.go b/post-processor/vagrant-cloud/step_verify_box.go index 6ad02132a..2731cbefd 100644 --- a/post-processor/vagrant-cloud/step_verify_box.go +++ b/post-processor/vagrant-cloud/step_verify_box.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type Box struct { diff --git a/post-processor/vagrant-cloud/version/version.go b/post-processor/vagrant-cloud/version/version.go index f5e5883f3..3c4fb601f 100644 --- a/post-processor/vagrant-cloud/version/version.go +++ b/post-processor/vagrant-cloud/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/vagrant/artifact_test.go b/post-processor/vagrant/artifact_test.go index 10c91a859..f17b4a9ab 100644 --- a/post-processor/vagrant/artifact_test.go +++ b/post-processor/vagrant/artifact_test.go @@ -3,7 +3,7 @@ package vagrant import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_ImplementsArtifact(t *testing.T) { diff --git a/post-processor/vagrant/aws.go b/post-processor/vagrant/aws.go index bce500935..b3454a6b6 100644 --- a/post-processor/vagrant/aws.go +++ b/post-processor/vagrant/aws.go @@ -6,7 +6,7 @@ import ( "strings" "text/template" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type AWSProvider struct{} diff --git a/post-processor/vagrant/aws_test.go b/post-processor/vagrant/aws_test.go index df8fce2e3..b1c2d05ff 100644 --- a/post-processor/vagrant/aws_test.go +++ b/post-processor/vagrant/aws_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestAWSProvider_impl(t *testing.T) { diff --git a/post-processor/vagrant/azure.go b/post-processor/vagrant/azure.go index 15887aed8..405efdf7c 100644 --- a/post-processor/vagrant/azure.go +++ b/post-processor/vagrant/azure.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type AzureProvider struct{} diff --git a/post-processor/vagrant/azure_test.go b/post-processor/vagrant/azure_test.go index 25c1acd88..bffb06b7d 100644 --- a/post-processor/vagrant/azure_test.go +++ b/post-processor/vagrant/azure_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestAzureProvider_impl(t *testing.T) { diff --git a/post-processor/vagrant/digitalocean.go b/post-processor/vagrant/digitalocean.go index 8e218b974..d22852093 100644 --- a/post-processor/vagrant/digitalocean.go +++ b/post-processor/vagrant/digitalocean.go @@ -6,7 +6,7 @@ import ( "strings" "text/template" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type digitalOceanVagrantfileTemplate struct { diff --git a/post-processor/vagrant/digitalocean_test.go b/post-processor/vagrant/digitalocean_test.go index 2dab71859..98a8eb94d 100644 --- a/post-processor/vagrant/digitalocean_test.go +++ b/post-processor/vagrant/digitalocean_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestDigitalOceanProvider_impl(t *testing.T) { diff --git a/post-processor/vagrant/docker.go b/post-processor/vagrant/docker.go index 4156833ae..bb1dfe390 100644 --- a/post-processor/vagrant/docker.go +++ b/post-processor/vagrant/docker.go @@ -3,7 +3,7 @@ package vagrant import ( "fmt" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type DockerProvider struct{} diff --git a/post-processor/vagrant/google.go b/post-processor/vagrant/google.go index 14ff46afe..cbe7cb0a9 100644 --- a/post-processor/vagrant/google.go +++ b/post-processor/vagrant/google.go @@ -4,7 +4,7 @@ import ( "bytes" "text/template" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type googleVagrantfileTemplate struct { diff --git a/post-processor/vagrant/google_test.go b/post-processor/vagrant/google_test.go index ffb1e64e6..5d713d21f 100644 --- a/post-processor/vagrant/google_test.go +++ b/post-processor/vagrant/google_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestGoogleProvider_impl(t *testing.T) { diff --git a/post-processor/vagrant/hyperv.go b/post-processor/vagrant/hyperv.go index 49ebb4ecd..8597ff201 100644 --- a/post-processor/vagrant/hyperv.go +++ b/post-processor/vagrant/hyperv.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type HypervProvider struct{} diff --git a/post-processor/vagrant/libvirt.go b/post-processor/vagrant/libvirt.go index 679a15e96..4a61bdf3d 100644 --- a/post-processor/vagrant/libvirt.go +++ b/post-processor/vagrant/libvirt.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // Lowercase a ascii letter. diff --git a/post-processor/vagrant/lxc.go b/post-processor/vagrant/lxc.go index 26eb5106c..1b0a80ba5 100644 --- a/post-processor/vagrant/lxc.go +++ b/post-processor/vagrant/lxc.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type LXCProvider struct{} diff --git a/post-processor/vagrant/parallels.go b/post-processor/vagrant/parallels.go index f98be6d7d..a40bafe97 100644 --- a/post-processor/vagrant/parallels.go +++ b/post-processor/vagrant/parallels.go @@ -5,7 +5,7 @@ import ( "path/filepath" "regexp" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // These are the extensions of files and directories that are unnecessary for the function diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go index 341aef2d6..d3df56080 100644 --- a/post-processor/vagrant/post-processor.go +++ b/post-processor/vagrant/post-processor.go @@ -16,11 +16,11 @@ import ( "text/template" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/tmp" "github.com/hashicorp/packer/post-processor/artifice" "github.com/mitchellh/mapstructure" ) diff --git a/post-processor/vagrant/post-processor_test.go b/post-processor/vagrant/post-processor_test.go index d2b947925..4529ef27c 100644 --- a/post-processor/vagrant/post-processor_test.go +++ b/post-processor/vagrant/post-processor_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/post-processor/vagrant/provider.go b/post-processor/vagrant/provider.go index 35e4d85cb..6b47ec295 100644 --- a/post-processor/vagrant/provider.go +++ b/post-processor/vagrant/provider.go @@ -1,7 +1,7 @@ package vagrant import ( - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // Provider is the interface that each provider must implement in order diff --git a/post-processor/vagrant/scaleway.go b/post-processor/vagrant/scaleway.go index 6277c6c2b..0ff6259d5 100644 --- a/post-processor/vagrant/scaleway.go +++ b/post-processor/vagrant/scaleway.go @@ -6,7 +6,7 @@ import ( "strings" "text/template" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type scalewayVagrantfileTemplate struct { diff --git a/post-processor/vagrant/util.go b/post-processor/vagrant/util.go index f1248c86f..be5e54157 100644 --- a/post-processor/vagrant/util.go +++ b/post-processor/vagrant/util.go @@ -11,8 +11,8 @@ import ( "path/filepath" "runtime" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/tmp" "github.com/klauspost/pgzip" ) diff --git a/post-processor/vagrant/version/version.go b/post-processor/vagrant/version/version.go index 9f54fee7b..8d1946e7b 100644 --- a/post-processor/vagrant/version/version.go +++ b/post-processor/vagrant/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/vagrant/virtualbox.go b/post-processor/vagrant/virtualbox.go index 834b3a82b..07ddcd920 100644 --- a/post-processor/vagrant/virtualbox.go +++ b/post-processor/vagrant/virtualbox.go @@ -11,7 +11,7 @@ import ( "path/filepath" "regexp" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type VBoxProvider struct{} diff --git a/post-processor/vagrant/virtualbox_test.go b/post-processor/vagrant/virtualbox_test.go index 3f072366d..243422283 100644 --- a/post-processor/vagrant/virtualbox_test.go +++ b/post-processor/vagrant/virtualbox_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/tmp" "github.com/stretchr/testify/assert" ) diff --git a/post-processor/vagrant/vmware.go b/post-processor/vagrant/vmware.go index 3d775a2b0..61a252644 100644 --- a/post-processor/vagrant/vmware.go +++ b/post-processor/vagrant/vmware.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type VMwareProvider struct{} diff --git a/post-processor/vsphere-template/post-processor.go b/post-processor/vsphere-template/post-processor.go index 1967e3735..852ce677f 100644 --- a/post-processor/vsphere-template/post-processor.go +++ b/post-processor/vsphere-template/post-processor.go @@ -11,14 +11,14 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" vmwcommon "github.com/hashicorp/packer/builder/vmware/common" vsphere "github.com/hashicorp/packer/builder/vsphere/common" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" vspherepost "github.com/hashicorp/packer/post-processor/vsphere" "github.com/vmware/govmomi" diff --git a/post-processor/vsphere-template/step_choose_datacenter.go b/post-processor/vsphere-template/step_choose_datacenter.go index 90ac9a86a..6645c4dc5 100644 --- a/post-processor/vsphere-template/step_choose_datacenter.go +++ b/post-processor/vsphere-template/step_choose_datacenter.go @@ -3,8 +3,8 @@ package vsphere_template import ( "context" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/vmware/govmomi" "github.com/vmware/govmomi/find" ) diff --git a/post-processor/vsphere-template/step_create_folder.go b/post-processor/vsphere-template/step_create_folder.go index 7ab7136e9..282848434 100644 --- a/post-processor/vsphere-template/step_create_folder.go +++ b/post-processor/vsphere-template/step_create_folder.go @@ -5,8 +5,8 @@ import ( "fmt" "path" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/vmware/govmomi" "github.com/vmware/govmomi/object" ) diff --git a/post-processor/vsphere-template/step_create_snapshot.go b/post-processor/vsphere-template/step_create_snapshot.go index 11d977e73..da815abb3 100644 --- a/post-processor/vsphere-template/step_create_snapshot.go +++ b/post-processor/vsphere-template/step_create_snapshot.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/post-processor/vsphere" "github.com/vmware/govmomi" ) diff --git a/post-processor/vsphere-template/step_mark_as_template.go b/post-processor/vsphere-template/step_mark_as_template.go index 76228cae2..6b5bc81ce 100644 --- a/post-processor/vsphere-template/step_mark_as_template.go +++ b/post-processor/vsphere-template/step_mark_as_template.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer/post-processor/vsphere" "github.com/vmware/govmomi" "github.com/vmware/govmomi/object" diff --git a/post-processor/vsphere-template/version/version.go b/post-processor/vsphere-template/version/version.go index c52a47174..46226fc6e 100644 --- a/post-processor/vsphere-template/version/version.go +++ b/post-processor/vsphere-template/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/vsphere/artifact_test.go b/post-processor/vsphere/artifact_test.go index f1b57508e..c5cf8c9cc 100644 --- a/post-processor/vsphere/artifact_test.go +++ b/post-processor/vsphere/artifact_test.go @@ -3,7 +3,7 @@ package vsphere import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestArtifact_ImplementsArtifact(t *testing.T) { diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go index e0102b5cb..634d93016 100644 --- a/post-processor/vsphere/post-processor.go +++ b/post-processor/vsphere/post-processor.go @@ -15,11 +15,11 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - shelllocal "github.com/hashicorp/packer/packer-plugin-sdk/shell-local" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + shelllocal "github.com/hashicorp/packer-plugin-sdk/shell-local" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) var ovftool string = "ovftool" diff --git a/post-processor/vsphere/version/version.go b/post-processor/vsphere/version/version.go index 413d1da66..5226fb020 100644 --- a/post-processor/vsphere/version/version.go +++ b/post-processor/vsphere/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/yandex-export/config.go b/post-processor/yandex-export/config.go index ce71f1ba2..5c5abb21e 100644 --- a/post-processor/yandex-export/config.go +++ b/post-processor/yandex-export/config.go @@ -4,7 +4,7 @@ package yandexexport import ( "fmt" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type ExchangeConfig struct { diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go index f149de5e8..355caeafd 100644 --- a/post-processor/yandex-export/post-processor.go +++ b/post-processor/yandex-export/post-processor.go @@ -11,15 +11,15 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/communicator" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/yandex" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/yandex-cloud/go-genproto/yandex/cloud/iam/v1" ycsdk "github.com/yandex-cloud/go-sdk" diff --git a/post-processor/yandex-export/post-processor_test.go b/post-processor/yandex-export/post-processor_test.go index 5befec952..872dbd6c9 100644 --- a/post-processor/yandex-export/post-processor_test.go +++ b/post-processor/yandex-export/post-processor_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/packer/builder/yandex" "github.com/stretchr/testify/require" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) func TestPostProcessor_Configure(t *testing.T) { diff --git a/post-processor/yandex-export/step-attach-disk.go b/post-processor/yandex-export/step-attach-disk.go index 038f7c5a7..f0246aab5 100644 --- a/post-processor/yandex-export/step-attach-disk.go +++ b/post-processor/yandex-export/step-attach-disk.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/yandex" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ) diff --git a/post-processor/yandex-export/step-create-s3-keys.go b/post-processor/yandex-export/step-create-s3-keys.go index 640f448ef..14e9e6daf 100644 --- a/post-processor/yandex-export/step-create-s3-keys.go +++ b/post-processor/yandex-export/step-create-s3-keys.go @@ -12,9 +12,9 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" + "github.com/hashicorp/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/yandex" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/yandex-cloud/go-genproto/yandex/cloud/iam/v1/awscompatibility" ) diff --git a/post-processor/yandex-export/step-upload-secrets.go b/post-processor/yandex-export/step-upload-secrets.go index 0ec9792d5..0988456df 100644 --- a/post-processor/yandex-export/step-upload-secrets.go +++ b/post-processor/yandex-export/step-upload-secrets.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/yandex" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/yandex-cloud/go-genproto/yandex/cloud/iam/v1/awscompatibility" ) diff --git a/post-processor/yandex-export/step-wait-cloud-init.go b/post-processor/yandex-export/step-wait-cloud-init.go index 688d9c839..4d78f80d1 100644 --- a/post-processor/yandex-export/step-wait-cloud-init.go +++ b/post-processor/yandex-export/step-wait-cloud-init.go @@ -8,10 +8,10 @@ import ( "fmt" "time" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" "github.com/hashicorp/packer/builder/yandex" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" ) type StepWaitCloudInitScript struct { diff --git a/post-processor/yandex-export/version/version.go b/post-processor/yandex-export/version/version.go index 7efc8ea03..8edc09a7a 100644 --- a/post-processor/yandex-export/version/version.go +++ b/post-processor/yandex-export/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/post-processor/yandex-import/post-processor.go b/post-processor/yandex-import/post-processor.go index 9d6b796f4..b949ba64f 100644 --- a/post-processor/yandex-import/post-processor.go +++ b/post-processor/yandex-import/post-processor.go @@ -8,12 +8,12 @@ import ( "fmt" "github.com/hashicorp/hcl/v2/hcldec" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/builder/file" "github.com/hashicorp/packer/builder/yandex" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/post-processor/artifice" "github.com/hashicorp/packer/post-processor/compress" yandexexport "github.com/hashicorp/packer/post-processor/yandex-export" diff --git a/post-processor/yandex-import/storage.go b/post-processor/yandex-import/storage.go index 2f30fa219..5715ed228 100644 --- a/post-processor/yandex-import/storage.go +++ b/post-processor/yandex-import/storage.go @@ -10,7 +10,7 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) const defaultS3Region = "ru-central1" diff --git a/post-processor/yandex-import/utils.go b/post-processor/yandex-import/utils.go index 40eb874de..4cdc38bd8 100644 --- a/post-processor/yandex-import/utils.go +++ b/post-processor/yandex-import/utils.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/yandex" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1" ) diff --git a/post-processor/yandex-import/version/version.go b/post-processor/yandex-import/version/version.go index 992e6ad08..d38c0ede4 100644 --- a/post-processor/yandex-import/version/version.go +++ b/post-processor/yandex-import/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/ansible-local/communicator_mock.go b/provisioner/ansible-local/communicator_mock.go index 054b76b02..4cec79020 100644 --- a/provisioner/ansible-local/communicator_mock.go +++ b/provisioner/ansible-local/communicator_mock.go @@ -5,7 +5,7 @@ import ( "io" "os" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type communicatorMock struct { diff --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go index 0dd55c9bf..a5b8eb75f 100644 --- a/provisioner/ansible-local/provisioner.go +++ b/provisioner/ansible-local/provisioner.go @@ -10,12 +10,12 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) const DefaultStagingDir = "/tmp/packer-provisioner-ansible-local" diff --git a/provisioner/ansible-local/provisioner_test.go b/provisioner/ansible-local/provisioner_test.go index 66238b11d..0fdf81bfa 100644 --- a/provisioner/ansible-local/provisioner_test.go +++ b/provisioner/ansible-local/provisioner_test.go @@ -11,9 +11,9 @@ import ( "fmt" "os/exec" + builderT "github.com/hashicorp/packer-plugin-sdk/acctest" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer/builder/docker" - builderT "github.com/hashicorp/packer/packer-plugin-sdk/acctest" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" "github.com/hashicorp/packer/provisioner/file" ) diff --git a/provisioner/ansible-local/version/version.go b/provisioner/ansible-local/version/version.go index 1f9f410f9..a4d455aad 100644 --- a/provisioner/ansible-local/version/version.go +++ b/provisioner/ansible-local/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/ansible/mock_ansible.go b/provisioner/ansible/mock_ansible.go index c17668dcb..22538efc8 100644 --- a/provisioner/ansible/mock_ansible.go +++ b/provisioner/ansible/mock_ansible.go @@ -5,7 +5,7 @@ package ansible import ( "fmt" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type provisionLogicTracker struct { diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go index e1b919002..58fac8e35 100644 --- a/provisioner/ansible/provisioner.go +++ b/provisioner/ansible/provisioner.go @@ -30,13 +30,13 @@ import ( "golang.org/x/crypto/ssh" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/adapter" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/adapter" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) type Config struct { diff --git a/provisioner/ansible/provisioner_test.go b/provisioner/ansible/provisioner_test.go index aa939d80f..12354f91f 100644 --- a/provisioner/ansible/provisioner_test.go +++ b/provisioner/ansible/provisioner_test.go @@ -14,9 +14,9 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + confighelper "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/ansible/version/version.go b/provisioner/ansible/version/version.go index 8009db0ca..09e4c48ee 100644 --- a/provisioner/ansible/version/version.go +++ b/provisioner/ansible/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/azure-dtlartifact/provisioner.go b/provisioner/azure-dtlartifact/provisioner.go index 1f9ca812d..39d415257 100644 --- a/provisioner/azure-dtlartifact/provisioner.go +++ b/provisioner/azure-dtlartifact/provisioner.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/packer/builder/azure/common/client" dtlBuilder "github.com/hashicorp/packer/builder/azure/dtl" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type DtlArtifact struct { diff --git a/provisioner/azure-dtlartifact/version/version.go b/provisioner/azure-dtlartifact/version/version.go index 89bb3ac46..5140ec7ba 100644 --- a/provisioner/azure-dtlartifact/version/version.go +++ b/provisioner/azure-dtlartifact/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/breakpoint/provisioner.go b/provisioner/breakpoint/provisioner.go index ebbdd3a11..6219d8bc4 100644 --- a/provisioner/breakpoint/provisioner.go +++ b/provisioner/breakpoint/provisioner.go @@ -9,10 +9,10 @@ import ( "golang.org/x/sync/errgroup" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/breakpoint/version/version.go b/provisioner/breakpoint/version/version.go index af4037d62..48a982805 100644 --- a/provisioner/breakpoint/version/version.go +++ b/provisioner/breakpoint/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go index 0447f8b84..a5b87889e 100644 --- a/provisioner/chef-client/provisioner.go +++ b/provisioner/chef-client/provisioner.go @@ -16,13 +16,13 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/pathing" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/guestexec" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/pathing" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type guestOSTypeConfig struct { diff --git a/provisioner/chef-client/provisioner_test.go b/provisioner/chef-client/provisioner_test.go index 80349fa5a..2b569314f 100644 --- a/provisioner/chef-client/provisioner_test.go +++ b/provisioner/chef-client/provisioner_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/provisioner/chef-client/version/version.go b/provisioner/chef-client/version/version.go index 2bc78f67c..f3cf16c4d 100644 --- a/provisioner/chef-client/version/version.go +++ b/provisioner/chef-client/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go index cfc049e99..e80b83f5a 100644 --- a/provisioner/chef-solo/provisioner.go +++ b/provisioner/chef-solo/provisioner.go @@ -16,11 +16,11 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/guestexec" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type guestOSTypeConfig struct { diff --git a/provisioner/chef-solo/provisioner_test.go b/provisioner/chef-solo/provisioner_test.go index 132cb36de..402e972fa 100644 --- a/provisioner/chef-solo/provisioner_test.go +++ b/provisioner/chef-solo/provisioner_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/provisioner/chef-solo/version/version.go b/provisioner/chef-solo/version/version.go index 63d20948b..44d97133e 100644 --- a/provisioner/chef-solo/version/version.go +++ b/provisioner/chef-solo/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/converge/provisioner.go b/provisioner/converge/provisioner.go index 73b690c42..77a3f749b 100644 --- a/provisioner/converge/provisioner.go +++ b/provisioner/converge/provisioner.go @@ -16,10 +16,10 @@ import ( "encoding/json" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // Config for Converge provisioner diff --git a/provisioner/converge/provisioner_test.go b/provisioner/converge/provisioner_test.go index 8b2c4bf29..c70022e7a 100644 --- a/provisioner/converge/provisioner_test.go +++ b/provisioner/converge/provisioner_test.go @@ -3,7 +3,7 @@ package converge import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/provisioner/converge/version/version.go b/provisioner/converge/version/version.go index 5d0d159a1..c37d9db82 100644 --- a/provisioner/converge/version/version.go +++ b/provisioner/converge/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/file/provisioner.go b/provisioner/file/provisioner.go index cd4088146..fe16d7590 100644 --- a/provisioner/file/provisioner.go +++ b/provisioner/file/provisioner.go @@ -13,10 +13,10 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/file/provisioner_test.go b/provisioner/file/provisioner_test.go index 07a9d2871..0e6f8061e 100644 --- a/provisioner/file/provisioner_test.go +++ b/provisioner/file/provisioner_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/provisioner/file/version/version.go b/provisioner/file/version/version.go index b9769b076..d524a335c 100644 --- a/provisioner/file/version/version.go +++ b/provisioner/file/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/inspec/provisioner.go b/provisioner/inspec/provisioner.go index f0e1b6add..db7164820 100644 --- a/provisioner/inspec/provisioner.go +++ b/provisioner/inspec/provisioner.go @@ -28,11 +28,11 @@ import ( "golang.org/x/crypto/ssh" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/adapter" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/adapter" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) var SupportedBackends = map[string]bool{"docker": true, "local": true, "ssh": true, "winrm": true} diff --git a/provisioner/inspec/provisioner_test.go b/provisioner/inspec/provisioner_test.go index 3725a7ba2..fdf1914e7 100644 --- a/provisioner/inspec/provisioner_test.go +++ b/provisioner/inspec/provisioner_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // Be sure to remove the InSpec stub file in each test with: diff --git a/provisioner/inspec/version/version.go b/provisioner/inspec/version/version.go index 80372a89c..ca5086143 100644 --- a/provisioner/inspec/version/version.go +++ b/provisioner/inspec/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go index 6d33afa1e..597b9a8e0 100644 --- a/provisioner/powershell/provisioner.go +++ b/provisioner/powershell/provisioner.go @@ -17,15 +17,15 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/shell" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + "github.com/hashicorp/packer-plugin-sdk/guestexec" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/shell" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) var retryableSleep = 2 * time.Second diff --git a/provisioner/powershell/provisioner_acc_test.go b/provisioner/powershell/provisioner_acc_test.go index 5488752c6..fb0be9a80 100644 --- a/provisioner/powershell/provisioner_acc_test.go +++ b/provisioner/powershell/provisioner_acc_test.go @@ -9,7 +9,7 @@ import ( "runtime" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/acctest/provisioneracc" + "github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc" ) const TestProvisionerType = "powershell" diff --git a/provisioner/powershell/provisioner_test.go b/provisioner/powershell/provisioner_test.go index a14e21910..65cbbe897 100644 --- a/provisioner/powershell/provisioner_test.go +++ b/provisioner/powershell/provisioner_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/powershell/version/version.go b/provisioner/powershell/version/version.go index 42765a845..2f89c8740 100644 --- a/provisioner/powershell/version/version.go +++ b/provisioner/powershell/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go index d0477912c..686333d4b 100644 --- a/provisioner/puppet-masterless/provisioner.go +++ b/provisioner/puppet-masterless/provisioner.go @@ -13,11 +13,11 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/guestexec" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/puppet-masterless/provisioner_test.go b/provisioner/puppet-masterless/provisioner_test.go index 9a522c59f..521fdaae0 100644 --- a/provisioner/puppet-masterless/provisioner_test.go +++ b/provisioner/puppet-masterless/provisioner_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/hashicorp/packer/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" "github.com/stretchr/testify/assert" ) diff --git a/provisioner/puppet-masterless/version/version.go b/provisioner/puppet-masterless/version/version.go index dde467d39..ecb0c42d3 100644 --- a/provisioner/puppet-masterless/version/version.go +++ b/provisioner/puppet-masterless/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go index 891e606db..e0e936fa7 100644 --- a/provisioner/puppet-server/provisioner.go +++ b/provisioner/puppet-server/provisioner.go @@ -12,11 +12,11 @@ import ( "strings" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/guestexec" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/puppet-server/provisioner_test.go b/provisioner/puppet-server/provisioner_test.go index 04d9d9dde..98507bfc5 100644 --- a/provisioner/puppet-server/provisioner_test.go +++ b/provisioner/puppet-server/provisioner_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() (config map[string]interface{}, tf *os.File) { diff --git a/provisioner/puppet-server/version/version.go b/provisioner/puppet-server/version/version.go index 606af83ec..402ab2dda 100644 --- a/provisioner/puppet-server/version/version.go +++ b/provisioner/puppet-server/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index dd94ef650..73fb3c0d2 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -16,11 +16,11 @@ import ( "github.com/hashicorp/go-getter/v2" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - "github.com/hashicorp/packer/packer-plugin-sdk/guestexec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/guestexec" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/provisioner/salt-masterless/provisioner_test.go b/provisioner/salt-masterless/provisioner_test.go index dc4d404d2..4aabf2c10 100644 --- a/provisioner/salt-masterless/provisioner_test.go +++ b/provisioner/salt-masterless/provisioner_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/provisioner/salt-masterless/version/version.go b/provisioner/salt-masterless/version/version.go index 293f242af..d61eb0409 100644 --- a/provisioner/salt-masterless/version/version.go +++ b/provisioner/salt-masterless/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/shell-local/provisioner.go b/provisioner/shell-local/provisioner.go index 1047a9bd6..e041278b6 100644 --- a/provisioner/shell-local/provisioner.go +++ b/provisioner/shell-local/provisioner.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + sl "github.com/hashicorp/packer-plugin-sdk/shell-local" ) type Provisioner struct { diff --git a/provisioner/shell-local/provisioner_acc_test.go b/provisioner/shell-local/provisioner_acc_test.go index c3998694e..fd0f390ae 100644 --- a/provisioner/shell-local/provisioner_acc_test.go +++ b/provisioner/shell-local/provisioner_acc_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/acctest/provisioneracc" - "github.com/hashicorp/packer/packer-plugin-sdk/acctest/testutils" + "github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc" + "github.com/hashicorp/packer-plugin-sdk/acctest/testutils" ) func fixtureDir() string { diff --git a/provisioner/shell-local/provisioner_test.go b/provisioner/shell-local/provisioner_test.go index f173763b3..7473e046d 100644 --- a/provisioner/shell-local/provisioner_test.go +++ b/provisioner/shell-local/provisioner_test.go @@ -3,7 +3,7 @@ package shell import ( "testing" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func TestProvisioner_impl(t *testing.T) { diff --git a/provisioner/shell-local/version/version.go b/provisioner/shell-local/version/version.go index 516b8705d..b26a6eb0a 100644 --- a/provisioner/shell-local/version/version.go +++ b/provisioner/shell-local/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go index 16e705d22..56333b15d 100644 --- a/provisioner/shell/provisioner.go +++ b/provisioner/shell/provisioner.go @@ -18,13 +18,13 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/shell" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/shell" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) type Config struct { diff --git a/provisioner/shell/provisioner_acc_test.go b/provisioner/shell/provisioner_acc_test.go index 98b986697..7dc956367 100644 --- a/provisioner/shell/provisioner_acc_test.go +++ b/provisioner/shell/provisioner_acc_test.go @@ -10,8 +10,8 @@ import ( "runtime" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/acctest/provisioneracc" - "github.com/hashicorp/packer/packer-plugin-sdk/acctest/testutils" + "github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc" + "github.com/hashicorp/packer-plugin-sdk/acctest/testutils" ) func fixtureDir() string { diff --git a/provisioner/shell/provisioner_test.go b/provisioner/shell/provisioner_test.go index 8068f3e65..0469b2d8a 100644 --- a/provisioner/shell/provisioner_test.go +++ b/provisioner/shell/provisioner_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/provisioner/shell/version/version.go b/provisioner/shell/version/version.go index 3e8d08e67..53fb36b1a 100644 --- a/provisioner/shell/version/version.go +++ b/provisioner/shell/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/sleep/provisioner.go b/provisioner/sleep/provisioner.go index 1f6746c97..ea64933a2 100644 --- a/provisioner/sleep/provisioner.go +++ b/provisioner/sleep/provisioner.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/config" ) type Provisioner struct { diff --git a/provisioner/sleep/version/version.go b/provisioner/sleep/version/version.go index cf8c1640e..cf38b8686 100644 --- a/provisioner/sleep/version/version.go +++ b/provisioner/sleep/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/windows-restart/provisioner.go b/provisioner/windows-restart/provisioner.go index e3afa1aa4..b921dcd3c 100644 --- a/provisioner/windows-restart/provisioner.go +++ b/provisioner/windows-restart/provisioner.go @@ -14,11 +14,11 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/common" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" ) diff --git a/provisioner/windows-restart/provisioner_test.go b/provisioner/windows-restart/provisioner_test.go index 93397e803..34977aba4 100644 --- a/provisioner/windows-restart/provisioner_test.go +++ b/provisioner/windows-restart/provisioner_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/provisioner/windows-restart/version/version.go b/provisioner/windows-restart/version/version.go index 385f8b31d..e20c9ddc1 100644 --- a/provisioner/windows-restart/version/version.go +++ b/provisioner/windows-restart/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go index 8d1e1c4b9..b319bf9d0 100644 --- a/provisioner/windows-shell/provisioner.go +++ b/provisioner/windows-shell/provisioner.go @@ -16,13 +16,13 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" - "github.com/hashicorp/packer/packer-plugin-sdk/shell" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/shell" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) //FIXME query remote host or use %SYSTEMROOT%, %TEMP% and more creative filename diff --git a/provisioner/windows-shell/provisioner_test.go b/provisioner/windows-shell/provisioner_test.go index 961bbe76c..0a4bd445c 100644 --- a/provisioner/windows-shell/provisioner_test.go +++ b/provisioner/windows-shell/provisioner_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func testConfig() map[string]interface{} { diff --git a/provisioner/windows-shell/version/version.go b/provisioner/windows-shell/version/version.go index 8b41e03ad..70d61de83 100644 --- a/provisioner/windows-shell/version/version.go +++ b/provisioner/windows-shell/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/hashicorp/packer/packer-plugin-sdk/version" + "github.com/hashicorp/packer-plugin-sdk/version" packerVersion "github.com/hashicorp/packer/version" ) diff --git a/scripts/generate-plugins.go b/scripts/generate-plugins.go index 67bfd5b9d..4d244646c 100644 --- a/scripts/generate-plugins.go +++ b/scripts/generate-plugins.go @@ -254,8 +254,8 @@ import ( "strings" "github.com/hashicorp/packer/packer" -packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/plugin" +packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/plugin" IMPORTS ) diff --git a/tty_solaris.go b/tty_solaris.go index 4706e77d2..1c20d3acf 100644 --- a/tty_solaris.go +++ b/tty_solaris.go @@ -3,7 +3,7 @@ package main import ( "fmt" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func openTTY() (packersdk.TTY, error) { diff --git a/version/version.go b/version/version.go index a4c35f1ee..03a68a973 100644 --- a/version/version.go +++ b/version/version.go @@ -2,7 +2,7 @@ package version import ( "github.com/hashicorp/go-version" - pluginVersion "github.com/hashicorp/packer/packer-plugin-sdk/version" + pluginVersion "github.com/hashicorp/packer-plugin-sdk/version" ) // The git commit that was compiled. This will be filled in by the compiler. diff --git a/website/content/docs/extending/plugins.mdx b/website/content/docs/extending/plugins.mdx index ff5607b4d..c03b99016 100644 --- a/website/content/docs/extending/plugins.mdx +++ b/website/content/docs/extending/plugins.mdx @@ -159,7 +159,7 @@ binary as it will allow to add more that one plugin per binary. ```go import ( - "github.com/hashicorp/packer/packer-plugin-sdk/plugin" + "github.com/hashicorp/packer-plugin-sdk/plugin" ) // Assume this implements packer.Builder