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

fix: fix typos

Browse Source
This commit is contained in:
franklin
2021-03-29 11:31:04 +02:00
parent dd16ab6110
commit 7ff3446e9b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
squadron.go
-1
View File
@@ -84,7 +84,6 @@ func (sq Squadron) Generate(units map[string]Unit) error {
if err != nil {
return err
}
// run helm package to basePath
return nil
}
template.go
+6 -6
View File
@@ -164,17 +164,17 @@ func onePassword(account, uuid, field string) (string, error) {
// validate session
if os.Getenv(fmt.Sprintf("OP_SESSION_%s", account)) == "" {
if err := onePasswordSignin(account); err != nil {
if err := onePasswordSignIn(account); err != nil {
return "", err
}
}
res, err := onPasswordGet(uuid, field)
res, err := onePasswordGet(uuid, field)
if err != nil && strings.Contains(res, "You are not currently signed in") {
// retry with login
if err := onePasswordSignin(account); err != nil {
if err := onePasswordSignIn(account); err != nil {
return "", err
} else if res, err = onPasswordGet(uuid, field); err != nil {
} else if res, err = onePasswordGet(uuid, field); err != nil {
return "", err
}
} else if err != nil {
@@ -183,12 +183,12 @@ func onePassword(account, uuid, field string) (string, error) {
return res, nil
}
func onPasswordGet(uuid, field string) (string, error) {
func onePasswordGet(uuid, field string) (string, error) {
res, err := exec.Command("op", "get", "item", uuid, "--fields", field).CombinedOutput()
return string(res), err
}
func onePasswordSignin(account string) error {
func onePasswordSignIn(account string) error {
fmt.Println("Your templates includes a call to 1Password, please sign to retrieve your session token:")
// create command