diff --git a/cmd/mesh-controller/forge_wait_test.go b/cmd/mesh-controller/forge_wait_test.go index 8216e91c..8a580cf0 100644 --- a/cmd/mesh-controller/forge_wait_test.go +++ b/cmd/mesh-controller/forge_wait_test.go @@ -68,7 +68,7 @@ func TestTheForgeNotAnsweringInTimeIsNotAskedAgain(t *testing.T) { // An ask that hangs past the bound is cut off at the bound, not at its own wait, and the failure still says it // waited: the receive loop is held no longer than the bound (novox/hq issue 486). func TestAnAskHangingPastTheBoundIsCutOffAtIt(t *testing.T) { - w := waitOut{bound: 200 * time.Millisecond, first: 10 * time.Millisecond, most: 50 * time.Millisecond, + w := waitOut{bound: 100 * time.Millisecond, first: 10 * time.Millisecond, most: 50 * time.Millisecond, now: time.Now, sleep: sleepOrDone} asked := 0 began := time.Now() diff --git a/cmd/mesh-controller/plan_moved_every_writer_test.go b/cmd/mesh-controller/plan_moved_every_writer_test.go index be7f712b..1b68d3da 100644 --- a/cmd/mesh-controller/plan_moved_every_writer_test.go +++ b/cmd/mesh-controller/plan_moved_every_writer_test.go @@ -31,7 +31,8 @@ func TestNoPlanIsWrittenButThroughSavePlansMoving(t *testing.T) { return err } text := string(raw) - if write.MatchString(text) { + // The regular expression is the costly part of reading every source: only a file that names the table can match. + if strings.Contains(strings.ToLower(text), "release_plan") && write.MatchString(text) { found = append(found, path+" writes the plan table") } // A plan record is written by the bucket's raw create and update, which only the plans' own file calls. diff --git a/cmd/mesh-controller/sayable_test.go b/cmd/mesh-controller/sayable_test.go index 1d51afa6..60481280 100644 --- a/cmd/mesh-controller/sayable_test.go +++ b/cmd/mesh-controller/sayable_test.go @@ -152,7 +152,7 @@ func answersRightly(q dnsmessage.Question) *dnsmessage.Message { func quickResolvers(t *testing.T, port string) { t.Helper() before, within, pause := resolverPort, resolverWithin, resolverPause - resolverPort, resolverWithin, resolverPause = port, 150*time.Millisecond, 10*time.Millisecond + resolverPort, resolverWithin, resolverPause = port, 60*time.Millisecond, 5*time.Millisecond t.Cleanup(func() { resolverPort, resolverWithin, resolverPause = before, within, pause }) } diff --git a/go.mod b/go.mod index dcb6ff56..8ff82d6e 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.20261021153908-725590e06e75 + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261021173436-07a65927c362 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 f06c6de7..61194a3d 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +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.20261021153908-725590e06e75 h1:AcYfyJpYaUufhI93VG76+b001msXY4XX7kuRjnf33HY= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261021153908-725590e06e75/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261021173436-07a65927c362 h1:Ud/YHmhlm0qdB45LyDvxq7l4x6Bg2Ye0siHK5JFE+kk= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261021173436-07a65927c362/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/testdata/beside/CAPTURED b/testdata/beside/CAPTURED index 7f81fd0d..515d20d5 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 725590e06e75c67b96ce58d015b3056c2d261249 conformance/events/module-event.json +mesh-sdk 07a65927c3620390e191cb6ccc97d3770f284526 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/catalogue/setting_into.go b/vendor/git.novox.be/novox/mesh-sdk/go/catalogue/setting_into.go index 73bd2b08..e16e28d4 100644 --- a/vendor/git.novox.be/novox/mesh-sdk/go/catalogue/setting_into.go +++ b/vendor/git.novox.be/novox/mesh-sdk/go/catalogue/setting_into.go @@ -327,7 +327,7 @@ func settingKeysUsedBy(m Manifest) map[string]bool { return used } -// settingKeysAskedOutsideOwners is every key a module's files, units, contributions and served facts +// settingKeysAskedOutsideOwners is every key a module's files, units, items, contributions and served facts // ask for: what a directory's owner may follow (OwnerSettingProblems). func settingKeysAskedOutsideOwners(m Manifest) map[string]bool { used := map[string]bool{} @@ -354,6 +354,10 @@ func settingKeysAskedOutsideOwners(m Manifest) map[string]bool { } } } + // An item's text, filled from its template (WithTemplatesFrom), places a key as a file's does (issue 1658). + for _, it := range m.Items { + note(it.Content) + } inValues := func(values map[string]any) { for _, v := range values { if s, ok := v.(string); ok { diff --git a/vendor/modules.txt b/vendor/modules.txt index 49cf5d54..7973b78c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261021153908-725590e06e75 +# git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261021173436-07a65927c362 ## explicit; go 1.26.0 git.novox.be/novox/mesh-sdk/go/asks git.novox.be/novox/mesh-sdk/go/catalogue