From a9b951e1fee856d13ae614a59fef4a0000bfc0ec Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 8 Aug 2013 14:57:38 -0700 Subject: [PATCH] builder/amazon/ebs: get rid of unnecessary template --- builder/amazon/ebs/step_create_ami.go | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go index 5f75fb423..e0dbec002 100644 --- a/builder/amazon/ebs/step_create_ami.go +++ b/builder/amazon/ebs/step_create_ami.go @@ -1,44 +1,26 @@ package ebs import ( - "bytes" "fmt" "github.com/mitchellh/goamz/ec2" "github.com/mitchellh/multistep" awscommon "github.com/mitchellh/packer/builder/amazon/common" "github.com/mitchellh/packer/packer" - "strconv" - "text/template" - "time" ) type stepCreateAMI struct{} -type amiNameData struct { - CreateTime string -} - func (s *stepCreateAMI) Run(state map[string]interface{}) multistep.StepAction { config := state["config"].(config) ec2conn := state["ec2"].(*ec2.EC2) instance := state["instance"].(*ec2.Instance) ui := state["ui"].(packer.Ui) - // Parse the name of the AMI - amiNameBuf := new(bytes.Buffer) - tData := amiNameData{ - strconv.FormatInt(time.Now().UTC().Unix(), 10), - } - - t := template.Must(template.New("ami").Parse(config.AMIName)) - t.Execute(amiNameBuf, tData) - amiName := amiNameBuf.String() - // Create the image - ui.Say(fmt.Sprintf("Creating the AMI: %s", amiName)) + ui.Say(fmt.Sprintf("Creating the AMI: %s", config.AMIName)) createOpts := &ec2.CreateImage{ InstanceId: instance.InstanceId, - Name: amiName, + Name: config.AMIName, } createResp, err := ec2conn.CreateImage(createOpts)