From be306f4a04961c01075a1f5e35d8e186e2dc5f5e Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 19 Nov 2026 22:51:27 +0100 Subject: [PATCH] =?UTF-8?q?seat=20list:=20the=20captured=20mesh-catalog=20?= =?UTF-8?q?and=20mesh-config=20definitions=20lose=20config-candidates=20an?= =?UTF-8?q?d=20kept=20(issue=201982;=20ADR=200681=20=C2=A77)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The bootstrapped, test and beside copies are the seats' files as the contracts hold them after the removal of the pull request path (design 47 G); the views test names a state the indexer still has. Builds: ADR 0681 ยง7 (mesh-sdk's seat list definitions of mesh-config's `kept` and the mesh-catalog seat's `config-candidates` go). Claude-Session: https://claude.ai/code/session_01JG73KHUnBze48rdua8u2sy --- go/seatlist/bootstrap/mesh-catalog.json | 105 +----------------- go/seatlist/bootstrap/mesh-config.json | 74 ------------ .../seatlisttest/seats/mesh-catalog.json | 105 +----------------- .../seatlisttest/seats/mesh-config.json | 74 ------------ .../seats/mesh-config/seat.json.captured | 74 ------------ .../seats/mesh-catalog/seat.json.captured | 105 +----------------- go/views/views_test.go | 2 +- 7 files changed, 13 insertions(+), 526 deletions(-) diff --git a/go/seatlist/bootstrap/mesh-catalog.json b/go/seatlist/bootstrap/mesh-catalog.json index 323a0447..f8163534 100644 --- a/go/seatlist/bootstrap/mesh-catalog.json +++ b/go/seatlist/bootstrap/mesh-catalog.json @@ -1364,107 +1364,6 @@ "description": "the kept predefined list", "history": 5 }, - { - "name": "config-candidates", - "template": "state", - "key-forms": [ - { - "key": "", - "value": { - "type": "object", - "properties": { - "v": { - "type": "integer", - "description": "the layout version" - }, - "pull": { - "type": "string" - }, - "head": { - "type": "string" - }, - "declares": { - "type": "object", - "additionalProperties": { - "type": "object", - "additionalProperties": { - "type": "object", - "properties": { - "kind": { - "type": "string" - }, - "default": { - "description": "the default" - }, - "why": { - "type": "string" - }, - "type": { - "type": "string" - }, - "description": { - "type": "string" - }, - "enum": { - "description": "the allowed values" - }, - "minimum": { - "type": [ - "number", - "null" - ], - "description": "a declared bound; 0 is a bound, absent is none" - }, - "maximum": { - "type": [ - "number", - "null" - ], - "description": "a declared bound; 0 is a bound, absent is none" - }, - "pattern": { - "type": "string" - }, - "trusted": { - "type": "boolean" - }, - "predefined": { - "type": "string" - }, - "required": { - "type": "boolean" - }, - "runtime": { - "type": "boolean" - } - }, - "required": [ - "kind", - "default", - "why" - ] - } - }, - "description": "module to key to declaration" - }, - "at": { - "type": "string", - "description": "when (RFC 3339 time)", - "format": "date-time" - } - }, - "required": [ - "pull", - "head", - "declares" - ] - }, - "description": "the configuration a pull request declares" - } - ], - "description": "the configuration declared by open pull requests", - "history": 5 - }, { "name": "packages", "template": "state", @@ -2959,6 +2858,10 @@ }, "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" diff --git a/go/seatlist/bootstrap/mesh-config.json b/go/seatlist/bootstrap/mesh-config.json index 9054314a..cee64ede 100644 --- a/go/seatlist/bootstrap/mesh-config.json +++ b/go/seatlist/bootstrap/mesh-config.json @@ -266,80 +266,6 @@ } ], "description": "the value each module on each node takes for each config key, built from the sources alone" - }, - { - "name": "kept", - "template": "state", - "key-forms": [ - { - "key": ".....", - "value": { - "type": "object", - "description": "an approved held value, kept apart from the values mesh-config resolves, laid only over the composition of its own pull request at its head (ADR 0565 clause 5)", - "properties": { - "pull": { - "type": "string", - "description": "the pull request, owner/repository#number" - }, - "head": { - "type": "string", - "description": "the head the declaration was read at" - }, - "declaration": { - "type": "string", - "description": "the digest of what the declaration holds the value to; the value stays only while it is the same" - }, - "node": { - "type": "string" - }, - "module": { - "type": "string" - }, - "key": { - "type": "string", - "description": "the config key" - }, - "value": { - "description": "the value held, as the operator approved it" - }, - "by": { - "type": "string" - }, - "via": { - "type": "string", - "description": "where the value was proposed from" - }, - "why": { - "type": "string" - }, - "approved": { - "type": "string", - "description": "who approved it, as the proposal kept it" - }, - "proposal": { - "type": "string", - "description": "the proposal's id" - }, - "at": { - "type": "string", - "format": "date-time", - "description": "when it was kept" - } - }, - "required": [ - "pull", - "head", - "declaration", - "node", - "module", - "key", - "value" - ] - }, - "description": "one held value: the pull request (owner, repository and number, none holding a dot), the node, the module and the config key, which may hold dots" - } - ], - "description": "the approved held values of open pull requests, read by the checker and the assigner's composition check" } ] } diff --git a/go/seatlist/seatlisttest/seats/mesh-catalog.json b/go/seatlist/seatlisttest/seats/mesh-catalog.json index 323a0447..f8163534 100644 --- a/go/seatlist/seatlisttest/seats/mesh-catalog.json +++ b/go/seatlist/seatlisttest/seats/mesh-catalog.json @@ -1364,107 +1364,6 @@ "description": "the kept predefined list", "history": 5 }, - { - "name": "config-candidates", - "template": "state", - "key-forms": [ - { - "key": "", - "value": { - "type": "object", - "properties": { - "v": { - "type": "integer", - "description": "the layout version" - }, - "pull": { - "type": "string" - }, - "head": { - "type": "string" - }, - "declares": { - "type": "object", - "additionalProperties": { - "type": "object", - "additionalProperties": { - "type": "object", - "properties": { - "kind": { - "type": "string" - }, - "default": { - "description": "the default" - }, - "why": { - "type": "string" - }, - "type": { - "type": "string" - }, - "description": { - "type": "string" - }, - "enum": { - "description": "the allowed values" - }, - "minimum": { - "type": [ - "number", - "null" - ], - "description": "a declared bound; 0 is a bound, absent is none" - }, - "maximum": { - "type": [ - "number", - "null" - ], - "description": "a declared bound; 0 is a bound, absent is none" - }, - "pattern": { - "type": "string" - }, - "trusted": { - "type": "boolean" - }, - "predefined": { - "type": "string" - }, - "required": { - "type": "boolean" - }, - "runtime": { - "type": "boolean" - } - }, - "required": [ - "kind", - "default", - "why" - ] - } - }, - "description": "module to key to declaration" - }, - "at": { - "type": "string", - "description": "when (RFC 3339 time)", - "format": "date-time" - } - }, - "required": [ - "pull", - "head", - "declares" - ] - }, - "description": "the configuration a pull request declares" - } - ], - "description": "the configuration declared by open pull requests", - "history": 5 - }, { "name": "packages", "template": "state", @@ -2959,6 +2858,10 @@ }, "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" diff --git a/go/seatlist/seatlisttest/seats/mesh-config.json b/go/seatlist/seatlisttest/seats/mesh-config.json index 9054314a..cee64ede 100644 --- a/go/seatlist/seatlisttest/seats/mesh-config.json +++ b/go/seatlist/seatlisttest/seats/mesh-config.json @@ -266,80 +266,6 @@ } ], "description": "the value each module on each node takes for each config key, built from the sources alone" - }, - { - "name": "kept", - "template": "state", - "key-forms": [ - { - "key": ".....", - "value": { - "type": "object", - "description": "an approved held value, kept apart from the values mesh-config resolves, laid only over the composition of its own pull request at its head (ADR 0565 clause 5)", - "properties": { - "pull": { - "type": "string", - "description": "the pull request, owner/repository#number" - }, - "head": { - "type": "string", - "description": "the head the declaration was read at" - }, - "declaration": { - "type": "string", - "description": "the digest of what the declaration holds the value to; the value stays only while it is the same" - }, - "node": { - "type": "string" - }, - "module": { - "type": "string" - }, - "key": { - "type": "string", - "description": "the config key" - }, - "value": { - "description": "the value held, as the operator approved it" - }, - "by": { - "type": "string" - }, - "via": { - "type": "string", - "description": "where the value was proposed from" - }, - "why": { - "type": "string" - }, - "approved": { - "type": "string", - "description": "who approved it, as the proposal kept it" - }, - "proposal": { - "type": "string", - "description": "the proposal's id" - }, - "at": { - "type": "string", - "format": "date-time", - "description": "when it was kept" - } - }, - "required": [ - "pull", - "head", - "declaration", - "node", - "module", - "key", - "value" - ] - }, - "description": "one held value: the pull request (owner, repository and number, none holding a dot), the node, the module and the config key, which may hold dots" - } - ], - "description": "the approved held values of open pull requests, read by the checker and the assigner's composition check" } ] } diff --git a/go/testdata/beside/mesh-contracts/seats/mesh-config/seat.json.captured b/go/testdata/beside/mesh-contracts/seats/mesh-config/seat.json.captured index 9054314a..cee64ede 100644 --- a/go/testdata/beside/mesh-contracts/seats/mesh-config/seat.json.captured +++ b/go/testdata/beside/mesh-contracts/seats/mesh-config/seat.json.captured @@ -266,80 +266,6 @@ } ], "description": "the value each module on each node takes for each config key, built from the sources alone" - }, - { - "name": "kept", - "template": "state", - "key-forms": [ - { - "key": ".....", - "value": { - "type": "object", - "description": "an approved held value, kept apart from the values mesh-config resolves, laid only over the composition of its own pull request at its head (ADR 0565 clause 5)", - "properties": { - "pull": { - "type": "string", - "description": "the pull request, owner/repository#number" - }, - "head": { - "type": "string", - "description": "the head the declaration was read at" - }, - "declaration": { - "type": "string", - "description": "the digest of what the declaration holds the value to; the value stays only while it is the same" - }, - "node": { - "type": "string" - }, - "module": { - "type": "string" - }, - "key": { - "type": "string", - "description": "the config key" - }, - "value": { - "description": "the value held, as the operator approved it" - }, - "by": { - "type": "string" - }, - "via": { - "type": "string", - "description": "where the value was proposed from" - }, - "why": { - "type": "string" - }, - "approved": { - "type": "string", - "description": "who approved it, as the proposal kept it" - }, - "proposal": { - "type": "string", - "description": "the proposal's id" - }, - "at": { - "type": "string", - "format": "date-time", - "description": "when it was kept" - } - }, - "required": [ - "pull", - "head", - "declaration", - "node", - "module", - "key", - "value" - ] - }, - "description": "one held value: the pull request (owner, repository and number, none holding a dot), the node, the module and the config key, which may hold dots" - } - ], - "description": "the approved held values of open pull requests, read by the checker and the assigner's composition check" } ] } 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 323a0447..f8163534 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 @@ -1364,107 +1364,6 @@ "description": "the kept predefined list", "history": 5 }, - { - "name": "config-candidates", - "template": "state", - "key-forms": [ - { - "key": "", - "value": { - "type": "object", - "properties": { - "v": { - "type": "integer", - "description": "the layout version" - }, - "pull": { - "type": "string" - }, - "head": { - "type": "string" - }, - "declares": { - "type": "object", - "additionalProperties": { - "type": "object", - "additionalProperties": { - "type": "object", - "properties": { - "kind": { - "type": "string" - }, - "default": { - "description": "the default" - }, - "why": { - "type": "string" - }, - "type": { - "type": "string" - }, - "description": { - "type": "string" - }, - "enum": { - "description": "the allowed values" - }, - "minimum": { - "type": [ - "number", - "null" - ], - "description": "a declared bound; 0 is a bound, absent is none" - }, - "maximum": { - "type": [ - "number", - "null" - ], - "description": "a declared bound; 0 is a bound, absent is none" - }, - "pattern": { - "type": "string" - }, - "trusted": { - "type": "boolean" - }, - "predefined": { - "type": "string" - }, - "required": { - "type": "boolean" - }, - "runtime": { - "type": "boolean" - } - }, - "required": [ - "kind", - "default", - "why" - ] - } - }, - "description": "module to key to declaration" - }, - "at": { - "type": "string", - "description": "when (RFC 3339 time)", - "format": "date-time" - } - }, - "required": [ - "pull", - "head", - "declares" - ] - }, - "description": "the configuration a pull request declares" - } - ], - "description": "the configuration declared by open pull requests", - "history": 5 - }, { "name": "packages", "template": "state", @@ -2959,6 +2858,10 @@ }, "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" diff --git a/go/views/views_test.go b/go/views/views_test.go index bd4ef33e..76eb1cb6 100644 --- a/go/views/views_test.go +++ b/go/views/views_test.go @@ -1247,7 +1247,7 @@ func subViews(t *testing.T) { } }) t.Run("an event names its state on its subject, and decodes as it was encoded", func(t *testing.T) { - if s := StateOfEvent("mesh.stream.mesh-delivery-indexer.event.views.config-candidates"); s != "config-candidates" { + if s := StateOfEvent("mesh.stream.mesh-delivery-indexer.event.views.predefined"); s != "predefined" { t.Errorf("state of subject = %q", s) } for subject, want := range map[string]string{"mesh.mod.o.event.views.modules": "o", "mesh.mod.o.event.views.a.b": "", "mesh.mod.o.event.other": "",