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..85484a97c 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{} { @@ -214,7 +214,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppiesPath := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppiesPath := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppiesPath), fmt.Sprintf("%s/foo.ps1", floppiesPath)} b = Builder{} _, warns, err = b.Prepare(config) 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..f663012d1 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{} { @@ -354,7 +354,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} b = Builder{} _, warns, err = b.Prepare(config) 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..5df4f702d 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{} { @@ -66,7 +66,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} b = Builder{} _, warns, err = b.Prepare(config) 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..0b7b5b0f0 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{} { @@ -74,7 +74,7 @@ func TestNewConfig_sourcePath(t *testing.T) { func TestNewConfig_FloppyFiles(t *testing.T) { c := testConfig(t) - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" c["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} _, err := (&Config{}).Prepare(c) if err != nil { 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..1f9969e10 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" ) @@ -328,7 +328,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", c.FloppyFiles) } - floppies_path := "../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} c = Config{} warns, err = c.Prepare(config) 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/packer-plugin-sdk/test-fixtures/floppies/bar.bat b/builder/test-fixtures/floppies/bar.bat similarity index 100% rename from packer-plugin-sdk/test-fixtures/floppies/bar.bat rename to builder/test-fixtures/floppies/bar.bat diff --git a/packer-plugin-sdk/test-fixtures/floppies/foo.ps1 b/builder/test-fixtures/floppies/foo.ps1 similarity index 100% rename from packer-plugin-sdk/test-fixtures/floppies/foo.ps1 rename to builder/test-fixtures/floppies/foo.ps1 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..f5be5225a 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{} { @@ -106,7 +106,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} b = Builder{} _, warns, err = b.Prepare(config) 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..18d134259 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{} { @@ -32,7 +32,7 @@ func getTempFile(t *testing.T) *os.File { func TestNewConfig_FloppyFiles(t *testing.T) { cfg := testConfig(t) - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" cfg["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} var c Config _, err := c.Prepare(cfg) 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..cf0205ca0 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{} { @@ -107,7 +107,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} b = Builder{} _, warns, err = b.Prepare(config) 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..55b57b453 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) { @@ -36,7 +36,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) { t.Fatalf("bad: %#v", b.config.FloppyFiles) } - floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies" + floppies_path := "../../test-fixtures/floppies" config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)} b = Builder{} _, warns, err = b.Prepare(config) 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/go.mod b/go.mod index 7eb45f330..37cb1d9f2 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/digitalocean/go-qemu v0.0.0-20181112162955-dd7bb9c771b8 github.com/digitalocean/godo v1.11.1 github.com/dylanmei/iso8601 v0.1.0 // indirect - github.com/dylanmei/winrmtest v0.0.0-20170819153634-c2fbb09e6c08 + github.com/dylanmei/winrmtest v0.0.0-20170819153634-c2fbb09e6c08 // indirect github.com/exoscale/egoscale v0.18.1 github.com/fatih/camelcase v1.0.0 github.com/fatih/structtag v1.0.0 @@ -42,11 +42,11 @@ require ( github.com/go-ole/go-ole v1.2.4 // indirect github.com/go-resty/resty/v2 v2.3.0 github.com/gobwas/glob v0.2.3 - github.com/gofrs/flock v0.7.3 + github.com/gofrs/flock v0.7.3 // indirect github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/google/go-cmp v0.5.2 github.com/google/go-querystring v1.0.0 // indirect - github.com/google/shlex v0.0.0-20150127133951-6f45313302b9 + github.com/google/shlex v0.0.0-20150127133951-6f45313302b9 // indirect github.com/google/uuid v1.1.1 github.com/gophercloud/gophercloud v0.12.0 github.com/gophercloud/utils v0.0.0-20200508015959-b0167b94122c @@ -54,13 +54,13 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 github.com/hashicorp/aws-sdk-go-base v0.6.0 - github.com/hashicorp/consul/api v1.4.0 + github.com/hashicorp/consul/api v1.4.0 // indirect github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de github.com/hashicorp/go-cleanhttp v0.5.1 github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840 - github.com/hashicorp/go-getter/gcs/v2 v2.0.0-20200604122502-a6995fa1edad - github.com/hashicorp/go-getter/s3/v2 v2.0.0-20200604122502-a6995fa1edad + github.com/hashicorp/go-getter/gcs/v2 v2.0.0-20200604122502-a6995fa1edad // indirect + github.com/hashicorp/go-getter/s3/v2 v2.0.0-20200604122502-a6995fa1edad // indirect github.com/hashicorp/go-getter/v2 v2.0.0-20200604122502-a6995fa1edad github.com/hashicorp/go-immutable-radix v1.1.0 // indirect github.com/hashicorp/go-msgpack v0.5.5 // indirect @@ -70,13 +70,14 @@ require ( github.com/hashicorp/go-version v1.2.0 github.com/hashicorp/golang-lru v0.5.3 // indirect github.com/hashicorp/hcl/v2 v2.6.0 + github.com/hashicorp/packer-plugin-sdk v0.0.4 github.com/hashicorp/serf v0.9.2 // indirect github.com/hashicorp/vault/api v1.0.4 - github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d + github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect github.com/hetznercloud/hcloud-go v1.15.1 github.com/hyperonecom/h1-client-go v0.0.0-20191203060043-b46280e4c4a4 github.com/jdcloud-api/jdcloud-sdk-go v1.9.1-0.20190605102154-3d81a50ca961 - github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 + github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62 github.com/json-iterator/go v1.1.6 // indirect github.com/jtolds/gls v4.2.1+incompatible // indirect @@ -90,12 +91,12 @@ require ( github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88 github.com/mattn/go-tty v0.0.0-20191112051231-74040eebce08 github.com/mitchellh/cli v1.1.0 - github.com/mitchellh/go-fs v0.0.0-20180402234041-7b48fa161ea7 + github.com/mitchellh/go-fs v0.0.0-20180402234041-7b48fa161ea7 // indirect github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/go-testing-interface v1.0.3 // indirect github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed github.com/mitchellh/gox v1.0.1 // indirect - github.com/mitchellh/iochan v1.0.0 + github.com/mitchellh/iochan v1.0.0 // indirect github.com/mitchellh/mapstructure v1.2.3 github.com/mitchellh/panicwrap v1.0.0 github.com/mitchellh/prefixedio v0.0.0-20151214002211-6e6954073784 @@ -106,13 +107,13 @@ require ( github.com/olekukonko/tablewriter v0.0.0-20180105111133-96aac992fc8b github.com/oracle/oci-go-sdk v18.0.0+incompatible github.com/outscale/osc-sdk-go/osc v0.0.0-20200722135656-d654809d0699 - github.com/packer-community/winrmcp v0.0.0-20180921204643-0fd363d6159a + github.com/packer-community/winrmcp v0.0.0-20180921204643-0fd363d6159a // indirect github.com/pierrec/lz4 v2.0.5+incompatible github.com/pkg/errors v0.9.1 - github.com/pkg/sftp v0.0.0-20160118190721-e84cc8c755ca + github.com/pkg/sftp v0.0.0-20160118190721-e84cc8c755ca // indirect github.com/posener/complete v1.2.3 github.com/profitbricks/profitbricks-sdk-go v4.0.2+incompatible - github.com/ryanuber/go-glob v1.0.0 + github.com/ryanuber/go-glob v1.0.0 // indirect github.com/satori/go.uuid v1.2.0 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7 github.com/shirou/gopsutil v2.18.12+incompatible @@ -124,7 +125,7 @@ require ( github.com/tencentcloud/tencentcloud-sdk-go v3.0.222+incompatible github.com/ucloud/ucloud-sdk-go v0.16.3 github.com/ufilesdk-dev/ufile-gosdk v0.0.0-20190830075812-b4dbc4ef43a6 - github.com/ugorji/go v0.0.0-20151218193438-646ae4a518c1 + github.com/ugorji/go v0.0.0-20151218193438-646ae4a518c1 // indirect github.com/ulikunitz/xz v0.5.5 github.com/vmware/govmomi v0.23.1 github.com/xanzy/go-cloudstack v0.0.0-20190526095453-42f262b63ed0 diff --git a/go.sum b/go.sum index a3bdb626a..64ce41485 100644 --- a/go.sum +++ b/go.sum @@ -402,6 +402,9 @@ github.com/hashicorp/memberlist v0.1.3 h1:EmmoJme1matNzb+hMpDuR/0sbJSUisxyqBGG67 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2 h1:5+RffWKwqJ71YPu9mWsF7ZOscZmwfasdA8kbdC7AO2g= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/packer v1.6.6/go.mod h1:meJucaEeJro8UP1jw+KaOCpaiC4VE+itPLXY8lbIU2A= +github.com/hashicorp/packer-plugin-sdk v0.0.4 h1:pWtrLNRburBZvZL0o4j8UgK9u+/V58fE+/0Z7A9GI+s= +github.com/hashicorp/packer-plugin-sdk v0.0.4/go.mod h1:Nvh28f+Jmpp2rcaN79bULTouNkGNDRfHckhHKTAXtyU= github.com/hashicorp/serf v0.8.2 h1:YZ7UKsJv+hKjqGVUUbtE3HNj79Eln2oQ75tniF6iPt0= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.2 h1:yJoyfZXo4Pk2p/M/viW+YLibBFiIbKoP79gu7kDAFP0= 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 '^ - CommentNode -) - -// NodeNavigator provides cursor model for navigating XML data. -type NodeNavigator interface { - // NodeType returns the XPathNodeType of the current node. - NodeType() NodeType - - // LocalName gets the Name of the current node. - LocalName() string - - // Prefix returns namespace prefix associated with the current node. - Prefix() string - - // Value gets the value of current node. - Value() string - - // Copy does a deep copy of the NodeNavigator and all its components. - Copy() NodeNavigator - - // MoveToRoot moves the NodeNavigator to the root node of the current node. - MoveToRoot() - - // MoveToParent moves the NodeNavigator to the parent node of the current node. - MoveToParent() bool - - // MoveToNextAttribute moves the NodeNavigator to the next attribute on current node. - MoveToNextAttribute() bool - - // MoveToChild moves the NodeNavigator to the first child node of the current node. - MoveToChild() bool - - // MoveToFirst moves the NodeNavigator to the first sibling node of the current node. - MoveToFirst() bool - - // MoveToNext moves the NodeNavigator to the next sibling node of the current node. - MoveToNext() bool - - // MoveToPrevious moves the NodeNavigator to the previous sibling node of the current node. - MoveToPrevious() bool - - // MoveTo moves the NodeNavigator to the same position as the specified NodeNavigator. - MoveTo(NodeNavigator) bool -} - -// NodeIterator holds all matched Node object. -type NodeIterator struct { - node NodeNavigator - query query -} - -// Current returns current node which matched. -func (t *NodeIterator) Current() NodeNavigator { - return t.node -} - -// MoveNext moves Navigator to the next match node. -func (t *NodeIterator) MoveNext() bool { - n := t.query.Select(t) - if n != nil { - if !t.node.MoveTo(n) { - t.node = n.Copy() - } - return true - } - return false -} - -// Select selects a node set using the specified XPath expression. -// This method is deprecated, recommend using Expr.Select() method instead. -func Select(root NodeNavigator, expr string) *NodeIterator { - exp, err := Compile(expr) - if err != nil { - panic(err) - } - return exp.Select(root) -} - -// Expr is an XPath expression for query. -type Expr struct { - s string - q query -} - -type iteratorFunc func() NodeNavigator - -func (f iteratorFunc) Current() NodeNavigator { - return f() -} - -// Evaluate returns the result of the expression. -// The result type of the expression is one of the follow: bool,float64,string,NodeIterator). -func (expr *Expr) Evaluate(root NodeNavigator) interface{} { - val := expr.q.Evaluate(iteratorFunc(func() NodeNavigator { return root })) - switch val.(type) { - case query: - return &NodeIterator{query: expr.q.Clone(), node: root} - } - return val -} - -// Select selects a node set using the specified XPath expression. -func (expr *Expr) Select(root NodeNavigator) *NodeIterator { - return &NodeIterator{query: expr.q.Clone(), node: root} -} - -// String returns XPath expression string. -func (expr *Expr) String() string { - return expr.s -} - -// Compile compiles an XPath expression string. -func Compile(expr string) (*Expr, error) { - if expr == "" { - return nil, errors.New("expr expression is nil") - } - qy, err := build(expr) - if err != nil { - return nil, err - } - return &Expr{s: expr, q: qy}, nil -} - -// MustCompile compiles an XPath expression string and ignored error. -func MustCompile(expr string) *Expr { - exp, err := Compile(expr) - if err != nil { - return nil - } - return exp -} diff --git a/vendor/github.com/antchfx/xquery/LICENSE b/vendor/github.com/antchfx/xquery/LICENSE deleted file mode 100644 index e14c37141..000000000 --- a/vendor/github.com/antchfx/xquery/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/vendor/github.com/antchfx/xquery/xml/node.go b/vendor/github.com/antchfx/xquery/xml/node.go deleted file mode 100644 index 064d1cdd8..000000000 --- a/vendor/github.com/antchfx/xquery/xml/node.go +++ /dev/null @@ -1,252 +0,0 @@ -package xmlquery - -import ( - "bytes" - "encoding/xml" - "fmt" - "io" - "net/http" - "strings" - - "golang.org/x/net/html/charset" -) - -// A NodeType is the type of a Node. -type NodeType uint - -const ( - // DocumentNode is a document object that, as the root of the document tree, - // provides access to the entire XML document. - DocumentNode NodeType = iota - // DeclarationNode is the document type declaration, indicated by the following - // tag (for example, ). - DeclarationNode - // ElementNode is an element (for example, ). - ElementNode - // TextNode is the text content of a node. - TextNode - // CommentNode a comment (for example, ). - CommentNode -) - -// A Node consists of a NodeType and some Data (tag name for -// element nodes, content for text) and are part of a tree of Nodes. -type Node struct { - Parent, FirstChild, LastChild, PrevSibling, NextSibling *Node - - Type NodeType - Data string - Prefix string - NamespaceURI string - Attr []xml.Attr - - level int // node level in the tree -} - -// InnerText returns the text between the start and end tags of the object. -func (n *Node) InnerText() string { - var output func(*bytes.Buffer, *Node) - output = func(buf *bytes.Buffer, n *Node) { - switch n.Type { - case TextNode: - buf.WriteString(n.Data) - return - case CommentNode: - return - } - for child := n.FirstChild; child != nil; child = child.NextSibling { - output(buf, child) - } - } - - var buf bytes.Buffer - output(&buf, n) - return buf.String() -} - -func outputXML(buf *bytes.Buffer, n *Node) { - if n.Type == TextNode || n.Type == CommentNode { - buf.WriteString(strings.TrimSpace(n.Data)) - return - } - buf.WriteString("<" + n.Data) - for _, attr := range n.Attr { - if attr.Name.Space != "" { - buf.WriteString(fmt.Sprintf(` %s:%s="%s"`, attr.Name.Space, attr.Name.Local, attr.Value)) - } else { - buf.WriteString(fmt.Sprintf(` %s="%s"`, attr.Name.Local, attr.Value)) - } - } - buf.WriteString(">") - for child := n.FirstChild; child != nil; child = child.NextSibling { - outputXML(buf, child) - } - buf.WriteString(fmt.Sprintf("", n.Data)) -} - -// OutputXML returns the text that including tags name. -func (n *Node) OutputXML(self bool) string { - var buf bytes.Buffer - if self { - outputXML(&buf, n) - } else { - for n := n.FirstChild; n != nil; n = n.NextSibling { - outputXML(&buf, n) - } - } - - return buf.String() -} - -func addAttr(n *Node, key, val string) { - var attr xml.Attr - if i := strings.Index(key, ":"); i > 0 { - attr = xml.Attr{ - Name: xml.Name{Space: key[:i], Local: key[i+1:]}, - Value: val, - } - } else { - attr = xml.Attr{ - Name: xml.Name{Local: key}, - Value: val, - } - } - - n.Attr = append(n.Attr, attr) -} - -func addChild(parent, n *Node) { - n.Parent = parent - if parent.FirstChild == nil { - parent.FirstChild = n - } else { - parent.LastChild.NextSibling = n - n.PrevSibling = parent.LastChild - } - - parent.LastChild = n -} - -func addSibling(sibling, n *Node) { - n.Parent = sibling.Parent - sibling.NextSibling = n - n.PrevSibling = sibling - if sibling.Parent != nil { - sibling.Parent.LastChild = n - } -} - -// LoadURL loads the XML document from the specified URL. -func LoadURL(url string) (*Node, error) { - resp, err := http.Get(url) - if err != nil { - return nil, err - } - defer resp.Body.Close() - return parse(resp.Body) -} - -func parse(r io.Reader) (*Node, error) { - var ( - decoder = xml.NewDecoder(r) - doc = &Node{Type: DocumentNode} - space2prefix = make(map[string]string) - level = 0 - ) - decoder.CharsetReader = charset.NewReaderLabel - prev := doc - for { - tok, err := decoder.Token() - switch { - case err == io.EOF: - goto quit - case err != nil: - return nil, err - } - - switch tok := tok.(type) { - case xml.StartElement: - if level == 0 { - // mising XML declaration - node := &Node{Type: DeclarationNode, Data: "xml", level: 1} - addChild(prev, node) - level = 1 - prev = node - } - node := &Node{ - Type: ElementNode, - Data: tok.Name.Local, - Prefix: space2prefix[tok.Name.Space], - NamespaceURI: tok.Name.Space, - Attr: tok.Attr, - level: level, - } - for _, att := range tok.Attr { - if att.Name.Space == "xmlns" { - space2prefix[att.Value] = att.Name.Local - } - } - //fmt.Println(fmt.Sprintf("start > %s : %d", node.Data, level)) - if level == prev.level { - addSibling(prev, node) - } else if level > prev.level { - addChild(prev, node) - } else if level < prev.level { - for i := prev.level - level; i > 1; i-- { - prev = prev.Parent - } - addSibling(prev.Parent, node) - } - prev = node - level++ - case xml.EndElement: - level-- - case xml.CharData: - node := &Node{Type: TextNode, Data: string(tok), level: level} - if level == prev.level { - addSibling(prev, node) - } else if level > prev.level { - addChild(prev, node) - } - case xml.Comment: - node := &Node{Type: CommentNode, Data: string(tok), level: level} - if level == prev.level { - addSibling(prev, node) - } else if level > prev.level { - addChild(prev, node) - } - case xml.ProcInst: // Processing Instruction - if prev.Type != DeclarationNode { - level++ - } - node := &Node{Type: DeclarationNode, Data: tok.Target, level: level} - pairs := strings.Split(string(tok.Inst), " ") - for _, pair := range pairs { - pair = strings.TrimSpace(pair) - if i := strings.Index(pair, "="); i > 0 { - addAttr(node, pair[:i], strings.Trim(pair[i+1:], `"`)) - } - } - if level == prev.level { - addSibling(prev, node) - } else if level > prev.level { - addChild(prev, node) - } - prev = node - case xml.Directive: - } - - } -quit: - return doc, nil -} - -// Parse returns the parse tree for the XML from the given Reader. -func Parse(r io.Reader) (*Node, error) { - return parse(r) -} - -// ParseXML returns the parse tree for the XML from the given Reader.Deprecated. -func ParseXML(r io.Reader) (*Node, error) { - return parse(r) -} diff --git a/vendor/github.com/antchfx/xquery/xml/query.go b/vendor/github.com/antchfx/xquery/xml/query.go deleted file mode 100644 index 7981c637e..000000000 --- a/vendor/github.com/antchfx/xquery/xml/query.go +++ /dev/null @@ -1,230 +0,0 @@ -/* -Package xmlquery provides extract data from XML documents using XPath expression. -*/ -package xmlquery - -import ( - "fmt" - "strings" - - "github.com/antchfx/xpath" -) - -// SelectElements finds child elements with the specified name. -func (n *Node) SelectElements(name string) []*Node { - return Find(n, name) -} - -// SelectElement finds child elements with the specified name. -func (n *Node) SelectElement(name string) *Node { - return FindOne(n, name) -} - -// SelectAttr returns the attribute value with the specified name. -func (n *Node) SelectAttr(name string) string { - var local, space string - local = name - if i := strings.Index(name, ":"); i > 0 { - space = name[:i] - local = name[i+1:] - } - for _, attr := range n.Attr { - if attr.Name.Local == local && attr.Name.Space == space { - return attr.Value - } - } - return "" -} - -var _ xpath.NodeNavigator = &NodeNavigator{} - -// CreateXPathNavigator creates a new xpath.NodeNavigator for the specified html.Node. -func CreateXPathNavigator(top *Node) *NodeNavigator { - return &NodeNavigator{curr: top, root: top, attr: -1} -} - -// Find searches the Node that matches by the specified XPath expr. -func Find(top *Node, expr string) []*Node { - exp, err := xpath.Compile(expr) - if err != nil { - panic(err) - } - t := exp.Select(CreateXPathNavigator(top)) - var elems []*Node - for t.MoveNext() { - elems = append(elems, (t.Current().(*NodeNavigator)).curr) - } - return elems -} - -// FindOne searches the Node that matches by the specified XPath expr, -// and returns first element of matched. -func FindOne(top *Node, expr string) *Node { - exp, err := xpath.Compile(expr) - if err != nil { - panic(err) - } - t := exp.Select(CreateXPathNavigator(top)) - var elem *Node - if t.MoveNext() { - elem = (t.Current().(*NodeNavigator)).curr - } - return elem -} - -// FindEach searches the html.Node and calls functions cb. -func FindEach(top *Node, expr string, cb func(int, *Node)) { - exp, err := xpath.Compile(expr) - if err != nil { - panic(err) - } - t := exp.Select(CreateXPathNavigator(top)) - var i int - for t.MoveNext() { - cb(i, (t.Current().(*NodeNavigator)).curr) - i++ - } -} - -type NodeNavigator struct { - root, curr *Node - attr int -} - -func (x *NodeNavigator) Current() *Node { - return x.curr -} - -func (x *NodeNavigator) NodeType() xpath.NodeType { - switch x.curr.Type { - case CommentNode: - return xpath.CommentNode - case TextNode: - return xpath.TextNode - case DeclarationNode, DocumentNode: - return xpath.RootNode - case ElementNode: - if x.attr != -1 { - return xpath.AttributeNode - } - return xpath.ElementNode - } - panic(fmt.Sprintf("unknown XML node type: %v", x.curr.Type)) -} - -func (x *NodeNavigator) LocalName() string { - if x.attr != -1 { - return x.curr.Attr[x.attr].Name.Local - } - return x.curr.Data - -} - -func (x *NodeNavigator) Prefix() string { - return x.curr.Prefix -} - -func (x *NodeNavigator) Value() string { - switch x.curr.Type { - case CommentNode: - return x.curr.Data - case ElementNode: - if x.attr != -1 { - return x.curr.Attr[x.attr].Value - } - return x.curr.InnerText() - case TextNode: - return x.curr.Data - } - return "" -} - -func (x *NodeNavigator) Copy() xpath.NodeNavigator { - n := *x - return &n -} - -func (x *NodeNavigator) MoveToRoot() { - x.curr = x.root -} - -func (x *NodeNavigator) MoveToParent() bool { - if x.attr != -1 { - x.attr = -1 - return true - } else if node := x.curr.Parent; node != nil { - x.curr = node - return true - } - return false -} - -func (x *NodeNavigator) MoveToNextAttribute() bool { - if x.attr >= len(x.curr.Attr)-1 { - return false - } - x.attr++ - return true -} - -func (x *NodeNavigator) MoveToChild() bool { - if x.attr != -1 { - return false - } - if node := x.curr.FirstChild; node != nil { - x.curr = node - return true - } - return false -} - -func (x *NodeNavigator) MoveToFirst() bool { - if x.attr != -1 || x.curr.PrevSibling == nil { - return false - } - for { - node := x.curr.PrevSibling - if node == nil { - break - } - x.curr = node - } - return true -} - -func (x *NodeNavigator) String() string { - return x.Value() -} - -func (x *NodeNavigator) MoveToNext() bool { - if x.attr != -1 { - return false - } - if node := x.curr.NextSibling; node != nil { - x.curr = node - return true - } - return false -} - -func (x *NodeNavigator) MoveToPrevious() bool { - if x.attr != -1 { - return false - } - if node := x.curr.PrevSibling; node != nil { - x.curr = node - return true - } - return false -} - -func (x *NodeNavigator) MoveTo(other xpath.NodeNavigator) bool { - node, ok := other.(*NodeNavigator) - if !ok || node.root != x.root { - return false - } - - x.curr = node.curr - x.attr = node.attr - return true -} diff --git a/vendor/github.com/dylanmei/winrmtest/.gitignore b/vendor/github.com/dylanmei/winrmtest/.gitignore deleted file mode 100644 index 2d4daa405..000000000 --- a/vendor/github.com/dylanmei/winrmtest/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.idea* diff --git a/vendor/github.com/dylanmei/winrmtest/LICENSE b/vendor/github.com/dylanmei/winrmtest/LICENSE deleted file mode 100644 index aac5c68e7..000000000 --- a/vendor/github.com/dylanmei/winrmtest/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2014-2015 Dylan Meissner - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/github.com/dylanmei/winrmtest/README.md b/vendor/github.com/dylanmei/winrmtest/README.md deleted file mode 100644 index 19c19609d..000000000 --- a/vendor/github.com/dylanmei/winrmtest/README.md +++ /dev/null @@ -1,48 +0,0 @@ - -# winrmtest - -An in-progress testing package to compliment the [masterzen/winrm](https://github.com/masterzen/winrm) Go-based winrm library. - -My primary use-case for this is for [dylanmei/packer-communicator-winrm](https://github.com/dylanmei/packer-communicator-winrm), a [Packer](http://packer.io) communicator plugin for interacting with machines using Windows Remote Management. - -## Example Use - -A fictitious "Windows tools" package. - -``` - -package wintools - -import ( - "io" - "testing" - "github.com/dylanmei/winrmtest" -) - -func Test_empty_temp_directory(t *testing.T) { - r := winrmtest.NewRemote() - defer r.Close() - - r.CommandFunc(wimrmtest.MatchText("dir C:\Temp"), func(out, err io.Writer) int { - out.Write([]byte(` Volume in drive C is Windows 2012 R2 - Volume Serial Number is XXXX-XXXX - - Directory of C:\ - -File Not Found`)) - return 0 - }) - - lister := NewDirectoryLister(r.Host, r.Port) - list, _ := lister.TempDirectory() - - if count := len(list.Dirs()); count != 0 { - t.Errorf("Expected 0 directories but found %d.\n", count) - } - - if count := len(list.Files()); count != 0 { - t.Errorf("Expected 0 files but found %d.\n", count) - } -} -``` - diff --git a/vendor/github.com/dylanmei/winrmtest/remote.go b/vendor/github.com/dylanmei/winrmtest/remote.go deleted file mode 100644 index ecc083f79..000000000 --- a/vendor/github.com/dylanmei/winrmtest/remote.go +++ /dev/null @@ -1,79 +0,0 @@ -package winrmtest - -import ( - "io" - "net/http" - "net/http/httptest" - "net/url" - "regexp" - "strconv" - "strings" -) - -// Remote respresents a WinRM server -type Remote struct { - Host string - Port int - server *httptest.Server - service *wsman -} - -// NewRemote returns a new initialized Remote -func NewRemote() *Remote { - mux := http.NewServeMux() - srv := httptest.NewServer(mux) - - host, port, _ := splitAddr(srv.URL) - remote := Remote{ - Host: host, - Port: port, - server: srv, - service: &wsman{}, - } - - mux.Handle("/wsman", remote.service) - return &remote -} - -// Close closes the WinRM server -func (r *Remote) Close() { - r.server.Close() -} - -// MatcherFunc respresents a function used to match WinRM commands -type MatcherFunc func(candidate string) bool - -// MatchText return a new MatcherFunc based on text matching -func MatchText(text string) MatcherFunc { - return func(candidate string) bool { - return text == candidate - } -} - -// MatchPattern return a new MatcherFunc based on pattern matching -func MatchPattern(pattern string) MatcherFunc { - r := regexp.MustCompile(pattern) - return func(candidate string) bool { - return r.MatchString(candidate) - } -} - -// CommandFunc respresents a function used to mock WinRM commands -type CommandFunc func(out, err io.Writer) (exitCode int) - -// CommandFunc adds a WinRM command mock function to the WinRM server -func (r *Remote) CommandFunc(m MatcherFunc, f CommandFunc) { - r.service.HandleCommand(m, f) -} - -func splitAddr(addr string) (host string, port int, err error) { - u, err := url.Parse(addr) - if err != nil { - return - } - - split := strings.Split(u.Host, ":") - host = split[0] - port, err = strconv.Atoi(split[1]) - return -} diff --git a/vendor/github.com/dylanmei/winrmtest/wsman.go b/vendor/github.com/dylanmei/winrmtest/wsman.go deleted file mode 100644 index 35234da47..000000000 --- a/vendor/github.com/dylanmei/winrmtest/wsman.go +++ /dev/null @@ -1,160 +0,0 @@ -package winrmtest - -import ( - "bytes" - "encoding/base64" - "fmt" - "net/http" - "strconv" - "strings" - - "github.com/antchfx/xquery/xml" - "github.com/satori/go.uuid" -) - -type wsman struct { - commands []*command - identitySeed int -} - -type command struct { - id string - matcher MatcherFunc - handler CommandFunc -} - -func (w *wsman) HandleCommand(m MatcherFunc, f CommandFunc) string { - id := uuid.NewV4().String() - w.commands = append(w.commands, &command{ - id: id, - matcher: m, - handler: f, - }) - - return id -} - -func (w *wsman) CommandByText(cmd string) *command { - for _, c := range w.commands { - if c.matcher(cmd) { - return c - } - } - return nil -} - -func (w *wsman) CommandByID(id string) *command { - for _, c := range w.commands { - if c.id == id { - return c - } - } - return nil -} - -func (w *wsman) ServeHTTP(rw http.ResponseWriter, r *http.Request) { - rw.Header().Add("Content-Type", "application/soap+xml") - - defer r.Body.Close() - env, err := xmlquery.Parse(r.Body) - - if err != nil { - return - } - - action := readAction(env) - switch { - case strings.HasSuffix(action, "transfer/Create"): - // create a new shell - - rw.Write([]byte(` - - 123 - `)) - - case strings.HasSuffix(action, "shell/Command"): - // execute on behalf of the client - text := readCommand(env) - cmd := w.CommandByText(text) - - if cmd == nil { - fmt.Printf("I don't know this command: Command=%s\n", text) - rw.WriteHeader(http.StatusInternalServerError) - return - } - - rw.Write([]byte(fmt.Sprintf(` - - %s - `, cmd.id))) - - case strings.HasSuffix(action, "shell/Receive"): - // client ready to receive the results - - id := readCommandIDFromDesiredStream(env) - cmd := w.CommandByID(id) - - if cmd == nil { - fmt.Printf("I don't know this command: CommandId=%s\n", id) - rw.WriteHeader(http.StatusInternalServerError) - return - } - - stdout := new(bytes.Buffer) - stderr := new(bytes.Buffer) - result := cmd.handler(stdout, stderr) - content := base64.StdEncoding.EncodeToString(stdout.Bytes()) - - rw.Write([]byte(fmt.Sprintf(` - - - %s - - - - %d - - - `, id, content, id, id, result))) - - case strings.HasSuffix(action, "shell/Signal"): - // end of the shell command - rw.WriteHeader(http.StatusOK) - case strings.HasSuffix(action, "transfer/Delete"): - // end of the session - rw.WriteHeader(http.StatusOK) - default: - fmt.Printf("I don't know this action: %s\n", action) - rw.WriteHeader(http.StatusInternalServerError) - } -} - -func readAction(env *xmlquery.Node) string { - xpath := xmlquery.FindOne(env, "//a:Action") - if xpath == nil { - return "" - } - - return xpath.InnerText() -} - -func readCommand(env *xmlquery.Node) string { - xpath := xmlquery.FindOne(env, "//rsp:Command") - if xpath == nil { - return "" - } - - if unquoted, err := strconv.Unquote(xpath.InnerText()); err == nil { - return unquoted - } - return xpath.InnerText() -} - -func readCommandIDFromDesiredStream(env *xmlquery.Node) string { - xpath := xmlquery.FindOne(env, "//rsp:DesiredStream") - if xpath == nil { - return "" - } - - return xpath.SelectAttr("CommandId") -} diff --git a/packer-plugin-sdk/acctest/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/acctest/doc.go similarity index 98% rename from packer-plugin-sdk/acctest/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/acctest/doc.go index 5d0f77325..56f4edddd 100644 --- a/packer-plugin-sdk/acctest/doc.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/acctest/doc.go @@ -86,8 +86,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/packer-plugin-sdk/acctest/provisioneracc/builders.go b/vendor/github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc/builders.go similarity index 96% rename from packer-plugin-sdk/acctest/provisioneracc/builders.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc/builders.go index 3eb1e747b..84010c07e 100644 --- a/packer-plugin-sdk/acctest/provisioneracc/builders.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc/builders.go @@ -6,7 +6,7 @@ acctest package. package provisioneracc import ( - "github.com/hashicorp/packer/packer-plugin-sdk/acctest/testutils" + "github.com/hashicorp/packer-plugin-sdk/acctest/testutils" ) // Variables stored in this file represent implementations of the BuilderFixture diff --git a/packer-plugin-sdk/acctest/provisioneracc/provisioners.go b/vendor/github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc/provisioners.go similarity index 98% rename from packer-plugin-sdk/acctest/provisioneracc/provisioners.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc/provisioners.go index c73705167..8473ced8b 100644 --- a/packer-plugin-sdk/acctest/provisioneracc/provisioners.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc/provisioners.go @@ -12,8 +12,8 @@ import ( "strings" "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" ) // ProvisionerTestCase is a single set of tests to run for a provisioner. diff --git a/packer-plugin-sdk/acctest/testing.go b/vendor/github.com/hashicorp/packer-plugin-sdk/acctest/testing.go similarity index 98% rename from packer-plugin-sdk/acctest/testing.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/acctest/testing.go index acdd0bf51..7af3dc48f 100644 --- a/packer-plugin-sdk/acctest/testing.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/acctest/testing.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/packer" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/template" "github.com/hashicorp/packer/provisioner/file" shellprovisioner "github.com/hashicorp/packer/provisioner/shell" ) diff --git a/packer-plugin-sdk/acctest/testutils/utils.go b/vendor/github.com/hashicorp/packer-plugin-sdk/acctest/testutils/utils.go similarity index 100% rename from packer-plugin-sdk/acctest/testutils/utils.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/acctest/testutils/utils.go diff --git a/packer-plugin-sdk/adapter/adapter.go b/vendor/github.com/hashicorp/packer-plugin-sdk/adapter/adapter.go similarity index 99% rename from packer-plugin-sdk/adapter/adapter.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/adapter/adapter.go index 84c102ebf..5d9adf455 100644 --- a/packer-plugin-sdk/adapter/adapter.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/adapter/adapter.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/google/shlex" - 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/packer-plugin-sdk/adapter/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/adapter/doc.go similarity index 100% rename from packer-plugin-sdk/adapter/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/adapter/doc.go diff --git a/packer-plugin-sdk/adapter/scp.go b/vendor/github.com/hashicorp/packer-plugin-sdk/adapter/scp.go similarity index 98% rename from packer-plugin-sdk/adapter/scp.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/adapter/scp.go index 100270aef..ccf2c1fb0 100644 --- a/packer-plugin-sdk/adapter/scp.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/adapter/scp.go @@ -12,8 +12,8 @@ import ( "strings" "time" - 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" ) const ( diff --git a/packer-plugin-sdk/bootcommand/boot_command.go b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/boot_command.go similarity index 100% rename from packer-plugin-sdk/bootcommand/boot_command.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/boot_command.go diff --git a/packer-plugin-sdk/bootcommand/boot_command.pigeon b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/boot_command.pigeon similarity index 100% rename from packer-plugin-sdk/bootcommand/boot_command.pigeon rename to vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/boot_command.pigeon diff --git a/packer-plugin-sdk/bootcommand/boot_command_ast.go b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/boot_command_ast.go similarity index 100% rename from packer-plugin-sdk/bootcommand/boot_command_ast.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/boot_command_ast.go diff --git a/packer-plugin-sdk/bootcommand/config.go b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/config.go similarity index 99% rename from packer-plugin-sdk/bootcommand/config.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/config.go index 79c14d3d5..e8f650822 100644 --- a/packer-plugin-sdk/bootcommand/config.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/config.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // PackerKeyEnv is used to specify the key interval (delay) between keystrokes diff --git a/packer-plugin-sdk/bootcommand/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/doc.go similarity index 100% rename from packer-plugin-sdk/bootcommand/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/doc.go diff --git a/packer-plugin-sdk/bootcommand/driver.go b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/driver.go similarity index 100% rename from packer-plugin-sdk/bootcommand/driver.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/driver.go diff --git a/packer-plugin-sdk/bootcommand/gen.go b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/gen.go similarity index 100% rename from packer-plugin-sdk/bootcommand/gen.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/gen.go diff --git a/packer-plugin-sdk/bootcommand/pc_xt_driver.go b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/pc_xt_driver.go similarity index 100% rename from packer-plugin-sdk/bootcommand/pc_xt_driver.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/pc_xt_driver.go diff --git a/packer-plugin-sdk/bootcommand/usb_driver.go b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/usb_driver.go similarity index 100% rename from packer-plugin-sdk/bootcommand/usb_driver.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/usb_driver.go diff --git a/packer-plugin-sdk/bootcommand/vnc_driver.go b/vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/vnc_driver.go similarity index 100% rename from packer-plugin-sdk/bootcommand/vnc_driver.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/bootcommand/vnc_driver.go diff --git a/packer-plugin-sdk/chroot/cleanup.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/cleanup.go similarity index 73% rename from packer-plugin-sdk/chroot/cleanup.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/cleanup.go index 37691305a..d31d25ffd 100644 --- a/packer-plugin-sdk/chroot/cleanup.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/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/packer-plugin-sdk/chroot/communicator.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/communicator.go similarity index 95% rename from packer-plugin-sdk/chroot/communicator.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/communicator.go index 24ccc4277..23a785249 100644 --- a/packer-plugin-sdk/chroot/communicator.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/communicator.go @@ -13,9 +13,9 @@ import ( "strings" "syscall" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "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/tmp" ) // Communicator is a special communicator that works by executing diff --git a/packer-plugin-sdk/chroot/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/doc.go similarity index 100% rename from packer-plugin-sdk/chroot/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/doc.go diff --git a/packer-plugin-sdk/chroot/interpolate_context_provider.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/interpolate_context_provider.go similarity index 56% rename from packer-plugin-sdk/chroot/interpolate_context_provider.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/interpolate_context_provider.go index 9d30b0dc1..9aab670b5 100644 --- a/packer-plugin-sdk/chroot/interpolate_context_provider.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/interpolate_context_provider.go @@ -1,6 +1,6 @@ package chroot -import "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" +import "github.com/hashicorp/packer-plugin-sdk/template/interpolate" type interpolateContextProvider interface { GetContext() interpolate.Context diff --git a/packer-plugin-sdk/chroot/run_local_commands.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/run_local_commands.go similarity index 78% rename from packer-plugin-sdk/chroot/run_local_commands.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/run_local_commands.go index e8b34a78d..946ecda8e 100644 --- a/packer-plugin-sdk/chroot/run_local_commands.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/run_local_commands.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/common" - 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" + "github.com/hashicorp/packer-plugin-sdk/common" + 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 common.CommandWrapper, ictx interpolate.Context, ui packersdk.Ui) error { diff --git a/packer-plugin-sdk/chroot/step_chroot_provision.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_chroot_provision.go similarity index 81% rename from packer-plugin-sdk/chroot/step_chroot_provision.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_chroot_provision.go index b22fefa04..4730619e6 100644 --- a/packer-plugin-sdk/chroot/step_chroot_provision.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_chroot_provision.go @@ -4,10 +4,10 @@ import ( "context" "log" - "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-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" ) // StepChrootProvision provisions the instance within a chroot. diff --git a/packer-plugin-sdk/chroot/step_copy_files.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_copy_files.go similarity index 93% rename from packer-plugin-sdk/chroot/step_copy_files.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_copy_files.go index 50c76b68c..869acb2bf 100644 --- a/packer-plugin-sdk/chroot/step_copy_files.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_copy_files.go @@ -8,9 +8,9 @@ import ( "path/filepath" "runtime" - "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-plugin-sdk/common" + "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/packer-plugin-sdk/chroot/step_early_cleanup.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_early_cleanup.go similarity index 87% rename from packer-plugin-sdk/chroot/step_early_cleanup.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_early_cleanup.go index e8cf9593f..f91681a11 100644 --- a/packer-plugin-sdk/chroot/step_early_cleanup.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/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/packer-plugin-sdk/chroot/step_mount_extra.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_mount_extra.go similarity index 94% rename from packer-plugin-sdk/chroot/step_mount_extra.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_mount_extra.go index 0ad511df2..843a385cc 100644 --- a/packer-plugin-sdk/chroot/step_mount_extra.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_mount_extra.go @@ -8,9 +8,9 @@ import ( "os/exec" "syscall" - "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-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepMountExtra mounts the attached device. diff --git a/packer-plugin-sdk/chroot/step_post_mount_commands.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_post_mount_commands.go similarity index 86% rename from packer-plugin-sdk/chroot/step_post_mount_commands.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_post_mount_commands.go index 55ecee7ca..803c61f20 100644 --- a/packer-plugin-sdk/chroot/step_post_mount_commands.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_post_mount_commands.go @@ -3,9 +3,9 @@ package chroot import ( "context" - "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-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type postMountCommandsData struct { diff --git a/packer-plugin-sdk/chroot/step_pre_mount_commands.go b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_pre_mount_commands.go similarity index 84% rename from packer-plugin-sdk/chroot/step_pre_mount_commands.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_pre_mount_commands.go index 41c413a13..8434dd27f 100644 --- a/packer-plugin-sdk/chroot/step_pre_mount_commands.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/chroot/step_pre_mount_commands.go @@ -3,9 +3,9 @@ package chroot import ( "context" - "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-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type preMountCommandsData struct { diff --git a/packer-plugin-sdk/common/command.go b/vendor/github.com/hashicorp/packer-plugin-sdk/common/command.go similarity index 100% rename from packer-plugin-sdk/common/command.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/common/command.go diff --git a/packer-plugin-sdk/common/packer_config.go b/vendor/github.com/hashicorp/packer-plugin-sdk/common/packer_config.go similarity index 100% rename from packer-plugin-sdk/common/packer_config.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/common/packer_config.go diff --git a/packer-plugin-sdk/communicator/comm_host.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/comm_host.go similarity index 92% rename from packer-plugin-sdk/communicator/comm_host.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/comm_host.go index 2077f6a7b..a07b0b400 100644 --- a/packer-plugin-sdk/communicator/comm_host.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/comm_host.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" + "github.com/hashicorp/packer-plugin-sdk/multistep" ) // CommHost determines the IP address of the cloud instance that Packer diff --git a/packer-plugin-sdk/communicator/config.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/config.go similarity index 97% rename from packer-plugin-sdk/communicator/config.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/config.go index 1d68e8120..c0615a4f0 100644 --- a/packer-plugin-sdk/communicator/config.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/config.go @@ -12,13 +12,13 @@ import ( "time" "github.com/hashicorp/hcl/v2/hcldec" - 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/pathing" - packerssh "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" - "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + 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/pathing" + packerssh "github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/masterzen/winrm" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/packer-plugin-sdk/communicator/config.hcl2spec.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/config.hcl2spec.go similarity index 100% rename from packer-plugin-sdk/communicator/config.hcl2spec.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/config.hcl2spec.go diff --git a/packer-plugin-sdk/communicator/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/doc.go similarity index 100% rename from packer-plugin-sdk/communicator/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/doc.go diff --git a/packer-plugin-sdk/communicator/ssh/key_pair.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/ssh/key_pair.go similarity index 100% rename from packer-plugin-sdk/communicator/ssh/key_pair.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/ssh/key_pair.go diff --git a/packer-plugin-sdk/communicator/ssh/ssh.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/ssh/ssh.go similarity index 100% rename from packer-plugin-sdk/communicator/ssh/ssh.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/ssh/ssh.go diff --git a/packer-plugin-sdk/communicator/ssh/tunnel.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/ssh/tunnel.go similarity index 94% rename from packer-plugin-sdk/communicator/ssh/tunnel.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/ssh/tunnel.go index a9695d011..7e30f0ef5 100644 --- a/packer-plugin-sdk/communicator/ssh/tunnel.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/ssh/tunnel.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" + "github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh" ) // ParseTunnelArgument parses an SSH tunneling argument compatible with the openssh client form. diff --git a/packer-plugin-sdk/communicator/sshkey/algorithm_enumer.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/sshkey/algorithm_enumer.go similarity index 100% rename from packer-plugin-sdk/communicator/sshkey/algorithm_enumer.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/sshkey/algorithm_enumer.go diff --git a/packer-plugin-sdk/communicator/sshkey/generate.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/sshkey/generate.go similarity index 100% rename from packer-plugin-sdk/communicator/sshkey/generate.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/sshkey/generate.go diff --git a/packer-plugin-sdk/communicator/step_connect.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_connect.go similarity index 94% rename from packer-plugin-sdk/communicator/step_connect.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_connect.go index 5f4e881ec..988123d3c 100644 --- a/packer-plugin-sdk/communicator/step_connect.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_connect.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/sdk-internals/communicator/none" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/none" gossh "golang.org/x/crypto/ssh" ) diff --git a/packer-plugin-sdk/communicator/step_connect_ssh.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_connect_ssh.go similarity index 96% rename from packer-plugin-sdk/communicator/step_connect_ssh.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_connect_ssh.go index 8e27570b0..7c6ed150f 100644 --- a/packer-plugin-sdk/communicator/step_connect_ssh.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_connect_ssh.go @@ -13,11 +13,11 @@ import ( "golang.org/x/crypto/ssh/terminal" - 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/pathing" - "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh" + 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/pathing" + "github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh" gossh "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" "golang.org/x/net/proxy" diff --git a/packer-plugin-sdk/communicator/step_connect_winrm.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_connect_winrm.go similarity index 97% rename from packer-plugin-sdk/communicator/step_connect_winrm.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_connect_winrm.go index 36630894a..015a7ab74 100644 --- a/packer-plugin-sdk/communicator/step_connect_winrm.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_connect_winrm.go @@ -13,9 +13,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/sdk-internals/communicator/winrm" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/winrm" winrmcmd "github.com/masterzen/winrm" "golang.org/x/net/http/httpproxy" ) diff --git a/packer-plugin-sdk/communicator/step_debug_ssh_keys.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_debug_ssh_keys.go similarity index 84% rename from packer-plugin-sdk/communicator/step_debug_ssh_keys.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_debug_ssh_keys.go index ab3c62473..baf58a0cc 100644 --- a/packer-plugin-sdk/communicator/step_debug_ssh_keys.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_debug_ssh_keys.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" ) // StepDumpSSHKey is a multistep Step implementation that writes the ssh diff --git a/packer-plugin-sdk/communicator/step_ssh_keygen.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_ssh_keygen.go similarity index 89% rename from packer-plugin-sdk/communicator/step_ssh_keygen.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_ssh_keygen.go index 0f7b03d15..9c94ea9c7 100644 --- a/packer-plugin-sdk/communicator/step_ssh_keygen.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/step_ssh_keygen.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/hashicorp/packer/packer-plugin-sdk/communicator/sshkey" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/communicator/sshkey" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepSSHKeyGen is a Packer build step that generates SSH key pairs. diff --git a/packer-plugin-sdk/communicator/testing.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/testing.go similarity index 97% rename from packer-plugin-sdk/communicator/testing.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/testing.go index 176412fc7..d45a59c3d 100644 --- a/packer-plugin-sdk/communicator/testing.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/testing.go @@ -3,7 +3,7 @@ package communicator import ( "testing" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) func TestPEM(t *testing.T) string { diff --git a/packer-plugin-sdk/communicator/winrm.go b/vendor/github.com/hashicorp/packer-plugin-sdk/communicator/winrm.go similarity index 100% rename from packer-plugin-sdk/communicator/winrm.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/communicator/winrm.go diff --git a/packer-plugin-sdk/filelock/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/filelock/doc.go similarity index 100% rename from packer-plugin-sdk/filelock/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/filelock/doc.go diff --git a/packer-plugin-sdk/filelock/filelock.go b/vendor/github.com/hashicorp/packer-plugin-sdk/filelock/filelock.go similarity index 100% rename from packer-plugin-sdk/filelock/filelock.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/filelock/filelock.go diff --git a/packer-plugin-sdk/filelock/filelock_solaris.go b/vendor/github.com/hashicorp/packer-plugin-sdk/filelock/filelock_solaris.go similarity index 100% rename from packer-plugin-sdk/filelock/filelock_solaris.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/filelock/filelock_solaris.go diff --git a/packer-plugin-sdk/filelock/noop.go b/vendor/github.com/hashicorp/packer-plugin-sdk/filelock/noop.go similarity index 100% rename from packer-plugin-sdk/filelock/noop.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/filelock/noop.go diff --git a/packer-plugin-sdk/guestexec/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/guestexec/doc.go similarity index 100% rename from packer-plugin-sdk/guestexec/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/guestexec/doc.go diff --git a/packer-plugin-sdk/guestexec/elevated.go b/vendor/github.com/hashicorp/packer-plugin-sdk/guestexec/elevated.go similarity index 98% rename from packer-plugin-sdk/guestexec/elevated.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/guestexec/elevated.go index 9dca69717..1a03a64b2 100644 --- a/packer-plugin-sdk/guestexec/elevated.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/guestexec/elevated.go @@ -8,8 +8,8 @@ import ( "strings" "text/template" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/uuid" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/uuid" ) type ElevatedProvisioner interface { diff --git a/packer-plugin-sdk/guestexec/guest_commands.go b/vendor/github.com/hashicorp/packer-plugin-sdk/guestexec/guest_commands.go similarity index 100% rename from packer-plugin-sdk/guestexec/guest_commands.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/guestexec/guest_commands.go diff --git a/packer-plugin-sdk/json/unmarshal.go b/vendor/github.com/hashicorp/packer-plugin-sdk/json/unmarshal.go similarity index 100% rename from packer-plugin-sdk/json/unmarshal.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/json/unmarshal.go diff --git a/packer-plugin-sdk/multistep/LICENSE.md b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/LICENSE.md similarity index 100% rename from packer-plugin-sdk/multistep/LICENSE.md rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/LICENSE.md diff --git a/packer-plugin-sdk/multistep/basic_runner.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/basic_runner.go similarity index 100% rename from packer-plugin-sdk/multistep/basic_runner.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/basic_runner.go diff --git a/packer-plugin-sdk/multistep/commonsteps/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/doc.go similarity index 100% rename from packer-plugin-sdk/multistep/commonsteps/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/doc.go diff --git a/packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go similarity index 97% rename from packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go index 749a59bf7..04692924d 100644 --- a/packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // An iso (CD) containing custom files can be made available for your build. diff --git a/packer-plugin-sdk/multistep/commonsteps/floppy_config.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/floppy_config.go similarity index 97% rename from packer-plugin-sdk/multistep/commonsteps/floppy_config.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/floppy_config.go index 71685e23c..e2ec86ae7 100644 --- a/packer-plugin-sdk/multistep/commonsteps/floppy_config.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/floppy_config.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // A floppy can be made available for your build. This is most useful for diff --git a/packer-plugin-sdk/multistep/commonsteps/http_config.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/http_config.go similarity index 97% rename from packer-plugin-sdk/multistep/commonsteps/http_config.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/http_config.go index 6939c43ec..21fee8dd6 100644 --- a/packer-plugin-sdk/multistep/commonsteps/http_config.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/http_config.go @@ -5,7 +5,7 @@ package commonsteps import ( "errors" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // Packer will create an http server serving `http_directory` when it is set, a diff --git a/packer-plugin-sdk/multistep/commonsteps/iso_config.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/iso_config.go similarity index 98% rename from packer-plugin-sdk/multistep/commonsteps/iso_config.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/iso_config.go index 5034939a0..ae54a3f7f 100644 --- a/packer-plugin-sdk/multistep/commonsteps/iso_config.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/iso_config.go @@ -12,7 +12,7 @@ import ( getter "github.com/hashicorp/go-getter/v2" urlhelper "github.com/hashicorp/go-getter/v2/helper/url" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // By default, Packer will symlink, download or copy image files to the Packer diff --git a/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go similarity index 89% rename from packer-plugin-sdk/multistep/commonsteps/multistep_debug.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go index 5c64d3545..a53071bb9 100644 --- a/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go @@ -5,8 +5,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" ) // MultistepDebugFn will return a proper multistep.DebugPauseFn to diff --git a/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go similarity index 96% rename from packer-plugin-sdk/multistep/commonsteps/multistep_runner.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go index 119a7e8e3..b4d823a8e 100644 --- a/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "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-plugin-sdk/common" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) func newRunner(steps []multistep.Step, config common.PackerConfig, ui packersdk.Ui) (multistep.Runner, multistep.DebugPauseFn) { diff --git a/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go similarity index 92% rename from packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go index 4aa7b9a5f..ce643f3d1 100644 --- a/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.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 StepCleanupTempKeys struct { diff --git a/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go similarity index 96% rename from packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go index fddeed117..97c0869f4 100644 --- a/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go @@ -11,10 +11,10 @@ import ( "runtime" "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/shell-local/localexec" - "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/shell-local/localexec" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) // StepCreateCD will create a CD disk with the given files. diff --git a/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go similarity index 98% rename from packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go index 920da32fa..8c4b0e562 100644 --- a/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go @@ -10,9 +10,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/tmp" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/tmp" "github.com/mitchellh/go-fs" "github.com/mitchellh/go-fs/fat" ) diff --git a/packer-plugin-sdk/multistep/commonsteps/step_download.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_download.go similarity index 97% rename from packer-plugin-sdk/multistep/commonsteps/step_download.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_download.go index 121a5cc01..0746b3c8f 100644 --- a/packer-plugin-sdk/multistep/commonsteps/step_download.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_download.go @@ -17,9 +17,9 @@ import ( getter "github.com/hashicorp/go-getter/v2" urlhelper "github.com/hashicorp/go-getter/v2/helper/url" - "github.com/hashicorp/packer/packer-plugin-sdk/filelock" - "github.com/hashicorp/packer/packer-plugin-sdk/multistep" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/filelock" + "github.com/hashicorp/packer-plugin-sdk/multistep" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // StepDownload downloads a remote file using the download client within diff --git a/packer-plugin-sdk/multistep/commonsteps/step_http_server.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_http_server.go similarity index 90% rename from packer-plugin-sdk/multistep/commonsteps/step_http_server.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_http_server.go index 59a643055..42a3f5d4f 100644 --- a/packer-plugin-sdk/multistep/commonsteps/step_http_server.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_http_server.go @@ -6,9 +6,9 @@ import ( "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 creates and runs the HTTP server that is serving files from the diff --git a/packer-plugin-sdk/multistep/commonsteps/step_output_dir.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_output_dir.go similarity index 93% rename from packer-plugin-sdk/multistep/commonsteps/step_output_dir.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_output_dir.go index 3a747ff03..94bc6fe1d 100644 --- a/packer-plugin-sdk/multistep/commonsteps/step_output_dir.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/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/packer-plugin-sdk/multistep/commonsteps/step_provision.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_provision.go similarity index 96% rename from packer-plugin-sdk/multistep/commonsteps/step_provision.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_provision.go index 7b0d62c5f..3b02dcea5 100644 --- a/packer-plugin-sdk/multistep/commonsteps/step_provision.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps/step_provision.go @@ -8,9 +8,9 @@ import ( "strconv" "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" ) // StepProvision runs the provisioners. diff --git a/packer-plugin-sdk/multistep/debug_runner.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/debug_runner.go similarity index 100% rename from packer-plugin-sdk/multistep/debug_runner.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/debug_runner.go diff --git a/packer-plugin-sdk/multistep/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/doc.go similarity index 100% rename from packer-plugin-sdk/multistep/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/doc.go diff --git a/packer-plugin-sdk/multistep/if.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/if.go similarity index 100% rename from packer-plugin-sdk/multistep/if.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/if.go diff --git a/packer-plugin-sdk/multistep/multistep.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/multistep.go similarity index 100% rename from packer-plugin-sdk/multistep/multistep.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/multistep.go diff --git a/packer-plugin-sdk/multistep/statebag.go b/vendor/github.com/hashicorp/packer-plugin-sdk/multistep/statebag.go similarity index 100% rename from packer-plugin-sdk/multistep/statebag.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/multistep/statebag.go diff --git a/packer-plugin-sdk/net/configure_port.go b/vendor/github.com/hashicorp/packer-plugin-sdk/net/configure_port.go similarity index 94% rename from packer-plugin-sdk/net/configure_port.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/net/configure_port.go index 16d830a02..6cc3d3d6c 100644 --- a/packer-plugin-sdk/net/configure_port.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/net/configure_port.go @@ -12,9 +12,9 @@ import ( "strconv" "time" - "github.com/hashicorp/packer/packer-plugin-sdk/filelock" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/retry" + "github.com/hashicorp/packer-plugin-sdk/filelock" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/retry" ) var _ net.Listener = &Listener{} diff --git a/packer-plugin-sdk/net/default_client.go b/vendor/github.com/hashicorp/packer-plugin-sdk/net/default_client.go similarity index 100% rename from packer-plugin-sdk/net/default_client.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/net/default_client.go diff --git a/packer-plugin-sdk/packer/artifact.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/artifact.go similarity index 100% rename from packer-plugin-sdk/packer/artifact.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/artifact.go diff --git a/packer-plugin-sdk/packer/artifact_mock.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/artifact_mock.go similarity index 100% rename from packer-plugin-sdk/packer/artifact_mock.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/artifact_mock.go diff --git a/packer-plugin-sdk/packer/build.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/build.go similarity index 100% rename from packer-plugin-sdk/packer/build.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/build.go diff --git a/packer-plugin-sdk/packer/builder.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/builder.go similarity index 100% rename from packer-plugin-sdk/packer/builder.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/builder.go diff --git a/packer-plugin-sdk/packer/builder_mock.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/builder_mock.go similarity index 100% rename from packer-plugin-sdk/packer/builder_mock.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/builder_mock.go diff --git a/packer-plugin-sdk/packer/builder_mock.hcl2spec.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/builder_mock.hcl2spec.go similarity index 100% rename from packer-plugin-sdk/packer/builder_mock.hcl2spec.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/builder_mock.hcl2spec.go diff --git a/packer-plugin-sdk/packer/cache.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/cache.go similarity index 100% rename from packer-plugin-sdk/packer/cache.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/cache.go diff --git a/packer-plugin-sdk/packer/communicator.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/communicator.go similarity index 100% rename from packer-plugin-sdk/packer/communicator.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/communicator.go diff --git a/packer-plugin-sdk/packer/communicator_mock.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/communicator_mock.go similarity index 100% rename from packer-plugin-sdk/packer/communicator_mock.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/communicator_mock.go diff --git a/packer-plugin-sdk/packer/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/doc.go similarity index 100% rename from packer-plugin-sdk/packer/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/doc.go diff --git a/packer-plugin-sdk/packer/hcl2spec.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/hcl2spec.go similarity index 100% rename from packer-plugin-sdk/packer/hcl2spec.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/hcl2spec.go diff --git a/packer-plugin-sdk/packer/hook.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/hook.go similarity index 100% rename from packer-plugin-sdk/packer/hook.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/hook.go diff --git a/packer-plugin-sdk/packer/hook_mock.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/hook_mock.go similarity index 100% rename from packer-plugin-sdk/packer/hook_mock.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/hook_mock.go diff --git a/packer-plugin-sdk/packer/logs.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/logs.go similarity index 100% rename from packer-plugin-sdk/packer/logs.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/logs.go diff --git a/packer-plugin-sdk/packer/maps.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/maps.go similarity index 100% rename from packer-plugin-sdk/packer/maps.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/maps.go diff --git a/packer-plugin-sdk/packer/multi_error.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/multi_error.go similarity index 100% rename from packer-plugin-sdk/packer/multi_error.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/multi_error.go diff --git a/packer-plugin-sdk/packer/post_processor.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/post_processor.go similarity index 100% rename from packer-plugin-sdk/packer/post_processor.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/post_processor.go diff --git a/packer-plugin-sdk/packer/provisioner.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/provisioner.go similarity index 100% rename from packer-plugin-sdk/packer/provisioner.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/provisioner.go diff --git a/packer-plugin-sdk/packer/provisioner_mock.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/provisioner_mock.go similarity index 100% rename from packer-plugin-sdk/packer/provisioner_mock.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/provisioner_mock.go diff --git a/packer-plugin-sdk/packer/provisioner_mock.hcl2spec.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/provisioner_mock.hcl2spec.go similarity index 100% rename from packer-plugin-sdk/packer/provisioner_mock.hcl2spec.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/provisioner_mock.hcl2spec.go diff --git a/packer-plugin-sdk/packer/ui.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/ui.go similarity index 100% rename from packer-plugin-sdk/packer/ui.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/ui.go diff --git a/packer-plugin-sdk/packer/ui_mock.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packer/ui_mock.go similarity index 100% rename from packer-plugin-sdk/packer/ui_mock.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packer/ui_mock.go diff --git a/packer-plugin-sdk/packerbuilderdata/generated_data.go b/vendor/github.com/hashicorp/packer-plugin-sdk/packerbuilderdata/generated_data.go similarity index 95% rename from packer-plugin-sdk/packerbuilderdata/generated_data.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/packerbuilderdata/generated_data.go index 8361f69a0..ba78fbbac 100644 --- a/packer-plugin-sdk/packerbuilderdata/generated_data.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/packerbuilderdata/generated_data.go @@ -4,7 +4,7 @@ // relevant details that provisioning scripts may need access to. package packerbuilderdata -import "github.com/hashicorp/packer/packer-plugin-sdk/multistep" +import "github.com/hashicorp/packer-plugin-sdk/multistep" // This is used in the BasicPlaceholderData() func in the packer/provisioner.go // To force users to access generated data via the "generated" func. diff --git a/packer-plugin-sdk/pathing/config_file.go b/vendor/github.com/hashicorp/packer-plugin-sdk/pathing/config_file.go similarity index 100% rename from packer-plugin-sdk/pathing/config_file.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/pathing/config_file.go diff --git a/packer-plugin-sdk/pathing/config_file_unix.go b/vendor/github.com/hashicorp/packer-plugin-sdk/pathing/config_file_unix.go similarity index 100% rename from packer-plugin-sdk/pathing/config_file_unix.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/pathing/config_file_unix.go diff --git a/packer-plugin-sdk/pathing/config_file_windows.go b/vendor/github.com/hashicorp/packer-plugin-sdk/pathing/config_file_windows.go similarity index 100% rename from packer-plugin-sdk/pathing/config_file_windows.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/pathing/config_file_windows.go diff --git a/packer-plugin-sdk/plugin/server.go b/vendor/github.com/hashicorp/packer-plugin-sdk/plugin/server.go similarity index 97% rename from packer-plugin-sdk/plugin/server.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/plugin/server.go index fd20607ae..32a19b137 100644 --- a/packer-plugin-sdk/plugin/server.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/plugin/server.go @@ -21,8 +21,8 @@ import ( "syscall" "time" - packrpc "github.com/hashicorp/packer/packer-plugin-sdk/rpc" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + packrpc "github.com/hashicorp/packer-plugin-sdk/rpc" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) // This is a count of the number of interrupts the process has received. diff --git a/packer-plugin-sdk/plugin/set.go b/vendor/github.com/hashicorp/packer-plugin-sdk/plugin/set.go similarity index 96% rename from packer-plugin-sdk/plugin/set.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/plugin/set.go index 7bde38a9d..216124b4d 100644 --- a/packer-plugin-sdk/plugin/set.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/plugin/set.go @@ -8,8 +8,8 @@ import ( "os" "sort" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - pluginVersion "github.com/hashicorp/packer/packer-plugin-sdk/version" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + pluginVersion "github.com/hashicorp/packer-plugin-sdk/version" "github.com/hashicorp/packer/version" ) diff --git a/packer-plugin-sdk/random/string.go b/vendor/github.com/hashicorp/packer-plugin-sdk/random/string.go similarity index 100% rename from packer-plugin-sdk/random/string.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/random/string.go diff --git a/packer-plugin-sdk/retry/retry.go b/vendor/github.com/hashicorp/packer-plugin-sdk/retry/retry.go similarity index 100% rename from packer-plugin-sdk/retry/retry.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/retry/retry.go diff --git a/packer-plugin-sdk/rpc/artifact.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/artifact.go similarity index 96% rename from packer-plugin-sdk/rpc/artifact.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/artifact.go index e8e7b3310..dde49c8fe 100644 --- a/packer-plugin-sdk/rpc/artifact.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/artifact.go @@ -1,7 +1,7 @@ package rpc import ( - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // An implementation of packersdk.Artifact where the artifact is actually diff --git a/packer-plugin-sdk/rpc/build.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/build.go similarity index 98% rename from packer-plugin-sdk/rpc/build.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/build.go index 59aca5438..b5eb851ed 100644 --- a/packer-plugin-sdk/rpc/build.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/build.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" ) // An implementation of packersdk.Build where the build is actually executed diff --git a/packer-plugin-sdk/rpc/builder.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/builder.go similarity index 97% rename from packer-plugin-sdk/rpc/builder.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/builder.go index 409f9f421..99761d42e 100644 --- a/packer-plugin-sdk/rpc/builder.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/builder.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" ) // An implementation of packersdk.Builder where the builder is actually executed diff --git a/packer-plugin-sdk/rpc/client.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/client.go similarity index 97% rename from packer-plugin-sdk/rpc/client.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/client.go index e0d3f01d8..ff7d5bb91 100644 --- a/packer-plugin-sdk/rpc/client.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/client.go @@ -5,7 +5,7 @@ import ( "log" "net/rpc" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/ugorji/go/codec" ) diff --git a/packer-plugin-sdk/rpc/common.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/common.go similarity index 100% rename from packer-plugin-sdk/rpc/common.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/common.go diff --git a/packer-plugin-sdk/rpc/communicator.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/communicator.go similarity index 99% rename from packer-plugin-sdk/rpc/communicator.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/communicator.go index 062708c24..02b55eeca 100644 --- a/packer-plugin-sdk/rpc/communicator.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/communicator.go @@ -9,7 +9,7 @@ import ( "os" "sync" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // An implementation of packersdk.Communicator where the communicator is actually diff --git a/packer-plugin-sdk/rpc/cty_encode.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/cty_encode.go similarity index 100% rename from packer-plugin-sdk/rpc/cty_encode.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/cty_encode.go diff --git a/packer-plugin-sdk/rpc/error.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/error.go similarity index 100% rename from packer-plugin-sdk/rpc/error.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/error.go diff --git a/packer-plugin-sdk/rpc/fileinfo.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/fileinfo.go similarity index 100% rename from packer-plugin-sdk/rpc/fileinfo.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/fileinfo.go diff --git a/packer-plugin-sdk/rpc/hook.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/hook.go similarity index 96% rename from packer-plugin-sdk/rpc/hook.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/hook.go index a670a8902..7971501ff 100644 --- a/packer-plugin-sdk/rpc/hook.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/hook.go @@ -5,7 +5,7 @@ import ( "log" "sync" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // An implementation of packersdk.Hook where the hook is actually executed diff --git a/packer-plugin-sdk/rpc/init.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/init.go similarity index 100% rename from packer-plugin-sdk/rpc/init.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/init.go diff --git a/packer-plugin-sdk/rpc/mux_broker.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/mux_broker.go similarity index 100% rename from packer-plugin-sdk/rpc/mux_broker.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/mux_broker.go diff --git a/packer-plugin-sdk/rpc/post_processor.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/post_processor.go similarity index 98% rename from packer-plugin-sdk/rpc/post_processor.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/post_processor.go index 0595c4bfe..9c2de87b6 100644 --- a/packer-plugin-sdk/rpc/post_processor.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/post_processor.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" ) // An implementation of packersdk.PostProcessor where the PostProcessor is actually diff --git a/packer-plugin-sdk/rpc/provisioner.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/provisioner.go similarity index 97% rename from packer-plugin-sdk/rpc/provisioner.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/provisioner.go index 391e968cf..ebf6b640f 100644 --- a/packer-plugin-sdk/rpc/provisioner.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/provisioner.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" ) // An implementation of packersdk.Provisioner where the provisioner is actually diff --git a/packer-plugin-sdk/rpc/server.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/server.go similarity index 98% rename from packer-plugin-sdk/rpc/server.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/server.go index 99a58c047..3d0ef4f7f 100644 --- a/packer-plugin-sdk/rpc/server.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/server.go @@ -5,7 +5,7 @@ import ( "log" "net/rpc" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/ugorji/go/codec" ) diff --git a/packer-plugin-sdk/rpc/ui.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/ui.go similarity index 96% rename from packer-plugin-sdk/rpc/ui.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/ui.go index 6fd9de2ee..61032413a 100644 --- a/packer-plugin-sdk/rpc/ui.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/ui.go @@ -3,7 +3,7 @@ package rpc import ( "log" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) // An implementation of packersdk.Ui where the Ui is actually executed diff --git a/packer-plugin-sdk/rpc/ui_progress_tracking.go b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/ui_progress_tracking.go similarity index 97% rename from packer-plugin-sdk/rpc/ui_progress_tracking.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/rpc/ui_progress_tracking.go index 4f22835e1..92fd5dd59 100644 --- a/packer-plugin-sdk/rpc/ui_progress_tracking.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/rpc/ui_progress_tracking.go @@ -5,7 +5,7 @@ import ( "log" "net/rpc" - "github.com/hashicorp/packer/packer-plugin-sdk/random" + "github.com/hashicorp/packer-plugin-sdk/random" ) // TrackProgress starts a pair of ProgressTrackingClient and ProgressProgressTrackingServer diff --git a/packer-plugin-sdk/sdk-internals/communicator/none/communicator.go b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/none/communicator.go similarity index 95% rename from packer-plugin-sdk/sdk-internals/communicator/none/communicator.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/none/communicator.go index 1bc7b1f6b..d37804961 100644 --- a/packer-plugin-sdk/sdk-internals/communicator/none/communicator.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/none/communicator.go @@ -9,7 +9,7 @@ import ( "io" "os" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type comm struct { diff --git a/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go similarity index 99% rename from packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go index 8746b7604..9b08af181 100644 --- a/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go @@ -19,8 +19,8 @@ import ( "strings" "time" - 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/pkg/sftp" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/packer-plugin-sdk/sdk-internals/communicator/ssh/connect.go b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/connect.go similarity index 100% rename from packer-plugin-sdk/sdk-internals/communicator/ssh/connect.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/connect.go diff --git a/packer-plugin-sdk/sdk-internals/communicator/ssh/connection.go b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/connection.go similarity index 100% rename from packer-plugin-sdk/sdk-internals/communicator/ssh/connection.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/connection.go diff --git a/packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive.go b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive.go similarity index 100% rename from packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive.go diff --git a/packer-plugin-sdk/sdk-internals/communicator/ssh/password.go b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/password.go similarity index 100% rename from packer-plugin-sdk/sdk-internals/communicator/ssh/password.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/password.go diff --git a/packer-plugin-sdk/sdk-internals/communicator/ssh/tunnel.go b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/tunnel.go similarity index 100% rename from packer-plugin-sdk/sdk-internals/communicator/ssh/tunnel.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh/tunnel.go diff --git a/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go similarity index 99% rename from packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go index 7da382be9..11398c994 100644 --- a/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go @@ -15,7 +15,7 @@ import ( "strings" "sync" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/masterzen/winrm" "github.com/packer-community/winrmcp/winrmcp" ) diff --git a/packer-plugin-sdk/sdk-internals/communicator/winrm/config.go b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/winrm/config.go similarity index 100% rename from packer-plugin-sdk/sdk-internals/communicator/winrm/config.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/winrm/config.go diff --git a/packer-plugin-sdk/sdk-internals/communicator/winrm/time.go b/vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/winrm/time.go similarity index 100% rename from packer-plugin-sdk/sdk-internals/communicator/winrm/time.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/winrm/time.go diff --git a/packer-plugin-sdk/shell-local/communicator.go b/vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/communicator.go similarity index 96% rename from packer-plugin-sdk/shell-local/communicator.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/communicator.go index bc4e66e5b..4c2cc0c98 100644 --- a/packer-plugin-sdk/shell-local/communicator.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/communicator.go @@ -9,7 +9,7 @@ import ( "os/exec" "syscall" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) type Communicator struct { diff --git a/packer-plugin-sdk/shell-local/config.go b/vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/config.go similarity index 96% rename from packer-plugin-sdk/shell-local/config.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/config.go index ba68e6119..ea80cab38 100644 --- a/packer-plugin-sdk/shell-local/config.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/config.go @@ -10,10 +10,10 @@ import ( "runtime" "strings" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" - "github.com/hashicorp/packer/packer-plugin-sdk/shell" - configHelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/shell" + configHelper "github.com/hashicorp/packer-plugin-sdk/template/config" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) type Config struct { diff --git a/packer-plugin-sdk/shell-local/config.hcl2spec.go b/vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/config.hcl2spec.go similarity index 100% rename from packer-plugin-sdk/shell-local/config.hcl2spec.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/config.hcl2spec.go diff --git a/packer-plugin-sdk/shell-local/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/doc.go similarity index 100% rename from packer-plugin-sdk/shell-local/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/doc.go diff --git a/packer-plugin-sdk/shell-local/localexec/run_and_stream.go b/vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/localexec/run_and_stream.go similarity index 97% rename from packer-plugin-sdk/shell-local/localexec/run_and_stream.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/localexec/run_and_stream.go index 81e6af526..b4c595309 100644 --- a/packer-plugin-sdk/shell-local/localexec/run_and_stream.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/localexec/run_and_stream.go @@ -10,7 +10,7 @@ import ( "sync" "syscall" - packersdk "github.com/hashicorp/packer/packer-plugin-sdk/packer" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/mitchellh/iochan" ) diff --git a/packer-plugin-sdk/shell-local/run.go b/vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/run.go similarity index 96% rename from packer-plugin-sdk/shell-local/run.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/run.go index eae6dedfa..a82f4ba7d 100644 --- a/packer-plugin-sdk/shell-local/run.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/shell-local/run.go @@ -11,10 +11,10 @@ import ( "sort" "strings" - "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/commonsteps" + packersdk "github.com/hashicorp/packer-plugin-sdk/packer" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/tmp" ) func Run(ctx context.Context, ui packersdk.Ui, config *Config, generatedData map[string]interface{}) (bool, error) { diff --git a/packer-plugin-sdk/shell/exit_code.go b/vendor/github.com/hashicorp/packer-plugin-sdk/shell/exit_code.go similarity index 100% rename from packer-plugin-sdk/shell/exit_code.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/shell/exit_code.go diff --git a/packer-plugin-sdk/shell/shell.go b/vendor/github.com/hashicorp/packer-plugin-sdk/shell/shell.go similarity index 97% rename from packer-plugin-sdk/shell/shell.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/shell/shell.go index 13a85a365..180955cbf 100644 --- a/packer-plugin-sdk/shell/shell.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/shell/shell.go @@ -5,7 +5,7 @@ // having to reimplement common useful functions across various environments. package shell -import "github.com/hashicorp/packer/packer-plugin-sdk/common" +import "github.com/hashicorp/packer-plugin-sdk/common" // Provisioner contains common fields to all shell provisioners. // It is provided as a convenience to encourage plugin developers to diff --git a/packer-plugin-sdk/shutdowncommand/config.go b/vendor/github.com/hashicorp/packer-plugin-sdk/shutdowncommand/config.go similarity index 96% rename from packer-plugin-sdk/shutdowncommand/config.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/shutdowncommand/config.go index a6f5e51a7..81caca725 100644 --- a/packer-plugin-sdk/shutdowncommand/config.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/shutdowncommand/config.go @@ -6,7 +6,7 @@ package shutdowncommand import ( "time" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" ) // ShutdownConfig defines implementation details for shutting down a VM once it diff --git a/packer-plugin-sdk/template/config/custom_types.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/config/custom_types.go similarity index 100% rename from packer-plugin-sdk/template/config/custom_types.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/config/custom_types.go diff --git a/packer-plugin-sdk/template/config/custom_types.hcl2spec.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/config/custom_types.hcl2spec.go similarity index 100% rename from packer-plugin-sdk/template/config/custom_types.hcl2spec.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/config/custom_types.hcl2spec.go diff --git a/packer-plugin-sdk/template/config/decode.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/config/decode.go similarity index 99% rename from packer-plugin-sdk/template/config/decode.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/config/decode.go index 4aa78530e..96b5a553a 100644 --- a/packer-plugin-sdk/template/config/decode.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/template/config/decode.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/template/interpolate" "github.com/mitchellh/mapstructure" "github.com/ryanuber/go-glob" "github.com/zclconf/go-cty/cty" diff --git a/packer-plugin-sdk/template/config/deprecated_options.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/config/deprecated_options.go similarity index 100% rename from packer-plugin-sdk/template/config/deprecated_options.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/config/deprecated_options.go diff --git a/packer-plugin-sdk/template/doc.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/doc.go similarity index 100% rename from packer-plugin-sdk/template/doc.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/doc.go diff --git a/packer-plugin-sdk/template/funcs.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/funcs.go similarity index 97% rename from packer-plugin-sdk/template/funcs.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/funcs.go index 5c89553c0..6a340d1c2 100644 --- a/packer-plugin-sdk/template/funcs.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/template/funcs.go @@ -9,7 +9,7 @@ import ( "sync" consulapi "github.com/hashicorp/consul/api" - awssmapi "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate/aws/secretsmanager" + awssmapi "github.com/hashicorp/packer-plugin-sdk/template/interpolate/aws/secretsmanager" vaultapi "github.com/hashicorp/vault/api" ) diff --git a/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go similarity index 100% rename from packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go diff --git a/packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go similarity index 100% rename from packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go diff --git a/packer-plugin-sdk/template/interpolate/funcs.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/funcs.go similarity index 97% rename from packer-plugin-sdk/template/interpolate/funcs.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/funcs.go index d8b6e13f5..f2878742c 100644 --- a/packer-plugin-sdk/template/interpolate/funcs.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/funcs.go @@ -10,9 +10,9 @@ import ( "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" + "github.com/hashicorp/packer-plugin-sdk/packerbuilderdata" + commontpl "github.com/hashicorp/packer-plugin-sdk/template" + "github.com/hashicorp/packer-plugin-sdk/uuid" strftime "github.com/jehiah/go-strftime" ) diff --git a/packer-plugin-sdk/template/interpolate/i.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/i.go similarity index 100% rename from packer-plugin-sdk/template/interpolate/i.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/i.go diff --git a/packer-plugin-sdk/template/interpolate/parse.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/parse.go similarity index 100% rename from packer-plugin-sdk/template/interpolate/parse.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/parse.go diff --git a/packer-plugin-sdk/template/interpolate/render.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/render.go similarity index 100% rename from packer-plugin-sdk/template/interpolate/render.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/interpolate/render.go diff --git a/packer-plugin-sdk/template/parse.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/parse.go similarity index 99% rename from packer-plugin-sdk/template/parse.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/parse.go index b96ec9d46..5d1f04cc1 100644 --- a/packer-plugin-sdk/template/parse.go +++ b/vendor/github.com/hashicorp/packer-plugin-sdk/template/parse.go @@ -12,7 +12,7 @@ import ( "strings" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/packer/packer-plugin-sdk/tmp" + "github.com/hashicorp/packer-plugin-sdk/tmp" "github.com/mitchellh/mapstructure" ) diff --git a/packer-plugin-sdk/template/template.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/template.go similarity index 100% rename from packer-plugin-sdk/template/template.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/template.go diff --git a/packer-plugin-sdk/template/template.hcl2spec.go b/vendor/github.com/hashicorp/packer-plugin-sdk/template/template.hcl2spec.go similarity index 100% rename from packer-plugin-sdk/template/template.hcl2spec.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/template/template.hcl2spec.go diff --git a/packer-plugin-sdk/tmp/tmp.go b/vendor/github.com/hashicorp/packer-plugin-sdk/tmp/tmp.go similarity index 100% rename from packer-plugin-sdk/tmp/tmp.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/tmp/tmp.go diff --git a/packer-plugin-sdk/useragent/useragent.go b/vendor/github.com/hashicorp/packer-plugin-sdk/useragent/useragent.go similarity index 100% rename from packer-plugin-sdk/useragent/useragent.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/useragent/useragent.go diff --git a/packer-plugin-sdk/uuid/uuid.go b/vendor/github.com/hashicorp/packer-plugin-sdk/uuid/uuid.go similarity index 100% rename from packer-plugin-sdk/uuid/uuid.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/uuid/uuid.go diff --git a/packer-plugin-sdk/version/version.go b/vendor/github.com/hashicorp/packer-plugin-sdk/version/version.go similarity index 100% rename from packer-plugin-sdk/version/version.go rename to vendor/github.com/hashicorp/packer-plugin-sdk/version/version.go diff --git a/vendor/modules.txt b/vendor/modules.txt index fa24c695d..059f67b9a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -84,10 +84,6 @@ github.com/aliyun/alibaba-cloud-sdk-go/services/ecs github.com/aliyun/alibaba-cloud-sdk-go/services/ram # github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20170113022742-e6dbea820a9f github.com/aliyun/aliyun-oss-go-sdk/oss -# github.com/antchfx/xpath v0.0.0-20170728053731-b5c552e1acbd -github.com/antchfx/xpath -# github.com/antchfx/xquery v0.0.0-20170730121040-eb8c3c172607 -github.com/antchfx/xquery/xml # github.com/antihax/optional v1.0.0 github.com/antihax/optional # github.com/apparentlymart/go-cidr v1.0.1 @@ -189,8 +185,6 @@ github.com/digitalocean/godo github.com/dimchansky/utfbom # github.com/dylanmei/iso8601 v0.1.0 github.com/dylanmei/iso8601 -# github.com/dylanmei/winrmtest v0.0.0-20170819153634-c2fbb09e6c08 -github.com/dylanmei/winrmtest # github.com/exoscale/egoscale v0.18.1 github.com/exoscale/egoscale # github.com/fatih/camelcase v1.0.0 @@ -361,6 +355,45 @@ github.com/hashicorp/hcl/v2/hclparse github.com/hashicorp/hcl/v2/hclsyntax github.com/hashicorp/hcl/v2/hclwrite github.com/hashicorp/hcl/v2/json +# github.com/hashicorp/packer-plugin-sdk v0.0.4 +github.com/hashicorp/packer-plugin-sdk/acctest +github.com/hashicorp/packer-plugin-sdk/acctest/provisioneracc +github.com/hashicorp/packer-plugin-sdk/acctest/testutils +github.com/hashicorp/packer-plugin-sdk/adapter +github.com/hashicorp/packer-plugin-sdk/bootcommand +github.com/hashicorp/packer-plugin-sdk/chroot +github.com/hashicorp/packer-plugin-sdk/common +github.com/hashicorp/packer-plugin-sdk/communicator +github.com/hashicorp/packer-plugin-sdk/communicator/ssh +github.com/hashicorp/packer-plugin-sdk/communicator/sshkey +github.com/hashicorp/packer-plugin-sdk/filelock +github.com/hashicorp/packer-plugin-sdk/guestexec +github.com/hashicorp/packer-plugin-sdk/json +github.com/hashicorp/packer-plugin-sdk/multistep +github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps +github.com/hashicorp/packer-plugin-sdk/net +github.com/hashicorp/packer-plugin-sdk/packer +github.com/hashicorp/packer-plugin-sdk/packerbuilderdata +github.com/hashicorp/packer-plugin-sdk/pathing +github.com/hashicorp/packer-plugin-sdk/plugin +github.com/hashicorp/packer-plugin-sdk/random +github.com/hashicorp/packer-plugin-sdk/retry +github.com/hashicorp/packer-plugin-sdk/rpc +github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/none +github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/ssh +github.com/hashicorp/packer-plugin-sdk/sdk-internals/communicator/winrm +github.com/hashicorp/packer-plugin-sdk/shell +github.com/hashicorp/packer-plugin-sdk/shell-local +github.com/hashicorp/packer-plugin-sdk/shell-local/localexec +github.com/hashicorp/packer-plugin-sdk/shutdowncommand +github.com/hashicorp/packer-plugin-sdk/template +github.com/hashicorp/packer-plugin-sdk/template/config +github.com/hashicorp/packer-plugin-sdk/template/interpolate +github.com/hashicorp/packer-plugin-sdk/template/interpolate/aws/secretsmanager +github.com/hashicorp/packer-plugin-sdk/tmp +github.com/hashicorp/packer-plugin-sdk/useragent +github.com/hashicorp/packer-plugin-sdk/uuid +github.com/hashicorp/packer-plugin-sdk/version # github.com/hashicorp/serf v0.9.2 github.com/hashicorp/serf/coordinate # github.com/hashicorp/vault/api v1.0.4 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