From cf1aba56a844fc3a32004c7fd17194243eec8d7e Mon Sep 17 00:00:00 2001
From: Diptanu Choudhury <diptanuc@gmail.com>
Date: Sat, 26 Mar 2016 12:49:49 -0700
Subject: [PATCH] Interpolating service tags

---
 client/driver/executor/executor.go      | 10 ++++++++++
 client/driver/executor/executor_test.go | 16 ++++++++++++++++
 helper/args/args.go                     |  4 ++--
 nomad/mock/mock.go                      |  1 +
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/client/driver/executor/executor.go b/client/driver/executor/executor.go
index 58d20a813..60fd6f40b 100644
--- a/client/driver/executor/executor.go
+++ b/client/driver/executor/executor.go
@@ -388,6 +388,9 @@ func (e *UniversalExecutor) SyncServices(ctx *ConsulContext) error {
 		cs.SetDelegatedChecks(e.createCheckMap(), e.createCheck)
 		e.consulService = cs
 	}
+	if e.ctx != nil {
+		e.interpolateServices(e.ctx.Task)
+	}
 	err := e.consulService.SyncTask(e.ctx.Task)
 	go e.consulService.PeriodicSync()
 	return err
@@ -541,3 +544,10 @@ func (e *UniversalExecutor) createCheck(check *structs.ServiceCheck, checkID str
 	}
 	return nil, fmt.Errorf("couldn't create check for %v", check.Name)
 }
+
+func (e *UniversalExecutor) interpolateServices(task *structs.Task) {
+	e.ctx.TaskEnv.Build()
+	for _, service := range task.Services {
+		service.Tags = e.ctx.TaskEnv.ParseAndReplace(service.Tags)
+	}
+}
diff --git a/client/driver/executor/executor_test.go b/client/driver/executor/executor_test.go
index f60f97807..0dc91e17c 100644
--- a/client/driver/executor/executor_test.go
+++ b/client/driver/executor/executor_test.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"testing"
 	"time"
@@ -267,3 +268,18 @@ func TestExecutor_MakeExecutable(t *testing.T) {
 		t.Fatalf("expected permissions %v; got %v", err)
 	}
 }
+
+func TestExecutorInterpolateServices(t *testing.T) {
+	task := mock.Job().TaskGroups[0].Tasks[0]
+	// Make a fake exececutor
+	ctx := testExecutorContext(t)
+	defer ctx.AllocDir.Destroy()
+	executor := NewExecutor(log.New(os.Stdout, "", log.LstdFlags))
+
+	executor.(*UniversalExecutor).ctx = ctx
+	executor.(*UniversalExecutor).interpolateServices(task)
+	expected := []string{"pci:true", "datacenter:dc1"}
+	if !reflect.DeepEqual(task.Services[0].Tags, expected) {
+		t.Fatalf("expected: %v, actual: %v", expected, task.Services[0].Tags)
+	}
+}
diff --git a/helper/args/args.go b/helper/args/args.go
index 32836f9ea..e97ec5f58 100644
--- a/helper/args/args.go
+++ b/helper/args/args.go
@@ -9,10 +9,10 @@ var (
 // ReplaceEnv takes an arg and replaces all occurences of environment variables.
 // If the variable is found in the passed map it is replaced, otherwise the
 // original string is returned.
-func ReplaceEnv(arg string, environents ...map[string]string) string {
+func ReplaceEnv(arg string, environments ...map[string]string) string {
 	return envRe.ReplaceAllStringFunc(arg, func(arg string) string {
 		stripped := arg[2 : len(arg)-1]
-		for _, env := range environents {
+		for _, env := range environments {
 			if value, ok := env[stripped]; ok {
 				return value
 			}
diff --git a/nomad/mock/mock.go b/nomad/mock/mock.go
index eee97a8d4..432917c80 100644
--- a/nomad/mock/mock.go
+++ b/nomad/mock/mock.go
@@ -96,6 +96,7 @@ func Job() *structs.Job {
 							{
 								Name:      "${TASK}-frontend",
 								PortLabel: "http",
+								Tags:      []string{"pci:${meta.pci-dss}", "datacenter:${node.datacenter}"},
 							},
 							{
 								Name:      "${TASK}-admin",