Skip to content

Fix: Process includes before extends for proper attribute inheritance #853

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

Merged
glours merged 2 commits into from
Apr 1, 2026
+8 −5
Merged

Fix: Process includes before extends for proper attribute inheritance #853

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99fa95a
Fix: Process includes before extends for proper attribute inheritance
infraAnchor Mar 6, 2026
d86c59d
Merge branch 'main' into fix-extends-include-order
infraAnchor Mar 31, 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
13 changes: 8 additions & 5 deletions loader/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,10 @@ func loadYamlFile(ctx context.Context,

fixEmptyNotNull(cfg)

if !opts.SkipExtends {
err = ApplyExtends(ctx, cfg, opts, ct, processor)
// Process includes first so that extended services have all merged attributes
if !opts.SkipInclude {
included = append(included, file.Filename)
err = ApplyInclude(ctx, workingDir, environment, cfg, opts, included, processor)
if err != nil {
return err
}
Expand All @@ -457,12 +459,13 @@ func loadYamlFile(ctx context.Context,
return err
}

if !opts.SkipInclude {
included = append(included, file.Filename)
err = ApplyInclude(ctx, workingDir, environment, cfg, opts, included, processor)
// Process extends after includes so base services are fully merged
if !opts.SkipExtends {
err = ApplyExtends(ctx, cfg, opts, ct, processor)
if err != nil {
return err
}

}

dict, err = override.Merge(dict, cfg)
Expand Down