Merge pull request #233 from secrethub/feature/update-error-checking

Update error comparison

Author: SimonBarendse

internals/secrethub/list.go

@@ -83,9 +83,9 @@ func (cmd *LsCommand) Run() error {
 	dirPath, err := cmd.path.ToDirPath()
 	if err == nil {
 		dirFS, err := client.Dirs().GetTree(dirPath.Value(), 1, false)
-		if err == api.ErrDirNotFound && dirPath.IsRepoPath() {
+		if api.IsErrNotFound(err) && dirPath.IsRepoPath() {
 			return err
-		} else if err != nil && err != api.ErrDirNotFound {
+		} else if err != nil && !isErrNotFound(err) {
 			return err
 		} else if err == nil {
 			err = printDir(cmd.io.Stdout(), cmd.quiet, dirFS.RootDir, timeFormatter)
@@ -100,7 +100,7 @@ func (cmd *LsCommand) Run() error {
 	secretPath, err := cmd.path.ToSecretPath()
 	if err == nil {
 		versions, err := client.Secrets().Versions().ListWithoutData(secretPath.Value())
-		if err == api.ErrSecretNotFound {
+		if api.IsErrNotFound(err) {
 			return ErrResourceNotFound(cmd.path)
 		} else if err != nil {
 			return err

internals/secrethub/rm.go

@@ -71,7 +71,7 @@ func (cmd *RmCommand) Run() error {
 				return ErrCannotRemoveDir
 			}
 			return rmDir(client, dirPath, cmd.force, cmd.io)
-		} else if err != api.ErrDirNotFound {
+		} else if !api.IsErrNotFound(err) {
 			return err
 		}
 	}
@@ -87,7 +87,7 @@ func (cmd *RmCommand) Run() error {
 
 	// Check if the secret exists first so we can return a generic error here instead of ErrSecretNotFound.
 	_, err = client.Secrets().Get(secretPath.Value())
-	if err == api.ErrSecretNotFound {
+	if api.IsErrNotFound(err) {
 		return ErrResourceNotFound(cmd.path)
 	}