From 58512a9c6d482c3d169bd1a229cd08be4891ec43 Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 22 Oct 2026 21:19:46 +0200 Subject: [PATCH] Pin mesh-sdk at the R4e member's final head 104533e8 and vendor it (R4e E) The SDK's S1 and S2 review fixes landed after 875c680d. --- go.mod | 2 +- go.sum | 10 ++-------- modules/route-proxy/go.mod | 2 +- modules/route-proxy/go.sum | 4 ++-- modules/route-proxy/vendor/modules.txt | 2 +- testdata/beside/CAPTURED | 2 +- .../git.novox.be/novox/mesh-sdk/go/buildstep/narrow.go | 6 ++++-- .../git.novox.be/novox/mesh-sdk/go/buildstep/trees.go | 4 ++-- vendor/modules.txt | 2 +- 9 files changed, 15 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 6fbf57ab..bc54493b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/novox/mesh-controller go 1.26.0 require ( - git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022183749-875c680d9876 + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022190740-104533e8c0c9 github.com/jackc/pgx/v5 v5.10.0 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 diff --git a/go.sum b/go.sum index 60fa576d..bea58f3a 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,7 @@ git.novox.be/novox/mesh-host v0.0.0-20261018171808-9d9e3a46c4f5 h1:E5stfIeCN6uYgA9TCv+4K8JgaURg3zQppvUgJLaDMP4= git.novox.be/novox/mesh-host v0.0.0-20261018171808-9d9e3a46c4f5/go.mod h1:4wyoCr6IIIIarEUuROThWDj7DAvJvIidqMjWcpSnOwE= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022075101-c61212eba77c h1:YdSbkI42rlVmClybH8BS717ut0vouKIMavO691fpdps= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022075101-c61212eba77c/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022152521-dfc2c858d94b h1:cfJ2LK/etUiV1eL58pnaEjmSi34+EVmO4ud9J7pXKOs= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022152521-dfc2c858d94b/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022161855-e76a5a31a07b h1:OjlhfiGr+wKLWxafV+BRjZx3TbBtwRYcm9mgoam/jv8= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022161855-e76a5a31a07b/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022183749-875c680d9876 h1:dtiIJzrX7ey1wmsdzapiFgCKDllCph7/vxfUp1ib/t8= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022183749-875c680d9876/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022190740-104533e8c0c9 h1:Ufmd2cYEXICQ817IGflccP9bexABE4WhIO49HPbaoSo= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022190740-104533e8c0c9/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/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/modules/route-proxy/go.mod b/modules/route-proxy/go.mod index a1f29bc9..f33ea3f1 100644 --- a/modules/route-proxy/go.mod +++ b/modules/route-proxy/go.mod @@ -3,7 +3,7 @@ module route-proxy go 1.26.0 require ( - git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022183749-875c680d9876 + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022190740-104533e8c0c9 github.com/nats-io/nats.go v1.54.0 golang.org/x/crypto v0.57.0 ) diff --git a/modules/route-proxy/go.sum b/modules/route-proxy/go.sum index b72ac074..47599506 100644 --- a/modules/route-proxy/go.sum +++ b/modules/route-proxy/go.sum @@ -1,5 +1,5 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022183749-875c680d9876 h1:dtiIJzrX7ey1wmsdzapiFgCKDllCph7/vxfUp1ib/t8= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022183749-875c680d9876/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022190740-104533e8c0c9 h1:Ufmd2cYEXICQ817IGflccP9bexABE4WhIO49HPbaoSo= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022190740-104533e8c0c9/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/route-proxy/vendor/modules.txt b/modules/route-proxy/vendor/modules.txt index c65612ed..8fff12d3 100644 --- a/modules/route-proxy/vendor/modules.txt +++ b/modules/route-proxy/vendor/modules.txt @@ -1,4 +1,4 @@ -# git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022183749-875c680d9876 +# git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022190740-104533e8c0c9 ## explicit; go 1.26.0 git.novox.be/novox/mesh-sdk/go git.novox.be/novox/mesh-sdk/go/announce diff --git a/testdata/beside/CAPTURED b/testdata/beside/CAPTURED index e9c65105..84ac613c 100644 --- a/testdata/beside/CAPTURED +++ b/testdata/beside/CAPTURED @@ -9,7 +9,7 @@ a second place to clean besides the catalogue itself. mesh-catalog e0bc919d4945bb5f13f971f74643a0b714cf45da modules/*/module.json, modules/nats/Dockerfile mesh-host 9d9e3a46c4f5943cfffb413d962ce48b75e2fd39 examples/foundation-first-node.lock -mesh-sdk 875c680d9876863a3817bbf253d5fe4e54d62c2e conformance/events/module-event.json +mesh-sdk 104533e8c0c9116fd1cbb02c474bafbbe229ce22 conformance/events/module-event.json To move them, from this repository's root, with the two repositories checked out beside it: diff --git a/vendor/git.novox.be/novox/mesh-sdk/go/buildstep/narrow.go b/vendor/git.novox.be/novox/mesh-sdk/go/buildstep/narrow.go index 9bc6e00f..e27050f1 100644 --- a/vendor/git.novox.be/novox/mesh-sdk/go/buildstep/narrow.go +++ b/vendor/git.novox.be/novox/mesh-sdk/go/buildstep/narrow.go @@ -9,8 +9,10 @@ import ( ) // narrowKept are the files of a module's directory a narrowed build keeps beside its named paths: its manifest and -// its lock files. -var narrowKept = []string{"module.json", "package.json", "package-lock.json", "go.mod", "go.sum"} +// its lock files, each an input of the module's key (ModuleTree's Manifest and Locks). package.json and go.mod are +// not kept: neither is in the named tree, so a build that needs one names it among its artifact's paths, which puts +// it in the key (novox/hq ADR 0499 clause 4). +var narrowKept = append([]string{"module.json"}, lockFiles...) // Narrow leaves in the fetched tree only what a build of an artifact that names its paths may see (novox/hq ADR 0499 // clause 4): r.Dir's named paths, its manifest and lock files, and .git; everything else is removed, so a file outside diff --git a/vendor/git.novox.be/novox/mesh-sdk/go/buildstep/trees.go b/vendor/git.novox.be/novox/mesh-sdk/go/buildstep/trees.go index fc31c62d..27d35ed5 100644 --- a/vendor/git.novox.be/novox/mesh-sdk/go/buildstep/trees.go +++ b/vendor/git.novox.be/novox/mesh-sdk/go/buildstep/trees.go @@ -76,10 +76,10 @@ func ModuleTrees(ctx context.Context, run forgekey.Runner, env []string, dir, co // narrow sets mt's Paths and its named Tree when the module's manifest names paths on every artifact (novox/hq ADR 0499 // clause 2): one `git ls-tree -z` gives each named path's object at commit. The merge preview reads the manifest here, as -// the indexer does, and no other build step reads paths from one (ADR 0495 clause 1). A manifest that does not parse +// the indexer does, with catalogue.ParseManifestForInputs (issue 1751), and no other build step reads paths from one (ADR 0495 clause 1). A manifest that does not parse // is not narrowed: the indexer gives it none. A named path absent at commit fails, naming the module and the path. func narrow(ctx context.Context, run forgekey.Runner, env []string, dir, commit, mdir string, raw []byte, mt *ModuleTree) error { - m, err := catalogue.ParseManifest(raw) + m, err := catalogue.ParseManifestForInputs(raw) if err != nil { return nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index ca0e1ff9..585419a2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022183749-875c680d9876 +# git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261022190740-104533e8c0c9 ## explicit; go 1.26.0 git.novox.be/novox/mesh-sdk/go git.novox.be/novox/mesh-sdk/go/announce