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

cli: Add var args to plan output. #11631

Merged
merged 3 commits into from
Dec 7, 2021
Merged

cli: Add var args to plan output. #11631

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb040c3
Add var args to plan output.
Liraim Dec 7, 2021
5bace94
Remove additional space after added args.
Liraim Dec 7, 2021
53d7f98
changelog
tgross Dec 7, 2021
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
17 changes: 13 additions & 4 deletions command/job_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
const (
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
job modify index given matches the server-side version. If the index has
Expand Down Expand Up @@ -192,8 +192,17 @@ func (c *JobPlanCommand) Run(args []string) int {
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)
c.Ui.Output(c.Colorize().Color(formatJobModifyIndex(resp.JobModifyIndex, path)))
c.Ui.Output(c.Colorize().Color(formatJobModifyIndex(resp.JobModifyIndex, runArgs.String(), path)))
return exitCode
}

Expand Down Expand Up @@ -333,8 +342,8 @@ func getExitCode(resp *api.JobPlanResponse) int {

// formatJobModifyIndex produces a help string that displays the job modify
// index and how to submit a job with it.
func formatJobModifyIndex(jobModifyIndex uint64, jobName string) string {
help := fmt.Sprintf(jobModifyIndexHelp, jobModifyIndex, jobName)
func formatJobModifyIndex(jobModifyIndex uint64, args string, jobName string) string {
help := fmt.Sprintf(jobModifyIndexHelp, jobModifyIndex, args, jobName)
out := fmt.Sprintf("[reset][bold]Job Modify Index: %d[reset]\n%s", jobModifyIndex, help)
return out
}
Expand Down