From 4713d984ea4542befad351c233a83857852611da Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 22 Oct 2026 22:19:12 +0200 Subject: [PATCH] Name no node: trim node names from the per-module manifest denylists now that the catalogue-wide check covers them (1838/AC1) --- modules/betterbird/cmd/betterbird-tools/manifest_test.go | 3 ++- modules/blueman/cmd/blueman-tools/manifest_test.go | 3 ++- modules/disk-load/cmd/disk-load/tools_test.go | 3 ++- modules/dunst/cmd/dunst-tools/manifest_helpers_test.go | 3 ++- modules/feh/cmd/feh-tools/manifest_helpers_test.go | 3 ++- modules/forticlient/cmd/forticlient-tools/manifest_test.go | 3 ++- .../cmd/gnome-keyring-tools/manifest_helpers_test.go | 3 ++- .../cmd/i3status-rust-tools/manifest_helpers_test.go | 3 ++- modules/memory-pressure/cmd/memory-pressure/manifest_test.go | 3 ++- modules/mesh-issues/cmd/mesh-issues/manifest_test.go | 3 ++- modules/mesh-knowledge/cmd/mesh-knowledge/manifest_test.go | 3 ++- modules/mesh-watcher/cmd/mesh-watcher/manifest_test.go | 3 ++- modules/messenger/cmd/messenger/manifest_test.go | 3 ++- modules/mounts/cmd/mounts/manifest_test.go | 3 ++- .../cmd/nextcloud-client-tools/manifest_test.go | 3 ++- modules/nfs-server/cmd/nfs-server/manifest_test.go | 3 ++- modules/nm-applet/cmd/nm-applet-tools/manifest_test.go | 3 ++- modules/openrazer/cmd/openrazer-tools/manifest_test.go | 3 ++- modules/picom/cmd/picom-tools/manifest_helpers_test.go | 3 ++- modules/polychromatic/cmd/polychromatic-tools/manifest_test.go | 3 ++- modules/rofi/cmd/rofi-tools/manifest_helpers_test.go | 3 ++- .../screen-lock/cmd/screen-lock-tools/manifest_helpers_test.go | 3 ++- modules/sensors/cmd/sensors/manifest_test.go | 3 ++- modules/slack/cmd/slack-tools/manifest_test.go | 3 ++- modules/telegram/cmd/telegram/manifest_test.go | 3 ++- modules/xdg/cmd/xdg-tools/manifest_test.go | 3 ++- modules/zfs/cmd/zfs-tools/manifest_test.go | 3 ++- 27 files changed, 54 insertions(+), 27 deletions(-) diff --git a/modules/betterbird/cmd/betterbird-tools/manifest_test.go b/modules/betterbird/cmd/betterbird-tools/manifest_test.go index 37e420b5..95dc6349 100644 --- a/modules/betterbird/cmd/betterbird-tools/manifest_test.go +++ b/modules/betterbird/cmd/betterbird-tools/manifest_test.go @@ -107,7 +107,8 @@ func TestItPlacesBetterbirdWhereTheCommunityPackageDidAndOnlyAfterItIsGone(t *te } } s := strings.ToLower(raw) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "http://", "mediahuis"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "http://", "mediahuis"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/blueman/cmd/blueman-tools/manifest_test.go b/modules/blueman/cmd/blueman-tools/manifest_test.go index de3f7fad..4e843cd7 100644 --- a/modules/blueman/cmd/blueman-tools/manifest_test.go +++ b/modules/blueman/cmd/blueman-tools/manifest_test.go @@ -101,7 +101,8 @@ func TestTheToolsAgreeWithTheManifest(t *testing.T) { t.Errorf("the Go tools bundle: %v", b) } s := strings.ToLower(raw) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "http", "password", "token"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "http", "password", "token"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/disk-load/cmd/disk-load/tools_test.go b/modules/disk-load/cmd/disk-load/tools_test.go index 88147715..df79b3ce 100644 --- a/modules/disk-load/cmd/disk-load/tools_test.go +++ b/modules/disk-load/cmd/disk-load/tools_test.go @@ -49,7 +49,8 @@ func TestTheManifestNamesExactlyTheToolsTheBundleServesAndNoMachine(t *testing.T if len(m.Resources) != 0 { t.Errorf("the module only reads, and declares %d resources", len(m.Resources)) } - for _, banned := range []string{"g14", "novox", "ace", "shanks", "jochen", "/home/"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, banned := range []string{"jochen", "/home/"} { if strings.Contains(string(raw), banned) { t.Errorf("the manifest says %q", banned) } diff --git a/modules/dunst/cmd/dunst-tools/manifest_helpers_test.go b/modules/dunst/cmd/dunst-tools/manifest_helpers_test.go index 2959a8b6..68c3e189 100644 --- a/modules/dunst/cmd/dunst-tools/manifest_helpers_test.go +++ b/modules/dunst/cmd/dunst-tools/manifest_helpers_test.go @@ -227,7 +227,8 @@ func checkNoSecretsOrInstallationNames(t *testing.T) { t.Fatal(err) } s := strings.ToLower(string(raw)) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "api_key", ".hal/", "greenclip daemon"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "api_key", ".hal/", "greenclip daemon"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/feh/cmd/feh-tools/manifest_helpers_test.go b/modules/feh/cmd/feh-tools/manifest_helpers_test.go index 28adb660..bd2d7c3c 100644 --- a/modules/feh/cmd/feh-tools/manifest_helpers_test.go +++ b/modules/feh/cmd/feh-tools/manifest_helpers_test.go @@ -259,7 +259,8 @@ func checkNoSecretsOrInstallationNames(t *testing.T) { t.Fatal(err) } s := strings.ToLower(string(raw)) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "api_key", ".hal/", "greenclip daemon"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "api_key", ".hal/", "greenclip daemon"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/forticlient/cmd/forticlient-tools/manifest_test.go b/modules/forticlient/cmd/forticlient-tools/manifest_test.go index 55060939..b261f869 100644 --- a/modules/forticlient/cmd/forticlient-tools/manifest_test.go +++ b/modules/forticlient/cmd/forticlient-tools/manifest_test.go @@ -82,7 +82,8 @@ func TestTheToolsAgreeWithTheManifest(t *testing.T) { t.Errorf("the Go tools bundle: %v", b) } s := strings.ToLower(raw) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "http", "password", "token"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "http", "password", "token"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/gnome-keyring/cmd/gnome-keyring-tools/manifest_helpers_test.go b/modules/gnome-keyring/cmd/gnome-keyring-tools/manifest_helpers_test.go index fb992951..c415043a 100644 --- a/modules/gnome-keyring/cmd/gnome-keyring-tools/manifest_helpers_test.go +++ b/modules/gnome-keyring/cmd/gnome-keyring-tools/manifest_helpers_test.go @@ -257,7 +257,8 @@ func checkNoSecretsOrInstallationNames(t *testing.T) { t.Fatal(err) } s := strings.ToLower(string(raw)) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "api_key", ".hal/", "greenclip daemon"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "api_key", ".hal/", "greenclip daemon"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/i3status-rust/cmd/i3status-rust-tools/manifest_helpers_test.go b/modules/i3status-rust/cmd/i3status-rust-tools/manifest_helpers_test.go index c33db7ec..f5bb6162 100644 --- a/modules/i3status-rust/cmd/i3status-rust-tools/manifest_helpers_test.go +++ b/modules/i3status-rust/cmd/i3status-rust-tools/manifest_helpers_test.go @@ -261,7 +261,8 @@ func checkNoSecretsOrInstallationNames(t *testing.T) { t.Fatal(err) } s := strings.ToLower(string(raw)) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "api_key", ".hal/", "greenclip daemon"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "api_key", ".hal/", "greenclip daemon"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/memory-pressure/cmd/memory-pressure/manifest_test.go b/modules/memory-pressure/cmd/memory-pressure/manifest_test.go index 7686ef4e..d7a969cd 100644 --- a/modules/memory-pressure/cmd/memory-pressure/manifest_test.go +++ b/modules/memory-pressure/cmd/memory-pressure/manifest_test.go @@ -34,7 +34,8 @@ func TestTheManifestNamesExactlyTheToolsTheBundleServesAndNoMachine(t *testing.T if strings.Join(m.Emits, ",") != "pressure.cleared,pressure.high" { t.Fatalf("emits %v", m.Emits) } - for _, banned := range []string{"g14", "jochen", "/home/", "shanks", "/run/user/1000"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, banned := range []string{"jochen", "/home/", "/run/user/1000"} { if strings.Contains(string(raw), banned) { t.Errorf("the manifest says %q", banned) } diff --git a/modules/mesh-issues/cmd/mesh-issues/manifest_test.go b/modules/mesh-issues/cmd/mesh-issues/manifest_test.go index eab44eb0..61e501c1 100644 --- a/modules/mesh-issues/cmd/mesh-issues/manifest_test.go +++ b/modules/mesh-issues/cmd/mesh-issues/manifest_test.go @@ -185,7 +185,8 @@ func TestTheSettingsStartTheCounterAndRegisterTheOwners(t *testing.T) { } } } - for _, never := range []string{"/home/", "jochen", "shanks", "novox.be"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen"} { if strings.Contains(strings.ToLower(raw), never) { t.Errorf("module.json names %q", never) } diff --git a/modules/mesh-knowledge/cmd/mesh-knowledge/manifest_test.go b/modules/mesh-knowledge/cmd/mesh-knowledge/manifest_test.go index 3249a942..a6b90fe4 100644 --- a/modules/mesh-knowledge/cmd/mesh-knowledge/manifest_test.go +++ b/modules/mesh-knowledge/cmd/mesh-knowledge/manifest_test.go @@ -95,7 +95,8 @@ func TestItDeclaresAndHoldsTheKnowledgeBaseSeatOnceForTheMesh(t *testing.T) { m.Build.Artifacts[0].Env["MESH_KNOWLEDGE_STATUS"] == "" || !reflect.DeepEqual(m.Build.Artifacts[0].Loads, []string{Module}) { t.Fatalf("build %+v", m.Build) } - for _, never := range []string{"/home/", "jochen", "node-d", "node-c.be"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen"} { if strings.Contains(strings.ToLower(raw), never) { t.Errorf("module.json names %q", never) } diff --git a/modules/mesh-watcher/cmd/mesh-watcher/manifest_test.go b/modules/mesh-watcher/cmd/mesh-watcher/manifest_test.go index 37052121..37b0708d 100644 --- a/modules/mesh-watcher/cmd/mesh-watcher/manifest_test.go +++ b/modules/mesh-watcher/cmd/mesh-watcher/manifest_test.go @@ -60,7 +60,8 @@ func TestTheManifestSaysWhatTheCodeDoes(t *testing.T) { if !reflect.DeepEqual(served, listed) { t.Fatalf("serves %v, lists %v", served, listed) } - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox", "zurag", "api.telegram"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "zurag", "api.telegram"} { if strings.Contains(strings.ToLower(string(raw)), never) { t.Errorf("module.json names %q", never) } diff --git a/modules/messenger/cmd/messenger/manifest_test.go b/modules/messenger/cmd/messenger/manifest_test.go index 796eecfd..27a8a2cc 100644 --- a/modules/messenger/cmd/messenger/manifest_test.go +++ b/modules/messenger/cmd/messenger/manifest_test.go @@ -134,7 +134,8 @@ func TestTheToolsAgreeWithTheManifest(t *testing.T) { if !reflect.DeepEqual(verbs, m.Claims[0].Serves) { t.Fatalf("verbs %v, claim %v", verbs, m.Claims[0].Serves) } - for _, never := range []string{"/home/", "jochen", "node-b", "node-d", "node-c", "zurag", "telegram"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "zurag", "telegram"} { if strings.Contains(strings.ToLower(raw), never) { t.Errorf("module.json names %q", never) } diff --git a/modules/mounts/cmd/mounts/manifest_test.go b/modules/mounts/cmd/mounts/manifest_test.go index 257ec6ce..674516fc 100644 --- a/modules/mounts/cmd/mounts/manifest_test.go +++ b/modules/mounts/cmd/mounts/manifest_test.go @@ -110,7 +110,8 @@ func TestTheManifestNamesWhatTheBundleServesAndWhatItNeeds(t *testing.T) { } } // A machine's or a person's name, as a word: "novox/hq" names the record, not the machine. - if hit := regexp.MustCompile(`\b(g14|novox|ace|shanks|jochen|recalbox)\b|/home/|/storage`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + if hit := regexp.MustCompile(`\b(jochen|recalbox)\b|/home/|/storage`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { t.Errorf("the manifest says %q", hit) } if strings.Contains(raw, "/etc/fstab") { diff --git a/modules/nextcloud-client/cmd/nextcloud-client-tools/manifest_test.go b/modules/nextcloud-client/cmd/nextcloud-client-tools/manifest_test.go index 08b67b72..85bc0433 100644 --- a/modules/nextcloud-client/cmd/nextcloud-client-tools/manifest_test.go +++ b/modules/nextcloud-client/cmd/nextcloud-client-tools/manifest_test.go @@ -100,7 +100,8 @@ func TestTheToolsAgreeWithTheManifest(t *testing.T) { t.Errorf("the Go tools bundle: %v", b) } s := strings.ToLower(raw) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "http", "password", "token"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "http", "password", "token"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/nfs-server/cmd/nfs-server/manifest_test.go b/modules/nfs-server/cmd/nfs-server/manifest_test.go index d43d5776..cc37bbf4 100644 --- a/modules/nfs-server/cmd/nfs-server/manifest_test.go +++ b/modules/nfs-server/cmd/nfs-server/manifest_test.go @@ -98,7 +98,8 @@ func TestItListensOnTwoThousandFortyNineFromTheMeshOnlyAndProvidesTheShare(t *te // assignment's config value, required and with no default (ADR 0348 ยง4), and the range the mesh's. func TestTheDefinitionNamesNoFolderNoMachineAndGivesTheSharesNoDefault(t *testing.T) { m, raw := readManifest(t) - if hit := regexp.MustCompile(`\b(g14|novox|ace|shanks|jochen)\b|/home/|/storage|/srv/`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + if hit := regexp.MustCompile(`\bjochen\b|/home/|/storage|/srv/`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { t.Errorf("the manifest says %q", hit) } if s := m.Config["shares"]; s["required"] != true || s["default"] != nil || s["type"] != "string" { diff --git a/modules/nm-applet/cmd/nm-applet-tools/manifest_test.go b/modules/nm-applet/cmd/nm-applet-tools/manifest_test.go index 3d301f57..7a571222 100644 --- a/modules/nm-applet/cmd/nm-applet-tools/manifest_test.go +++ b/modules/nm-applet/cmd/nm-applet-tools/manifest_test.go @@ -77,7 +77,8 @@ func TestTheToolsAgreeWithTheManifest(t *testing.T) { t.Errorf("the Go tools bundle: %v", b) } s := strings.ToLower(raw) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "http", "password", "token"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "http", "password", "token"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/openrazer/cmd/openrazer-tools/manifest_test.go b/modules/openrazer/cmd/openrazer-tools/manifest_test.go index 97f68355..fada0361 100644 --- a/modules/openrazer/cmd/openrazer-tools/manifest_test.go +++ b/modules/openrazer/cmd/openrazer-tools/manifest_test.go @@ -77,7 +77,8 @@ func TestTheToolsAgreeWithTheManifest(t *testing.T) { t.Errorf("the Go tools bundle: %v", b) } s := strings.ToLower(raw) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "http", "password", "token"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "http", "password", "token"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/picom/cmd/picom-tools/manifest_helpers_test.go b/modules/picom/cmd/picom-tools/manifest_helpers_test.go index a652d238..4d8fa637 100644 --- a/modules/picom/cmd/picom-tools/manifest_helpers_test.go +++ b/modules/picom/cmd/picom-tools/manifest_helpers_test.go @@ -223,7 +223,8 @@ func checkNoSecretsOrInstallationNames(t *testing.T) { t.Fatal(err) } s := strings.ToLower(string(raw)) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "api_key", ".hal/", "greenclip daemon"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "api_key", ".hal/", "greenclip daemon"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/polychromatic/cmd/polychromatic-tools/manifest_test.go b/modules/polychromatic/cmd/polychromatic-tools/manifest_test.go index aef16b5b..75443a13 100644 --- a/modules/polychromatic/cmd/polychromatic-tools/manifest_test.go +++ b/modules/polychromatic/cmd/polychromatic-tools/manifest_test.go @@ -80,7 +80,8 @@ func TestTheToolsAgreeWithTheManifest(t *testing.T) { t.Errorf("the Go tools bundle: %v", b) } s := strings.ToLower(raw) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "http", "password", "token"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "http", "password", "token"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/rofi/cmd/rofi-tools/manifest_helpers_test.go b/modules/rofi/cmd/rofi-tools/manifest_helpers_test.go index dff8ee96..e7e1266b 100644 --- a/modules/rofi/cmd/rofi-tools/manifest_helpers_test.go +++ b/modules/rofi/cmd/rofi-tools/manifest_helpers_test.go @@ -211,7 +211,8 @@ func checkNoSecretsOrInstallationNames(t *testing.T) { t.Fatal(err) } s := strings.ToLower(string(raw)) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "api_key", ".hal/", "greenclip daemon"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "api_key", ".hal/", "greenclip daemon"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/screen-lock/cmd/screen-lock-tools/manifest_helpers_test.go b/modules/screen-lock/cmd/screen-lock-tools/manifest_helpers_test.go index fb992951..c415043a 100644 --- a/modules/screen-lock/cmd/screen-lock-tools/manifest_helpers_test.go +++ b/modules/screen-lock/cmd/screen-lock-tools/manifest_helpers_test.go @@ -257,7 +257,8 @@ func checkNoSecretsOrInstallationNames(t *testing.T) { t.Fatal(err) } s := strings.ToLower(string(raw)) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "api_key", ".hal/", "greenclip daemon"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "api_key", ".hal/", "greenclip daemon"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/sensors/cmd/sensors/manifest_test.go b/modules/sensors/cmd/sensors/manifest_test.go index 79e56eda..2ced624b 100644 --- a/modules/sensors/cmd/sensors/manifest_test.go +++ b/modules/sensors/cmd/sensors/manifest_test.go @@ -46,7 +46,8 @@ func TestTheManifestNamesExactlyTheToolsTheBundleServesAllReadOnlyAndNoMachine(t t.Errorf("the module holds no seat (ADR 0256 rule 3), and claims %v", m.Claims) } // A machine's or a person's name, as a word: "novox/hq" names the record, not the machine. - if hit := regexp.MustCompile(`\b(g14|novox|ace|shanks|jochen)\b|/home/`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + if hit := regexp.MustCompile(`\bjochen\b|/home/`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { t.Errorf("the manifest says %q", hit) } } diff --git a/modules/slack/cmd/slack-tools/manifest_test.go b/modules/slack/cmd/slack-tools/manifest_test.go index 01c43d74..b170a533 100644 --- a/modules/slack/cmd/slack-tools/manifest_test.go +++ b/modules/slack/cmd/slack-tools/manifest_test.go @@ -147,7 +147,8 @@ func TestTheToolsAgreeWithTheManifest(t *testing.T) { t.Errorf("the Go tools bundle: %v", b) } s := strings.ToLower(raw) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "http", "password", "token"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "http", "password", "token"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/telegram/cmd/telegram/manifest_test.go b/modules/telegram/cmd/telegram/manifest_test.go index 4baba908..f74d841f 100644 --- a/modules/telegram/cmd/telegram/manifest_test.go +++ b/modules/telegram/cmd/telegram/manifest_test.go @@ -61,7 +61,8 @@ func TestItRunsAsItsOwnAccountWhichAloneHoldsTheToken(t *testing.T) { if !account || !state { t.Errorf("the account %v, its state %v", account, state) } - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox", "api.telegram"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "api.telegram"} { if strings.Contains(strings.ToLower(string(raw)), never) { t.Errorf("module.json names %q", never) } diff --git a/modules/xdg/cmd/xdg-tools/manifest_test.go b/modules/xdg/cmd/xdg-tools/manifest_test.go index b6bc0828..e86d7c7d 100644 --- a/modules/xdg/cmd/xdg-tools/manifest_test.go +++ b/modules/xdg/cmd/xdg-tools/manifest_test.go @@ -189,7 +189,8 @@ func TestTheToolsAgreeWithTheManifest(t *testing.T) { t.Errorf("the Go tools bundle: %v", bundle) } s := strings.ToLower(raw) - for _, never := range []string{"/home/", "jochen", "g14", "shanks", "novox.be", "zurag", ".hal/", "api_key"} { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + for _, never := range []string{"/home/", "jochen", "zurag", ".hal/", "api_key"} { if strings.Contains(s, never) { t.Errorf("module.json names %q", never) } diff --git a/modules/zfs/cmd/zfs-tools/manifest_test.go b/modules/zfs/cmd/zfs-tools/manifest_test.go index ca82669c..932d137c 100644 --- a/modules/zfs/cmd/zfs-tools/manifest_test.go +++ b/modules/zfs/cmd/zfs-tools/manifest_test.go @@ -71,7 +71,8 @@ func TestTheManifestNamesTheToolsTheBundleServesAndWhatEachReplaces(t *testing.T if strings.Join(m.Emits, ",") != SnapshotEvent+","+ScrubEvent { t.Errorf("emits %v", m.Emits) } - if hit := regexp.MustCompile(`\b(g14|novox|ace|shanks|jochen)\b|/home/`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { + // 1838/AC1: the catalogue-wide check covers a node's name now; this list keeps what it does not. + if hit := regexp.MustCompile(`\bjochen\b|/home/`).FindString(strings.ReplaceAll(raw, "novox/hq", "")); hit != "" { t.Errorf("the manifest says %q", hit) } }