From 4215eac9934b1827f8616711b102af2096e61be9 Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 5 Nov 2026 14:38:13 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"mesh-delivery-contracts:=20mesh-catal?= =?UTF-8?q?og=20serves=20the=20verb=20seat-definitions,=20every=20definiti?= =?UTF-8?q?on=20names=20its=20domain=20Delivery,=20regenerated=20(ADR=2006?= =?UTF-8?q?36=20=C2=A71,=20=C2=A75;=20issue=201966)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d64131328001ff3d1d6786d06d33e48a8600e23f. --- contracts/go/seats/meshcatalog/contract.go | 20 +++++-------------- .../seats/container-image-registry/seat.json | 1 - contracts/seats/git/seat.json | 1 - contracts/seats/go-package-registry/seat.json | 1 - contracts/seats/mesh-artifact-store/seat.json | 1 - contracts/seats/mesh-artifact-sweep/seat.json | 5 ++--- contracts/seats/mesh-catalog/seat.json | 19 ------------------ .../seats/mesh-delivery-checker/seat.json | 1 - contracts/seats/mesh-delivery/seat.json | 1 - contracts/seats/node-build-go/seat.json | 1 - contracts/seats/node-build-image/seat.json | 1 - contracts/seats/node-build-node/seat.json | 1 - .../seats/npm-package-registry/seat.json | 1 - .../seats/oci-artifact-registry/seat.json | 1 - contracts/ts/seats/meshcatalog/src/index.ts | 10 ---------- 15 files changed, 7 insertions(+), 58 deletions(-) diff --git a/contracts/go/seats/meshcatalog/contract.go b/contracts/go/seats/meshcatalog/contract.go index 323e853a..aeecc413 100644 --- a/contracts/go/seats/meshcatalog/contract.go +++ b/contracts/go/seats/meshcatalog/contract.go @@ -14,11 +14,10 @@ import ( const Seat = "mesh-catalog" const ( - VerbSeatDefinitions = "seat-definitions" - VerbModules = "modules" - VerbModule = "module" - VerbProvides = "provides" - VerbDependents = "dependents" + VerbModules = "modules" + VerbModule = "module" + VerbProvides = "provides" + VerbDependents = "dependents" ) const ( @@ -28,7 +27,7 @@ const ( // Verbs is every verb the seat serves, in its definition's order: a new copy each call. func Verbs() []string { - return []string{VerbSeatDefinitions, VerbModules, VerbModule, VerbProvides, VerbDependents} + return []string{VerbModules, VerbModule, VerbProvides, VerbDependents} } // Events is every event published on the seat's subject: a new copy each call. @@ -310,15 +309,6 @@ func DecodePackagesByPackageSeriesValue(raw []byte) (PackagesByPackageSeriesValu return v, nil } -// SeatDefinitionsInput is what seat-definitions takes. -type SeatDefinitionsInput struct { - // the seat to give whole; omit for the list of every seat - Seat string `json:"seat,omitempty"` -} - -// SeatDefinitionsAnswer is what seat-definitions answers. -type SeatDefinitionsAnswer = map[string]any - // ModulesInput is what modules takes. type ModulesInput struct { } diff --git a/contracts/seats/container-image-registry/seat.json b/contracts/seats/container-image-registry/seat.json index bc116b4b..9f95f1e4 100644 --- a/contracts/seats/container-image-registry/seat.json +++ b/contracts/seats/container-image-registry/seat.json @@ -3,7 +3,6 @@ "seat": "container-image-registry", "scope": "mesh", "grain": "whole", - "domain": "Delivery", "decision": "novox/hq ADR 0605", "description": "The mesh's container images, in the one artifact store: the OCI distribution protocol's read side, an image's tags and mirroring an outside image.", "includes": [ diff --git a/contracts/seats/git/seat.json b/contracts/seats/git/seat.json index b7c55a10..836285ab 100644 --- a/contracts/seats/git/seat.json +++ b/contracts/seats/git/seat.json @@ -3,7 +3,6 @@ "seat": "git", "scope": "mesh", "grain": "seat-list", - "domain": "Delivery", "decision": "novox/hq ADR 0111", "delivers": "git" } diff --git a/contracts/seats/go-package-registry/seat.json b/contracts/seats/go-package-registry/seat.json index 9d426368..edf39986 100644 --- a/contracts/seats/go-package-registry/seat.json +++ b/contracts/seats/go-package-registry/seat.json @@ -3,7 +3,6 @@ "seat": "go-package-registry", "scope": "mesh", "grain": "whole", - "domain": "Delivery", "decision": "novox/hq ADR 0605", "description": "The mesh's Go modules: Go's module proxy protocol's read side, and publishing over the bus.", "delivers": "go-package-registry", diff --git a/contracts/seats/mesh-artifact-store/seat.json b/contracts/seats/mesh-artifact-store/seat.json index d82ab333..84c8a57e 100644 --- a/contracts/seats/mesh-artifact-store/seat.json +++ b/contracts/seats/mesh-artifact-store/seat.json @@ -3,6 +3,5 @@ "seat": "mesh-artifact-store", "scope": "mesh", "grain": "seat-list", - "domain": "Delivery", "decision": "novox/hq ADR 0075" } diff --git a/contracts/seats/mesh-artifact-sweep/seat.json b/contracts/seats/mesh-artifact-sweep/seat.json index 3cf6fa69..602a5f8d 100644 --- a/contracts/seats/mesh-artifact-sweep/seat.json +++ b/contracts/seats/mesh-artifact-sweep/seat.json @@ -3,7 +3,6 @@ "seat": "mesh-artifact-sweep", "scope": "mesh", "grain": "seat-list", - "domain": "Delivery", "decision": "novox/hq ADR 0571", "verbs": [ { @@ -20,7 +19,7 @@ "type": "string" }, "repository": { - "description": "only this repository's references, as / (the counts stay whole)", + "description": "only this repository's references, as \u003cmodule\u003e/\u003cartifact\u003e (the counts stay whole)", "type": "string" } }, @@ -33,7 +32,7 @@ "input": { "properties": { "references": { - "description": "the artifacts' references, artifact-store:////blobs/sha256:: a list, or one text separated by commas", + "description": "the artifacts' references, artifact-store://\u003cmodule\u003e/\u003cartifact\u003e/blobs/sha256:\u003chex\u003e: a list, or one text separated by commas", "items": { "type": "string" }, diff --git a/contracts/seats/mesh-catalog/seat.json b/contracts/seats/mesh-catalog/seat.json index 3ba5b97e..92a8307e 100644 --- a/contracts/seats/mesh-catalog/seat.json +++ b/contracts/seats/mesh-catalog/seat.json @@ -3,27 +3,8 @@ "seat": "mesh-catalog", "scope": "mesh", "grain": "whole", - "domain": "Delivery", "decision": "novox/hq ADR 0604", "verbs": [ - { - "name": "seat-definitions", - "description": "The seats' definitions the trunk holds, for the seat list reader of every host (ADR 0636 §1, §4): with no seat, the revision and every trunk seat's name and digest; with a seat, that seat's resolved definition, its digest and any reason it did not parse. Trunk definitions only. Reads only.", - "optional": false, - "input": { - "properties": { - "seat": { - "description": "the seat to give whole; omit for the list of every seat", - "type": "string" - } - }, - "type": "object" - }, - "answer": { - "type": "object", - "description": "{revision, seats:[{seat, source, digest}]} for no seat; {seat, found, entry:{seat, source, digest, definition, unparsed?}, revision} for one" - } - }, { "name": "modules", "description": "Every module the trunk holds, each with its repository, its directory there, the merge commit it was last changed at and its fingerprint (or why it has none): the catalog of the mesh, read from its holder's state. Reads only.", diff --git a/contracts/seats/mesh-delivery-checker/seat.json b/contracts/seats/mesh-delivery-checker/seat.json index 0a9220d3..2aaba6bf 100644 --- a/contracts/seats/mesh-delivery-checker/seat.json +++ b/contracts/seats/mesh-delivery-checker/seat.json @@ -3,7 +3,6 @@ "seat": "mesh-delivery-checker", "scope": "mesh", "grain": "whole", - "domain": "Delivery", "decision": "novox/hq ADR 0547", "verbs": [ { diff --git a/contracts/seats/mesh-delivery/seat.json b/contracts/seats/mesh-delivery/seat.json index 8365118a..bc08d0ff 100644 --- a/contracts/seats/mesh-delivery/seat.json +++ b/contracts/seats/mesh-delivery/seat.json @@ -3,7 +3,6 @@ "seat": "mesh-delivery", "scope": "mesh", "grain": "whole", - "domain": "Delivery", "decision": "novox/hq ADR 0239", "verbs": [ { diff --git a/contracts/seats/node-build-go/seat.json b/contracts/seats/node-build-go/seat.json index a810a6bb..ff273bdb 100644 --- a/contracts/seats/node-build-go/seat.json +++ b/contracts/seats/node-build-go/seat.json @@ -3,7 +3,6 @@ "seat": "node-build-go", "scope": "node", "grain": "whole", - "domain": "Delivery", "decision": "novox/hq ADR 0525, ADR 0536, ADR 0553", "pulled-by-kind": true, "yields": true, diff --git a/contracts/seats/node-build-image/seat.json b/contracts/seats/node-build-image/seat.json index 037a8907..f0ca605b 100644 --- a/contracts/seats/node-build-image/seat.json +++ b/contracts/seats/node-build-image/seat.json @@ -3,7 +3,6 @@ "seat": "node-build-image", "scope": "node", "grain": "whole", - "domain": "Delivery", "decision": "novox/hq ADR 0525, ADR 0536, ADR 0553", "pulled-by-kind": true, "yields": true, diff --git a/contracts/seats/node-build-node/seat.json b/contracts/seats/node-build-node/seat.json index 6fce1468..34ee7310 100644 --- a/contracts/seats/node-build-node/seat.json +++ b/contracts/seats/node-build-node/seat.json @@ -3,7 +3,6 @@ "seat": "node-build-node", "scope": "node", "grain": "whole", - "domain": "Delivery", "decision": "novox/hq ADR 0525, ADR 0536, ADR 0553", "pulled-by-kind": true, "yields": true, diff --git a/contracts/seats/npm-package-registry/seat.json b/contracts/seats/npm-package-registry/seat.json index ae2ab3db..61f77c32 100644 --- a/contracts/seats/npm-package-registry/seat.json +++ b/contracts/seats/npm-package-registry/seat.json @@ -3,7 +3,6 @@ "seat": "npm-package-registry", "scope": "mesh", "grain": "whole", - "domain": "Delivery", "decision": "novox/hq ADR 0109", "description": "The mesh's npm packages: the npm registry protocol's read side, and publishing over the bus.", "delivers": "npm-package-registry", diff --git a/contracts/seats/oci-artifact-registry/seat.json b/contracts/seats/oci-artifact-registry/seat.json index ee6f5bf7..ae30e92c 100644 --- a/contracts/seats/oci-artifact-registry/seat.json +++ b/contracts/seats/oci-artifact-registry/seat.json @@ -3,7 +3,6 @@ "seat": "oci-artifact-registry", "scope": "mesh", "grain": "whole", - "domain": "Delivery", "decision": "novox/hq ADR 0605", "description": "The mesh's bundles and archives, by digest, in the one artifact store: the OCI distribution protocol's read side.", "includes": [ diff --git a/contracts/ts/seats/meshcatalog/src/index.ts b/contracts/ts/seats/meshcatalog/src/index.ts index 948161ec..10a89abb 100644 --- a/contracts/ts/seats/meshcatalog/src/index.ts +++ b/contracts/ts/seats/meshcatalog/src/index.ts @@ -5,7 +5,6 @@ export const seat = "mesh-catalog"; export const verbs = { - seatDefinitions: "seat-definitions", modules: "modules", module: "module", provides: "provides", @@ -156,15 +155,6 @@ export function parsePackagesByPackageSeriesKey(key: string): { packagePart: str return { packagePart, series }; } -/** is what seat-definitions takes. */ -export interface SeatDefinitionsInput { - /** the seat to give whole; omit for the list of every seat */ - "seat"?: string; -} - -/** is what seat-definitions answers. */ -export type SeatDefinitionsAnswer = Record; - /** is what modules takes. */ export interface ModulesInput { }