From 8d24b3930a0841f659fb9b13a5e8b9989785fb6d Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 5 Sep 2017 15:23:22 -0700 Subject: [PATCH] cleanup imports and rebase artifacts --- builder/lxc/builder.go | 1 - builder/lxc/builder_test.go | 2 +- builder/lxc/communicator.go | 2 +- builder/lxc/communicator_test.go | 2 +- builder/lxc/config.go | 8 ++++---- builder/lxc/step_export.go | 2 +- builder/lxc/step_lxc_create.go | 2 +- builder/lxc/step_prepare_output_dir.go | 2 +- builder/lxc/step_provision.go | 2 +- builder/lxc/step_wait_init.go | 2 +- command/plugin.go | 3 +-- 11 files changed, 13 insertions(+), 15 deletions(-) diff --git a/builder/lxc/builder.go b/builder/lxc/builder.go index 2f8fb83b3..31770b740 100644 --- a/builder/lxc/builder.go +++ b/builder/lxc/builder.go @@ -1,7 +1,6 @@ package lxc import ( - "errors" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/template/interpolate" diff --git a/builder/lxc/builder_test.go b/builder/lxc/builder_test.go index 55bd4a547..4eeb27594 100644 --- a/builder/lxc/builder_test.go +++ b/builder/lxc/builder_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/mitchellh/packer/packer" + "github.com/hashicorp/packer/packer" ) func testConfig() map[string]interface{} { diff --git a/builder/lxc/communicator.go b/builder/lxc/communicator.go index 7a4133057..8d9765979 100644 --- a/builder/lxc/communicator.go +++ b/builder/lxc/communicator.go @@ -2,7 +2,7 @@ package lxc import ( "fmt" - "github.com/mitchellh/packer/packer" + "github.com/hashicorp/packer/packer" "io" "io/ioutil" "log" diff --git a/builder/lxc/communicator_test.go b/builder/lxc/communicator_test.go index 7599bd630..854ba6680 100644 --- a/builder/lxc/communicator_test.go +++ b/builder/lxc/communicator_test.go @@ -1,7 +1,7 @@ package lxc import ( - "github.com/mitchellh/packer/packer" + "github.com/hashicorp/packer/packer" "testing" ) diff --git a/builder/lxc/config.go b/builder/lxc/config.go index a0f1edb9f..c3c28d4fb 100644 --- a/builder/lxc/config.go +++ b/builder/lxc/config.go @@ -2,11 +2,11 @@ package lxc import ( "fmt" + "github.com/hashicorp/packer/common" + "github.com/hashicorp/packer/helper/config" + "github.com/hashicorp/packer/packer" + "github.com/hashicorp/packer/template/interpolate" "github.com/mitchellh/mapstructure" - "github.com/mitchellh/packer/common" - "github.com/mitchellh/packer/helper/config" - "github.com/mitchellh/packer/packer" - "github.com/mitchellh/packer/template/interpolate" "os" "time" ) diff --git a/builder/lxc/step_export.go b/builder/lxc/step_export.go index bc10a2338..59e4b79e9 100644 --- a/builder/lxc/step_export.go +++ b/builder/lxc/step_export.go @@ -3,8 +3,8 @@ package lxc import ( "bytes" "fmt" + "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/packer" "io" "log" "os" diff --git a/builder/lxc/step_lxc_create.go b/builder/lxc/step_lxc_create.go index 070eae680..a98926ffa 100644 --- a/builder/lxc/step_lxc_create.go +++ b/builder/lxc/step_lxc_create.go @@ -3,8 +3,8 @@ package lxc import ( "bytes" "fmt" + "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/packer" "log" "os/exec" "path/filepath" diff --git a/builder/lxc/step_prepare_output_dir.go b/builder/lxc/step_prepare_output_dir.go index 4b66c0c87..07c6f08b7 100644 --- a/builder/lxc/step_prepare_output_dir.go +++ b/builder/lxc/step_prepare_output_dir.go @@ -1,8 +1,8 @@ package lxc import ( + "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/packer" "log" "os" "time" diff --git a/builder/lxc/step_provision.go b/builder/lxc/step_provision.go index 8b33373dc..f91eb56ce 100644 --- a/builder/lxc/step_provision.go +++ b/builder/lxc/step_provision.go @@ -1,8 +1,8 @@ package lxc import ( + "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/packer" "log" ) diff --git a/builder/lxc/step_wait_init.go b/builder/lxc/step_wait_init.go index d2d58628a..e5d375312 100644 --- a/builder/lxc/step_wait_init.go +++ b/builder/lxc/step_wait_init.go @@ -3,8 +3,8 @@ package lxc import ( "errors" "fmt" + "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/packer" "log" "strings" "time" diff --git a/command/plugin.go b/command/plugin.go index 2b0d3428c..cc87e81dc 100644 --- a/command/plugin.go +++ b/command/plugin.go @@ -27,7 +27,7 @@ import ( googlecomputebuilder "github.com/hashicorp/packer/builder/googlecompute" hypervisobuilder "github.com/hashicorp/packer/builder/hyperv/iso" lxcbuilder "github.com/hashicorp/packer/builder/lxc" - lxdbuilder "github.com/hashicorp/packer/builder/lxd" + lxdbuilder "github.com/hashicorp/packer/builder/lxd" nullbuilder "github.com/hashicorp/packer/builder/null" oneandonebuilder "github.com/hashicorp/packer/builder/oneandone" openstackbuilder "github.com/hashicorp/packer/builder/openstack" @@ -78,7 +78,6 @@ type PluginCommand struct { } var Builders = map[string]packer.Builder{ -<<<<<<< HEAD "alicloud-ecs": new(alicloudecsbuilder.Builder), "amazon-chroot": new(amazonchrootbuilder.Builder), "amazon-ebs": new(amazonebsbuilder.Builder),