From 2082e8d5fc7c182ac164a7b0ae5934d65aaed7bb Mon Sep 17 00:00:00 2001 From: Marco Nenciarini Date: Wed, 24 Dec 2025 14:27:41 +0100 Subject: [PATCH] fix(targetTime): treat RFC3339-like timestamps without timezone as UTC Update the machinery dependency to include the fix that ensures RFC3339-like timestamps without timezone (e.g., "2024-01-15T10:30:00") are interpreted as UTC. The documentation has been updated to use a targetTime example with an explicit Z suffix and to clarify that timestamps without timezone are interpreted as UTC. Closes #699 Signed-off-by: Marco Nenciarini --- go.mod | 4 ++-- go.sum | 8 ++++---- web/docs/troubleshooting.md | 7 ++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 378e67e2..652e4e86 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/cloudnative-pg/cloudnative-pg v1.28.0 github.com/cloudnative-pg/cnpg-i v0.3.0 github.com/cloudnative-pg/cnpg-i-machinery v0.4.1 - github.com/cloudnative-pg/machinery v0.3.1 + github.com/cloudnative-pg/machinery v0.3.2-0.20251224124022-0a2c04fbd5fe github.com/onsi/ginkgo/v2 v2.27.3 github.com/onsi/gomega v1.38.3 github.com/spf13/cobra v1.10.2 @@ -119,7 +119,7 @@ require ( golang.org/x/net v0.47.0 // indirect golang.org/x/oauth2 v0.32.0 // indirect golang.org/x/sync v0.18.0 // indirect - golang.org/x/sys v0.38.0 // indirect + golang.org/x/sys v0.39.0 // indirect golang.org/x/term v0.37.0 // indirect golang.org/x/text v0.31.0 // indirect golang.org/x/time v0.13.0 // indirect diff --git a/go.sum b/go.sum index 73d81d82..ec331316 100644 --- a/go.sum +++ b/go.sum @@ -26,8 +26,8 @@ github.com/cloudnative-pg/cnpg-i v0.3.0 h1:5ayNOG5x68lU70IVbHDZQrv5p+bErCJ0mqRmO github.com/cloudnative-pg/cnpg-i v0.3.0/go.mod h1:VOIWWXcJ1RyioK+elR2DGOa4cBA6K+6UQgx05aZmH+g= github.com/cloudnative-pg/cnpg-i-machinery v0.4.1 h1:M4ELhZO0e7UjiV3PZ3uGJOz3SgG/3ThWiqkbrFCcXNE= github.com/cloudnative-pg/cnpg-i-machinery v0.4.1/go.mod h1:TxwoMgQINOJkS1kepudqCBTYd8QYev6JoT8R52pYD4E= -github.com/cloudnative-pg/machinery v0.3.1 h1:KtPA6EwELTUNisCMLiFYkK83GU9606rkGQhDJGPB8Yw= -github.com/cloudnative-pg/machinery v0.3.1/go.mod h1:jebuqKxZAbrRKDEEpVCIDMKW+FbWtB9Kf/hb2kMUu9o= +github.com/cloudnative-pg/machinery v0.3.2-0.20251224124022-0a2c04fbd5fe h1:Tnh+eRQdcFquywy1Oit9vaMRw1YOfN14+PpMBDhexyk= +github.com/cloudnative-pg/machinery v0.3.2-0.20251224124022-0a2c04fbd5fe/go.mod h1:RYAYlVKBF5pH4mg+Q8wHjNDyENV9ajbkG41zOEf8DEs= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -275,8 +275,8 @@ golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY= golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= -golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= +golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= diff --git a/web/docs/troubleshooting.md b/web/docs/troubleshooting.md index 132916ba..4a8f0ea3 100644 --- a/web/docs/troubleshooting.md +++ b/web/docs/troubleshooting.md @@ -339,7 +339,7 @@ For detailed Barman restore operations and troubleshooting, refer to the recovery: source: origin recoveryTarget: - targetTime: "2024-01-15 10:30:00" + targetTime: "2024-01-15T10:30:00Z" externalClusters: - name: origin @@ -358,6 +358,11 @@ For detailed Barman restore operations and troubleshooting, refer to the -c plugin-barman-cloud | grep -i wal ``` +:::note +RFC 3339 timestamps without an explicit timezone suffix +(e.g., `2024-01-15T10:30:00`) are interpreted as UTC. +::: + :::note For detailed PITR configuration and WAL management, see the [Barman PITR documentation](https://docs.pgbarman.org/latest/).