kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

api: enable support for setting original job source (#16763)

Browse Source 
* api: enable support for setting original source alongside job

This PR adds support for setting job source material along with
the registration of a job.

This includes a new HTTP endpoint and a new RPC endpoint for
making queries for the original source of a job. The
HTTP endpoint is /v1/job/<id>/submission?version=<version> and
the RPC method is Job.GetJobSubmission.

The job source (if submitted, and doing so is always optional), is
stored in the job_submission memdb table, separately from the
actual job. This way we do not incur overhead of reading the large
string field throughout normal job operations.

The server config now includes job_max_source_size for configuring
the maximum size the job source may be, before the server simply
drops the source material. This should help prevent Bad Things from
happening when huge jobs are submitted. If the value is set to 0,
all job source material will be dropped.

* api: avoid writing var content to disk for parsing

* api: move submission validation into RPC layer

* api: return an error if updating a job submission without namespace or job id

* api: be exact about the job index we associate a submission with (modify)

* api: reword api docs scheduling

* api: prune all but the last 6 job submissions

* api: protect against nil job submission in job validation

* api: set max job source size in test server

* api: fixups from pr
This commit is contained in:
Seth Hoenig
2023-04-11 08:45:08 -05:00
committed by GitHub
parent 27b5596b9c
commit 2c44cbb001
79 changed files with 1987 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jobspec2/parse.go
View File

@@ -59,15 +59,20 @@ type ParseConfig struct {
// Body is the HCL body
Body []byte
// AllowFS enables HCL functions that require file system accecss
// AllowFS enables HCL functions that require file system access
AllowFS bool
// ArgVars is the CLI -var arguments
ArgVars []string
// VarFiles is the paths of variable data files
// VarFiles is the paths of variable data files that should be read during
// parsing.
VarFiles []string
// VarContent is the content of variable data known without reading an
// actual var file during parsing.
VarContent string
// Envs represent process environment variable
Envs []string
@@ -98,6 +103,14 @@ func decode(c *jobConfig) error {
diags = append(diags, ds...)
}
if config.VarContent != "" {
hclFile, hclDiagnostics := parseHCLOrJSON([]byte(config.VarContent), "input.hcl")
if hclDiagnostics.HasErrors() {
return fmt.Errorf("unable to parse var content: %v", hclDiagnostics.Error())
}
config.parsedVarFiles = append(config.parsedVarFiles, hclFile)
}
// Return early if the input job or variable files are not valid.
// Decoding and evaluating invalid files may result in unexpected results.
if diags.HasErrors() {