diff --git a/go/seatlist/bootstrap/mesh-catalog.json b/go/seatlist/bootstrap/mesh-catalog.json index ba7fdd0f..b3c7c8a9 100644 --- a/go/seatlist/bootstrap/mesh-catalog.json +++ b/go/seatlist/bootstrap/mesh-catalog.json @@ -638,115 +638,6 @@ ] } }, - { - "name": "manifest-accepted", - "body": { - "type": "object", - "properties": { - "v": { - "type": "integer" - }, - "module": { - "type": "string" - }, - "digest": { - "type": "string" - }, - "judge": { - "type": "string" - }, - "revision": { - "type": "integer", - "description": "the indexer's revision of the verdict it says; a reader asks its first view again on a gap in it; zero from an indexer that does not say it" - }, - "problems": { - "type": "array", - "items": { - "type": "string" - }, - "description": "each problem the indexer's re-judgement finds in a manifest it keeps accepted because its digest is unchanged: the manifest validator's strings, the same items its verdict writes as warnings, in the same order; an empty list when none (design 47 G section 668, 692)" - }, - "bus-state": { - "type": "array", - "items": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "storage": { - "type": "string" - }, - "template": { - "type": "string" - }, - "options": { - "type": "object" - }, - "configuration": { - "type": "object" - }, - "types": { - "type": "array", - "items": { - "type": "object" - } - } - }, - "required": [ - "name", - "storage" - ] - } - } - }, - "required": [ - "v", - "module", - "digest", - "judge", - "bus-state", - "problems" - ] - } - }, - { - "name": "manifest-refused", - "body": { - "type": "object", - "properties": { - "v": { - "type": "integer" - }, - "module": { - "type": "string" - }, - "digest": { - "type": "string" - }, - "judge": { - "type": "string" - }, - "revision": { - "type": "integer", - "description": "the indexer's revision of the verdict it says; a reader asks its first view again on a gap in it; zero from an indexer that does not say it" - }, - "problems": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "required": [ - "v", - "module", - "digest", - "judge", - "problems" - ] - } - }, { "name": "catalog-revision", "body": { @@ -2194,6 +2085,15 @@ ], "description": "required runs and holds the delivery until it passes; optional runs, a failure is shown and may be accepted; bypass runs nothing and is said as bypassed" }, + "validate": { + "type": "string", + "enum": [ + "required", + "optional", + "bypass" + ], + "description": "required runs and holds the delivery until it passes; optional runs, a failure is shown and may be accepted; bypass runs nothing and is said as bypassed" + }, "composition": { "type": "string", "enum": [ @@ -2638,49 +2538,9 @@ } }, "bodies": { - "TakeInMerge": { - "type": "object", - "description": "one merge a take-in event holds: the repository, its pull request and the merge commit the forge made of it", - "properties": { - "repository": { - "type": "string" - }, - "number": { - "type": "integer" - }, - "merge": { - "type": "string" - } - }, - "required": [ - "repository", - "number", - "merge" - ] - }, - "TakeInMember": { - "type": "object", - "description": "one pull request at one commit", - "properties": { - "repository": { - "type": "string" - }, - "number": { - "type": "integer" - }, - "head": { - "type": "string" - } - }, - "required": [ - "repository", - "number", - "head" - ] - }, "TakeInEntry": { "type": "object", - "description": "one module of a taken-in revision (design 47 G section 476, section 648)", + "description": "one mover of a taken-in source revision (design 47 H §743, §763)", "properties": { "module": { "type": "string" @@ -2694,208 +2554,83 @@ }, "repository": { "type": "string", - "description": "from a merged message; absent for a pushed one (design 47 G section 648)" - }, - "pull": { - "type": "integer", - "description": "from a merged message; absent for a pushed one (design 47 G section 648)" + "description": "the repository the module is registered for" } }, "required": [ "module", "commit", - "fingerprint" + "fingerprint", + "repository" ] }, "TakeInPending": { "type": "object", - "description": "the body of the indexer's take-in.pending: a wait for a revision or a group, with the watched branch (design 47 G section 493)", + "description": "the body of the indexer's take-in.pending: a source revision's take-in held, said once per source (design 47 H §744)", "properties": { - "v": { + "branch": { + "type": "string", + "description": "the watched branch" + }, + "source": { "type": "integer", - "description": "the layout version" - }, - "kind": { - "type": "string", - "description": "the event's kind, pending or taken" - }, - "key": { - "type": "string", - "description": "the wait's key: m. of its oldest merge, or g. for a group being gathered" - }, - "what": { - "type": "string", - "description": "what waits: a revision or a group" - }, - "merges": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMerge" - }, - "description": "the merges it holds, oldest first" - }, - "group": { - "type": "string", - "description": "the delivery group, for a group being gathered" - }, - "members": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMember" - }, - "description": "every approved member of a group with its head" - }, - "waits-for": { - "type": "string", - "description": "the indexer build a revision waits for" - }, - "since": { - "type": "string", - "description": "when the wait began", - "format": "date-time" - }, - "by": { - "type": "string", - "description": "who acted by hand, on a taken event" + "description": "the source revision held" }, "why": { "type": "string", - "description": "why they acted by hand, on a taken event" - }, - "dropped": { - "type": "boolean", - "description": "a hand drop: the merges are not taken in" - }, - "lost": { - "type": "array", - "items": { - "type": "string" - }, - "description": "the keys of merges whose message the forge bridge's stream no longer holds" - }, - "refused": { - "type": "string", - "description": "why the manifest of the indexer the revision names was refused" - }, - "own-build-unknown": { - "type": "string", - "description": "why the indexer holds a merge it does not take in although no indexer build is named" - }, - "branch": { - "type": "string", - "description": "the watched branch the revision is of (design 47 G section 476, section 493)" + "description": "why it cannot be written, such as the catalog store full" } }, "required": [ - "v", - "kind", - "key", - "what", - "merges", - "since" + "branch", + "source", + "why" ] }, "TakeInTaken": { "type": "object", - "description": "the body of the indexer's take-in.taken: a wait ended, with the branch, the source revision and the entries (design 47 G section 476, section 493)", + "description": "the body of the indexer's take-in.taken: a source revision taken in, said once, with one entry per mover (design 47 H §743, §744)", "properties": { - "v": { - "type": "integer", - "description": "the layout version" - }, - "kind": { - "type": "string", - "description": "the event's kind, pending or taken" - }, - "key": { - "type": "string", - "description": "the wait's key: m. of its oldest merge, or g. for a group being gathered" - }, - "what": { - "type": "string", - "description": "what waits: a revision or a group" - }, - "merges": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMerge" - }, - "description": "the merges it holds, oldest first" - }, - "revision": { - "type": "integer", - "description": "the catalog graph revision of the branch the take-in made, which the pipelines of its entries start at (design 47 G section 476, A-448)" - }, - "group": { - "type": "string", - "description": "the delivery group, for a group being gathered" - }, - "members": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMember" - }, - "description": "every approved member of a group with its head" - }, - "waits-for": { - "type": "string", - "description": "the indexer build a revision waits for" - }, - "since": { - "type": "string", - "description": "when the wait began", - "format": "date-time" - }, - "by": { - "type": "string", - "description": "who acted by hand, on a taken event" - }, - "why": { - "type": "string", - "description": "why they acted by hand, on a taken event" - }, - "dropped": { - "type": "boolean", - "description": "a hand drop: the merges are not taken in" - }, - "lost": { - "type": "array", - "items": { - "type": "string" - }, - "description": "the keys of merges whose message the forge bridge's stream no longer holds" - }, - "refused": { - "type": "string", - "description": "why the manifest of the indexer the revision names was refused" - }, - "own-build-unknown": { - "type": "string", - "description": "why the indexer holds a merge it does not take in although no indexer build is named" - }, "branch": { "type": "string", - "description": "the watched branch the revision is of (design 47 G section 476, section 493)" + "description": "the watched branch" }, "source": { "type": "integer", - "description": "the source revision taken in (design 47 G section 476)" + "description": "the source revision taken in" + }, + "revision": { + "type": "integer", + "description": "the catalog revision of the branch the take-in wrote; absent for a skip" + }, + "call": { + "type": "string", + "description": "the merge call the source revision names" }, "entries": { "type": "array", "items": { "$ref": "#/bodies/TakeInEntry" }, - "description": "one entry per module of that revision; none for a hand drop (design 47 G section 476, section 493)" + "description": "one entry per mover; none for a take-in with no mover or a skip" + }, + "skipped": { + "type": "boolean", + "description": "acknowledged unwritten by the tool indexer_take_in_skip (design 47 H §744)" + }, + "by": { + "type": "string", + "description": "who acted by hand" + }, + "why": { + "type": "string", + "description": "why they acted by hand" } }, "required": [ - "v", - "kind", - "key", - "what", - "merges", - "since" + "branch", + "source", + "call" ] } } diff --git a/go/seatlist/seatlisttest/seats/mesh-catalog.json b/go/seatlist/seatlisttest/seats/mesh-catalog.json index ba7fdd0f..b3c7c8a9 100644 --- a/go/seatlist/seatlisttest/seats/mesh-catalog.json +++ b/go/seatlist/seatlisttest/seats/mesh-catalog.json @@ -638,115 +638,6 @@ ] } }, - { - "name": "manifest-accepted", - "body": { - "type": "object", - "properties": { - "v": { - "type": "integer" - }, - "module": { - "type": "string" - }, - "digest": { - "type": "string" - }, - "judge": { - "type": "string" - }, - "revision": { - "type": "integer", - "description": "the indexer's revision of the verdict it says; a reader asks its first view again on a gap in it; zero from an indexer that does not say it" - }, - "problems": { - "type": "array", - "items": { - "type": "string" - }, - "description": "each problem the indexer's re-judgement finds in a manifest it keeps accepted because its digest is unchanged: the manifest validator's strings, the same items its verdict writes as warnings, in the same order; an empty list when none (design 47 G section 668, 692)" - }, - "bus-state": { - "type": "array", - "items": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "storage": { - "type": "string" - }, - "template": { - "type": "string" - }, - "options": { - "type": "object" - }, - "configuration": { - "type": "object" - }, - "types": { - "type": "array", - "items": { - "type": "object" - } - } - }, - "required": [ - "name", - "storage" - ] - } - } - }, - "required": [ - "v", - "module", - "digest", - "judge", - "bus-state", - "problems" - ] - } - }, - { - "name": "manifest-refused", - "body": { - "type": "object", - "properties": { - "v": { - "type": "integer" - }, - "module": { - "type": "string" - }, - "digest": { - "type": "string" - }, - "judge": { - "type": "string" - }, - "revision": { - "type": "integer", - "description": "the indexer's revision of the verdict it says; a reader asks its first view again on a gap in it; zero from an indexer that does not say it" - }, - "problems": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "required": [ - "v", - "module", - "digest", - "judge", - "problems" - ] - } - }, { "name": "catalog-revision", "body": { @@ -2194,6 +2085,15 @@ ], "description": "required runs and holds the delivery until it passes; optional runs, a failure is shown and may be accepted; bypass runs nothing and is said as bypassed" }, + "validate": { + "type": "string", + "enum": [ + "required", + "optional", + "bypass" + ], + "description": "required runs and holds the delivery until it passes; optional runs, a failure is shown and may be accepted; bypass runs nothing and is said as bypassed" + }, "composition": { "type": "string", "enum": [ @@ -2638,49 +2538,9 @@ } }, "bodies": { - "TakeInMerge": { - "type": "object", - "description": "one merge a take-in event holds: the repository, its pull request and the merge commit the forge made of it", - "properties": { - "repository": { - "type": "string" - }, - "number": { - "type": "integer" - }, - "merge": { - "type": "string" - } - }, - "required": [ - "repository", - "number", - "merge" - ] - }, - "TakeInMember": { - "type": "object", - "description": "one pull request at one commit", - "properties": { - "repository": { - "type": "string" - }, - "number": { - "type": "integer" - }, - "head": { - "type": "string" - } - }, - "required": [ - "repository", - "number", - "head" - ] - }, "TakeInEntry": { "type": "object", - "description": "one module of a taken-in revision (design 47 G section 476, section 648)", + "description": "one mover of a taken-in source revision (design 47 H §743, §763)", "properties": { "module": { "type": "string" @@ -2694,208 +2554,83 @@ }, "repository": { "type": "string", - "description": "from a merged message; absent for a pushed one (design 47 G section 648)" - }, - "pull": { - "type": "integer", - "description": "from a merged message; absent for a pushed one (design 47 G section 648)" + "description": "the repository the module is registered for" } }, "required": [ "module", "commit", - "fingerprint" + "fingerprint", + "repository" ] }, "TakeInPending": { "type": "object", - "description": "the body of the indexer's take-in.pending: a wait for a revision or a group, with the watched branch (design 47 G section 493)", + "description": "the body of the indexer's take-in.pending: a source revision's take-in held, said once per source (design 47 H §744)", "properties": { - "v": { + "branch": { + "type": "string", + "description": "the watched branch" + }, + "source": { "type": "integer", - "description": "the layout version" - }, - "kind": { - "type": "string", - "description": "the event's kind, pending or taken" - }, - "key": { - "type": "string", - "description": "the wait's key: m. of its oldest merge, or g. for a group being gathered" - }, - "what": { - "type": "string", - "description": "what waits: a revision or a group" - }, - "merges": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMerge" - }, - "description": "the merges it holds, oldest first" - }, - "group": { - "type": "string", - "description": "the delivery group, for a group being gathered" - }, - "members": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMember" - }, - "description": "every approved member of a group with its head" - }, - "waits-for": { - "type": "string", - "description": "the indexer build a revision waits for" - }, - "since": { - "type": "string", - "description": "when the wait began", - "format": "date-time" - }, - "by": { - "type": "string", - "description": "who acted by hand, on a taken event" + "description": "the source revision held" }, "why": { "type": "string", - "description": "why they acted by hand, on a taken event" - }, - "dropped": { - "type": "boolean", - "description": "a hand drop: the merges are not taken in" - }, - "lost": { - "type": "array", - "items": { - "type": "string" - }, - "description": "the keys of merges whose message the forge bridge's stream no longer holds" - }, - "refused": { - "type": "string", - "description": "why the manifest of the indexer the revision names was refused" - }, - "own-build-unknown": { - "type": "string", - "description": "why the indexer holds a merge it does not take in although no indexer build is named" - }, - "branch": { - "type": "string", - "description": "the watched branch the revision is of (design 47 G section 476, section 493)" + "description": "why it cannot be written, such as the catalog store full" } }, "required": [ - "v", - "kind", - "key", - "what", - "merges", - "since" + "branch", + "source", + "why" ] }, "TakeInTaken": { "type": "object", - "description": "the body of the indexer's take-in.taken: a wait ended, with the branch, the source revision and the entries (design 47 G section 476, section 493)", + "description": "the body of the indexer's take-in.taken: a source revision taken in, said once, with one entry per mover (design 47 H §743, §744)", "properties": { - "v": { - "type": "integer", - "description": "the layout version" - }, - "kind": { - "type": "string", - "description": "the event's kind, pending or taken" - }, - "key": { - "type": "string", - "description": "the wait's key: m. of its oldest merge, or g. for a group being gathered" - }, - "what": { - "type": "string", - "description": "what waits: a revision or a group" - }, - "merges": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMerge" - }, - "description": "the merges it holds, oldest first" - }, - "revision": { - "type": "integer", - "description": "the catalog graph revision of the branch the take-in made, which the pipelines of its entries start at (design 47 G section 476, A-448)" - }, - "group": { - "type": "string", - "description": "the delivery group, for a group being gathered" - }, - "members": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMember" - }, - "description": "every approved member of a group with its head" - }, - "waits-for": { - "type": "string", - "description": "the indexer build a revision waits for" - }, - "since": { - "type": "string", - "description": "when the wait began", - "format": "date-time" - }, - "by": { - "type": "string", - "description": "who acted by hand, on a taken event" - }, - "why": { - "type": "string", - "description": "why they acted by hand, on a taken event" - }, - "dropped": { - "type": "boolean", - "description": "a hand drop: the merges are not taken in" - }, - "lost": { - "type": "array", - "items": { - "type": "string" - }, - "description": "the keys of merges whose message the forge bridge's stream no longer holds" - }, - "refused": { - "type": "string", - "description": "why the manifest of the indexer the revision names was refused" - }, - "own-build-unknown": { - "type": "string", - "description": "why the indexer holds a merge it does not take in although no indexer build is named" - }, "branch": { "type": "string", - "description": "the watched branch the revision is of (design 47 G section 476, section 493)" + "description": "the watched branch" }, "source": { "type": "integer", - "description": "the source revision taken in (design 47 G section 476)" + "description": "the source revision taken in" + }, + "revision": { + "type": "integer", + "description": "the catalog revision of the branch the take-in wrote; absent for a skip" + }, + "call": { + "type": "string", + "description": "the merge call the source revision names" }, "entries": { "type": "array", "items": { "$ref": "#/bodies/TakeInEntry" }, - "description": "one entry per module of that revision; none for a hand drop (design 47 G section 476, section 493)" + "description": "one entry per mover; none for a take-in with no mover or a skip" + }, + "skipped": { + "type": "boolean", + "description": "acknowledged unwritten by the tool indexer_take_in_skip (design 47 H §744)" + }, + "by": { + "type": "string", + "description": "who acted by hand" + }, + "why": { + "type": "string", + "description": "why they acted by hand" } }, "required": [ - "v", - "kind", - "key", - "what", - "merges", - "since" + "branch", + "source", + "call" ] } } diff --git a/go/testdata/beside/CAPTURED b/go/testdata/beside/CAPTURED index 51cc5274..b28a3593 100644 --- a/go/testdata/beside/CAPTURED +++ b/go/testdata/beside/CAPTURED @@ -16,6 +16,7 @@ mesh-contracts bfc5073b824ef355270da4c44ccf8fa709f6a253 seats/mesh-broker/seat. mesh-contracts dca9ce0245595cce2ff75ff155833ecc50a99bc0 seats/node-engine/seat.json and operator-and-conversation/seats/operator-channel/seat.json, taken again as seat.json.captured (milestone 47/H1, branch feat/47-H1-seats) mesh-delivery 5bf848144283055a1ef37441eeda0e439fb6ad7e contracts/seats/mesh-catalog and mesh-delivery-checker, as seat.json.captured (go/seatlist's bootstrap test; milestone 47/G) mesh-delivery 0259d77d115c95dde492ac2360e9a518d992adb0 modules/mesh-delivery-contracts/seats/mesh-catalog and git, taken again and added (milestone 47/G lead answer A-387) +mesh-delivery f006ab50bcc2e5759627f20fa7e5a9c62501032d modules/mesh-delivery-contracts/seats/git, mesh-delivery and mesh-catalog, taken again as seat.json.captured (milestone 47/H1, branch feat/47-H1-contracts-indexer-bridge; the checker seat is dropped) mesh-host cdcba9ca73755854d21e4e657d7e46c32b9b5265 internal/apply/placement_guard.go The two seat copies are put back the same way (git show : > .captured, the path kept). To move the others, from this repository's go/ directory, with the two repositories checked out beside mesh-sdk: diff --git a/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json.captured b/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json.captured index ba7fdd0f..b3c7c8a9 100644 --- a/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json.captured +++ b/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json.captured @@ -638,115 +638,6 @@ ] } }, - { - "name": "manifest-accepted", - "body": { - "type": "object", - "properties": { - "v": { - "type": "integer" - }, - "module": { - "type": "string" - }, - "digest": { - "type": "string" - }, - "judge": { - "type": "string" - }, - "revision": { - "type": "integer", - "description": "the indexer's revision of the verdict it says; a reader asks its first view again on a gap in it; zero from an indexer that does not say it" - }, - "problems": { - "type": "array", - "items": { - "type": "string" - }, - "description": "each problem the indexer's re-judgement finds in a manifest it keeps accepted because its digest is unchanged: the manifest validator's strings, the same items its verdict writes as warnings, in the same order; an empty list when none (design 47 G section 668, 692)" - }, - "bus-state": { - "type": "array", - "items": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "storage": { - "type": "string" - }, - "template": { - "type": "string" - }, - "options": { - "type": "object" - }, - "configuration": { - "type": "object" - }, - "types": { - "type": "array", - "items": { - "type": "object" - } - } - }, - "required": [ - "name", - "storage" - ] - } - } - }, - "required": [ - "v", - "module", - "digest", - "judge", - "bus-state", - "problems" - ] - } - }, - { - "name": "manifest-refused", - "body": { - "type": "object", - "properties": { - "v": { - "type": "integer" - }, - "module": { - "type": "string" - }, - "digest": { - "type": "string" - }, - "judge": { - "type": "string" - }, - "revision": { - "type": "integer", - "description": "the indexer's revision of the verdict it says; a reader asks its first view again on a gap in it; zero from an indexer that does not say it" - }, - "problems": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "required": [ - "v", - "module", - "digest", - "judge", - "problems" - ] - } - }, { "name": "catalog-revision", "body": { @@ -2194,6 +2085,15 @@ ], "description": "required runs and holds the delivery until it passes; optional runs, a failure is shown and may be accepted; bypass runs nothing and is said as bypassed" }, + "validate": { + "type": "string", + "enum": [ + "required", + "optional", + "bypass" + ], + "description": "required runs and holds the delivery until it passes; optional runs, a failure is shown and may be accepted; bypass runs nothing and is said as bypassed" + }, "composition": { "type": "string", "enum": [ @@ -2638,49 +2538,9 @@ } }, "bodies": { - "TakeInMerge": { - "type": "object", - "description": "one merge a take-in event holds: the repository, its pull request and the merge commit the forge made of it", - "properties": { - "repository": { - "type": "string" - }, - "number": { - "type": "integer" - }, - "merge": { - "type": "string" - } - }, - "required": [ - "repository", - "number", - "merge" - ] - }, - "TakeInMember": { - "type": "object", - "description": "one pull request at one commit", - "properties": { - "repository": { - "type": "string" - }, - "number": { - "type": "integer" - }, - "head": { - "type": "string" - } - }, - "required": [ - "repository", - "number", - "head" - ] - }, "TakeInEntry": { "type": "object", - "description": "one module of a taken-in revision (design 47 G section 476, section 648)", + "description": "one mover of a taken-in source revision (design 47 H §743, §763)", "properties": { "module": { "type": "string" @@ -2694,208 +2554,83 @@ }, "repository": { "type": "string", - "description": "from a merged message; absent for a pushed one (design 47 G section 648)" - }, - "pull": { - "type": "integer", - "description": "from a merged message; absent for a pushed one (design 47 G section 648)" + "description": "the repository the module is registered for" } }, "required": [ "module", "commit", - "fingerprint" + "fingerprint", + "repository" ] }, "TakeInPending": { "type": "object", - "description": "the body of the indexer's take-in.pending: a wait for a revision or a group, with the watched branch (design 47 G section 493)", + "description": "the body of the indexer's take-in.pending: a source revision's take-in held, said once per source (design 47 H §744)", "properties": { - "v": { + "branch": { + "type": "string", + "description": "the watched branch" + }, + "source": { "type": "integer", - "description": "the layout version" - }, - "kind": { - "type": "string", - "description": "the event's kind, pending or taken" - }, - "key": { - "type": "string", - "description": "the wait's key: m. of its oldest merge, or g. for a group being gathered" - }, - "what": { - "type": "string", - "description": "what waits: a revision or a group" - }, - "merges": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMerge" - }, - "description": "the merges it holds, oldest first" - }, - "group": { - "type": "string", - "description": "the delivery group, for a group being gathered" - }, - "members": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMember" - }, - "description": "every approved member of a group with its head" - }, - "waits-for": { - "type": "string", - "description": "the indexer build a revision waits for" - }, - "since": { - "type": "string", - "description": "when the wait began", - "format": "date-time" - }, - "by": { - "type": "string", - "description": "who acted by hand, on a taken event" + "description": "the source revision held" }, "why": { "type": "string", - "description": "why they acted by hand, on a taken event" - }, - "dropped": { - "type": "boolean", - "description": "a hand drop: the merges are not taken in" - }, - "lost": { - "type": "array", - "items": { - "type": "string" - }, - "description": "the keys of merges whose message the forge bridge's stream no longer holds" - }, - "refused": { - "type": "string", - "description": "why the manifest of the indexer the revision names was refused" - }, - "own-build-unknown": { - "type": "string", - "description": "why the indexer holds a merge it does not take in although no indexer build is named" - }, - "branch": { - "type": "string", - "description": "the watched branch the revision is of (design 47 G section 476, section 493)" + "description": "why it cannot be written, such as the catalog store full" } }, "required": [ - "v", - "kind", - "key", - "what", - "merges", - "since" + "branch", + "source", + "why" ] }, "TakeInTaken": { "type": "object", - "description": "the body of the indexer's take-in.taken: a wait ended, with the branch, the source revision and the entries (design 47 G section 476, section 493)", + "description": "the body of the indexer's take-in.taken: a source revision taken in, said once, with one entry per mover (design 47 H §743, §744)", "properties": { - "v": { - "type": "integer", - "description": "the layout version" - }, - "kind": { - "type": "string", - "description": "the event's kind, pending or taken" - }, - "key": { - "type": "string", - "description": "the wait's key: m. of its oldest merge, or g. for a group being gathered" - }, - "what": { - "type": "string", - "description": "what waits: a revision or a group" - }, - "merges": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMerge" - }, - "description": "the merges it holds, oldest first" - }, - "revision": { - "type": "integer", - "description": "the catalog graph revision of the branch the take-in made, which the pipelines of its entries start at (design 47 G section 476, A-448)" - }, - "group": { - "type": "string", - "description": "the delivery group, for a group being gathered" - }, - "members": { - "type": "array", - "items": { - "$ref": "#/bodies/TakeInMember" - }, - "description": "every approved member of a group with its head" - }, - "waits-for": { - "type": "string", - "description": "the indexer build a revision waits for" - }, - "since": { - "type": "string", - "description": "when the wait began", - "format": "date-time" - }, - "by": { - "type": "string", - "description": "who acted by hand, on a taken event" - }, - "why": { - "type": "string", - "description": "why they acted by hand, on a taken event" - }, - "dropped": { - "type": "boolean", - "description": "a hand drop: the merges are not taken in" - }, - "lost": { - "type": "array", - "items": { - "type": "string" - }, - "description": "the keys of merges whose message the forge bridge's stream no longer holds" - }, - "refused": { - "type": "string", - "description": "why the manifest of the indexer the revision names was refused" - }, - "own-build-unknown": { - "type": "string", - "description": "why the indexer holds a merge it does not take in although no indexer build is named" - }, "branch": { "type": "string", - "description": "the watched branch the revision is of (design 47 G section 476, section 493)" + "description": "the watched branch" }, "source": { "type": "integer", - "description": "the source revision taken in (design 47 G section 476)" + "description": "the source revision taken in" + }, + "revision": { + "type": "integer", + "description": "the catalog revision of the branch the take-in wrote; absent for a skip" + }, + "call": { + "type": "string", + "description": "the merge call the source revision names" }, "entries": { "type": "array", "items": { "$ref": "#/bodies/TakeInEntry" }, - "description": "one entry per module of that revision; none for a hand drop (design 47 G section 476, section 493)" + "description": "one entry per mover; none for a take-in with no mover or a skip" + }, + "skipped": { + "type": "boolean", + "description": "acknowledged unwritten by the tool indexer_take_in_skip (design 47 H §744)" + }, + "by": { + "type": "string", + "description": "who acted by hand" + }, + "why": { + "type": "string", + "description": "why they acted by hand" } }, "required": [ - "v", - "kind", - "key", - "what", - "merges", - "since" + "branch", + "source", + "call" ] } }