update jobspec and api

api/tasks.go

@@ -799,6 +799,8 @@ type Template struct {
 	ChangeSignal *string        `mapstructure:"change_signal" hcl:"change_signal,optional"`
 	Splay        *time.Duration `mapstructure:"splay" hcl:"splay,optional"`
 	Perms        *string        `mapstructure:"perms" hcl:"perms,optional"`
+	Uid          *int           `mapstructure:"uid" hcl:"uid,optional"`
+	Gid          *int           `mapstructure:"gid" hcl:"gid,optional"`
 	LeftDelim    *string        `mapstructure:"left_delimiter" hcl:"left_delimiter,optional"`
 	RightDelim   *string        `mapstructure:"right_delimiter" hcl:"right_delimiter,optional"`
 	Envvars      *bool          `mapstructure:"env" hcl:"env,optional"`
@@ -835,6 +837,12 @@ func (tmpl *Template) Canonicalize() {
 	if tmpl.Perms == nil {
 		tmpl.Perms = stringToPtr("0644")
 	}
+	if tmpl.Uid == nil {
+		tmpl.Uid = intToPtr(0)
+	}
+	if tmpl.Gid == nil {
+		tmpl.Gid = intToPtr(0)
+	}
 	if tmpl.LeftDelim == nil {
 		tmpl.LeftDelim = stringToPtr("{{")
 	}

jobspec/helper.go

@@ -18,6 +18,26 @@ func stringToPtr(str string) *string {
 	return &str
 }
 
+// intToPtr returns the pointer to an int
+func intToPtr(i int) *int {
+	return &i
+}
+
+// int8ToPtr returns the pointer to an int8
+func int8ToPtr(i int8) *int8 {
+	return &i
+}
+
+// int64ToPtr returns the pointer to an int
+func int64ToPtr(i int64) *int64 {
+	return &i
+}
+
+// Uint64ToPtr returns the pointer to an uint64
+func uint64ToPtr(u uint64) *uint64 {
+	return &u
+}
+
 // timeToPtr returns the pointer to a time.Duration.
 func timeToPtr(t time.Duration) *time.Duration {
 	return &t

jobspec/parse_task.go

@@ -441,6 +441,8 @@ func parseTemplates(result *[]*api.Template, list *ast.ObjectList) error {
 			"destination",
 			"left_delimiter",
 			"perms",
+			"uid",
+			"gid",
 			"right_delimiter",
 			"source",
 			"splay",
@@ -460,6 +462,8 @@ func parseTemplates(result *[]*api.Template, list *ast.ObjectList) error {
 			ChangeMode: stringToPtr("restart"),
 			Splay:      timeToPtr(5 * time.Second),
 			Perms:      stringToPtr("0644"),
+			Uid:        intToPtr(0),
+			Gid:        intToPtr(0),
 		}
 
 		dec, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{

jobspec/parse_test.go

@@ -363,6 +363,8 @@ func TestParse(t *testing.T) {
 										ChangeSignal: stringToPtr("foo"),
 										Splay:        timeToPtr(10 * time.Second),
 										Perms:        stringToPtr("0644"),
+										Uid:          intToPtr(0),
+										Gid:          intToPtr(0),
 										Envvars:      boolToPtr(true),
 										VaultGrace:   timeToPtr(33 * time.Second),
 									},
@@ -372,6 +374,8 @@ func TestParse(t *testing.T) {
 										ChangeMode: stringToPtr(templateChangeModeRestart),
 										Splay:      timeToPtr(5 * time.Second),
 										Perms:      stringToPtr("777"),
+										Uid:        intToPtr(1001),
+										Gid:        intToPtr(20),
 										LeftDelim:  stringToPtr("--"),
 										RightDelim: stringToPtr("__"),
 									},

jobspec/test-fixtures/basic.hcl

@@ -318,6 +318,8 @@ job "binstore-storagelocker" {
         source          = "bar"
         destination     = "bar"
         perms           = "777"
+        uid             = 1001
+        gid             = 20
         left_delimiter  = "--"
         right_delimiter = "__"
       }

jobspec2/parse_job.go

@@ -107,6 +107,12 @@ func normalizeTemplates(templates []*api.Template) {
 		if t.Perms == nil {
 			t.Perms = stringToPtr("0644")
 		}
+		if t.Uid == nil {
+			t.Uid = intToPtr(0)
+		}
+		if t.Gid == nil {
+			t.Gid = intToPtr(0)
+		}
 		if t.Splay == nil {
 			t.Splay = durationToPtr(5 * time.Second)
 		}
@@ -121,6 +127,10 @@ func boolToPtr(v bool) *bool {
 	return &v
 }
 
+func intToPtr(v int) *int {
+	return &v
+}
+
 func stringToPtr(v string) *string {
 	return &v
 }