From 8a6faf1ad31e6caf2b09ce3c7cae7e3fb3bf34a8 Mon Sep 17 00:00:00 2001
From: Marin Salinas <marinssalinas@gmail.com>
Date: Wed, 6 Mar 2019 14:04:25 -0600
Subject: [PATCH] feature: add create tags for vm and volume

---
 builder/osc/common/step_run_source_vm.go | 37 ++++++++++++++++++------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/builder/osc/common/step_run_source_vm.go b/builder/osc/common/step_run_source_vm.go
index 38e175a0d..85e74e68c 100644
--- a/builder/osc/common/step_run_source_vm.go
+++ b/builder/osc/common/step_run_source_vm.go
@@ -98,13 +98,13 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
 		return multistep.ActionHalt
 	}
 
-	// volTags, err := s.VolumeTags.OAPITags(s.Ctx, oapiconn.GetConfig().Region, state)
-	// if err != nil {
-	// 	err := fmt.Errorf("Error tagging volumes: %s", err)
-	// 	state.Put("error", err)
-	// 	ui.Error(err.Error())
-	// 	return multistep.ActionHalt
-	// }
+	volTags, err := s.VolumeTags.OAPITags(s.Ctx, oapiconn.GetConfig().Region, state)
+	if err != nil {
+		err := fmt.Errorf("Error tagging volumes: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
 
 	subregion := state.Get("subregion_name").(string)
 	runOpts := oapi.CreateVmsRequest{
@@ -125,7 +125,7 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
 	// }
 
 	// Collect tags for tagging on resource creation
-	// var tagSpecs []oapi.ResourceTag
+	//	var tagSpecs []oapi.ResourceTag
 
 	// if len(oapiTags) > 0 {
 	// 	runTags := &oapi.ResourceTag{
@@ -185,6 +185,7 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
 		return multistep.ActionHalt
 	}
 	vmId = runResp.OK.Vms[0].VmId
+	volumeId := runResp.OK.Vms[0].BlockDeviceMappings[0].Bsu.VolumeId
 
 	// Set the vm ID so that the cleanup works properly
 	s.vmId = vmId
@@ -204,7 +205,25 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
 		return multistep.ActionHalt
 	}
 
-	//TODO:Set Vm and Volume Tags,
+	//Set Vm tags and vollume tags
+	if len(oapiTags) > 0 {
+		if err := CreateTags(oapiconn, s.vmId, ui, oapiTags); err != nil {
+			err := fmt.Errorf("Error creating tags for vm (%s): %s", s.vmId, err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+	}
+
+	if len(volTags) > 0 {
+		if err := CreateTags(oapiconn, volumeId, ui, volTags); err != nil {
+			err := fmt.Errorf("Error creating tags for volume (%s): %s", volumeId, err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
+	}
+
 	//TODO: LinkPublicIp i
 
 	resp, err := oapiconn.POST_ReadVms(request)