From ef59ee41a8fe81e0b1c90bd2640e9b86aee3f009 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 1 Aug 2013 12:11:54 -0700 Subject: [PATCH] rename builder/common to common since it is generally useful --- builder/amazon/chroot/builder.go | 2 +- builder/amazon/ebs/builder.go | 2 +- builder/amazon/instance/builder.go | 2 +- builder/digitalocean/builder.go | 2 +- builder/virtualbox/builder.go | 2 +- builder/virtualbox/step_download_guest_additions.go | 2 +- builder/virtualbox/step_download_iso.go | 2 +- builder/vmware/builder.go | 2 +- builder/vmware/step_download_iso.go | 2 +- {builder/common => common}/config.go | 0 {builder/common => common}/config_test.go | 0 {builder/common => common}/download.go | 0 {builder/common => common}/download_test.go | 0 {builder/common => common}/multistep_debug.go | 0 {builder/common => common}/packer_config.go | 0 {builder/common => common}/step_connect_ssh.go | 0 {builder/common => common}/step_connect_ssh_test.go | 0 {builder/common => common}/step_create_floppy.go | 0 {builder/common => common}/step_provision.go | 0 {builder/common => common}/step_provision_test.go | 0 provisioner/salt-masterless/provisioner.go | 2 +- 21 files changed, 10 insertions(+), 10 deletions(-) rename {builder/common => common}/config.go (100%) rename {builder/common => common}/config_test.go (100%) rename {builder/common => common}/download.go (100%) rename {builder/common => common}/download_test.go (100%) rename {builder/common => common}/multistep_debug.go (100%) rename {builder/common => common}/packer_config.go (100%) rename {builder/common => common}/step_connect_ssh.go (100%) rename {builder/common => common}/step_connect_ssh_test.go (100%) rename {builder/common => common}/step_create_floppy.go (100%) rename {builder/common => common}/step_provision.go (100%) rename {builder/common => common}/step_provision_test.go (100%) diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go index d96f518f6..689d198c7 100644 --- a/builder/amazon/chroot/builder.go +++ b/builder/amazon/chroot/builder.go @@ -10,7 +10,7 @@ import ( "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" - "github.com/mitchellh/packer/builder/common" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "log" "runtime" diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go index c9536c815..da51c264e 100644 --- a/builder/amazon/ebs/builder.go +++ b/builder/amazon/ebs/builder.go @@ -11,7 +11,7 @@ import ( "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" - "github.com/mitchellh/packer/builder/common" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "log" "text/template" diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go index ffbdfb467..f485263b1 100644 --- a/builder/amazon/instance/builder.go +++ b/builder/amazon/instance/builder.go @@ -8,7 +8,7 @@ import ( "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" - "github.com/mitchellh/packer/builder/common" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "log" "os" diff --git a/builder/digitalocean/builder.go b/builder/digitalocean/builder.go index c4ab8c5bc..1561868e5 100644 --- a/builder/digitalocean/builder.go +++ b/builder/digitalocean/builder.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/builder/common" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "log" "os" diff --git a/builder/virtualbox/builder.go b/builder/virtualbox/builder.go index ed8743bc8..5033f6509 100644 --- a/builder/virtualbox/builder.go +++ b/builder/virtualbox/builder.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/builder/common" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "log" "os" diff --git a/builder/virtualbox/step_download_guest_additions.go b/builder/virtualbox/step_download_guest_additions.go index 9e304e968..9f0c23cf4 100644 --- a/builder/virtualbox/step_download_guest_additions.go +++ b/builder/virtualbox/step_download_guest_additions.go @@ -6,7 +6,7 @@ import ( "encoding/hex" "fmt" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/builder/common" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "io" "io/ioutil" diff --git a/builder/virtualbox/step_download_iso.go b/builder/virtualbox/step_download_iso.go index 40553dca2..045a3da7c 100644 --- a/builder/virtualbox/step_download_iso.go +++ b/builder/virtualbox/step_download_iso.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "fmt" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/builder/common" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "log" "time" diff --git a/builder/vmware/builder.go b/builder/vmware/builder.go index 6b9caf11d..70ce9f507 100644 --- a/builder/vmware/builder.go +++ b/builder/vmware/builder.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/builder/common" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "log" "math/rand" diff --git a/builder/vmware/step_download_iso.go b/builder/vmware/step_download_iso.go index 0cf12e2a9..9c27ca879 100644 --- a/builder/vmware/step_download_iso.go +++ b/builder/vmware/step_download_iso.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "fmt" "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/builder/common" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "log" "time" diff --git a/builder/common/config.go b/common/config.go similarity index 100% rename from builder/common/config.go rename to common/config.go diff --git a/builder/common/config_test.go b/common/config_test.go similarity index 100% rename from builder/common/config_test.go rename to common/config_test.go diff --git a/builder/common/download.go b/common/download.go similarity index 100% rename from builder/common/download.go rename to common/download.go diff --git a/builder/common/download_test.go b/common/download_test.go similarity index 100% rename from builder/common/download_test.go rename to common/download_test.go diff --git a/builder/common/multistep_debug.go b/common/multistep_debug.go similarity index 100% rename from builder/common/multistep_debug.go rename to common/multistep_debug.go diff --git a/builder/common/packer_config.go b/common/packer_config.go similarity index 100% rename from builder/common/packer_config.go rename to common/packer_config.go diff --git a/builder/common/step_connect_ssh.go b/common/step_connect_ssh.go similarity index 100% rename from builder/common/step_connect_ssh.go rename to common/step_connect_ssh.go diff --git a/builder/common/step_connect_ssh_test.go b/common/step_connect_ssh_test.go similarity index 100% rename from builder/common/step_connect_ssh_test.go rename to common/step_connect_ssh_test.go diff --git a/builder/common/step_create_floppy.go b/common/step_create_floppy.go similarity index 100% rename from builder/common/step_create_floppy.go rename to common/step_create_floppy.go diff --git a/builder/common/step_provision.go b/common/step_provision.go similarity index 100% rename from builder/common/step_provision.go rename to common/step_provision.go diff --git a/builder/common/step_provision_test.go b/common/step_provision_test.go similarity index 100% rename from builder/common/step_provision_test.go rename to common/step_provision_test.go diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index 256d11859..13f514a61 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -5,7 +5,7 @@ package saltmasterless import ( "errors" "fmt" - "github.com/mitchellh/packer/builder/common" + "github.com/mitchellh/packer/common" "github.com/mitchellh/packer/packer" "os" "path/filepath"