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

clarify variable references

This commit is contained in:
Mahmood Ali 2020-11-09 16:23:09 -05:00
parent 725e715c2e
commit a155423ba3
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jobspec2/parse_job.go
View File

@ -6,13 +6,13 @@ import (
"github.com/hashicorp/nomad/api"
)
func normalizeJob(jw *jobConfig) {
j := jw.Job
func normalizeJob(jc *jobConfig) {
j := jc.Job
if j.Name == nil {
j.Name = &jw.JobID
j.Name = &jc.JobID
}
if j.ID == nil {
j.ID = &jw.JobID
j.ID = &jc.JobID
}
if j.Periodic != nil && j.Periodic.Spec != nil {
@ -20,11 +20,11 @@ func normalizeJob(jw *jobConfig) {
j.Periodic.SpecType = &v
}
normalizeVault(jw.Vault)
normalizeVault(jc.Vault)
if len(jw.Tasks) != 0 {
alone := make([]*api.TaskGroup, 0, len(jw.Tasks))
for _, t := range jw.Tasks {
if len(jc.Tasks) != 0 {
alone := make([]*api.TaskGroup, 0, len(jc.Tasks))
for _, t := range jc.Tasks {
alone = append(alone, &api.TaskGroup{
Name: &t.Name,
Tasks: []*api.Task{t},
@ -47,7 +47,7 @@ func normalizeJob(jw *jobConfig) {
normalizeVault(t.Vault)
if t.Vault == nil {
t.Vault = jw.Vault
t.Vault = jc.Vault
}
}
}

6
jobspec2/types.config.go
View File

@ -69,19 +69,19 @@ func (c *jobConfig) decodeBody(body hcl.Body) hcl.Diagnostics {
// decodeInputVariables looks in the found blocks for 'variables' and
// 'variable' blocks. It should be called firsthand so that other blocks can
// use the variables.
func (j *jobConfig) decodeInputVariables(content *hcl.BodyContent) hcl.Diagnostics {
func (c *jobConfig) decodeInputVariables(content *hcl.BodyContent) hcl.Diagnostics {
var diags hcl.Diagnostics
for _, block := range content.Blocks {
switch block.Type {
case variableLabel:
moreDiags := j.InputVariables.decodeVariableBlock(block, nil)
moreDiags := c.InputVariables.decodeVariableBlock(block, nil)
diags = append(diags, moreDiags...)
case variablesLabel:
attrs, moreDiags := block.Body.JustAttributes()
diags = append(diags, moreDiags...)
for key, attr := range attrs {
moreDiags = j.InputVariables.decodeVariable(key, attr, nil)
moreDiags = c.InputVariables.decodeVariable(key, attr, nil)
diags = append(diags, moreDiags...)
}
}