Tag and Untag job versions #23863
Tag and Untag job versions #23863
Conversation
Ember Test Audit comparison
|
philrenaud
force-pushed
the
23846-nomad-job-tag-cli-command-scaffolding
branch
from
86153aa
to
233f051
Compare
philrenaud
force-pushed
the
23846-nomad-job-tag-cli-command-scaffolding
branch
from
a3b6b5e
to
bb9ef81
Compare
| s.parseWriteRequest(req, &rpcArgs.WriteRequest) | ||
|
|
||
| var out structs.JobTagResponse | ||
| if err := s.agent.RPC("Job.TagVersion", &rpcArgs, &out); err != nil { |
There was a problem hiding this comment.
these two httpserver methods are almost identical except for the RPC that they call, so you could save a decent little bit of duplicate code by moving the logic into the main jobTagVersion method instead.
There was a problem hiding this comment.
I ended up splitting these up a bit more — the differences started compounding (unset doesn't get version passed in now that we go by tag name; they both get their own structs for req/resp, etc.)
Not opposed to having a single method to handle these but they look to me like they should be separated currently
There was a problem hiding this comment.
(This did in fact end up being a fence I straddled and continue to straddle — see "request for reviewers" code comment)
* TaggedVersion information in structs, rather than job_endpoint * Test for taggedVersion description length * Some API plumbing
philrenaud
force-pushed
the
23846-nomad-job-tag-cli-command-scaffolding
branch
from
21ec042
to
7568f47
Compare
philrenaud
force-pushed
the
epic/23794-golden-versions
branch
from
17e3baf
to
86d89c7
Compare
|
|
||
| // parseVersion parses the version flag and returns the index, whether it | ||
| // was set and potentially an error during parsing. | ||
| func parseVersion(input string) (uint64, bool, error) { |
There was a problem hiding this comment.
this doesn't appear to be used; I suspect it was orphaned here when the version str->int logic was moved to command
| jobID, namespace, err := c.JobIDByPrefix(client, jobIDPrefix, nil) | ||
| if err != nil { | ||
| c.Ui.Error(err.Error()) | ||
| return 1 | ||
| } | ||
|
|
||
| // If the version is not provided, get the "active" version of the job | ||
| var versionInt uint64 | ||
| if versionStr == "" { | ||
| q := &api.QueryOptions{ | ||
| Namespace: namespace, | ||
| } | ||
| latestVersion, _, err := client.Jobs().Info(job, q) |
There was a problem hiding this comment.
couldn't this be a single call? or is it two so that users can provide just a prefix?
There was a problem hiding this comment.
Because versions can be 0, we need to query in order to have a TagVersion API that's both ergonomic and unambiguous.
| // err := state.UpsertJob(structs.MsgTypeTestSetup, 1000, nil, v0) | ||
| // must.NoError(t, err) |
| func (c *JobTagUnsetCommand) AutocompleteFlags() complete.Flags { | ||
| return mergeAutocompleteFlags(c.Meta.AutocompleteFlags(FlagSetClient), | ||
| complete.Flags{ | ||
| // "-version": complete.PredictNothing, |
| return j, nil | ||
| } | ||
| } | ||
| return nil, nil |
There was a problem hiding this comment.
my nil pointer sense is tingling! to me nil, nil return for (*pointer, error) is a capital offense.
shouldn't it be an error if they asked for a tag by name, but no such tag exists?
There was a problem hiding this comment.
Most of the single-object state store methods return nil, nil on non-existing objects, rather than some kind of NotFound error.
| latestJob, err := s.JobByID(nil, namespace, jobID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if versionCopy.Version == latestJob.Version { | ||
| if err := txn.Insert("jobs", versionCopy); err != nil { | ||
| return err | ||
| } | ||
| } |
There was a problem hiding this comment.
I sure hope that versionCopy and latestJob are otherwise totally identical, since this replaces the latter with the former in the "jobs" table.
There was a problem hiding this comment.
job and latestJob are pointers to the exact same struct, so versionCopy is a copy of job that for safe upsert that needs to be done to any table where we have that pointer.
via
curl:Adds a tag to Version 3:
Removes the tag:
via Nomad CLI:
Adds a tag to Version 0:
Adds a tag to the latest/current version:
Removes a tag: