From 7f0d253dbffddd712205e615f21080b577e9723e Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Tue, 5 Sep 2017 14:09:15 -0700 Subject: [PATCH] some last minute cleanup --- builder/lxd/builder.go | 1 - builder/lxd/builder_test.go | 2 +- builder/lxd/communicator.go | 2 +- builder/lxd/communicator_test.go | 2 +- builder/lxd/config.go | 8 ++++---- builder/lxd/step_lxd_launch.go | 2 +- builder/lxd/step_provision.go | 2 +- builder/lxd/step_publish.go | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/builder/lxd/builder.go b/builder/lxd/builder.go index bd3877c15..d59cf5bcf 100644 --- a/builder/lxd/builder.go +++ b/builder/lxd/builder.go @@ -1,7 +1,6 @@ package lxd import ( - "errors" "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/template/interpolate" diff --git a/builder/lxd/builder_test.go b/builder/lxd/builder_test.go index ad5a6c95a..b2ea70e55 100644 --- a/builder/lxd/builder_test.go +++ b/builder/lxd/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/lxd/communicator.go b/builder/lxd/communicator.go index 4a8970668..8eaa47a5f 100644 --- a/builder/lxd/communicator.go +++ b/builder/lxd/communicator.go @@ -2,7 +2,7 @@ package lxd import ( "fmt" - "github.com/mitchellh/packer/packer" + "github.com/hashicorp/packer/packer" "io" "log" "os" diff --git a/builder/lxd/communicator_test.go b/builder/lxd/communicator_test.go index a4a122185..4a70160b7 100644 --- a/builder/lxd/communicator_test.go +++ b/builder/lxd/communicator_test.go @@ -1,7 +1,7 @@ package lxd import ( - "github.com/mitchellh/packer/packer" + "github.com/hashicorp/packer/packer" "testing" ) diff --git a/builder/lxd/config.go b/builder/lxd/config.go index ff75deed2..73de7212e 100644 --- a/builder/lxd/config.go +++ b/builder/lxd/config.go @@ -2,11 +2,11 @@ package lxd 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" "time" ) diff --git a/builder/lxd/step_lxd_launch.go b/builder/lxd/step_lxd_launch.go index cd51c34f2..1ec573b18 100644 --- a/builder/lxd/step_lxd_launch.go +++ b/builder/lxd/step_lxd_launch.go @@ -2,8 +2,8 @@ package lxd import ( "fmt" + "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/packer" "time" ) diff --git a/builder/lxd/step_provision.go b/builder/lxd/step_provision.go index 584d61659..c46b900e7 100644 --- a/builder/lxd/step_provision.go +++ b/builder/lxd/step_provision.go @@ -1,8 +1,8 @@ package lxd import ( + "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/packer" "log" ) diff --git a/builder/lxd/step_publish.go b/builder/lxd/step_publish.go index ecc547d92..0c0aabd3f 100644 --- a/builder/lxd/step_publish.go +++ b/builder/lxd/step_publish.go @@ -2,8 +2,8 @@ package lxd import ( "fmt" + "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/packer" "regexp" )