From f756fda34c57e072565d8d8c2978a138451bc502 Mon Sep 17 00:00:00 2001 From: Andrei Aaron Date: Thu, 9 Jan 2025 18:39:16 +0000 Subject: [PATCH] fix(metadb): wrong error message in PatchDB() implementation Signed-off-by: Andrei Aaron --- errors/errors.go | 1 + pkg/meta/boltdb/boltdb.go | 2 +- pkg/meta/dynamodb/dynamodb.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/errors/errors.go b/errors/errors.go index f46569ea2..60dbffea5 100644 --- a/errors/errors.go +++ b/errors/errors.go @@ -129,6 +129,7 @@ var ( ErrMissingAuthHeader = errors.New("required authorization header is missing") ErrUserAPIKeyNotFound = errors.New("user info for given API key hash not found") ErrUserSessionNotFound = errors.New("user session for given ID not found") + ErrInvalidMetaDBVersion = errors.New("unrecognized version meta") ErrBucketDoesNotExist = errors.New("bucket does not exist") ErrOpenIDProviderDoesNotExist = errors.New("openid provider does not exist in given config") ErrHashKeyNotCreated = errors.New("cookiestore generated random hash key is nil, aborting") diff --git a/pkg/meta/boltdb/boltdb.go b/pkg/meta/boltdb/boltdb.go index 0166bf517..d7ee08f32 100644 --- a/pkg/meta/boltdb/boltdb.go +++ b/pkg/meta/boltdb/boltdb.go @@ -1569,7 +1569,7 @@ func (bdw *BoltDB) PatchDB() error { } if version.GetVersionIndex(DBVersion) == -1 { - return fmt.Errorf("DB has broken format, no version found %w", err) + return fmt.Errorf("%w: %s could not identify patches", zerr.ErrInvalidMetaDBVersion, DBVersion) } for patchIndex, patch := range bdw.Patches { diff --git a/pkg/meta/dynamodb/dynamodb.go b/pkg/meta/dynamodb/dynamodb.go index fcbb1b765..5357d0122 100644 --- a/pkg/meta/dynamodb/dynamodb.go +++ b/pkg/meta/dynamodb/dynamodb.go @@ -2055,7 +2055,7 @@ func (dwr *DynamoDB) PatchDB() error { } if version.GetVersionIndex(DBVersion) == -1 { - return fmt.Errorf("DB has broken format, no version found %w", err) + return fmt.Errorf("%w: %s could not identify patches", zerr.ErrInvalidMetaDBVersion, DBVersion) } for patchIndex, patch := range dwr.Patches {