Skip to content
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

fix: ensure folders do not get loaded more than once #10551

Merged
merged 16 commits into from
Feb 16, 2022
Merged

fix: ensure folders do not get loaded more than once #10551

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d6b1e61
fix: ensure folders do not get loaded more than once
MyaLongmire Jan 31, 2022
a0e48b1
fix: remove left over print statement
MyaLongmire Jan 31, 2022
8b70a09
fix: change to removing duplicates for performancce
MyaLongmire Jan 31, 2022
23d08e6
fix: remove extra space
MyaLongmire Jan 31, 2022
aa26379
rework: laoding folders
MyaLongmire Feb 6, 2022
6b07dfb
chore: add comments
MyaLongmire Feb 6, 2022
9d71cb3
fix: rework folder loading and add test
MyaLongmire Feb 7, 2022
570d0eb
fix: file format based on os
MyaLongmire Feb 7, 2022
a3fd4df
fix: windows returns symlinks as files
MyaLongmire Feb 7, 2022
884b3e9
fix: rework test
MyaLongmire Feb 8, 2022
6dff27e
fix: move mib path into table
MyaLongmire Feb 8, 2022
73e26c6
fix: check folders based on os
MyaLongmire Feb 9, 2022
8977563
fix: following symlink
MyaLongmire Feb 16, 2022
ec64ae4
chore: go mod tidy
MyaLongmire Feb 16, 2022
b05c18f
fix: skip symlinks on windows
MyaLongmire Feb 16, 2022
c64cdeb
chore: move skip
MyaLongmire Feb 16, 2022
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
Prev Previous commit
Next Next commit
fix: check folders based on os
  • Loading branch information
@MyaLongmire
MyaLongmire committed Feb 10, 2022
commit 73e26c6d1f9b6cd941fad2c09f29edaea2ceac9d
12 changes: 8 additions & 4 deletions internal/snmp/translate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,18 @@ func (t *TestingMibLoader) loadModule(path string) error {
}
func TestFolderLookup(t *testing.T) {
var folders []string
var givenPath []string

tests := []struct {
name string
mibPath []string
mibPath [][]string
paths [][]string
files []string
windowsFiles []string
}{
{
name: "loading folders",
mibPath: []string{"testdata/loadMibsFromPath"},
mibPath: [][]string{{"testdata", "loadMibsFromPath"}},
paths: [][]string{{"testdata", "loadMibsFromPath"}, {"testdata", "loadMibsFromPath", "linkTarget"}, {"testdata", "loadMibsFromPath", "root"}},
files: []string{"emptyFile"},
windowsFiles: []string{"emptyFile", "symlink"},
Expand All @@ -125,8 +126,11 @@ func TestFolderLookup(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
loader := TestingMibLoader{}

err := LoadMibsFromPath(tt.mibPath, testutil.Logger{}, &loader)
for _, paths := range tt.mibPath {
rootPath := filepath.Join(paths...)
givenPath = append(givenPath, rootPath)
}
err := LoadMibsFromPath(givenPath, testutil.Logger{}, &loader)
require.NoError(t, err)
for _, pathSlice := range tt.paths {
path := filepath.Join(pathSlice...)
Expand Down