From e42d72a80a62aec8415dfbb419368dcb0336b387 Mon Sep 17 00:00:00 2001 From: mesh-tools Date: Thu, 15 Oct 2026 23:36:30 +0000 Subject: [PATCH] Compose the forge in its manifest tests with the operator's account, as the mesh does (issue 869) The gitea manifest names its patch spool's owner ${machine:account} since mesh-catalog d4b8b247 (issue 852); these tests gave the machine no account, so main failed its own merge check. Co-Authored-By: Claude --- internal/catalogue/foundation_manifests_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/catalogue/foundation_manifests_test.go b/internal/catalogue/foundation_manifests_test.go index b7533df0..8a05f088 100644 --- a/internal/catalogue/foundation_manifests_test.go +++ b/internal/catalogue/foundation_manifests_test.go @@ -190,7 +190,7 @@ func TestTheForgesOwnAddressFollowsThePortTheNodeGaveIt(t *testing.T) { if err != nil { t.Fatalf("the forge's manifest does not resolve against its own build: %v", err) } - r := Resolution{Node: "anchor", Modules: []Manifest{forge, theRuntime(t)}, Needs: []Needed{ + r := Resolution{Node: "anchor", Account: "op", Modules: []Manifest{forge, theRuntime(t)}, Needs: []Needed{ {Name: "postgres-database", For: "gitea", From: "anchor", At: "127.0.0.1", Serves: map[string]any{"port": float64(5432)}, Sealed: "sealed-db"}, {Name: "route", For: "gitea", From: "anchor"}, @@ -243,7 +243,7 @@ func declaredGiteaSsh(t *testing.T, given map[int]int) map[string]any { if err != nil { t.Fatalf("the forge's manifest does not resolve against its own build: %v", err) } - r := Resolution{Node: "anchor", Modules: []Manifest{resolved, theRuntime(t)}, Needs: []Needed{ + r := Resolution{Node: "anchor", Account: "op", Modules: []Manifest{resolved, theRuntime(t)}, Needs: []Needed{ {Name: "postgres-database", For: "gitea", From: "anchor", At: "127.0.0.1", Serves: map[string]any{"port": float64(5432)}, Sealed: "sealed-db"}, {Name: "route", For: "gitea", From: "anchor"}, -- 2.54.0