From 9ccb6f40609974041a7904dce80ccfd20d7ba31d Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 29 Oct 2026 22:00:20 +0100 Subject: [PATCH] Re-pin the release sdk; the nats tools' credential gets a directory of its own the tools can reach (issue 1952) --- checks/health/go.mod | 2 +- checks/health/go.sum | 4 ++-- modules/mesh-build-go/go.mod | 2 +- modules/mesh-build-go/go.sum | 4 ++-- modules/mesh-build-image/go.mod | 2 +- modules/mesh-build-image/go.sum | 4 ++-- modules/mesh-build-node/go.mod | 2 +- modules/mesh-build-node/go.sum | 4 ++-- modules/mesh-watcher/go.mod | 2 +- modules/mesh-watcher/go.sum | 4 ++-- modules/messenger/go.mod | 2 +- modules/messenger/go.sum | 4 ++-- modules/nats/cmd/nats-tools/manifest_test.go | 2 +- modules/nats/go.mod | 2 +- modules/nats/go.sum | 4 ++-- modules/nats/module.json | 11 +++++++++-- 16 files changed, 31 insertions(+), 24 deletions(-) diff --git a/checks/health/go.mod b/checks/health/go.mod index 50f03879..f4fb4878 100644 --- a/checks/health/go.mod +++ b/checks/health/go.mod @@ -2,4 +2,4 @@ module checks/health go 1.26.0 -require git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec +require git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 diff --git a/checks/health/go.sum b/checks/health/go.sum index 098263b6..5f8c813d 100644 --- a/checks/health/go.sum +++ b/checks/health/go.sum @@ -1,2 +1,2 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec h1:OLXHSQkAHnf03hzJTxRrUsl7vMfMhOx43M5yJpi5L5Y= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 h1:qUPJWiwnvLh6aoy0IZjHbN4GnJH297CkYqLef0V5O7c= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= diff --git a/modules/mesh-build-go/go.mod b/modules/mesh-build-go/go.mod index 66f9f5f3..133b9bd5 100644 --- a/modules/mesh-build-go/go.mod +++ b/modules/mesh-build-go/go.mod @@ -3,7 +3,7 @@ module meshbuildgo go 1.26.0 require ( - git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 github.com/distribution/distribution/v3 v3.1.2 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 diff --git a/modules/mesh-build-go/go.sum b/modules/mesh-build-go/go.sum index 4292656c..557e7fa6 100644 --- a/modules/mesh-build-go/go.sum +++ b/modules/mesh-build-go/go.sum @@ -1,5 +1,5 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec h1:OLXHSQkAHnf03hzJTxRrUsl7vMfMhOx43M5yJpi5L5Y= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 h1:qUPJWiwnvLh6aoy0IZjHbN4GnJH297CkYqLef0V5O7c= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= github.com/alicebob/miniredis/v2 v2.35.0 h1:QwLphYqCEAo1eu1TqPRN2jgVMPBweeQcR21jeqDCONI= github.com/alicebob/miniredis/v2 v2.35.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM= github.com/antithesishq/antithesis-sdk-go v0.7.0-default-no-op h1:Z/MZK75wC/NSrkgqeNIa7jexam9uWzhLmFTSCPI/kn0= diff --git a/modules/mesh-build-image/go.mod b/modules/mesh-build-image/go.mod index 1fe3d825..45ae6d7d 100644 --- a/modules/mesh-build-image/go.mod +++ b/modules/mesh-build-image/go.mod @@ -3,7 +3,7 @@ module meshbuildimage go 1.26.0 require ( - git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 ) diff --git a/modules/mesh-build-image/go.sum b/modules/mesh-build-image/go.sum index b0b32c99..dcb17a97 100644 --- a/modules/mesh-build-image/go.sum +++ b/modules/mesh-build-image/go.sum @@ -1,5 +1,5 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec h1:OLXHSQkAHnf03hzJTxRrUsl7vMfMhOx43M5yJpi5L5Y= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 h1:qUPJWiwnvLh6aoy0IZjHbN4GnJH297CkYqLef0V5O7c= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35/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-build-node/go.mod b/modules/mesh-build-node/go.mod index 87de4dc7..53ce8771 100644 --- a/modules/mesh-build-node/go.mod +++ b/modules/mesh-build-node/go.mod @@ -3,7 +3,7 @@ module meshbuildnode go 1.26.0 require ( - git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 github.com/distribution/distribution/v3 v3.1.2 github.com/nats-io/nats.go v1.54.0 ) diff --git a/modules/mesh-build-node/go.sum b/modules/mesh-build-node/go.sum index 72b4b211..fd97bc66 100644 --- a/modules/mesh-build-node/go.sum +++ b/modules/mesh-build-node/go.sum @@ -1,5 +1,5 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec h1:OLXHSQkAHnf03hzJTxRrUsl7vMfMhOx43M5yJpi5L5Y= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 h1:qUPJWiwnvLh6aoy0IZjHbN4GnJH297CkYqLef0V5O7c= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= github.com/alicebob/miniredis/v2 v2.35.0 h1:QwLphYqCEAo1eu1TqPRN2jgVMPBweeQcR21jeqDCONI= github.com/alicebob/miniredis/v2 v2.35.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM= github.com/antithesishq/antithesis-sdk-go v0.7.0-default-no-op h1:Z/MZK75wC/NSrkgqeNIa7jexam9uWzhLmFTSCPI/kn0= diff --git a/modules/mesh-watcher/go.mod b/modules/mesh-watcher/go.mod index 70f8b84a..1da5a8da 100644 --- a/modules/mesh-watcher/go.mod +++ b/modules/mesh-watcher/go.mod @@ -2,4 +2,4 @@ module mesh-watcher go 1.26.0 -require git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec +require git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 diff --git a/modules/mesh-watcher/go.sum b/modules/mesh-watcher/go.sum index 098263b6..5f8c813d 100644 --- a/modules/mesh-watcher/go.sum +++ b/modules/mesh-watcher/go.sum @@ -1,2 +1,2 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec h1:OLXHSQkAHnf03hzJTxRrUsl7vMfMhOx43M5yJpi5L5Y= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 h1:qUPJWiwnvLh6aoy0IZjHbN4GnJH297CkYqLef0V5O7c= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= diff --git a/modules/messenger/go.mod b/modules/messenger/go.mod index 4343bc7a..de38765e 100644 --- a/modules/messenger/go.mod +++ b/modules/messenger/go.mod @@ -3,7 +3,7 @@ module messenger go 1.26.0 require ( - git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 ) diff --git a/modules/messenger/go.sum b/modules/messenger/go.sum index b0b32c99..dcb17a97 100644 --- a/modules/messenger/go.sum +++ b/modules/messenger/go.sum @@ -1,5 +1,5 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec h1:OLXHSQkAHnf03hzJTxRrUsl7vMfMhOx43M5yJpi5L5Y= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 h1:qUPJWiwnvLh6aoy0IZjHbN4GnJH297CkYqLef0V5O7c= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35/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/nats/cmd/nats-tools/manifest_test.go b/modules/nats/cmd/nats-tools/manifest_test.go index 2ff0750d..2007b1ef 100644 --- a/modules/nats/cmd/nats-tools/manifest_test.go +++ b/modules/nats/cmd/nats-tools/manifest_test.go @@ -123,7 +123,7 @@ func TestTheBussManifestMountsItsProgramsIntoTheUpstreamImage(t *testing.T) { } } for _, a := range m.Build.Artifacts { - if a.Name == "tools" && a.Env["NATS_TOOLS_CREDENTIAL"] != "${dir:mesh-state}/broker-nats-tools" { + if a.Name == "tools" && a.Env["NATS_TOOLS_CREDENTIAL"] != "${dir:tools-secret}/broker-nats-tools" { t.Errorf("the tools' credential is %q: the process nats-tools' own secret broker-nats-tools, under a word of the bundle's own (the runtime strips MESH_BROKER_FILE)", a.Env["NATS_TOOLS_CREDENTIAL"]) } } diff --git a/modules/nats/go.mod b/modules/nats/go.mod index bf717c03..7cb752d3 100644 --- a/modules/nats/go.mod +++ b/modules/nats/go.mod @@ -3,7 +3,7 @@ module nats-tools go 1.26.0 require ( - git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 github.com/klauspost/compress v1.20.0 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 diff --git a/modules/nats/go.sum b/modules/nats/go.sum index b0b32c99..dcb17a97 100644 --- a/modules/nats/go.sum +++ b/modules/nats/go.sum @@ -1,5 +1,5 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec h1:OLXHSQkAHnf03hzJTxRrUsl7vMfMhOx43M5yJpi5L5Y= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205252-7000bd5049ec/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35 h1:qUPJWiwnvLh6aoy0IZjHbN4GnJH297CkYqLef0V5O7c= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261029205911-8e3d7a4c3c35/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/nats/module.json b/modules/nats/module.json index eeee7924..8f943e90 100644 --- a/modules/nats/module.json +++ b/modules/nats/module.json @@ -20,7 +20,7 @@ "bus-users": "/var/lib/nats-module/conf/accounts.conf", "own-secrets": { "broker": "${dir:mesh-state}/broker", - "broker-nats-tools": "${dir:mesh-state}/broker-nats-tools" + "broker-nats-tools": "${dir:tools-secret}/broker-nats-tools" }, "capabilities": [ "container-runtime" @@ -92,6 +92,13 @@ "mode": "0700", "unknown": "program" }, + { + "id": "tools-secret", + "type": "directory", + "mode": "0711", + "place": "mesh", + "unknown": "program" + }, { "id": "snapshots", "type": "directory", @@ -202,7 +209,7 @@ "MESH_NATS_CONTAINER": "mesh-broker-nats", "MESH_NATS_USERS_FILE": "/etc/nats/accounts.conf", "MESH_NATS_SNAPSHOTS_DIR": "${dir:snapshots}", - "NATS_TOOLS_CREDENTIAL": "${dir:mesh-state}/broker-nats-tools" + "NATS_TOOLS_CREDENTIAL": "${dir:tools-secret}/broker-nats-tools" } }, {