From 1d0467d4c3f5bae268b19888280c1baf90aea943 Mon Sep 17 00:00:00 2001 From: jochen Date: Wed, 28 Oct 2026 18:34:19 +0100 Subject: [PATCH] =?UTF-8?q?Forge=20bridge:=20hold=20that=20a=20catalogue?= =?UTF-8?q?=20merge=20carries=20no=20placement=20against=20the=20retired?= =?UTF-8?q?=20field,=20as=20mesh-sdk=20now=20names=20it=20(ADR=200567=20?= =?UTF-8?q?=C2=A711,=20issue=201126)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mesh-delivery-forge-bridge/go.mod | 2 ++ modules/mesh-delivery-forge-bridge/go.sum | 2 -- .../mesh-delivery-forge-bridge/internal/bridge/files_test.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/mesh-delivery-forge-bridge/go.mod b/modules/mesh-delivery-forge-bridge/go.mod index b1bc526..77d6d7d 100644 --- a/modules/mesh-delivery-forge-bridge/go.mod +++ b/modules/mesh-delivery-forge-bridge/go.mod @@ -20,3 +20,5 @@ require ( golang.org/x/sys v0.48.0 // indirect golang.org/x/time v0.15.0 // indirect ) + +replace git.novox.be/novox/mesh-sdk/go => /home/jochen/projects/novox/mesh-sdk/go diff --git a/modules/mesh-delivery-forge-bridge/go.sum b/modules/mesh-delivery-forge-bridge/go.sum index fa4f833..98dc72c 100644 --- a/modules/mesh-delivery-forge-bridge/go.sum +++ b/modules/mesh-delivery-forge-bridge/go.sum @@ -1,5 +1,3 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261027193820-8ad9372b1952 h1:TmveT3Bija643RGWkilvkzP/h8UWlVvHFZZtQfJK5oU= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261027193820-8ad9372b1952/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= github.com/antithesishq/antithesis-sdk-go v0.7.0-default-no-op h1:Z/MZK75wC/NSrkgqeNIa7jexam9uWzhLmFTSCPI/kn0= github.com/antithesishq/antithesis-sdk-go v0.7.0-default-no-op/go.mod h1:FQyySiasQQM8735Ddel3MRojmy4dA1IqCeyJ5jmPMbI= github.com/google/go-tpm v0.9.8 h1:slArAR9Ft+1ybZu0lBwpSmpwhRXaa85hWtMinMyRAWo= diff --git a/modules/mesh-delivery-forge-bridge/internal/bridge/files_test.go b/modules/mesh-delivery-forge-bridge/internal/bridge/files_test.go index 4fbac74..3e5e681 100644 --- a/modules/mesh-delivery-forge-bridge/internal/bridge/files_test.go +++ b/modules/mesh-delivery-forge-bridge/internal/bridge/files_test.go @@ -89,8 +89,8 @@ func TestMergedCarriesManifestsAndLocks(t *testing.T) { // 1448/AC1 if f, err = delivery.DecodeForge(msg.Data); err != nil { t.Fatal(err) } - if f.Placements != nil || f.PlacementsRead { - t.Errorf("a merge of the catalogue carries placement: %v", f.Placements) + if len(f.RetiredPlacements) > 0 || f.RetiredRead || strings.Contains(string(msg.Data), `"placements`) { + t.Errorf("a merge of the catalogue carries placement: %s", msg.Data) } for _, c := range forge.calls { if strings.HasPrefix(c.path, "placement") {