Merge 0d049249cf into 0bb78879ce

Signed-off-by: Tao Li <tao.li@enterprisedb.com>

go.mod

@@ -5,7 +5,7 @@ go 1.26.3
 require (
 	github.com/cert-manager/cert-manager v1.20.2
 	github.com/cloudnative-pg/api v1.29.1
-	github.com/cloudnative-pg/barman-cloud v0.5.2-0.20260529020047-bb683bf8d82a
+	github.com/cloudnative-pg/barman-cloud v0.5.1
 	github.com/cloudnative-pg/cloudnative-pg v1.29.1
 	github.com/cloudnative-pg/cnpg-i v0.5.0
 	github.com/cloudnative-pg/cnpg-i-machinery v0.4.2

go.sum

@@ -20,8 +20,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cloudnative-pg/api v1.29.1 h1:FWr8S7EQeOfdhYXyr2cof8wUXLARZiiQt5Qa6ltED7w=
 github.com/cloudnative-pg/api v1.29.1/go.mod h1:QtWF3yzSvIfORMHaSkPAk/o3bhCJwEHJgN3riyRiz3o=
-github.com/cloudnative-pg/barman-cloud v0.5.2-0.20260529020047-bb683bf8d82a h1:u2Ykj9oCJlJw/xxiCXjG+svTmpaHMcaW6kGNdHdertk=
+github.com/cloudnative-pg/barman-cloud v0.5.1 h1:vjkXrrxo2DQXHT9u9usqhtaHiPZ/lTfDVs/pIWYTepQ=
-github.com/cloudnative-pg/barman-cloud v0.5.2-0.20260529020047-bb683bf8d82a/go.mod h1:DACs5rdlMIQ7mUOpJVBRTrbf+d7OGyMOLsFUEMJ2JV8=
+github.com/cloudnative-pg/barman-cloud v0.5.1/go.mod h1:XPc5IUFP1y4cZX1sg+Pd8j9V4tmUEVnv3BGCpfQOOg8=
 github.com/cloudnative-pg/cloudnative-pg v1.29.1 h1:ZNEt1TMlnQKXI1kho2UqQuqdfvIvjGln4kN7C1lsmGA=
 github.com/cloudnative-pg/cloudnative-pg v1.29.1/go.mod h1:Sbgx9jVmkle4/gR2U5JHrzDd74sRPOBHDtPkvncg5v8=
 github.com/cloudnative-pg/cnpg-i v0.5.0 h1:/TOzpNT6cwNgrpftTtrnLKdoHgMwd+88vZgXjlVgXeE=

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),

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",
+		Entry("ErrInvalidWalName -> InvalidArgument",
-			fmt.Errorf("invalid name for a WAL file: %w", barmanRestorer.ErrInvalidWALName),
+			fmt.Errorf("invalid name for a WAL file: %w", barmanRestorer.ErrInvalidWalName),
 			codes.InvalidArgument),
 		Entry("ErrConnectivity -> Unavailable",
 			fmt.Errorf("connectivity failure, retrying: %w", barmanRestorer.ErrConnectivity),