From 137a6186d9bc79e5643f8a602d2bfc8c6012dc0a Mon Sep 17 00:00:00 2001 From: Tao Li Date: Tue, 2 Jun 2026 13:17:27 +0800 Subject: [PATCH] fix: use correct ErrInvalidWALName Signed-off-by: Tao Li --- internal/cnpgi/common/errors.go | 2 +- internal/cnpgi/common/errors_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/cnpgi/common/errors.go b/internal/cnpgi/common/errors.go index 2aa1836..b006f95 100644 --- a/internal/cnpgi/common/errors.go +++ b/internal/cnpgi/common/errors.go @@ -34,7 +34,7 @@ func classifyWALRestoreError(walName string, walErr error) error { switch { case errors.Is(walErr, barmanRestorer.ErrWALNotFound): return newWALNotFoundError(walName) - case errors.Is(walErr, barmanRestorer.ErrInvalidWalName): + case errors.Is(walErr, barmanRestorer.ErrInvalidWALName): // A malformed WAL name will never become valid on retry. return newInvalidWALNameError(walName, walErr) case errors.Is(walErr, barmanRestorer.ErrConnectivity), diff --git a/internal/cnpgi/common/errors_test.go b/internal/cnpgi/common/errors_test.go index ac3d509..d2647b0 100644 --- a/internal/cnpgi/common/errors_test.go +++ b/internal/cnpgi/common/errors_test.go @@ -47,8 +47,8 @@ var _ = Describe("classifyWALRestoreError", func() { Entry("ErrWALNotFound -> NotFound", fmt.Errorf("object storage or file not found: %w", barmanRestorer.ErrWALNotFound), codes.NotFound), - Entry("ErrInvalidWalName -> InvalidArgument", - fmt.Errorf("invalid name for a WAL file: %w", barmanRestorer.ErrInvalidWalName), + Entry("ErrInvalidWALName -> InvalidArgument", + fmt.Errorf("invalid name for a WAL file: %w", barmanRestorer.ErrInvalidWALName), codes.InvalidArgument), Entry("ErrConnectivity -> Unavailable", fmt.Errorf("connectivity failure, retrying: %w", barmanRestorer.ErrConnectivity),