diff --git a/builder/alicloud/ecs/artifact.go b/builder/alicloud/ecs/artifact.go index 7e7b258d5..f22735e3f 100644 --- a/builder/alicloud/ecs/artifact.go +++ b/builder/alicloud/ecs/artifact.go @@ -2,12 +2,13 @@ package ecs import ( "fmt" - "github.com/denverdino/aliyungo/common" - "github.com/denverdino/aliyungo/ecs" - "github.com/hashicorp/packer/packer" "log" "sort" "strings" + + "github.com/denverdino/aliyungo/common" + "github.com/denverdino/aliyungo/ecs" + "github.com/hashicorp/packer/packer" ) type Artifact struct { diff --git a/builder/alicloud/ecs/builder_acc_test.go b/builder/alicloud/ecs/builder_acc_test.go index 33e0acc15..415bfcf8b 100644 --- a/builder/alicloud/ecs/builder_acc_test.go +++ b/builder/alicloud/ecs/builder_acc_test.go @@ -5,6 +5,7 @@ import ( "testing" "fmt" + "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" builderT "github.com/hashicorp/packer/helper/builder/testing" diff --git a/builder/alicloud/ecs/image_config.go b/builder/alicloud/ecs/image_config.go index f4efe4d9a..cbf1f3f91 100644 --- a/builder/alicloud/ecs/image_config.go +++ b/builder/alicloud/ecs/image_config.go @@ -2,6 +2,7 @@ package ecs import ( "fmt" + "github.com/denverdino/aliyungo/common" "github.com/hashicorp/packer/template/interpolate" ) diff --git a/builder/alicloud/ecs/image_config_test.go b/builder/alicloud/ecs/image_config_test.go index 983d569d1..bb4581871 100644 --- a/builder/alicloud/ecs/image_config_test.go +++ b/builder/alicloud/ecs/image_config_test.go @@ -1,8 +1,9 @@ package ecs import ( - "github.com/denverdino/aliyungo/common" "testing" + + "github.com/denverdino/aliyungo/common" ) func testAlicloudImageConfig() *AlicloudImageConfig { diff --git a/builder/alicloud/ecs/packer_helper.go b/builder/alicloud/ecs/packer_helper.go index e08ceba9b..f88f6ff1a 100644 --- a/builder/alicloud/ecs/packer_helper.go +++ b/builder/alicloud/ecs/packer_helper.go @@ -2,6 +2,7 @@ package ecs import ( "fmt" + "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep" ) diff --git a/builder/alicloud/ecs/run_config.go b/builder/alicloud/ecs/run_config.go index 32e3173e5..1fc0397bc 100644 --- a/builder/alicloud/ecs/run_config.go +++ b/builder/alicloud/ecs/run_config.go @@ -3,10 +3,11 @@ package ecs import ( "errors" "fmt" + "os" + "github.com/hashicorp/packer/common/uuid" "github.com/hashicorp/packer/helper/communicator" "github.com/hashicorp/packer/template/interpolate" - "os" ) type RunConfig struct { diff --git a/builder/alicloud/ecs/ssh_helper.go b/builder/alicloud/ecs/ssh_helper.go index 281dd6544..d3d6b8b1c 100644 --- a/builder/alicloud/ecs/ssh_helper.go +++ b/builder/alicloud/ecs/ssh_helper.go @@ -2,13 +2,14 @@ package ecs import ( "fmt" + "net" + "os" + "time" + packerssh "github.com/hashicorp/packer/communicator/ssh" "github.com/mitchellh/multistep" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" - "net" - "os" - "time" ) var ( diff --git a/builder/alicloud/ecs/step_check_source_image.go b/builder/alicloud/ecs/step_check_source_image.go index 7d69470f5..4990f99d5 100644 --- a/builder/alicloud/ecs/step_check_source_image.go +++ b/builder/alicloud/ecs/step_check_source_image.go @@ -2,6 +2,7 @@ package ecs import ( "fmt" + "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" "github.com/hashicorp/packer/packer" diff --git a/builder/alicloud/ecs/step_config_key_pair.go b/builder/alicloud/ecs/step_config_key_pair.go index dca2e0866..6e1276dcc 100644 --- a/builder/alicloud/ecs/step_config_key_pair.go +++ b/builder/alicloud/ecs/step_config_key_pair.go @@ -2,13 +2,14 @@ package ecs import ( "fmt" + "io/ioutil" + "os" + "runtime" + "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep" - "io/ioutil" - "os" - "runtime" ) type StepConfigAlicloudKeyPair struct { diff --git a/builder/alicloud/ecs/step_pre_validate.go b/builder/alicloud/ecs/step_pre_validate.go index 9917f4b23..12d8e098f 100644 --- a/builder/alicloud/ecs/step_pre_validate.go +++ b/builder/alicloud/ecs/step_pre_validate.go @@ -2,6 +2,7 @@ package ecs import ( "fmt" + "github.com/denverdino/aliyungo/common" "github.com/denverdino/aliyungo/ecs" "github.com/hashicorp/packer/packer" diff --git a/builder/alicloud/ecs/step_stop_instance.go b/builder/alicloud/ecs/step_stop_instance.go index a72748bdf..b12a74c63 100644 --- a/builder/alicloud/ecs/step_stop_instance.go +++ b/builder/alicloud/ecs/step_stop_instance.go @@ -2,6 +2,7 @@ package ecs import ( "fmt" + "github.com/denverdino/aliyungo/ecs" "github.com/hashicorp/packer/packer" "github.com/mitchellh/multistep"