awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 17:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update keyringwrapper.go

Browse Source
This commit is contained in:
Daniel Hougaard
2024-07-29 12:10:42 +02:00
parent 2177ec6bcc
commit 3d380710ee
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/util/keyringwrapper.go
+5 -14
View File
@@ -1,18 +1,11 @@
package util package util
import ( import (
"strings"
"github.com/fatih/color"
"github.com/zalando/go-keyring" "github.com/zalando/go-keyring"
) )
const MAIN_KEYRING_SERVICE = "infisical-cli" const MAIN_KEYRING_SERVICE = "infisical-cli"
func keyringNotConfigured(err error) bool {
return err != nil && strings.Contains(err.Error(), "was not provided by any .service files")
}
type TimeoutError struct { type TimeoutError struct {
message string message string
} }
@@ -29,11 +22,9 @@ func SetValueInKeyring(key, value string) error {
err = keyring.Set(currentVaultBackend, MAIN_KEYRING_SERVICE, key, value) err = keyring.Set(currentVaultBackend, MAIN_KEYRING_SERVICE, key, value)
if err == keyring.ErrUnsupportedPlatform || keyringNotConfigured(err) { if err != nil {
boldYellow := color.New(color.FgYellow).Add(color.Bold)
boldYellow.Printf("Warning: Fallback file keyring is being used\n\n") PrintWarning("Fallback file keyring is being used\n\nYou can persist your file passphrase by running the following command:\ninfisical vault set file passphrase <your-passphrase>\n")
boldYellow.Printf("You can persist your file passphrase by running the following command:\n")
boldYellow.Printf("infisical vault set file passphrase <your-passphrase>\n\n")
err = keyring.Set(VAULT_BACKEND_FILE_MODE, MAIN_KEYRING_SERVICE, key, value) err = keyring.Set(VAULT_BACKEND_FILE_MODE, MAIN_KEYRING_SERVICE, key, value)
} }
@@ -48,7 +39,7 @@ func GetValueInKeyring(key string) (string, error) {
value, err := keyring.Get(currentVaultBackend, MAIN_KEYRING_SERVICE, key) value, err := keyring.Get(currentVaultBackend, MAIN_KEYRING_SERVICE, key)
if err == keyring.ErrUnsupportedPlatform || keyringNotConfigured(err) { if err != nil {
value, err = keyring.Get(currentVaultBackend, MAIN_KEYRING_SERVICE, key) value, err = keyring.Get(currentVaultBackend, MAIN_KEYRING_SERVICE, key)
} }
return value, err return value, err
@@ -63,7 +54,7 @@ func DeleteValueInKeyring(key string) error {
err = keyring.Delete(currentVaultBackend, MAIN_KEYRING_SERVICE, key) err = keyring.Delete(currentVaultBackend, MAIN_KEYRING_SERVICE, key)
if err == keyring.ErrUnsupportedPlatform || keyringNotConfigured(err) { if err != nil {
err = keyring.Delete(currentVaultBackend, MAIN_KEYRING_SERVICE, key) err = keyring.Delete(currentVaultBackend, MAIN_KEYRING_SERVICE, key)
} }