cli: add -json flag to support job commands #12591
Merged
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
schmichael
force-pushed
the
f-job-run-json
branch
from
764cdcc
to
3a8de51
Compare
schmichael
changed the title
jrasell
requested changes
Apr 20, 2022
There was a problem hiding this comment.
I missed the test failure on my original review. It looks like the plan command is failing with a redefined flag:
panic: job plan flag redefined: hcl1 [recovered]
panic: job plan flag redefined: hcl1
goroutine 19967 [running]:
testing.tRunner.func1.2({0x22f6e60, 0xc003aae680})
/usr/local/go/src/testing/testing.go:1209 +0x24e
testing.tRunner.func1()
/usr/local/go/src/testing/testing.go:1212 +0x218
panic({0x22f6e60, 0xc003aae680})
/usr/local/go/src/runtime/panic.go:1038 +0x215
flag.(*FlagSet).Var(0xc0042ff920, {0x2ea2d28, 0xc0048eb3b0}, {0x2907e23, 0x4}, {0x0, 0x0})
/usr/local/go/src/flag/flag.go:879 +0x2f4
flag.(*FlagSet).BoolVar(...)
/usr/local/go/src/flag/flag.go:632
github.com/hashicorp/nomad/command.(*JobPlanCommand).Run(0xc0048eb300, {0xc004f6f410, 0x3, 0x3})
/home/circleci/go/src/github.com/hashicorp/nomad/command/job_plan.go:142 +0x237
github.com/hashicorp/nomad/command.TestPlanCommand_Fails(0xc00429b6c0)
/home/circleci/go/src/github.com/hashicorp/nomad/command/job_plan_test.go:33 +0x198
testing.tRunner(0xc00429b6c0, 0x2a227d8)
/usr/local/go/src/testing/testing.go:1259 +0x102
created by testing.(*T).Run
/usr/local/go/src/testing/testing.go:1306 +0x35a
``
3a8de51
to
d03714a
Compare
schmichael
force-pushed
the
f-job-run-json
branch
from
d03714a
to
f00aea8
Compare
schmichael
force-pushed
the
f-job-run-json
branch
from
f00aea8
to
5d1d2b2
Compare
lgfa29
approved these changes
Apr 20, 2022
While the CLI has always supported running JSON jobs, its support has
been via HCLv2's JSON parsing. I have no idea what format it expects the
job to be in, but it's absolutely not in the same format as the API
expects.
So I ignored that and added a new -json flag to explicitly support *API*
style JSON jobspecs.
The jobspecs can even have the wrapping {"Job": {...}} envelope or not!
We haven't been able to validate inside driver config stanzas ever since the move to task driver plugins. 😭
schmichael
force-pushed
the
f-job-run-json
branch
from
5d1d2b2
to
413bd49
Compare
jrasell
approved these changes
Apr 21, 2022
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #6758
Fixes #1749
While the CLI has always supported running JSON jobs, its support has
been via HCLv2's JSON parsing. I have no idea what format it expects the
job to be in, but it's absolutely not in the same format as the API
expects.
So I ignored that and added a new -json flag to explicitly support API
style JSON jobspecs.