move catalog errors to errors.go (#847)

catalog/cataloger_diff.go

@@ -49,8 +49,6 @@ type diffResultsBatchWriter struct {
 	Records              []*diffResultRecord
 }
 
-var ErrMissingDiffResultsIDInContext = errors.New("missing diff results id in context")
-
 // Diff lists of differences between leftBranch and rightBranch.
 // The second return value will be true if there are more results. Use the last entry's path as the next call to Diff in the 'after' argument.
 // limit - is the maximum number of differences we will return, limited by DiffMaxLimit (which will be used in case limit less than 0)

catalog/errors.go

@@ -8,22 +8,24 @@ import (
 )
 
 var (
-	ErrFeatureNotSupported      = errors.New("feature not supported")
-	ErrOperationNotPermitted    = errors.New("operation not permitted")
-	ErrInvalidLockValue         = errors.New("invalid lock value")
-	ErrNothingToCommit          = errors.New("nothing to commit")
-	ErrNoDifferenceWasFound     = errors.New("no difference was found")
-	ErrConflictFound            = errors.New("conflict found")
-	ErrUnsupportedRelation      = errors.New("unsupported relation")
-	ErrUnsupportedDelimiter     = errors.New("unsupported delimiter")
-	ErrInvalidReference         = errors.New("invalid reference")
-	ErrBranchNotFound           = fmt.Errorf("branch %w", db.ErrNotFound)
-	ErrCommitNotFound           = fmt.Errorf("commit %w", db.ErrNotFound)
-	ErrRepositoryNotFound       = fmt.Errorf("repository %w", db.ErrNotFound)
-	ErrMultipartUploadNotFound  = fmt.Errorf("multipart upload %w", db.ErrNotFound)
-	ErrEntryNotFound            = fmt.Errorf("entry %w", db.ErrNotFound)
-	ErrByteSliceTypeAssertion   = errors.New("type assertion to []byte failed")
-	ErrInvalidMetadataSrcFormat = errors.New("invalid metadata src format")
-	ErrUnexpected               = errors.New("unexpected error")
-	ErrReadEntryTimeout         = errors.New("read entry timeout")
+	ErrFeatureNotSupported           = errors.New("feature not supported")
+	ErrOperationNotPermitted         = errors.New("operation not permitted")
+	ErrInvalidLockValue              = errors.New("invalid lock value")
+	ErrNothingToCommit               = errors.New("nothing to commit")
+	ErrNoDifferenceWasFound          = errors.New("no difference was found")
+	ErrConflictFound                 = errors.New("conflict found")
+	ErrUnsupportedRelation           = errors.New("unsupported relation")
+	ErrUnsupportedDelimiter          = errors.New("unsupported delimiter")
+	ErrInvalidReference              = errors.New("invalid reference")
+	ErrBranchNotFound                = fmt.Errorf("branch %w", db.ErrNotFound)
+	ErrCommitNotFound                = fmt.Errorf("commit %w", db.ErrNotFound)
+	ErrRepositoryNotFound            = fmt.Errorf("repository %w", db.ErrNotFound)
+	ErrMultipartUploadNotFound       = fmt.Errorf("multipart upload %w", db.ErrNotFound)
+	ErrEntryNotFound                 = fmt.Errorf("entry %w", db.ErrNotFound)
+	ErrByteSliceTypeAssertion        = errors.New("type assertion to []byte failed")
+	ErrInvalidMetadataSrcFormat      = errors.New("invalid metadata src format")
+	ErrUnexpected                    = errors.New("unexpected error")
+	ErrReadEntryTimeout              = errors.New("read entry timeout")
+	ErrMissingDiffResultsIDInContext = errors.New("missing diff results id in context")
+	ErrInvalidValue                  = errors.New("invalid value")
 )

catalog/validate.go

@@ -1,14 +1,11 @@
 package catalog
 
 import (
-	"errors"
 	"fmt"
 	"regexp"
 )
 
 var (
-	ErrInvalidValue = errors.New("invalid value")
-
 	validBranchNameRegexp     = regexp.MustCompile(`^\w[-\w]*$`)
 	validRepositoryNameRegexp = regexp.MustCompile(`^[a-z0-9][a-z0-9-]{2,62}$`)
 )