From 4c37ce5304a217cfbe66e407227bcb2da1a6bd7b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 9 May 2013 14:05:15 -0700
Subject: [PATCH] builder/amazonebs: Don't worry about the map[string]interface
 crap

---
 builder/amazonebs/builder.go      | 7 -------
 builder/amazonebs/builder_test.go | 9 ---------
 example.json                      | 2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/builder/amazonebs/builder.go b/builder/amazonebs/builder.go
index 28867ab4f..49b768723 100644
--- a/builder/amazonebs/builder.go
+++ b/builder/amazonebs/builder.go
@@ -2,7 +2,6 @@ package amazonebs
 
 import (
 	"encoding/json"
-	"errors"
 	"github.com/mitchellh/packer/packer"
 	"log"
 )
@@ -19,12 +18,6 @@ type Builder struct {
 }
 
 func (b *Builder) Prepare(raw interface{}) (err error) {
-	_, ok := raw.(map[string]interface{})
-	if !ok {
-		err = errors.New("configuration isn't a valid map")
-		return
-	}
-
 	jsonBytes, err := json.Marshal(raw)
 	if err != nil {
 		return
diff --git a/builder/amazonebs/builder_test.go b/builder/amazonebs/builder_test.go
index 2a56c0e4f..6c2fb1ac6 100644
--- a/builder/amazonebs/builder_test.go
+++ b/builder/amazonebs/builder_test.go
@@ -13,15 +13,6 @@ func TestBuilder_ImplementsBuilder(t *testing.T) {
 	assert.Implementor(&Builder{}, &actual, "should be a Builder")
 }
 
-func TestBuilder_Prepare_NotMap(t *testing.T) {
-	assert := asserts.NewTestingAsserts(t, true)
-
-	b := &Builder{}
-	err := b.Prepare(42)
-	assert.NotNil(err, "should have an error")
-	assert.Equal(err.Error(), "configuration isn't a valid map", "config is not a map")
-}
-
 func TestBuilder_Prepare_BadType(t *testing.T) {
 	assert := asserts.NewTestingAsserts(t, true)
 
diff --git a/example.json b/example.json
index 0ff9c3987..385882490 100644
--- a/example.json
+++ b/example.json
@@ -5,7 +5,7 @@
         {
             "type": "amazon-ebs",
             "region": "us-east-1",
-            "source": "ami-de0d9eb7"
+            "source_ami": "ami-de0d9eb7"
         }
     ],