From 353d231a4eaa1b62b7ee11e2f1883ee1d333abdc Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Wed, 7 Aug 2024 18:35:07 -0400 Subject: [PATCH] =?UTF-8?q?Patch=20CLI=20auto=20select=20file=20vault=20#?= =?UTF-8?q?=20Description=20=F0=9F=93=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When we auto select file vault, we also need to set it's type. When we set the type, we don't need to fall back to file vault in the `GetValueInKeyring` and `DeleteValueInKeyring` because `currentVaultBackend` will be `file`. Also rephrased the text asking the user to eneter a passphrase. --- cli/packages/util/keyringwrapper.go | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/cli/packages/util/keyringwrapper.go b/cli/packages/util/keyringwrapper.go index 065271906..296f6439c 100644 --- a/cli/packages/util/keyringwrapper.go +++ b/cli/packages/util/keyringwrapper.go @@ -32,9 +32,8 @@ func SetValueInKeyring(key, value string) error { configFile, _ := GetConfigFile() if configFile.VaultBackendPassphrase == "" { - PrintWarning("System keyring could not be used, falling back to `file` vault for sensitive data storage.") passphrasePrompt := promptui.Prompt{ - Label: "Enter the passphrase to use for keyring encryption", + Label: "Enter a passphrase to protect your local backup secrets & login access token", } passphrase, err := passphrasePrompt.Run() if err != nil { @@ -43,6 +42,7 @@ func SetValueInKeyring(key, value string) error { encodedPassphrase := base64.StdEncoding.EncodeToString([]byte(passphrase)) configFile.VaultBackendPassphrase = encodedPassphrase + configFile.VaultBackendType = VAULT_BACKEND_FILE_MODE err = WriteConfigFile(&configFile) if err != nil { return err @@ -65,12 +65,7 @@ func GetValueInKeyring(key string) (string, error) { PrintErrorAndExit(1, err, "Unable to get current vault. Tip: run [infisical reset] then try again") } - value, err := keyring.Get(currentVaultBackend, MAIN_KEYRING_SERVICE, key) - - if err != nil { - value, err = keyring.Get(VAULT_BACKEND_FILE_MODE, MAIN_KEYRING_SERVICE, key) - } - return value, err + return keyring.Get(currentVaultBackend, MAIN_KEYRING_SERVICE, key) } @@ -80,11 +75,6 @@ func DeleteValueInKeyring(key string) error { return err } - err = keyring.Delete(currentVaultBackend, MAIN_KEYRING_SERVICE, key) + return keyring.Delete(currentVaultBackend, MAIN_KEYRING_SERVICE, key) - if err != nil { - err = keyring.Delete(VAULT_BACKEND_FILE_MODE, MAIN_KEYRING_SERVICE, key) - } - - return err }