fix: compose deployment: use mutex to correctly collect service specs

This commit is contained in:
Pavel Sviderski
2025-04-22 22:48:06 +10:00
parent fcf164dda1
commit d6ff62159d
+5 -1
View File
@@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"slices" "slices"
"strings" "strings"
"sync"
"github.com/compose-spec/compose-go/v2/graph" "github.com/compose-spec/compose-go/v2/graph"
"github.com/compose-spec/compose-go/v2/types" "github.com/compose-spec/compose-go/v2/types"
@@ -60,14 +61,17 @@ func (d *Deployment) Plan(ctx context.Context) (deploy.SequenceOperation, error)
// Generate service specs for all services in the project. // Generate service specs for all services in the project.
var serviceSpecs []api.ServiceSpec var serviceSpecs []api.ServiceSpec
var mu sync.Mutex
err := graph.InDependencyOrder(ctx, d.Project, err := graph.InDependencyOrder(ctx, d.Project,
func(ctx context.Context, name string, _ types.ServiceConfig) error { func(ctx context.Context, name string, _ types.ServiceConfig) error {
spec, err := d.ServiceSpec(name) spec, err := d.ServiceSpec(name)
if err != nil { if err != nil {
return err return err
} }
// The graph is traversed concurrently, so we need to use a mutex to protect the shared slice.
mu.Lock()
serviceSpecs = append(serviceSpecs, spec) serviceSpecs = append(serviceSpecs, spec)
mu.Unlock()
return nil return nil
}) })
if err != nil { if err != nil {