From 231f01cd352c7fc93fa5091b7840d12ebe1b3b89 Mon Sep 17 00:00:00 2001
From: Clint Shryock <clint@ctshryock.com>
Date: Mon, 8 Jun 2015 17:08:39 -0500
Subject: [PATCH 1/2] builder/aws: Add pre validate step, to validate things
 before building.

---
 builder/amazon/common/step_pre_validate.go | 47 ++++++++++++++++++++++
 builder/amazon/ebs/builder.go              |  3 ++
 2 files changed, 50 insertions(+)
 create mode 100644 builder/amazon/common/step_pre_validate.go

diff --git a/builder/amazon/common/step_pre_validate.go b/builder/amazon/common/step_pre_validate.go
new file mode 100644
index 000000000..1fc3dbade
--- /dev/null
+++ b/builder/amazon/common/step_pre_validate.go
@@ -0,0 +1,47 @@
+package common
+
+import (
+	"fmt"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/mitchellh/multistep"
+	"github.com/mitchellh/packer/packer"
+)
+
+// StepPreValidate provides an opportunity to pre-validate any configuration for
+// the build before actually doing any time consuming work
+//
+type StepPreValidate struct {
+	DestAmiName string
+}
+
+func (s *StepPreValidate) Run(state multistep.StateBag) multistep.StepAction {
+	ec2conn := state.Get("ec2").(*ec2.EC2)
+	ui := state.Get("ui").(packer.Ui)
+
+	ui.Say("Prevalidating AMI Name...")
+	resp, err := ec2conn.DescribeImages(&ec2.DescribeImagesInput{
+		Filters: []*ec2.Filter{&ec2.Filter{
+			Name:   aws.String("name"),
+			Values: []*string{aws.String(s.DestAmiName)},
+		}}})
+
+	if err != nil {
+		err := fmt.Errorf("Error querying AMI: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	if len(resp.Images) > 0 {
+		err := fmt.Errorf("Error: an AMI with that name already exists")
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
+	return multistep.ActionContinue
+}
+
+func (s *StepPreValidate) Cleanup(multistep.StateBag) {}
diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go
index 274e3cd6d..93bb23e54 100644
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -78,6 +78,9 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 
 	// Build the steps
 	steps := []multistep.Step{
+		&awscommon.StepPreValidate{
+			DestAmiName: b.config.AMIName,
+		},
 		&awscommon.StepSourceAMIInfo{
 			SourceAmi:          b.config.SourceAmi,
 			EnhancedNetworking: b.config.AMIEnhancedNetworking,

From 68040f786c314ef9fc8a839f681f3c2220d56c55 Mon Sep 17 00:00:00 2001
From: Clint Shryock <clint@ctshryock.com>
Date: Mon, 8 Jun 2015 22:00:59 -0500
Subject: [PATCH 2/2] show AMI id in error message

---
 builder/amazon/common/step_pre_validate.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/amazon/common/step_pre_validate.go b/builder/amazon/common/step_pre_validate.go
index 1fc3dbade..5eb263eca 100644
--- a/builder/amazon/common/step_pre_validate.go
+++ b/builder/amazon/common/step_pre_validate.go
@@ -35,7 +35,7 @@ func (s *StepPreValidate) Run(state multistep.StateBag) multistep.StepAction {
 	}
 
 	if len(resp.Images) > 0 {
-		err := fmt.Errorf("Error: an AMI with that name already exists")
+		err := fmt.Errorf("Error: name conflicts with an existing AMI: %s", *resp.Images[0].ImageID)
 		state.Put("error", err)
 		ui.Error(err.Error())
 		return multistep.ActionHalt