diff --git a/command/helpers.go b/command/helpers.go index a09382fef..74b221bba 100644 --- a/command/helpers.go +++ b/command/helpers.go @@ -458,6 +458,7 @@ func (j *JobGetter) ApiJobWithArgs(jpath string, vars []string, varfiles []strin ArgVars: vars, AllowFS: true, VarFiles: varfiles, + Envs: os.Environ(), }) if err != nil { diff --git a/command/helpers_test.go b/command/helpers_test.go index d07f3deed..dcdd7f207 100644 --- a/command/helpers_test.go +++ b/command/helpers_test.go @@ -338,16 +338,20 @@ variables { var1 = "default-val" var2 = "default-val" var3 = "default-val" + var4 = "default-val" } job "example" { - datacenters = ["${var.var1}", "${var.var2}", "${var.var3}"] + datacenters = ["${var.var1}", "${var.var2}", "${var.var3}", "${var.var4}"] } ` + os.Setenv("NOMAD_VAR_var4", "from-envvar") + defer os.Unsetenv("NOMAD_VAR_var4") + cliArgs := []string{`var2=from-cli`} fileVars := `var3 = "from-varfile"` - expected := []string{"default-val", "from-cli", "from-varfile"} + expected := []string{"default-val", "from-cli", "from-varfile", "from-envvar"} hclf, err := ioutil.TempFile("", "hcl") require.NoError(t, err)