From aa70c82ec8bc8b0953591c3b8c449883e4b2f4b8 Mon Sep 17 00:00:00 2001
From: Roman Zhuzha <romazhuzha@gmail.com>
Date: Wed, 18 Jan 2017 11:36:31 +0000
Subject: [PATCH] use ConvertToEC2Tags to apply tags to source instance, add
 Say message

---
 builder/amazon/common/step_run_source_instance.go | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go
index 4b79131de..774fd94b5 100644
--- a/builder/amazon/common/step_run_source_instance.go
+++ b/builder/amazon/common/step_run_source_instance.go
@@ -291,11 +291,9 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi
 
 	instance := latestInstance.(*ec2.Instance)
 
-	ec2Tags := make([]*ec2.Tag, 1, len(s.Tags)+1)
-	ec2Tags[0] = &ec2.Tag{Key: aws.String("Name"), Value: aws.String("Packer Builder")}
-	for k, v := range s.Tags {
-		ec2Tags = append(ec2Tags, &ec2.Tag{Key: aws.String(k), Value: aws.String(v)})
-	}
+	ui.Say(fmt.Sprintf("Adding tags to source instance:"))
+	s.Tags["Name"] = "Packer Builder"
+	ec2Tags := ConvertToEC2Tags(s.Tags, ui)
 
 	_, err = ec2conn.CreateTags(&ec2.CreateTagsInput{
 		Tags:      ec2Tags,