mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 02:27:39 +00:00
Revert "Patch CLI auto select file vault "
This commit is contained in:
@@ -32,16 +32,18 @@ func SetValueInKeyring(key, value string) error {
|
|||||||
configFile, _ := GetConfigFile()
|
configFile, _ := GetConfigFile()
|
||||||
|
|
||||||
if configFile.VaultBackendPassphrase == "" {
|
if configFile.VaultBackendPassphrase == "" {
|
||||||
|
PrintWarning("System keyring could not be used, falling back to `file` vault for sensitive data storage.")
|
||||||
passphrasePrompt := promptui.Prompt{
|
passphrasePrompt := promptui.Prompt{
|
||||||
Label: "Enter a passphrase to encrypt sensitive CLI data at rest",
|
Label: "Enter the passphrase to use for keyring encryption",
|
||||||
}
|
}
|
||||||
passphrase, err := passphrasePrompt.Run()
|
passphrase, err := passphrasePrompt.Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
encodedPassphrase := base64.StdEncoding.EncodeToString([]byte(passphrase))
|
encodedPassphrase := base64.StdEncoding.EncodeToString([]byte(passphrase))
|
||||||
configFile.VaultBackendPassphrase = encodedPassphrase
|
configFile.VaultBackendPassphrase = encodedPassphrase
|
||||||
configFile.VaultBackendType = VAULT_BACKEND_FILE_MODE
|
err = WriteConfigFile(&configFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -63,7 +65,12 @@ func GetValueInKeyring(key string) (string, error) {
|
|||||||
PrintErrorAndExit(1, err, "Unable to get current vault. Tip: run [infisical reset] then try again")
|
PrintErrorAndExit(1, err, "Unable to get current vault. Tip: run [infisical reset] then try again")
|
||||||
}
|
}
|
||||||
|
|
||||||
return keyring.Get(currentVaultBackend, MAIN_KEYRING_SERVICE, key)
|
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
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,6 +80,11 @@ func DeleteValueInKeyring(key string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return keyring.Delete(currentVaultBackend, MAIN_KEYRING_SERVICE, key)
|
err = keyring.Delete(currentVaultBackend, MAIN_KEYRING_SERVICE, key)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
err = keyring.Delete(VAULT_BACKEND_FILE_MODE, MAIN_KEYRING_SERVICE, key)
|
||||||
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user