Merge pull request #941 from DeterminateSystems/align-api
ToJSON: allow custom as_json function; JobsetInputs, Jobsets: update schema to align with the API
This commit is contained in:
Graham Christensen
GitHub
commit
ec288e6d88
|
|
@ -589,17 +589,15 @@ components:
|
|||
name:
|
||||
description: name of the input
|
||||
type: string
|
||||
value:
|
||||
description: value of the input
|
||||
type: string
|
||||
type:
|
||||
description: type of input
|
||||
type: string
|
||||
emailresponsible:
|
||||
description: whether or not to email responsible parties
|
||||
type: boolean
|
||||
jobsetinputalts:
|
||||
type: array
|
||||
description: ???
|
||||
items:
|
||||
type: string
|
||||
|
||||
Jobset:
|
||||
type: object
|
||||
|
|
@ -644,8 +642,8 @@ components:
|
|||
enableemail:
|
||||
description: when true the jobset sends emails when previously-successful builds fail
|
||||
type: boolean
|
||||
hidden:
|
||||
description: when false the jobset is visible in the web frontend
|
||||
visible:
|
||||
description: when true the jobset is visible in the web frontend
|
||||
type: boolean
|
||||
emailoverride:
|
||||
description: email address to send notices to instead of the package maintainer (can be a comma separated list)
|
||||
|
|
@ -669,12 +667,12 @@ components:
|
|||
type: integer
|
||||
type:
|
||||
description: the type of the jobset
|
||||
type: string
|
||||
type: integer
|
||||
flake:
|
||||
nullable: true
|
||||
description: the flake uri to evaluate
|
||||
type: string
|
||||
jobsetinputs:
|
||||
inputs:
|
||||
description: inputs configured for this jobset
|
||||
type: object
|
||||
additionalProperties:
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@ use JSON;
|
|||
sub TO_JSON {
|
||||
my $self = shift;
|
||||
|
||||
if ($self->can("as_json")) {
|
||||
return $self->as_json();
|
||||
}
|
||||
|
||||
my $hint = $self->json_hint;
|
||||
|
||||
my %json = ();
|
||||
|
|
|
|||
|
|
@ -270,8 +270,8 @@ sub updateJobset {
|
|||
$jobset->jobsetinputs->delete;
|
||||
|
||||
if ($type == 0) {
|
||||
foreach my $name (keys %{$c->stash->{params}->{jobsetinputs}}) {
|
||||
my $inputData = $c->stash->{params}->{jobsetinputs}->{$name};
|
||||
foreach my $name (keys %{$c->stash->{params}->{inputs}}) {
|
||||
my $inputData = $c->stash->{params}->{inputs}->{$name};
|
||||
my $type = $inputData->{type};
|
||||
my $value = $inputData->{value};
|
||||
my $emailresponsible = defined $inputData->{emailresponsible} ? 1 : 0;
|
||||
|
|
|
|||
|
|
@ -134,21 +134,22 @@ __PACKAGE__->has_many(
|
|||
# Created by DBIx::Class::Schema::Loader v0.07049 @ 2020-02-06 12:22:36
|
||||
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5uKwEhDXso4IR1TFmwRxiA
|
||||
|
||||
my %hint = (
|
||||
string_columns => [
|
||||
"name",
|
||||
"type"
|
||||
],
|
||||
boolean_columns => [
|
||||
"emailresponsible"
|
||||
],
|
||||
relations => {
|
||||
"jobsetinputalts" => "value"
|
||||
}
|
||||
);
|
||||
sub as_json {
|
||||
my $self = shift;
|
||||
|
||||
sub json_hint {
|
||||
return \%hint;
|
||||
my ($input) = $self->jobsetinputalts;
|
||||
|
||||
my %json = (
|
||||
# string_columns
|
||||
"name" => $self->get_column("name") // "",
|
||||
"type" => $self->get_column("type") // "",
|
||||
"value" => $input->value // "",
|
||||
|
||||
# boolean_columns
|
||||
"emailresponsible" => $self->get_column("emailresponsible") ? JSON::true : JSON::false,
|
||||
);
|
||||
|
||||
return \%json;
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -410,40 +410,40 @@ __PACKAGE__->add_column(
|
|||
"+id" => { retrieve_on_insert => 1 }
|
||||
);
|
||||
|
||||
my %hint = (
|
||||
columns => [
|
||||
"errortime",
|
||||
"lastcheckedtime",
|
||||
"triggertime",
|
||||
"enabled",
|
||||
"keepnr",
|
||||
"checkinterval",
|
||||
"schedulingshares",
|
||||
"starttime"
|
||||
],
|
||||
string_columns => [
|
||||
"name",
|
||||
"project",
|
||||
"description",
|
||||
"nixexprinput",
|
||||
"nixexprpath",
|
||||
"errormsg",
|
||||
"emailoverride",
|
||||
"fetcherrormsg",
|
||||
"type",
|
||||
"flake"
|
||||
],
|
||||
boolean_columns => [
|
||||
"enableemail",
|
||||
"hidden"
|
||||
],
|
||||
eager_relations => {
|
||||
jobsetinputs => "name"
|
||||
}
|
||||
);
|
||||
sub as_json {
|
||||
my $self = shift;
|
||||
|
||||
sub json_hint {
|
||||
return \%hint;
|
||||
my %json = (
|
||||
# columns
|
||||
"errortime" => $self->get_column("errortime"),
|
||||
"lastcheckedtime" => $self->get_column("lastcheckedtime"),
|
||||
"triggertime" => $self->get_column("triggertime"),
|
||||
"enabled" => $self->get_column("enabled"),
|
||||
"keepnr" => $self->get_column("keepnr"),
|
||||
"checkinterval" => $self->get_column("checkinterval"),
|
||||
"schedulingshares" => $self->get_column("schedulingshares"),
|
||||
"starttime" => $self->get_column("starttime"),
|
||||
|
||||
# string_columns
|
||||
"name" => $self->get_column("name") // "",
|
||||
"project" => $self->get_column("project") // "",
|
||||
"description" => $self->get_column("description") // "",
|
||||
"nixexprinput" => $self->get_column("nixexprinput") // "",
|
||||
"nixexprpath" => $self->get_column("nixexprpath") // "",
|
||||
"errormsg" => $self->get_column("errormsg") // "",
|
||||
"emailoverride" => $self->get_column("emailoverride") // "",
|
||||
"fetcherrormsg" => $self->get_column("fetcherrormsg") // "",
|
||||
"type" => $self->get_column("type") // "",
|
||||
"flake" => $self->get_column("flake") // "",
|
||||
|
||||
# boolean_columns
|
||||
"enableemail" => $self->get_column("enableemail") ? JSON::true : JSON::false,
|
||||
"visible" => $self->get_column("hidden") ? JSON::false : JSON::true,
|
||||
|
||||
"inputs" => { map { $_->name => $_ } $self->jobsetinputs }
|
||||
);
|
||||
|
||||
return \%json;
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@
|
|||
<thead>
|
||||
<tr><th></th><th>Input name</th><th>Type</th><th style="width: 50%">Value</th><th>Notify committers</th></tr>
|
||||
</thead>
|
||||
<tbody class="jobsetinputs">
|
||||
[% jobsetinputs = createFromEval ? eval.jobsetevalinputs : jobset.jobsetinputs; FOREACH input IN jobsetinputs %]
|
||||
<tbody class="inputs">
|
||||
[% inputs = createFromEval ? eval.jobsetevalinputs : jobset.jobsetinputs; FOREACH input IN inputs %]
|
||||
[% INCLUDE renderJobsetInput input=input baseName="input-$input.name" %]
|
||||
[% END %]
|
||||
<tr>
|
||||
|
|
@ -220,8 +220,8 @@
|
|||
|
||||
$("#submit-jobset").click(function() {
|
||||
var formElements = $(this).parents("form").serializeArray();
|
||||
var data = { 'jobsetinputs': {} };
|
||||
var jobsetinputs = {};
|
||||
var data = { 'inputs': {} };
|
||||
var inputs = {};
|
||||
for (var i = 0; formElements.length > i; i++) {
|
||||
var elem = formElements[i];
|
||||
var match = elem.name.match(/^input-([\w-]+)-(\w+)$/);
|
||||
|
|
@ -233,13 +233,13 @@
|
|||
|
||||
if (baseName === "template") continue;
|
||||
|
||||
if (!(baseName in jobsetinputs))
|
||||
jobsetinputs[baseName] = {};
|
||||
if (!(baseName in inputs))
|
||||
inputs[baseName] = {};
|
||||
|
||||
if (param === "name")
|
||||
data.jobsetinputs[elem.value] = jobsetinputs[baseName];
|
||||
data.inputs[elem.value] = inputs[baseName];
|
||||
else
|
||||
jobsetinputs[baseName][param] = elem.value;
|
||||
inputs[baseName][param] = elem.value;
|
||||
}
|
||||
}
|
||||
redirectJSON({
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ subtest 'Create new jobset "job" as flake type' => sub {
|
|||
Cookie => $cookie,
|
||||
Content => encode_json({
|
||||
enabled => 2,
|
||||
visible => 1,
|
||||
visible => JSON::true,
|
||||
name => "job",
|
||||
type => 1,
|
||||
description => "test jobset",
|
||||
|
|
@ -76,8 +76,8 @@ subtest 'Read newly-created jobset "job"' => sub {
|
|||
errormsg => "",
|
||||
fetcherrormsg => "",
|
||||
flake => "github:nixos/nix",
|
||||
hidden => JSON::false,
|
||||
jobsetinputs => {},
|
||||
visible => JSON::true,
|
||||
inputs => {},
|
||||
keepnr => 3,
|
||||
lastcheckedtime => undef,
|
||||
name => "job",
|
||||
|
|
@ -99,12 +99,12 @@ subtest 'Update jobset "job" to legacy type' => sub {
|
|||
Cookie => $cookie,
|
||||
Content => encode_json({
|
||||
enabled => 3,
|
||||
visible => 1,
|
||||
visible => JSON::true,
|
||||
name => "job",
|
||||
type => 0,
|
||||
nixexprinput => "ofborg",
|
||||
nixexprpath => "release.nix",
|
||||
jobsetinputs => {
|
||||
inputs => {
|
||||
ofborg => {
|
||||
name => "ofborg",
|
||||
type => "git",
|
||||
|
|
@ -134,15 +134,13 @@ subtest 'Update jobset "job" to legacy type' => sub {
|
|||
errormsg => "",
|
||||
fetcherrormsg => "",
|
||||
flake => "",
|
||||
hidden => JSON::false,
|
||||
jobsetinputs => {
|
||||
visible => JSON::true,
|
||||
inputs => {
|
||||
ofborg => {
|
||||
name => "ofborg",
|
||||
type => "git",
|
||||
emailresponsible => JSON::false,
|
||||
jobsetinputalts => [
|
||||
"https://github.com/NixOS/ofborg.git released"
|
||||
]
|
||||
value => "https://github.com/NixOS/ofborg.git released"
|
||||
}
|
||||
},
|
||||
keepnr => 1,
|
||||
|
|
|
|||
|
|
@ -81,14 +81,14 @@ subtest "projects" => sub {
|
|||
};
|
||||
|
||||
subtest "jobsets" => sub {
|
||||
my $result = request_json({ uri => '/jobset/sample/default', method => 'PUT', data => { nixexprpath => "default.nix", nixexprinput => "my-src", jobsetinputs => { "my-src" => { type => "path", value => $jobsetdir } }, enabled => "1", visible => "1", checkinterval => "3600"} });
|
||||
my $result = request_json({ uri => '/jobset/sample/default', method => 'PUT', data => { nixexprpath => "default.nix", nixexprinput => "my-src", inputs => { "my-src" => { type => "path", value => $jobsetdir } }, enabled => "1", visible => "1", checkinterval => "3600"} });
|
||||
is($result->code(), 201, "PUTting a new jobset creates it");
|
||||
|
||||
my $jobset = decode_json(request_json({ uri => '/jobset/sample/default' })->content());
|
||||
|
||||
ok(exists $jobset->{jobsetinputs}->{"my-src"}, "The new jobset has a 'my-src' input");
|
||||
ok(exists $jobset->{inputs}->{"my-src"}, "The new jobset has a 'my-src' input");
|
||||
|
||||
is($jobset->{jobsetinputs}->{"my-src"}->{"jobsetinputalts"}->[0], $jobsetdir, "The 'my-src' input is in $jobsetdir");
|
||||
is($jobset->{inputs}->{"my-src"}->{value}, $jobsetdir, "The 'my-src' input is in $jobsetdir");
|
||||
};
|
||||
|
||||
subtest "evaluation" => sub {
|
||||
|
|
|
|||
Loading…
Reference in a new issue