From 64c18b15a4a0c8b7e59587aa09de92d52c698ede Mon Sep 17 00:00:00 2001 From: Steve Moyer Date: Sun, 27 Nov 2022 20:51:37 -0500 Subject: feat: wrap ErrNoConfigEntry to report missing key Resolves #935. --- entities/identity/identity_user.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'entities/identity/identity_user.go') diff --git a/entities/identity/identity_user.go b/entities/identity/identity_user.go index cd67459e..435af060 100644 --- a/entities/identity/identity_user.go +++ b/entities/identity/identity_user.go @@ -36,7 +36,7 @@ func GetUserIdentity(repo repository.Repo) (*Identity, error) { func GetUserIdentityId(repo repository.Repo) (entity.Id, error) { val, err := repo.LocalConfig().ReadString(identityConfigKey) - if err == repository.ErrNoConfigEntry { + if errors.Is(err, repository.ErrNoConfigEntry) { return entity.UnsetId, ErrNoIdentitySet } if err == repository.ErrMultipleConfigEntry { @@ -58,7 +58,7 @@ func GetUserIdentityId(repo repository.Repo) (entity.Id, error) { // IsUserIdentitySet say if the user has set his identity func IsUserIdentitySet(repo repository.Repo) (bool, error) { _, err := repo.LocalConfig().ReadString(identityConfigKey) - if err == repository.ErrNoConfigEntry { + if errors.Is(err, repository.ErrNoConfigEntry) { return false, nil } if err != nil { -- cgit From 49929c034f52272986ea6ac7457e64dbaa9454cb Mon Sep 17 00:00:00 2001 From: Steve Moyer Date: Sun, 27 Nov 2022 20:56:45 -0500 Subject: feat: wrap ErrMultipleConfigEntry to report duplicate key References #935. --- entities/identity/identity_user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'entities/identity/identity_user.go') diff --git a/entities/identity/identity_user.go b/entities/identity/identity_user.go index 435af060..cbbb8974 100644 --- a/entities/identity/identity_user.go +++ b/entities/identity/identity_user.go @@ -39,7 +39,7 @@ func GetUserIdentityId(repo repository.Repo) (entity.Id, error) { if errors.Is(err, repository.ErrNoConfigEntry) { return entity.UnsetId, ErrNoIdentitySet } - if err == repository.ErrMultipleConfigEntry { + if errors.Is(err, repository.ErrMultipleConfigEntry) { return entity.UnsetId, ErrMultipleIdentitiesSet } if err != nil { -- cgit