From b3585746367ef45d59cb908444ddb9ccc5d2c19d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 15 Jul 2013 15:02:18 +0900
Subject: [PATCH] builder/amazon/ebs: rename to amazon/ebs in order to support
 others

---
 builder/{amazonebs => amazon/ebs}/artifact.go                 | 2 +-
 builder/{amazonebs => amazon/ebs}/artifact_test.go            | 2 +-
 builder/{amazonebs => amazon/ebs}/builder.go                  | 2 +-
 builder/{amazonebs => amazon/ebs}/builder_test.go             | 2 +-
 builder/{amazonebs => amazon/ebs}/hook.go                     | 2 +-
 builder/{amazonebs => amazon/ebs}/instance.go                 | 2 +-
 builder/{amazonebs => amazon/ebs}/ssh.go                      | 2 +-
 builder/{amazonebs => amazon/ebs}/step_create_ami.go          | 2 +-
 builder/{amazonebs => amazon/ebs}/step_keypair.go             | 2 +-
 builder/{amazonebs => amazon/ebs}/step_provision.go           | 2 +-
 builder/{amazonebs => amazon/ebs}/step_run_source_instance.go | 2 +-
 builder/{amazonebs => amazon/ebs}/step_security_group.go      | 2 +-
 builder/{amazonebs => amazon/ebs}/step_stop_instance.go       | 2 +-
 plugin/builder-amazon-ebs/main.go                             | 4 ++--
 14 files changed, 15 insertions(+), 15 deletions(-)
 rename builder/{amazonebs => amazon/ebs}/artifact.go (98%)
 rename builder/{amazonebs => amazon/ebs}/artifact_test.go (98%)
 rename builder/{amazonebs => amazon/ebs}/builder.go (99%)
 rename builder/{amazonebs => amazon/ebs}/builder_test.go (99%)
 rename builder/{amazonebs => amazon/ebs}/hook.go (85%)
 rename builder/{amazonebs => amazon/ebs}/instance.go (97%)
 rename builder/{amazonebs => amazon/ebs}/ssh.go (97%)
 rename builder/{amazonebs => amazon/ebs}/step_create_ami.go (99%)
 rename builder/{amazonebs => amazon/ebs}/step_keypair.go (98%)
 rename builder/{amazonebs => amazon/ebs}/step_provision.go (97%)
 rename builder/{amazonebs => amazon/ebs}/step_run_source_instance.go (99%)
 rename builder/{amazonebs => amazon/ebs}/step_security_group.go (99%)
 rename builder/{amazonebs => amazon/ebs}/step_stop_instance.go (98%)

diff --git a/builder/amazonebs/artifact.go b/builder/amazon/ebs/artifact.go
similarity index 98%
rename from builder/amazonebs/artifact.go
rename to builder/amazon/ebs/artifact.go
index 0533be01f..4d25d4595 100644
--- a/builder/amazonebs/artifact.go
+++ b/builder/amazon/ebs/artifact.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	"fmt"
diff --git a/builder/amazonebs/artifact_test.go b/builder/amazon/ebs/artifact_test.go
similarity index 98%
rename from builder/amazonebs/artifact_test.go
rename to builder/amazon/ebs/artifact_test.go
index 70888a8a8..dd8ccba9b 100644
--- a/builder/amazonebs/artifact_test.go
+++ b/builder/amazon/ebs/artifact_test.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	"cgl.tideland.biz/asserts"
diff --git a/builder/amazonebs/builder.go b/builder/amazon/ebs/builder.go
similarity index 99%
rename from builder/amazonebs/builder.go
rename to builder/amazon/ebs/builder.go
index 83e3b0a91..3424ef2ac 100644
--- a/builder/amazonebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -3,7 +3,7 @@
 //
 // In general, there are two types of AMIs that can be created: ebs-backed or
 // instance-store. This builder _only_ builds ebs-backed images.
-package amazonebs
+package ebs
 
 import (
 	"errors"
diff --git a/builder/amazonebs/builder_test.go b/builder/amazon/ebs/builder_test.go
similarity index 99%
rename from builder/amazonebs/builder_test.go
rename to builder/amazon/ebs/builder_test.go
index 03a99cdb3..ea0d326b5 100644
--- a/builder/amazonebs/builder_test.go
+++ b/builder/amazon/ebs/builder_test.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	"github.com/mitchellh/packer/packer"
diff --git a/builder/amazonebs/hook.go b/builder/amazon/ebs/hook.go
similarity index 85%
rename from builder/amazonebs/hook.go
rename to builder/amazon/ebs/hook.go
index 5e3d2a2b8..b33bfe86a 100644
--- a/builder/amazonebs/hook.go
+++ b/builder/amazon/ebs/hook.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 // This hook is fired prior to launching the EC2 instance.
 const HookPreLaunch = "amazonebs_pre_launch"
diff --git a/builder/amazonebs/instance.go b/builder/amazon/ebs/instance.go
similarity index 97%
rename from builder/amazonebs/instance.go
rename to builder/amazon/ebs/instance.go
index 0362ebe8f..d5a0a8006 100644
--- a/builder/amazonebs/instance.go
+++ b/builder/amazon/ebs/instance.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	"fmt"
diff --git a/builder/amazonebs/ssh.go b/builder/amazon/ebs/ssh.go
similarity index 97%
rename from builder/amazonebs/ssh.go
rename to builder/amazon/ebs/ssh.go
index 95bbda4cb..c71429d89 100644
--- a/builder/amazonebs/ssh.go
+++ b/builder/amazon/ebs/ssh.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	gossh "code.google.com/p/go.crypto/ssh"
diff --git a/builder/amazonebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go
similarity index 99%
rename from builder/amazonebs/step_create_ami.go
rename to builder/amazon/ebs/step_create_ami.go
index cca4a68b9..a33021b49 100644
--- a/builder/amazonebs/step_create_ami.go
+++ b/builder/amazon/ebs/step_create_ami.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	"bytes"
diff --git a/builder/amazonebs/step_keypair.go b/builder/amazon/ebs/step_keypair.go
similarity index 98%
rename from builder/amazonebs/step_keypair.go
rename to builder/amazon/ebs/step_keypair.go
index 5b598b7ea..498dcb65c 100644
--- a/builder/amazonebs/step_keypair.go
+++ b/builder/amazon/ebs/step_keypair.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	"cgl.tideland.biz/identifier"
diff --git a/builder/amazonebs/step_provision.go b/builder/amazon/ebs/step_provision.go
similarity index 97%
rename from builder/amazonebs/step_provision.go
rename to builder/amazon/ebs/step_provision.go
index 00f1a5540..385ebe81f 100644
--- a/builder/amazonebs/step_provision.go
+++ b/builder/amazon/ebs/step_provision.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	"github.com/mitchellh/multistep"
diff --git a/builder/amazonebs/step_run_source_instance.go b/builder/amazon/ebs/step_run_source_instance.go
similarity index 99%
rename from builder/amazonebs/step_run_source_instance.go
rename to builder/amazon/ebs/step_run_source_instance.go
index 77c2c99e7..2e6d9133b 100644
--- a/builder/amazonebs/step_run_source_instance.go
+++ b/builder/amazon/ebs/step_run_source_instance.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	"fmt"
diff --git a/builder/amazonebs/step_security_group.go b/builder/amazon/ebs/step_security_group.go
similarity index 99%
rename from builder/amazonebs/step_security_group.go
rename to builder/amazon/ebs/step_security_group.go
index c35413c90..1dd326e83 100644
--- a/builder/amazonebs/step_security_group.go
+++ b/builder/amazon/ebs/step_security_group.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	"cgl.tideland.biz/identifier"
diff --git a/builder/amazonebs/step_stop_instance.go b/builder/amazon/ebs/step_stop_instance.go
similarity index 98%
rename from builder/amazonebs/step_stop_instance.go
rename to builder/amazon/ebs/step_stop_instance.go
index 59b141dee..ac81bda6b 100644
--- a/builder/amazonebs/step_stop_instance.go
+++ b/builder/amazon/ebs/step_stop_instance.go
@@ -1,4 +1,4 @@
-package amazonebs
+package ebs
 
 import (
 	"fmt"
diff --git a/plugin/builder-amazon-ebs/main.go b/plugin/builder-amazon-ebs/main.go
index 38c9c4028..f0598d749 100644
--- a/plugin/builder-amazon-ebs/main.go
+++ b/plugin/builder-amazon-ebs/main.go
@@ -1,10 +1,10 @@
 package main
 
 import (
-	"github.com/mitchellh/packer/builder/amazonebs"
+	"github.com/mitchellh/packer/builder/amazon/ebs"
 	"github.com/mitchellh/packer/packer/plugin"
 )
 
 func main() {
-	plugin.ServeBuilder(new(amazonebs.Builder))
+	plugin.ServeBuilder(new(ebs.Builder))
 }