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

cli: Add var args to plan output. (#11631)

This commit is contained in:
Vyacheslav Morov 2021-12-07 18:43:52 +03:00 committed by GitHub
parent 9f9e813515
commit 6a244f18ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/11631.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
cli: Add `-var` and `-var-file` to the command line printed by `job plan`
```

17
command/job_plan.go
View File

@ -15,7 +15,7 @@ import (
const ( const (
jobModifyIndexHelp = `To submit the job with version verification run: jobModifyIndexHelp = `To submit the job with version verification run:
nomad job run -check-index %d %s nomad job run -check-index %d %s%s
When running the job with the check-index flag, the job will only be run if the When running the job with the check-index flag, the job will only be run if the
job modify index given matches the server-side version. If the index has job modify index given matches the server-side version. If the index has
@ -192,8 +192,17 @@ func (c *JobPlanCommand) Run(args []string) int {
return 255 return 255
} }
runArgs := strings.Builder{}
for _, varArg := range varArgs {
runArgs.WriteString(fmt.Sprintf("-var=%q ", varArg))
}
for _, varFile := range varFiles {
runArgs.WriteString(fmt.Sprintf("-var-file=%q ", varFile))
}
exitCode := c.outputPlannedJob(job, resp, diff, verbose) exitCode := c.outputPlannedJob(job, resp, diff, verbose)
c.Ui.Output(c.Colorize().Color(formatJobModifyIndex(resp.JobModifyIndex, path))) c.Ui.Output(c.Colorize().Color(formatJobModifyIndex(resp.JobModifyIndex, runArgs.String(), path)))
return exitCode return exitCode
} }
@ -333,8 +342,8 @@ func getExitCode(resp *api.JobPlanResponse) int {
// formatJobModifyIndex produces a help string that displays the job modify // formatJobModifyIndex produces a help string that displays the job modify
// index and how to submit a job with it. // index and how to submit a job with it.
func formatJobModifyIndex(jobModifyIndex uint64, jobName string) string { func formatJobModifyIndex(jobModifyIndex uint64, args string, jobName string) string {
help := fmt.Sprintf(jobModifyIndexHelp, jobModifyIndex, jobName) help := fmt.Sprintf(jobModifyIndexHelp, jobModifyIndex, args, jobName)
out := fmt.Sprintf("[reset][bold]Job Modify Index: %d[reset]\n%s", jobModifyIndex, help) out := fmt.Sprintf("[reset][bold]Job Modify Index: %d[reset]\n%s", jobModifyIndex, help)
return out return out
} }