containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Export no such secret error 

There is code in podman which uses `errors.Cause(err).Error() != "no such secret"`,
this is just bad code. Common should expose this error so podman
can check with `errors.Is()`.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2021-09-21 11:12:52 +02:00
parent c42a32358c
commit 27be5dc1df
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/pkg/secrets/secrets.go
View File

@ -24,8 +24,8 @@ const secretIDLength = 25
// errInvalidPath indicates that the secrets path is invalid // errInvalidPath indicates that the secrets path is invalid
var errInvalidPath = errors.New("invalid secrets path") var errInvalidPath = errors.New("invalid secrets path")
// errNoSuchSecret indicates that the secret does not exist // ErrNoSuchSecret indicates that the secret does not exist
var errNoSuchSecret = errors.New("no such secret") var ErrNoSuchSecret = errors.New("no such secret")
// errSecretNameInUse indicates that the secret name is already in use // errSecretNameInUse indicates that the secret name is already in use
var errSecretNameInUse = errors.New("secret name in use") var errSecretNameInUse = errors.New("secret name in use")
@ -152,7 +152,7 @@ func (s *SecretsManager) Store(name string, data []byte, driverType string, driv
newID = newID[0:secretIDLength] newID = newID[0:secretIDLength]
_, err := s.lookupSecret(newID) _, err := s.lookupSecret(newID)
if err != nil { if err != nil {
if errors.Cause(err) == errNoSuchSecret { if errors.Cause(err) == ErrNoSuchSecret {
secr.ID = newID secr.ID = newID
break break
} else { } else {

12
common/pkg/secrets/secretsdb.go
View File

@ -71,14 +71,14 @@ func (s *SecretsManager) getNameAndID(nameOrID string) (name, id string, err err
name, id, err = s.getExactNameAndID(nameOrID) name, id, err = s.getExactNameAndID(nameOrID)
if err == nil { if err == nil {
return name, id, nil return name, id, nil
} else if errors.Cause(err) != errNoSuchSecret { } else if errors.Cause(err) != ErrNoSuchSecret {
return "", "", err return "", "", err
} }
// ID prefix may have been given, iterate through all IDs. // ID prefix may have been given, iterate through all IDs.
// ID and partial ID has a max length of 25, so we return if its greater than that. // ID and partial ID has a max length of 25, so we return if its greater than that.
if len(nameOrID) > secretIDLength { if len(nameOrID) > secretIDLength {
return "", "", errors.Wrapf(errNoSuchSecret, "no secret with name or id %q", nameOrID) return "", "", errors.Wrapf(ErrNoSuchSecret, "no secret with name or id %q", nameOrID)
} }
exists := false exists := false
var foundID, foundName string var foundID, foundName string
@ -96,7 +96,7 @@ func (s *SecretsManager) getNameAndID(nameOrID string) (name, id string, err err
if exists { if exists {
return foundName, foundID, nil return foundName, foundID, nil
} }
return "", "", errors.Wrapf(errNoSuchSecret, "no secret with name or id %q", nameOrID) return "", "", errors.Wrapf(ErrNoSuchSecret, "no secret with name or id %q", nameOrID)
} }
// getExactNameAndID takes a secret's name or ID and returns both its name and full ID. // getExactNameAndID takes a secret's name or ID and returns both its name and full ID.
@ -115,7 +115,7 @@ func (s *SecretsManager) getExactNameAndID(nameOrID string) (name, id string, er
return name, id, nil return name, id, nil
} }
return "", "", errors.Wrapf(errNoSuchSecret, "no secret with name or id %q", nameOrID) return "", "", errors.Wrapf(ErrNoSuchSecret, "no secret with name or id %q", nameOrID)
} }
// exactSecretExists checks if the secret exists, given a name or ID // exactSecretExists checks if the secret exists, given a name or ID
@ -123,7 +123,7 @@ func (s *SecretsManager) getExactNameAndID(nameOrID string) (name, id string, er
func (s *SecretsManager) exactSecretExists(nameOrID string) (bool, error) { func (s *SecretsManager) exactSecretExists(nameOrID string) (bool, error) {
_, _, err := s.getExactNameAndID(nameOrID) _, _, err := s.getExactNameAndID(nameOrID)
if err != nil { if err != nil {
if errors.Cause(err) == errNoSuchSecret { if errors.Cause(err) == ErrNoSuchSecret {
return false, nil return false, nil
} }
return false, err return false, err
@ -158,7 +158,7 @@ func (s *SecretsManager) lookupSecret(nameOrID string) (*Secret, error) {
return &secret, nil return &secret, nil
} }
return nil, errors.Wrapf(errNoSuchSecret, "no secret with name or id %q", nameOrID) return nil, errors.Wrapf(ErrNoSuchSecret, "no secret with name or id %q", nameOrID)
} }
// Store creates a new secret in the secrets database. // Store creates a new secret in the secrets database.