github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(edge-config): allow empty filter type EE-5962 (#10381)

pull/10382/head
cmeng 2023-09-26 13:49:25 +13:00 committed by GitHub
parent 2dfa4a7c45
commit b4b44e6fa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/filesystem/serialize_per_dev_configs.go
View File

@ -80,12 +80,16 @@ func shouldIncludeEntry(dirEntry DirEntry, deviceName, configPath string, filter
return shouldIncludeFile(dirEntry, deviceName, configPath) return shouldIncludeFile(dirEntry, deviceName, configPath)
} }
if filterType == portainer.PerDevConfigsTypeDir {
// Include: // Include:
// dir entry A/B/C/<deviceName> // dir entry A/B/C/<deviceName>
// all entries A/B/C/<deviceName>/* // all entries A/B/C/<deviceName>/*
return shouldIncludeDir(dirEntry, deviceName, configPath) return shouldIncludeDir(dirEntry, deviceName, configPath)
} }
return false
}
func isInConfigRootDir(dirEntry DirEntry, configPath string) bool { func isInConfigRootDir(dirEntry DirEntry, configPath string) bool {
// get the first element of the configPath // get the first element of the configPath
rootDir := strings.Split(configPath, string(os.PathSeparator))[0] rootDir := strings.Split(configPath, string(os.PathSeparator))[0]