Merge branch 'master' of github.com:hashicorp/nomad

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,22 @@ func (e *UniversalExecutor) createCheck(check *structs.ServiceCheck, checkID str
 	}
 	return nil, fmt.Errorf("couldn't create check for %v", check.Name)
 }
+
+// interpolateServices interpolates tags in a service and checks with values from the
+// task's environment.
+func (e *UniversalExecutor) interpolateServices(task *structs.Task) {
+	e.ctx.TaskEnv.Build()
+	for _, service := range task.Services {
+		for _, check := range service.Checks {
+			if check.Type == structs.ServiceCheckScript {
+				check.Name = e.ctx.TaskEnv.ReplaceEnv(check.Name)
+				check.Command = e.ctx.TaskEnv.ReplaceEnv(check.Command)
+				check.Args = e.ctx.TaskEnv.ParseAndReplace(check.Args)
+				check.Path = e.ctx.TaskEnv.ReplaceEnv(check.Path)
+				check.Protocol = e.ctx.TaskEnv.ReplaceEnv(check.Protocol)
+			}
+		}
+		service.Name = e.ctx.TaskEnv.ReplaceEnv(service.Name)
+		service.Tags = e.ctx.TaskEnv.ParseAndReplace(service.Tags)
+	}
+}

client/driver/executor/executor_test.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"os"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"testing"
 	"time"
@@ -267,3 +268,28 @@ 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)
+	expectedTags := []string{"pci:true", "datacenter:dc1"}
+	if !reflect.DeepEqual(task.Services[0].Tags, expectedTags) {
+		t.Fatalf("expected: %v, actual: %v", expectedTags, task.Services[0].Tags)
+	}
+
+	expectedCheckCmd := "/usr/local/check-table-mysql"
+	expectedCheckArgs := []string{"5.6"}
+	if !reflect.DeepEqual(task.Services[0].Checks[0].Command, expectedCheckCmd) {
+		t.Fatalf("expected: %v, actual: %v", expectedCheckCmd, task.Services[0].Checks[0].Command)
+	}
+
+	if !reflect.DeepEqual(task.Services[0].Checks[0].Args, expectedCheckArgs) {
+		t.Fatalf("expected: %v, actual: %v", expectedCheckArgs, task.Services[0].Checks[0].Args)
+	}
+}

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
 			}

nomad/mock/mock.go

@@ -47,7 +47,9 @@ func Node() *structs.Node {
 			"consul": "foobar.dc1",
 		},
 		Meta: map[string]string{
-			"pci-dss": "true",
+			"pci-dss":  "true",
+			"database": "mysql",
+			"version":  "5.6",
 		},
 		NodeClass: "linux-medium-pci",
 		Status:    structs.NodeStatusReady,
@@ -96,6 +98,17 @@ func Job() *structs.Job {
 							{
 								Name:      "${TASK}-frontend",
 								PortLabel: "http",
+								Tags:      []string{"pci:${meta.pci-dss}", "datacenter:${node.datacenter}"},
+								Checks: []*structs.ServiceCheck{
+									{
+										Name:     "check-table",
+										Type:     structs.ServiceCheckScript,
+										Command:  "/usr/local/check-table-${meta.database}",
+										Args:     []string{"${meta.version}"},
+										Interval: 30 * time.Second,
+										Timeout:  5 * time.Second,
+									},
+								},
 							},
 							{
 								Name:      "${TASK}-admin",

website/source/docs/jobspec/servicediscovery.html.md

@@ -110,7 +110,8 @@ group "database" {
   limited to alphanumeric and hyphen characters (i.e. `[a-z0-9\-]`), and be
   less than 64 characters in length.
 
-* `tags`: A list of tags associated with this Service.
+* `tags`: A list of tags associated with this Service. String interpolation is
+  supported in tags.
 
 * `port`: The port indicates the port associated with the service. Users are
   required to specify a valid port label here which they have defined in the