From 24fad2b92a08e81f5c611194967c418b87679e37 Mon Sep 17 00:00:00 2001 From: jochen Date: Wed, 28 Oct 2026 20:34:27 +0100 Subject: [PATCH] mesh-vault: pin mesh-sdk 4e6e5cc, the L3 group's head rebased on L2 (issue 774) --- .../assignments-readers | 0 checks/placement/go.mod | 9 ----- checks/placement/go.sum | 14 ------- checks/placement/realtree_test.go | 37 ------------------- modules/mesh-vault/go.mod | 2 +- modules/mesh-vault/go.sum | 4 +- 6 files changed, 3 insertions(+), 63 deletions(-) rename checks/{placement => noplacement}/assignments-readers (100%) delete mode 100644 checks/placement/go.mod delete mode 100644 checks/placement/go.sum delete mode 100644 checks/placement/realtree_test.go diff --git a/checks/placement/assignments-readers b/checks/noplacement/assignments-readers similarity index 100% rename from checks/placement/assignments-readers rename to checks/noplacement/assignments-readers diff --git a/checks/placement/go.mod b/checks/placement/go.mod deleted file mode 100644 index d1731962..00000000 --- a/checks/placement/go.mod +++ /dev/null @@ -1,9 +0,0 @@ -module checks/placement - -go 1.26.0 - -require git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261027014310-cadd7b1b2f8f - -require git.novox.be/novox/mesh-catalog/checks/trunk v0.0.0 - -replace git.novox.be/novox/mesh-catalog/checks/trunk => ../trunk diff --git a/checks/placement/go.sum b/checks/placement/go.sum deleted file mode 100644 index fde2a9d0..00000000 --- a/checks/placement/go.sum +++ /dev/null @@ -1,14 +0,0 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261027014310-cadd7b1b2f8f h1:mimAGERguQmCGYVNdRTrFcZ1dhpU6GWo+Q3EDhHOrVk= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261027014310-cadd7b1b2f8f/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= -github.com/klauspost/compress v1.20.0 h1:a3C1ke2ohxFymNlb2HWAHjDeKCI90scRskErZkR0ezA= -github.com/klauspost/compress v1.20.0/go.mod h1:LUdAzn7YLVvxLpc7y3V1m40wESHTgc1422pwwBSKYuI= -github.com/nats-io/nats.go v1.54.0 h1:vsXoOxjHp/GmPUN+EcI7uOf/uB+iAP+kEsAFNQN0yzA= -github.com/nats-io/nats.go v1.54.0/go.mod h1:y+DZoD1oBOYfZTU681eTUiUjI0vbqYGixNVFHcjHJ0k= -github.com/nats-io/nkeys v0.4.16 h1:rd5oAuLOb8mnAycB0xleuEBNS1pVVnN0fv/FF34Eypg= -github.com/nats-io/nkeys v0.4.16/go.mod h1:llLgWoI0o4z/Q57q2R1kHfmocyhGV6VG/U18Glg1Afs= -github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= -golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= -golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= -golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= diff --git a/checks/placement/realtree_test.go b/checks/placement/realtree_test.go deleted file mode 100644 index 6a6adfd8..00000000 --- a/checks/placement/realtree_test.go +++ /dev/null @@ -1,37 +0,0 @@ -package main - -import ( - "os" - "strings" - "testing" - - "git.novox.be/novox/mesh-catalog/checks/trunk" -) - -// Issue 774 (ADR 0549 §3, §6; the comparison of novox/hq ADR 0529 clause 2): the list of modules still reading the -// controller's assignments gains none the trunk's copy at the merge base does not hold. Its first copy gains nothing. -func TestTheAssignmentsReadersListGainsNoModuleTheTrunksDoesNot(t *testing.T) { - path, ok := trunk.Copy(t, Allowed) - if !ok { - return - } - names := func(path string) map[string]bool { - raw, err := os.ReadFile(path) - if err != nil { - t.Fatal(err) - } - out := map[string]bool{} - for _, line := range strings.Split(string(raw), "\n") { - if f := strings.Fields(line); len(f) > 0 && !strings.HasPrefix(f[0], "#") { - out[f[0]] = true - } - } - return out - } - base := names(path) - for module := range names("../../" + Allowed) { - if !base[module] { - t.Errorf("%s gains %s, which the trunk's copy does not hold: the list only shrinks", Allowed, module) - } - } -} diff --git a/modules/mesh-vault/go.mod b/modules/mesh-vault/go.mod index 34a8552a..220b4745 100644 --- a/modules/mesh-vault/go.mod +++ b/modules/mesh-vault/go.mod @@ -3,7 +3,7 @@ module mesh-vault go 1.26.0 require ( - git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261028174713-38dbe1d3a388 + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261028192127-4e6e5cc366e7 github.com/nats-io/nats-server/v2 v2.11.17 github.com/nats-io/nats.go v1.54.0 golang.org/x/crypto v0.57.0 diff --git a/modules/mesh-vault/go.sum b/modules/mesh-vault/go.sum index 6245202d..991df40e 100644 --- a/modules/mesh-vault/go.sum +++ b/modules/mesh-vault/go.sum @@ -1,5 +1,5 @@ -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261028174713-38dbe1d3a388 h1:ycu/sNieTdLpD3bzhZOCXdzcoqXUOxPRmqWV019REpo= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261028174713-38dbe1d3a388/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261028192127-4e6e5cc366e7 h1:P1wm46rHQh2m/8oRI4lreF2hsgvmwfUDK4CJ3h1Sc2c= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261028192127-4e6e5cc366e7/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=