From 6655bdff509b4bbb70a3e2a1923444d7d1905a56 Mon Sep 17 00:00:00 2001 From: jochen Date: Tue, 3 Nov 2026 13:16:49 +0100 Subject: [PATCH] =?UTF-8?q?The=20check=20that=20the=20catalogue=20package?= =?UTF-8?q?=20names=20no=20module=20reads=20the=20names=20from=20the=20cat?= =?UTF-8?q?alogue's=20module=20directories=20alone,=20no=20list=20beside?= =?UTF-8?q?=20them=20(ADR=200601=20=C2=A74)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go/catalogue/amqp_is_not_a_provision_test.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/go/catalogue/amqp_is_not_a_provision_test.go b/go/catalogue/amqp_is_not_a_provision_test.go index 01aba6e..0b0191c 100644 --- a/go/catalogue/amqp_is_not_a_provision_test.go +++ b/go/catalogue/amqp_is_not_a_provision_test.go @@ -36,21 +36,15 @@ func TestNoCatalogueManifestNamesAmqp(t *testing.T) { filepath.Base(filepath.Dir(path))) } } - // Nor does this package's code name any module (issue 774, the operator 2026-11-03): what a module is, its manifest - // says. Every string literal of its non-test files is read; a module's name is refused there unless it is also a - // seat's or a provision's name, or one of the words below, which name something else. + // Nor does this package's code name any module the catalogue holds (ADR 0601 ยง4): what a module is, its manifest + // says. The names are read from the catalogue's module directories, never from a list here; every string literal of + // the package's non-test files is read, and a module's name is refused unless it is also a seat's name or one of the + // words below, which name something else. t.Run("the package names no module", func(t *testing.T) { modules := map[string]bool{} for _, path := range modules0 { modules[filepath.Base(filepath.Dir(path))] = true } - // The mesh's modules held outside the catalogue: the node-engine, the private network, the tool runner, the - // ended controller and the delivery's parts. - for _, m := range []string{"mesh-host", "mesh-wireguard", "node-tools", "mesh-controller", "mesh-delivery-assigner", - "mesh-delivery-builder", "mesh-delivery-checker", "mesh-delivery-forge-bridge", "mesh-delivery-indexer", - "mesh-delivery-teller", "mesh-delivery-view", "mesh-delivery-watchman", "mesh-enrolment", "mesh-grants"} { - modules[m] = true - } // Words that are a module's name and name something else here: a language, an environment's rendering, a package. elsewhere := map[string]bool{"go": true, "systemd": true, "nftables": true} fset := token.NewFileSet()