foomo/squadron
1
0
Fork 0
mirror of https://github.com/foomo/squadron.git synced 2026-10-06 15:47:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: return correct not signed in error

Browse Source
This commit is contained in:
Kevin Franklin Kim
2021-11-05 13:27:00 +01:00
parent 5f680685c1
commit 2f45720f1e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
template.go
+5 -3
View File
@@ -195,6 +195,8 @@ func onePassword(ctx context.Context, templateVars interface{}, errorOnMissing b
} else {
onePasswordCache[cacheKey] = res
}
} else if err != nil {
return "", err
} else {
onePasswordCache[cacheKey] = res
}
@@ -226,10 +228,10 @@ func onePasswordGet(ctx context.Context, uuid string) (map[string]string, error)
} `json:"fields"`
} `json:"details"`
}
if res, err := exec.CommandContext(ctx, "op", "--cache", "get", "item", uuid).CombinedOutput(); err != nil {
return nil, err
} else if strings.Contains(string(res), "You are not currently signed in") {
if res, err := exec.CommandContext(ctx, "op", "--cache", "get", "item", uuid).CombinedOutput(); err != nil && strings.Contains(string(res), "You are not currently signed in") {
return nil, ErrOnePasswordNotSignedIn
} else if err != nil {
return nil, err
} else if err := json.Unmarshal(res, &v); err != nil {
return nil, err
} else {