cmd: propagate keyring reading errors (#5360)
Reading a token from the keyring can sometimes fail for reasons other than the token not being present in the keyring. This PR introduces a new error used to indicate that the token requested could not be found in the keyring and propagates errors from the keyring up to the caller, so that the caller can act on them. Additionally, this fixes a bug in the client cache where it would incorrectly assume that a token had been removed from the keyring, when in fact there was an error reading from the keyring.
This commit is contained in:
1 parent
98bb4c8c31
commit
1a6320794e
12 files changed
+71
-33
No files matched your search
+1
-1
@@ -174,7 +174,7 @@ func (c *AddTokenCommand) Add(ctx context.Context, ui cli.Ui, apiClient *api.Cli
|
||||
|
||||
// Try to read the token from the keyring in a best effort way. Ignore
|
||||
// any errors since the keyring may not be present on the system.
|
||||
at := base.ReadTokenFromKeyring(ui, keyringType, tokenName)
|
||||
at, _ := base.ReadTokenFromKeyring(ui, keyringType, tokenName)
|
||||
if at != nil && (token == "" || pa.AuthTokenId == at.Id) {
|
||||
pa.Keyring = &daemon.KeyringToken{
|
||||
KeyringType: keyringType,
|
||||
|
||||
Reference in new issue
Block a user