Skip to content

cli/compose/loader: remove some wrapper utilities and use errors.Join #6809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thaJeztah wants to merge 2 commits into
base: master
Choose a base branch
from
Open

cli/compose/loader: remove some wrapper utilities and use errors.Join #6809

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b6f23d
cli/compose/loader: remove some wrapper utilities
thaJeztah Feb 19, 2026
13c993f
cli/compose/loader: merge: use errors.Join
thaJeztah Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 18 additions & 37 deletions cli/compose/loader/merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package loader

import (
"cmp"
"errors"
"fmt"
"reflect"
"slices"
Expand All @@ -28,26 +29,26 @@ func (s *specials) Transformer(t reflect.Type) func(dst, src reflect.Value) erro
func merge(configs []*types.Config) (*types.Config, error) {
base := configs[0]
for _, override := range configs[1:] {
var err error
base.Services, err = mergeServices(base.Services, override.Services)
if err != nil {
return base, fmt.Errorf("cannot merge services from %s: %w", override.Filename, err)
var errs []error
if services, err := mergeServices(base.Services, override.Services); err != nil {
errs = append(errs, fmt.Errorf("cannot merge services: %w", err))
} else {
base.Services = services
}
base.Volumes, err = mergeVolumes(base.Volumes, override.Volumes)
if err != nil {
return base, fmt.Errorf("cannot merge volumes from %s: %w", override.Filename, err)
if err := mergo.Map(&base.Volumes, &override.Volumes, mergo.WithOverride); err != nil {
errs = append(errs, fmt.Errorf("cannot merge volumes: %w", err))
}
base.Networks, err = mergeNetworks(base.Networks, override.Networks)
if err != nil {
return base, fmt.Errorf("cannot merge networks from %s: %w", override.Filename, err)
if err := mergo.Map(&base.Networks, &override.Networks, mergo.WithOverride); err != nil {
errs = append(errs, fmt.Errorf("cannot merge networks: %w", err))
}
base.Secrets, err = mergeSecrets(base.Secrets, override.Secrets)
if err != nil {
return base, fmt.Errorf("cannot merge secrets from %s: %w", override.Filename, err)
if err := mergo.Map(&base.Secrets, &override.Secrets, mergo.WithOverride); err != nil {
errs = append(errs, fmt.Errorf("cannot merge secrets: %w", err))
}
base.Configs, err = mergeConfigs(base.Configs, override.Configs)
if err != nil {
return base, fmt.Errorf("cannot merge configs from %s: %w", override.Filename, err)
if err := mergo.Map(&base.Configs, &override.Configs, mergo.WithOverride); err != nil {
errs = append(errs, fmt.Errorf("cannot merge configs: %w", err))
}
if err := errors.Join(errs...); err != nil {
return nil, errors.Join(fmt.Errorf("failed to merge file %s", override.Filename), err)
Copy link

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The top-level error is built with errors.Join, which makes the file-context a separate error line and loses normal wrapping semantics. Consider wrapping the joined merge errors instead (e.g., include the filename in a single fmt.Errorf with %w), and use %q for the filename for clearer output.

Suggested change
return nil, errors.Join(fmt.Errorf("failed to merge file %s", override.Filename), err)
return nil, fmt.Errorf("failed to merge file %q: %w", override.Filename, err)

Copilot uses AI. Check for mistakes.
}
}
return base, nil
Expand Down Expand Up @@ -78,7 +79,7 @@ func mergeServices(base, override []types.ServiceConfig) ([]types.ServiceConfig,
for _, overrideService := range override {
if baseService, ok := baseServices[overrideService.Name]; ok {
if err := mergo.Merge(&baseService, &overrideService, mergeOpts...); err != nil {
return base, fmt.Errorf("cannot merge service %s: %w", overrideService.Name, err)
return nil, fmt.Errorf("cannot merge service %s: %w", overrideService.Name, err)
}
baseServices[overrideService.Name] = baseService
continue
Expand Down Expand Up @@ -284,23 +285,3 @@ func mergeUint64(dst, src reflect.Value) error {
}
return nil
}

func mergeVolumes(base, override map[string]types.VolumeConfig) (map[string]types.VolumeConfig, error) {
err := mergo.Map(&base, &override, mergo.WithOverride)
return base, err
}

func mergeNetworks(base, override map[string]types.NetworkConfig) (map[string]types.NetworkConfig, error) {
err := mergo.Map(&base, &override, mergo.WithOverride)
return base, err
}

func mergeSecrets(base, override map[string]types.SecretConfig) (map[string]types.SecretConfig, error) {
err := mergo.Map(&base, &override, mergo.WithOverride)
return base, err
}

func mergeConfigs(base, override map[string]types.ConfigObjConfig) (map[string]types.ConfigObjConfig, error) {
err := mergo.Map(&base, &override, mergo.WithOverride)
return base, err
}
Loading