Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

set EnvVar variables in hcl2 parsing #9623

Merged
merged 2 commits into from
Dec 11, 2020
Merged

set EnvVar variables in hcl2 parsing #9623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae7e29f
actually pass env-vars to hcl2 parsing
Dec 11, 2020
205a1de
docs: remove envvar option
Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions command/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 6 additions & 2 deletions command/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
15 changes: 5 additions & 10 deletions website/pages/docs/job-specification/hcl2/variables.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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

To specify individual variables on the command line, use the `-var` option when
Expand Down Expand Up @@ -211,7 +202,6 @@ corresponding to variable names:
"labels": ["testing", "internal"],
}
```
--->

### Environment Variables

Expand All @@ -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
case letters as in the above example.

--->

### Complex-typed Values

When variable values are provided in a variable definitions file, Nomad's
Expand Down Expand Up @@ -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
files.

<!---
### Variable Definition Precedence

The above mechanisms for setting variables can be used together in any
Expand All @@ -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
other variables: the last value found overrides the previous values.

--->

## A variable value must be known:

Take the following variable for example:
Expand Down