Backport of cli: fix panic on job plan when -diff=false into release/1.5.x #16951
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hc-github-team-nomad-core
force-pushed
the
backport/b-fix-panic-on-job-plan/happily-merry-emu
branch
from
5ef2f31 to
3e5baed
Compare
hc-github-team-nomad-core
deleted the
backport/b-fix-panic-on-job-plan/happily-merry-emu
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #16944 to be assessed for backporting due to the inclusion of the label backport/1.5.x.
The below text is copied from the body of the original PR.
PR #14492 introduced a new check to return 0 when the
nomad job plancommand returns a diff of typeNone.But the
-diffCLI flag was also being used to control whether the plan request should return the diff of not instead of just controlling if the diff was printed.This means that when
-diff=falseis set the response does not include any diff information, and so the new check panics.This commit fixes the problem by always requesting a diff and using the
-diffonly for controlling output, as it's currently documented.Closes #16939