Skip to content

Fix indentation for shadow key values #388

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
utkarshalpha wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −4
Open

Fix indentation for shadow key values #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,10 +430,6 @@ func (f *File) writeToBuffer(indent string) (*bytes.Buffer, error) {
}
}

if len(indent) > 0 && sname != DefaultSection {
buf.WriteString(indent)
}

switch {
case key.isAutoIncrement:
kname = "-"
Expand All @@ -444,6 +440,9 @@ func (f *File) writeToBuffer(indent string) (*bytes.Buffer, error) {
}

writeKeyValue := func(val string) (bool, error) {
if len(indent) > 0 && sname != DefaultSection {
buf.WriteString(indent)
}
if _, err := buf.WriteString(kname); err != nil {
return false, err
}
Expand Down
20 changes: 20 additions & 0 deletions file_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,26 @@ bar3 = " val ue3 "
})
}

func TestFile_WriteToIndentWithShadows(t *testing.T) {
f := Empty(LoadOptions{AllowShadows: true})
section, err := f.NewSection("FILTER")
require.NoError(t, err)
key, err := section.NewKey("whitelist_key", "_CMDLINE")
require.NoError(t, err)
require.NoError(t, key.AddShadow("_EXE"))
require.NoError(t, key.AddShadow("_HOSTNAME"))

var buf bytes.Buffer
_, err = f.WriteToIndent(&buf, " ")
require.NoError(t, err)

want := "[FILTER]" + LineBreak +
" whitelist_key = _CMDLINE" + LineBreak +
" whitelist_key = _EXE" + LineBreak +
" whitelist_key = _HOSTNAME" + LineBreak
assert.Equal(t, want, buf.String())
}

func TestFile_SaveTo(t *testing.T) {
f, err := Load(fullConf)
require.NoError(t, err)
Expand Down