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

Add secret path to all secret not found errors #183

Merged
merged 2 commits into from
Apr 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions pkg/secrethub/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,16 @@ func (s secretService) Get(path string) (*api.Secret, error) {
}

blindName, err := s.client.convertPathToBlindName(secretPath)
if err != nil {
if api.IsErrNotFound(err) {
return nil, &errSecretNotFound{path: secretPath, err: err}
} else if err != nil {
return nil, errio.Error(err)
}

encSecret, err := s.client.httpClient.GetSecret(blindName)
if err != nil {
if api.IsErrNotFound(err) {
return nil, &errSecretNotFound{path: secretPath, err: err}
} else if err != nil {
return nil, errio.Error(err)
}

Expand Down
8 changes: 6 additions & 2 deletions pkg/secrethub/secret_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,16 @@ func (s secretVersionService) GetWithoutData(path string) (*api.SecretVersion, e

func (s secretVersionService) list(path api.SecretPath, withData bool) ([]*api.SecretVersion, error) {
blindName, err := s.client.convertPathToBlindName(path)
if err != nil {
if api.IsErrNotFound(err) {
return nil, &errSecretNotFound{path: path, err: err}
} else if err != nil {
return nil, errio.Error(err)
}

versions, err := s.client.httpClient.ListSecretVersions(blindName, withData)
if err != nil {
if api.IsErrNotFound(err) {
return nil, &errSecretNotFound{path: path, err: err}
} else if err != nil {
return nil, errio.Error(err)
}

Expand Down