From 7ff3446e9bec7f21a5da2cd205ed97da73a71e97 Mon Sep 17 00:00:00 2001 From: franklin Date: Mon, 29 Mar 2021 11:31:04 +0200 Subject: [PATCH] fix: fix typos --- squadron.go | 1 - template.go | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/squadron.go b/squadron.go index 3b9a06c..cba89f2 100644 --- a/squadron.go +++ b/squadron.go @@ -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 } diff --git a/template.go b/template.go index 9f55b0b..bd6d10a 100644 --- a/template.go +++ b/template.go @@ -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