Skip to content
This repository has been archived by the owner on Feb 16, 2023. It is now read-only.

Fix error handling of credential loading #234

Merged
merged 4 commits into from
Feb 8, 2021
Merged

Fix error handling of credential loading #234

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a82982
Return error for setting a credential
jpcoenen Feb 5, 2021
1a490aa
Remove setting default passphrase reader from client constructor
jpcoenen Feb 5, 2021
9f74af2
Fix "incorrect passphrase" error for env sourced passphrases
jpcoenen Feb 5, 2021
4291882
Fix UserAgent test
jpcoenen Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/secrethub/credentials/key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ func ImportKey(credentialReader, passphraseReader Reader) (Key, error) {
if envPassphrase != "" {
credential, err := decryptKey([]byte(envPassphrase), encoded)
if err != nil {
if crypto.IsWrongKey(err) {
err = ErrCannotDecryptCredential
}
return Key{}, fmt.Errorf("decrypting credential with passphrase read from $%s: %v", credentialPassphraseEnvVar, err)
jpcoenen marked this conversation as resolved.
Show resolved Hide resolved
}
return Key{key: credential}, nil
Expand Down