fix: use correct ErrInvalidWALName

Signed-off-by: Tao Li <tao.li@enterprisedb.com>
chore: remove replace in go mod
2026-07-08 10:42:21 +02:00 · 2026-06-02 13:50:13 +08:00 · 2026-06-02 12:13:41 +08:00 · 2026-05-28 17:35:07 +02:00 · 2026-05-28 16:27:00 +02:00 · 2026-05-28 16:25:28 +02:00
2 changed files with 20 additions and 20 deletions
--- a/Taskfile.yml
+++ b/Taskfile.yml
@ -9,7 +9,7 @@ vars:
  GO_VERSION:
    sh: sed -n 's/^toolchain go//p' go.mod | grep . || sed -n 's/^go //p' go.mod
  # renovate: datasource=docker depName=kindest/node versioning=semver
-  E2E_KUBERNETES_VERSION: v1.36.1
+  E2E_KUBERNETES_VERSION: v1.35.1
  E2E_CLUSTER_NAME: barman-cloud-plugin-e2e-{{.E2E_KUBERNETES_VERSION}}
  REGISTRY_NETWORK: barman-cloud-plugin
  REGISTRY_NAME: registry.barman-cloud-plugin
@ -21,7 +21,7 @@ tasks:
    desc: Run golangci-lint
    env:
      # renovate: datasource=git-refs depName=golangci-lint lookupName=https://github.com/sagikazarmark/daggerverse currentValue=main
-      DAGGER_GOLANGCI_LINT_SHA: ff27cd50f6b4eed2e3753c520632cd6099e1ce52
+      DAGGER_GOLANGCI_LINT_SHA: 81b688189377135bd0cf85f3ddba88c4fbb52c2d
      # renovate: datasource=docker depName=golangci/golangci-lint versioning=semver
      GOLANGCI_LINT_VERSION: v2.12.2
    cmds:
@ -263,7 +263,7 @@ tasks:
    run: once
    vars:
      # renovate: datasource=git-refs depName=kind lookupName=https://github.com/kubernetes-sigs/kind versioning=semver
-      KIND_VERSION: v0.32.0
+      KIND_VERSION: v0.31.0
    cmds:
      - go install sigs.k8s.io/kind@{{.KIND_VERSION}}
      - kind version | grep -q {{.KIND_VERSION}}
@ -453,7 +453,7 @@ tasks:
      IMAGE_VERSION: '{{regexReplaceAll "(\\d+)/merge" .GITHUB_REF_NAME "pr-${1}"}}'
    env:
      # renovate: datasource=git-refs depName=kustomize lookupName=https://github.com/sagikazarmark/daggerverse currentValue=main
-      DAGGER_KUSTOMIZE_SHA: ff27cd50f6b4eed2e3753c520632cd6099e1ce52
+      DAGGER_KUSTOMIZE_SHA: 81b688189377135bd0cf85f3ddba88c4fbb52c2d
    cmds:
      - >
        dagger -s call -m https://github.com/sagikazarmark/daggerverse/kustomize@${DAGGER_KUSTOMIZE_SHA}
@ -483,7 +483,7 @@ tasks:
        - GITHUB_TOKEN
    env:
      # renovate: datasource=git-refs depName=gh lookupName=https://github.com/sagikazarmark/daggerverse
-      DAGGER_GH_SHA: ff27cd50f6b4eed2e3753c520632cd6099e1ce52
+      DAGGER_GH_SHA: 81b688189377135bd0cf85f3ddba88c4fbb52c2d
    preconditions:
      - sh: "[[ {{.GITHUB_REF}} =~ 'refs/tags/v.*' ]]"
        msg: not a tag, failing
--- a/containers/sidecar-requirements.txt
+++ b/containers/sidecar-requirements.txt
@ -22,13 +22,13 @@ barman==3.19.1 \
    --hash=sha256:0a6a9e1babf97687732d8b2a3eb79ea95d55246a5257b9433865cb6e755221c0 \
    --hash=sha256:2f71c4a1f1ba53f694cbdf838bb9906d8ba02b97d1fd3041196e8999bec7a1ee
    # via -r sidecar-requirements.in
-boto3==1.43.18 \
+boto3==1.43.14 \
-    --hash=sha256:33138883e984eb1937d1553da699182c8ad2099138091e885b65c9accbccea16 \
+    --hash=sha256:574335744656cfed0b362a0a0467aaf2eb2bf15526edcd02d31d3c661f4b09e4 \
-    --hash=sha256:7b62ce5c0a51428d692aa4f2adc9dc2a4a4c2989bf65a0a12834eeffa99b0b84
+    --hash=sha256:5c0a994b3182061ee101812e721100717a4d664f9f4ceaf4a86b6d032ce9fc2d
    # via barman
-botocore==1.43.18 \
+botocore==1.43.14 \
-    --hash=sha256:dc8c105351b49688c667065cd5a45fc5b9db982657cefc9e3fbfb9417a55c7df \
+    --hash=sha256:1f4a2a95ea78c10398e78431e98c1fe47adb54a7b10a32975144c1f541186658 \
-    --hash=sha256:e2610fce16df9f89deab5f3c163430a814e6804034eb95bef8957c8db60b7dbc
+    --hash=sha256:b9e500737e43d2f147c9d4e23b54360335e77d4c0ba90a318f51b65e06cb8516
    # via
    #   boto3
    #   s3transfer
@ -512,9 +512,9 @@ googleapis-common-protos==1.75.0 \
    --hash=sha256:53a062ff3c32552fbd62c11fe23768b78e4ddf0494d5e5fd97d3f4689c75fbbd \
    --hash=sha256:961ed60399c457ceb0ee8f285a84c870aabc9c6a832b9d37bb281b5bebde43ed
    # via google-api-core
-idna==3.17 \
+idna==3.16 \
-    --hash=sha256:466e48829084efe2548012b855df21540b96f2e20e51bd124c851536556a592c \
+    --hash=sha256:cc246e3a3f89580c3a951b5ad298ca4638078b2cdd4f115654332b5c26daded5 \
-    --hash=sha256:5eb0cb53bc467c12eadcf6de83163ad8527cec9416f44b9b61b19caedad2b87f
+    --hash=sha256:d7a6da03db833450fca25d2358ac9ff06cd624577a4aea3a596d5c0f77b8e03d
    # via requests
 isodate==0.7.2 \
    --hash=sha256:28009937d8031054830160fce6d409ed342816b543597cece116d966c6d99e15 \
@ -585,9 +585,9 @@ lz4==4.4.5 \
    --hash=sha256:f9b8bde9909a010c75b3aea58ec3910393b758f3c219beed67063693df854db0 \
    --hash=sha256:ff1b50aeeec64df5603f17984e4b5be6166058dcf8f1e26a3da40d7a0f6ab547
    # via barman
-msal==1.37.0 \
+msal==1.36.0 \
-    --hash=sha256:1b1672a33ee467c1d70b341bb16cafd51bb3c817147a95b93263794b03971bec \
+    --hash=sha256:36ecac30e2ff4322d956029aabce3c82301c29f0acb1ad89b94edcabb0e58ec4 \
-    --hash=sha256:dd17e95a7c71bce75e8108113438ba7c4a086b3bcad4f57a8c09b7af3d753c2d
+    --hash=sha256:3f6a4af2b036b476a4215111c4297b4e6e236ed186cd804faefba23e4990978b
    # via
    #   azure-identity
    #   msal-extensions
@ -657,9 +657,9 @@ requests==2.34.2 \
    #   google-api-core
    #   google-cloud-storage
    #   msal
-s3transfer==0.18.0 \
+s3transfer==0.17.0 \
-    --hash=sha256:239c13b09e65ad0346e1be7348b8a202dcad44ac7ea7c6eb858fc881dce739b6 \
+    --hash=sha256:9edeb6d1c3c2f89d6050348548834ad8289610d886e5bf7b7207728bd43ce33a \
-    --hash=sha256:3760b8b7ec1315da54048b2d626276732bee4300d054d492d4e1d43e20d4ecbd
+    --hash=sha256:ce3801712acf4ad3e89fb9990df97b4972e93f4b3b0004d214be5bce12814c20
    # via boto3
 six==1.17.0 \
    --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \
Author	SHA1	Message	Date
Tao Li	be888236e6	fix: use correct ErrInvalidWALName Signed-off-by: Tao Li <tao.li@enterprisedb.com>	2026-06-02 13:50:13 +08:00
Tao Li	127e4f2075	chore: remove replace in go mod Signed-off-by: Tao Li <tao.li@enterprisedb.com>	2026-06-02 12:13:41 +08:00
Armando Ruocco	5560083160	chore(crd): regenerate after barman-cloud restoreAdditionalCommandArgs addition The replace directive in go.mod pulls in a barman-cloud version that exposes the new restoreAdditionalCommandArgs field on BarmanObjectStoreConfiguration. The plugin's CRD embeds that struct, so controller-gen + kustomize must be rerun to surface the field in the published CRD and bundled manifest. CI's uncommitted-changes guard caught the gap. Regenerated with controller-gen v0.21.0 (matching the daggerverse module version) and kustomize v5.5.0; only the new field is added, no annotation drift. Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>	2026-05-28 17:35:07 +02:00
Armando Ruocco	7c63be1d24	test(common): cover WAL restore error classification Extract the barman-restorer error -> gRPC code switch from restoreFromBarmanObjectStore into a pure helper, classifyWALRestoreError, so it can be exercised in isolation without the surrounding k8s client / configuration scaffolding. Add ginkgo specs that check: - each barman sentinel maps to the expected gRPC status code (ErrConnectivity and ErrGeneric both -> Unavailable, since barman uses exit 4 for some retryable conditions too), - an unclassified error falls through to codes.Internal, - classification still works through multiple fmt.Errorf wraps, - the switch matches by errors.Is identity rather than message substring (so a NotFound whose message happens to mention "connectivity" still maps to NotFound). internal/cnpgi/common had no tests before; this introduces the suite scaffolding alongside the new specs. Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>	2026-05-28 16:27:00 +02:00
Armando Ruocco	273bbb474c	docs(wal): describe gRPC code intent, not future operator behavior The per-case and helper comments asserted what the operator will do with each gRPC code ("the operator stops retrying", "the operator will retry the request", etc.). On the current cloudnative-pg main, the operator only differentiates ErrWALNotFound; the precise-code distinctions become meaningful only after the operator-side retry work lands. Rewrite the comments to describe what the code emits and why (per gRPC convention), so they stay accurate regardless of the operator version on the other end. Also note that barman returns ErrGeneric (exit 4) for some retryable conditions too — not only ErrConnectivity (exit 2) — which justifies why both map to codes.Unavailable. Signed-off-by: Armando Ruocco <armando.ruocco@enterprisedb.com>	2026-05-28 16:25:28 +02:00
Leonardo Cecchi	263ebe2bc1	fix: classify WAL restore errors with precise gRPC statuses Map each restorer sentinel to the gRPC status that best reflects whether the operator should retry: - ErrWALNotFound -> NotFound (terminal) - ErrInvalidWalName -> InvalidArgument (terminal) - ErrConnectivity -> Unavailable (retry) - ErrGeneric -> Unavailable (retry) - anything else -> Internal (terminal) Previously every non-NotFound failure was returned verbatim, leaving the operator unable to tell transient blips apart from terminal conditions like a malformed WAL name. Signed-off-by: Leonardo Cecchi <leonardo.cecchi@enterprisedb.com>	2026-05-28 15:54:29 +02:00