extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-21 10:17:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

if there is not an identities path, just skip listing identities (#136)

Browse Source
This commit is contained in:
Michael Quigley 2023-01-09 17:37:43 -05:00
parent 2ec8a07d4b
commit 03172244cc
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zrokdir/zrokdir.go
View File

@ -104,15 +104,23 @@ func Obliterate() error {
} }
func listIdentities() (map[string]struct{}, error) { func listIdentities() (map[string]struct{}, error) {
ids := make(map[string]struct{})
idd, err := identitiesDir() idd, err := identitiesDir()
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error getting zrokdir identities path") return nil, errors.Wrap(err, "error getting zrokdir identities path")
} }
_, err = os.Stat(idd)
if os.IsNotExist(err) {
return ids, nil
}
if err != nil {
return nil, errors.Wrapf(err, "error stat-ing zrokdir identities root '%v'", idd)
}
des, err := os.ReadDir(idd) des, err := os.ReadDir(idd)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error listing zrokdir identities from '%v'", idd) return nil, errors.Wrapf(err, "error listing zrokdir identities from '%v'", idd)
} }
ids := make(map[string]struct{})
for _, de := range des { for _, de := range des {
if strings.HasSuffix(de.Name(), ".json") && !de.IsDir() { if strings.HasSuffix(de.Name(), ".json") && !de.IsDir() {
name := strings.TrimSuffix(de.Name(), ".json") name := strings.TrimSuffix(de.Name(), ".json")