Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion runner/pool/pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ func (r *basePoolManager) persistJobToDB(ctx context.Context, jobParams params.J
"is_new_job", isNewJob,
"job_action", jobParams.Action,
)
return fmt.Errorf("job %d should not be recorded", jobParams.WorkflowJobID)
return fmt.Errorf("job %d should not be recorded: %w", jobParams.WorkflowJobID, runnerErrors.ErrUnprocessable)
}

slog.DebugContext(
Expand Down
6 changes: 6 additions & 0 deletions util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ func MaybeAddWrapperToExtraSpecs(ctx context.Context, param commonParams.Bootstr
return param
}
}
if data == nil {
// Unmarshal returned nil. An explicit `null` was probably passed.
// Any other valid json would either fail to unmarshal or unmarshal
// into an actual map we can use.
return param
}

if _, ok := data["runner_install_template"]; ok {
// User has already set a runner install template override. Do not touch.
Expand Down