From d9186dc8cf7943240842ba38b5acfac1a396a992 Mon Sep 17 00:00:00 2001
From: Roman Zhuzha <romazhuzha@gmail.com>
Date: Wed, 18 Jan 2017 14:02:10 +0100
Subject: [PATCH] add proper error handling for tagging source instance

---
 builder/amazon/common/step_run_source_instance.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go
index ab31be980..e436e5aff 100644
--- a/builder/amazon/common/step_run_source_instance.go
+++ b/builder/amazon/common/step_run_source_instance.go
@@ -302,8 +302,10 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
 		Resources: []*string{instance.InstanceId},
 	})
 	if err != nil {
-		ui.Message(
-			fmt.Sprintf("Failed to tag a Name on the builder instance: %s", err))
+		err := fmt.Errorf("Error tagging source instance: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
 	}
 
 	if s.Debug {