From ddc4b044b62e9f715212ea4143fa830fac76382f Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Fri, 14 Aug 2026 18:32:39 +0200 Subject: [PATCH] chore: honest name for navigation-menu resolution, share setServiceScale MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit validateNavigationMenu validated nothing: it resolves the TTY / COMPOSE_MENU / --menu precedence and mutates opts.navigationMenu — rename to resolveNavigationMenu. runScale duplicated setServiceScale's GetService/SetScale/write-back dance inline; move the helper next to its natural home in scale.go and use it from both callers. Signed-off-by: Nicolas De Loof --- cmd/compose/scale.go | 15 +++++++++++---- cmd/compose/up.go | 14 ++------------ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/cmd/compose/scale.go b/cmd/compose/scale.go index 94fd6e15e..d82c1e5b4 100644 --- a/cmd/compose/scale.go +++ b/cmd/compose/scale.go @@ -93,17 +93,24 @@ func runScale(ctx context.Context, dockerCli command.Cli, backendOptions *Backen } for key, value := range serviceReplicaTuples { - service, err := project.GetService(key) - if err != nil { + if err := setServiceScale(project, key, value); err != nil { return err } - service.SetScale(value) - project.Services[key] = service } return backend.Scale(ctx, project, api.ScaleOptions{Services: services}) } +func setServiceScale(project *types.Project, name string, replicas int) error { + service, err := project.GetService(name) + if err != nil { + return err + } + service.SetScale(replicas) + project.Services[name] = service + return nil +} + func parseServicesReplicasArgs(args []string) (map[string]int, error) { serviceReplicaTuples := map[string]int{} for _, arg := range args { diff --git a/cmd/compose/up.go b/cmd/compose/up.go index cda2678bb..abd4fd10d 100644 --- a/cmd/compose/up.go +++ b/cmd/compose/up.go @@ -83,7 +83,7 @@ func (opts upOptions) apply(project *types.Project, services []string) (*types.P return project, nil } -func (opts *upOptions) validateNavigationMenu(dockerCli command.Cli) { +func (opts *upOptions) resolveNavigationMenu(dockerCli command.Cli) { if !dockerCli.Out().IsTerminal() { opts.navigationMenu = false return @@ -135,7 +135,7 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backendOptions *Backend return errors.New("cannot combine --attach and --attach-dependencies") } - up.validateNavigationMenu(dockerCli) + up.resolveNavigationMenu(dockerCli) if !p.All && len(project.Services) == 0 { return fmt.Errorf("no service selected") @@ -351,13 +351,3 @@ func runUp( }, }) } - -func setServiceScale(project *types.Project, name string, replicas int) error { - service, err := project.GetService(name) - if err != nil { - return err - } - service.SetScale(replicas) - project.Services[name] = service - return nil -}