Skip to content

fix: set indentation to 2 when marshalling spec for overlay #2172

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
jamietanna merged 3 commits into from
Feb 16, 2026
Merged

fix: set indentation to 2 when marshalling spec for overlay #2172

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d933c73
set indentation to 2
wndhydrnt Nov 27, 2025
b15d058
Merge branch 'main' into fix-overlay-load-array-newline
jamietanna Feb 14, 2026
cb3d513
Merge branch 'main' into fix-overlay-load-array-newline
jamietanna Feb 16, 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
8 changes: 6 additions & 2 deletions pkg/util/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,17 @@ func LoadSwaggerWithOverlay(filePath string, opts LoadSwaggerWithOverlayOpts) (s
}

// parse out the yaml.Node, which is required by the overlay library
data, err := yaml.Marshal(spec)
buf := &bytes.Buffer{}
enc := yaml.NewEncoder(buf)
// set to 2 to work around https://github.com/yaml/go-yaml/issues/76
enc.SetIndent(2)
err = enc.Encode(spec)
if err != nil {
return nil, fmt.Errorf("failed to marshal spec from %#v as YAML: %w", filePath, err)
}

var node yaml.Node
err = yaml.NewDecoder(bytes.NewReader(data)).Decode(&node)
err = yaml.NewDecoder(buf).Decode(&node)
if err != nil {
return nil, fmt.Errorf("failed to parse spec from %#v: %w", filePath, err)
}
Expand Down