diff --git a/modules/mesh-build-go/cmd/mesh-build-go/asks.go b/modules/mesh-build-go/cmd/mesh-build-go/asks.go index 312d0469..c8606d49 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/asks.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/asks.go @@ -121,5 +121,5 @@ const StepEndTool = "build_go_step_end" // stepScan is the module's steps state as buildstep reads it. func (m *Module) stepScan() buildstep.Scan { - return buildstep.Scan{Keys: m.ReadSteps.Keys, Get: m.ReadSteps.Get} + return buildstep.ScanOf(stdio.State(delivery.StepsState)) } diff --git a/modules/mesh-build-go/cmd/mesh-build-go/main.go b/modules/mesh-build-go/cmd/mesh-build-go/main.go index 0e230ccc..0fe82227 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/main.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/main.go @@ -77,7 +77,7 @@ func main() { m.Held = puller if m.Node != "" { // A step a previous process left running is ended (issue 1890); this process's own steps start after booted. - go buildstep.EndStaleAtStart(ctx, m.stepScan(), m.Steps, m.Node, booted, logf) + go buildstep.EndStaleAtStart(ctx, m.stepScan(), m.Node, booted, logf) } if m.Node != "" { // The seat's asks, pulled once Serve has the runtime's channel; a pull before it is said and tried again. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/tools.go b/modules/mesh-build-go/cmd/mesh-build-go/tools.go index 080c50a1..5589cc4a 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/tools.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/tools.go @@ -41,7 +41,7 @@ func (m *Module) Tools(steps []StepTool) []stdio.Tool { tools = append(tools, t) } tools = append(tools, m.ReadTools()...) - tools = append(tools, buildstep.StepEndTool(StepEndTool, m.Node, m.stepScan(), m.Steps, m.Held)) + tools = append(tools, buildstep.StepEndTool(StepEndTool, m.Node, m.stepScan(), m.Held)) tools = append(tools, m.releaseTool()) return append(tools, stdio.Tool{Name: StatusTool, diff --git a/modules/mesh-build-go/go.mod b/modules/mesh-build-go/go.mod index 294e4513..1831697c 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.20261026122558-18e0a01c5488 + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026124305-e66c6fea6204 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 0a635faa..d99f0495 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.20261026122558-18e0a01c5488 h1:KaDsLSzBbkimJwi7oPLfxihvNMOQpW8VjZFMg+/qs2E= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026122558-18e0a01c5488/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026124305-e66c6fea6204 h1:4d1l+pPE+FQF8jNEjTrRdzw+4GDgNm6Yhf++SMDVtBs= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026124305-e66c6fea6204/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/cmd/mesh-build-image/asks.go b/modules/mesh-build-image/cmd/mesh-build-image/asks.go index b70ad067..45e03207 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/asks.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/asks.go @@ -72,5 +72,5 @@ const StepEndTool = "build_image_step_end" // stepScan is the module's steps state as buildstep reads it. func (m *Module) stepScan() buildstep.Scan { - return buildstep.Scan{Keys: m.ReadSteps.Keys, Get: m.ReadSteps.Get} + return buildstep.ScanOf(stdio.State(delivery.StepsState)) } diff --git a/modules/mesh-build-image/cmd/mesh-build-image/main.go b/modules/mesh-build-image/cmd/mesh-build-image/main.go index fb019d18..525143a4 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/main.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/main.go @@ -64,7 +64,7 @@ func main() { m.Held = puller if m.Node != "" { // A step a previous process left running is ended (issue 1890); this process's own steps start after booted. - go buildstep.EndStaleAtStart(ctx, m.stepScan(), m.Steps, m.Node, booted, logf) + go buildstep.EndStaleAtStart(ctx, m.stepScan(), m.Node, booted, logf) } if m.Node != "" { // The seat's asks, pulled once Serve has the runtime's channel; a pull before it is said and tried again. diff --git a/modules/mesh-build-image/cmd/mesh-build-image/tools.go b/modules/mesh-build-image/cmd/mesh-build-image/tools.go index 11bd4ff4..8455637c 100644 --- a/modules/mesh-build-image/cmd/mesh-build-image/tools.go +++ b/modules/mesh-build-image/cmd/mesh-build-image/tools.go @@ -45,7 +45,7 @@ func (m *Module) Tools(steps []StepTool) []stdio.Tool { tools = append(tools, t) } tools = append(tools, m.ReadTools()...) - tools = append(tools, buildstep.StepEndTool(StepEndTool, m.Node, m.stepScan(), m.Steps, m.Held)) + tools = append(tools, buildstep.StepEndTool(StepEndTool, m.Node, m.stepScan(), m.Held)) tools = append(tools, m.releaseTool()) return append(tools, stdio.Tool{Name: StatusTool, diff --git a/modules/mesh-build-image/go.mod b/modules/mesh-build-image/go.mod index 4c7d243b..2734f1d8 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.20261026122558-18e0a01c5488 + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026124305-e66c6fea6204 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 472aa48d..06ab5ad8 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.20261026122558-18e0a01c5488 h1:KaDsLSzBbkimJwi7oPLfxihvNMOQpW8VjZFMg+/qs2E= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026122558-18e0a01c5488/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026124305-e66c6fea6204 h1:4d1l+pPE+FQF8jNEjTrRdzw+4GDgNm6Yhf++SMDVtBs= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026124305-e66c6fea6204/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/cmd/mesh-build-node/asks.go b/modules/mesh-build-node/cmd/mesh-build-node/asks.go index b4417d07..0e1b845d 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/asks.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/asks.go @@ -80,5 +80,5 @@ const StepEndTool = "build_node_step_end" // stepScan is the module's steps state as buildstep reads it. func (m *Module) stepScan() buildstep.Scan { - return buildstep.Scan{Keys: m.ReadSteps.Keys, Get: m.ReadSteps.Get} + return buildstep.ScanOf(stdio.State(delivery.StepsState)) } diff --git a/modules/mesh-build-node/cmd/mesh-build-node/main.go b/modules/mesh-build-node/cmd/mesh-build-node/main.go index c1a4879d..aac0d513 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/main.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/main.go @@ -76,7 +76,7 @@ func main() { m.Held = puller if m.Node != "" { // A step a previous process left running is ended (issue 1890); this process's own steps start after booted. - go buildstep.EndStaleAtStart(ctx, m.stepScan(), m.Steps, m.Node, booted, logf) + go buildstep.EndStaleAtStart(ctx, m.stepScan(), m.Node, booted, logf) } if m.Node != "" { // The seat's asks, pulled once Serve has the runtime's channel; a pull before it is said and tried again. diff --git a/modules/mesh-build-node/cmd/mesh-build-node/tools.go b/modules/mesh-build-node/cmd/mesh-build-node/tools.go index 763c6cec..64edbdcd 100644 --- a/modules/mesh-build-node/cmd/mesh-build-node/tools.go +++ b/modules/mesh-build-node/cmd/mesh-build-node/tools.go @@ -41,7 +41,7 @@ func (m *Module) Tools(steps []StepTool) []stdio.Tool { tools = append(tools, t) } tools = append(tools, m.ReadTools()...) - tools = append(tools, buildstep.StepEndTool(StepEndTool, m.Node, m.stepScan(), m.Steps, m.Held)) + tools = append(tools, buildstep.StepEndTool(StepEndTool, m.Node, m.stepScan(), m.Held)) tools = append(tools, m.releaseTool()) return append(tools, stdio.Tool{Name: StatusTool, diff --git a/modules/mesh-build-node/go.mod b/modules/mesh-build-node/go.mod index 3042ad78..c5cfba46 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.20261026122558-18e0a01c5488 + git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026124305-e66c6fea6204 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 3473deb1..8501986c 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.20261026122558-18e0a01c5488 h1:KaDsLSzBbkimJwi7oPLfxihvNMOQpW8VjZFMg+/qs2E= -git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026122558-18e0a01c5488/go.mod h1:ouERNpZizzwZ0HLEtAypsY9FR20FyUgUYRni6J7kVCY= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026124305-e66c6fea6204 h1:4d1l+pPE+FQF8jNEjTrRdzw+4GDgNm6Yhf++SMDVtBs= +git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261026124305-e66c6fea6204/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=