responding to feedback on PR: remove Region from Node struct, some grammatical niceties.

client/driver/driver.go

@@ -294,7 +294,7 @@ func GetTaskEnv(taskDir *allocdir.TaskDir, node *structs.Node,
 		SetTaskMeta(alloc.Job.CombinedTaskMeta(alloc.TaskGroup, task.Name)).
 		SetJobName(alloc.Job.Name).
 		SetDatacenterName(node.Datacenter).
-		SetRegionName(node.Region).
+		SetRegionName(conf.Region).
 		SetEnvvars(task.Env).
 		SetTaskName(task.Name)
 

client/driver/env/env.go

@@ -242,7 +242,7 @@ func (t *TaskEnvironment) Build() *TaskEnvironment {
 		// Set up the node values.
 		t.NodeValues[nodeIdKey] = t.Node.ID
 		t.NodeValues[nodeDcKey] = t.Node.Datacenter
-		t.NodeValues[nodeRegionKey] = t.Node.Region
+		t.NodeValues[nodeRegionKey] = t.Region
 		t.NodeValues[nodeNameKey] = t.Node.Name
 		t.NodeValues[nodeClassKey] = t.Node.NodeClass
 

command/agent/agent.go

@@ -280,7 +280,6 @@ func (a *Agent) clientConfig() (*clientconfig.Config, error) {
 	// Setup the node
 	conf.Node = new(structs.Node)
 	conf.Node.Datacenter = a.config.Datacenter
-	conf.Node.Region = a.config.Region
 	conf.Node.Name = a.config.NodeName
 	conf.Node.Meta = a.config.Client.Meta
 	conf.Node.NodeClass = a.config.Client.NodeClass

nomad/structs/structs.go

@@ -735,9 +735,6 @@ type Node struct {
 	// Datacenter for this node
 	Datacenter string
 
-	// Region for this node
-	Region string
-
 	// Node name
 	Name string