luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #9623 from hashicorp/b-hcl2-envvar

Browse source 
set EnvVar variables in hcl2 parsing
This commit is contained in:
Mahmood Ali 2020-12-11 13:59:37 -05:00 committed by GitHub
parent 54becaab7d 5351764b1b
commit 348c814611
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
command/helpers.go
View file

@ -458,6 +458,7 @@ func (j *JobGetter) ApiJobWithArgs(jpath string, vars []string, varfiles []strin
ArgVars: vars, ArgVars: vars,
AllowFS: true, AllowFS: true,
VarFiles: varfiles, VarFiles: varfiles,
Envs: os.Environ(),
}) })
if err != nil { if err != nil {

8
command/helpers_test.go
View file

@ -338,16 +338,20 @@ variables {
var1 = "default-val" var1 = "default-val"
var2 = "default-val" var2 = "default-val"
var3 = "default-val" var3 = "default-val"
var4 = "default-val"
} }
job "example" { 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`} cliArgs := []string{`var2=from-cli`}
fileVars := `var3 = "from-varfile"` 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") hclf, err := ioutil.TempFile("", "hcl")
require.NoError(t, err) require.NoError(t, err)

15
website/pages/docs/job-specification/hcl2/variables.mdx
View file

@ -153,15 +153,6 @@ documentation about the job, and so it should be written from the perspective
of the user of the job rather than its maintainer. For commentary for job of the user of the job rather than its maintainer. For commentary for job
maintainers, use comments. maintainers, use comments.
## Assigning Values to job Variables
Once a variable is declared in your configuration, you can set it:
- Individually, with the `-var foo=bar` command line option.
- As environment variables, for example: `NOMAD_VAR_foo=bar`
The following sections describe these options in more detail.
### Variables on the Command Line ### Variables on the Command Line
To specify individual variables on the command line, use the `-var` option when To specify individual variables on the command line, use the `-var` option when
@ -211,7 +202,6 @@ corresponding to variable names:
"labels": ["testing", "internal"], "labels": ["testing", "internal"],
} }
``` ```
--->
### Environment Variables ### Environment Variables
@ -234,6 +224,8 @@ Nomad matches the variable name exactly as given in configuration, and so the
required environment variable name will usually have a mix of upper and lower required environment variable name will usually have a mix of upper and lower
case letters as in the above example. case letters as in the above example.
--->
### Complex-typed Values ### Complex-typed Values
When variable values are provided in a variable definitions file, Nomad's When variable values are provided in a variable definitions file, Nomad's
@ -262,6 +254,7 @@ For readability, and to avoid the need to worry about shell escaping, we
recommend always setting complex variable values via variable definitions recommend always setting complex variable values via variable definitions
files. files.
<!---
### Variable Definition Precedence ### Variable Definition Precedence
The above mechanisms for setting variables can be used together in any The above mechanisms for setting variables can be used together in any
@ -281,6 +274,8 @@ that the same variable cannot be assigned multiple values within a single source
~> **Important:** Variables with map and object values behave the same way as ~> **Important:** Variables with map and object values behave the same way as
other variables: the last value found overrides the previous values. other variables: the last value found overrides the previous values.
--->
## A variable value must be known: ## A variable value must be known:
Take the following variable for example: Take the following variable for example: