Sync/release/3.12.1

.github/workflows/main.yml

@@ -8,23 +8,6 @@ on:
     branches: [master]
 
 jobs:
-  linter:
-    name: flake8
-    runs-on: ubuntu-latest
-    steps:
-      - name: Step 1 - Checkout repository
-        uses: actions/checkout@v4
-      - name: Step 2 - Install python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.7
-      - name: Step 3 - Install dependencies
-        run: |
-          python -m pip install --upgrade pip setuptools wheel
-          python -m pip install -r requirements-tox.txt
-      - name: Step 4 - Run flake with tox
-        run: "python -m tox -e flake8"
-
   unit-tests:
     name: "Python ${{ matrix.python-version }} ${{ matrix.tox-env }}"
     runs-on: ubuntu-20.04

RELNOTES.md

@@ -2,6 +2,25 @@
 
 © Copyright EnterpriseDB UK Limited 2024 - All rights reserved.
 
+## 3.12.1 (2024-12-09)
+
+### Bugfixes
+
+- Add isoformat fields for backup start and end times in json output
+
+  This patch modifies the json output of the infofile object
+  adding two new fields: `begin_time_iso` and `end_time_iso`.
+  The new fields allow the use of a more standard and timezone aware
+  time format, preserving compatibility with previous versions.
+  It is worth noting that in the future the iso format for dates will be the
+  standard used by barman for storing dates and will be used everywhere
+  non human readable output is requested.
+
+  As part of the work, this patch reverts BAR-316, which was introduced on Barman
+  3.12.0.
+
+  References: BAR-494.
+
 ## 3.12.0 (2024-11-21)
 
 ### Minor changes
@@ -157,6 +176,14 @@
 
   References: BAR-417.
 
+- Use ISO format instead of ctime when producing JSON output of Barman cloud commands
+
+  The ctime format has no information about the time zone associated with the timestamp.
+  Besides that, that format is better suited for human consumption. For machine
+  consumption the ISO format is better suited.
+
+  References: BAR-316.
+
 ### Bugfixes
 
 - Fix barman check which returns wrong results for Replication Slot
@@ -213,6 +240,16 @@
 
   References: BAR-348.
 
+- Check for USAGE instead of MEMBER when calling pg_has_role in Barman
+
+  To work correctly Barman database user needs to be included in some roles. Barman was
+  verifying the conditions was satisfied by calling `pg_has_role` in Postgres. However,
+  it was check for the `MEMBER` privilege instead of `USAGE`. This oversight was fixed.
+
+  This change is a contribution from @RealGreenDragon.
+
+  References: BAR-489.
+
 ## 3.11.1 (2024-08-22)
 
 ### Bugfixes

barman/infofile.py

@@ -713,10 +713,19 @@ def to_json(self):
         # Convert fields which need special types not supported by json
         if data.get("tablespaces") is not None:
             data["tablespaces"] = [list(item) for item in data["tablespaces"]]
+        # Note on the `begin_time_iso`` and `end_time_iso`` fields:
+        # as ctime is not timezone-aware and mostly for human-readable output,
+        # we want to migrate to isoformat for datetime objects representation.
+        # To retain, for now, compatibility with the previous version of the output
+        # we add two new _iso fields to the json document.
         if data.get("begin_time") is not None:
-            data["begin_time"] = data["begin_time"].isoformat()
+            begin_time = data["begin_time"]
+            data["begin_time"] = begin_time.ctime()
+            data["begin_time_iso"] = begin_time.isoformat()
         if data.get("end_time") is not None:
-            data["end_time"] = data["end_time"].isoformat()
+            end_time = data["end_time"]
+            data["end_time"] = end_time.ctime()
+            data["end_time_iso"] = end_time.isoformat()
         return data
 
     @classmethod
@@ -734,9 +743,15 @@ def from_json(cls, server, json_backup_info):
             data["tablespaces"] = [
                 Tablespace._make(item) for item in data["tablespaces"]
             ]
-        if data.get("begin_time") is not None:
+        if data.get("begin_time_iso") is not None:
+            data["begin_time"] = load_datetime_tz(data["begin_time_iso"])
+            del data["begin_time_iso"]
+        elif data.get("begin_time") is not None:
             data["begin_time"] = load_datetime_tz(data["begin_time"])
-        if data.get("end_time") is not None:
+        if data.get("end_time_iso") is not None:
+            data["end_time"] = load_datetime_tz(data["end_time_iso"])
+            del data["end_time_iso"]
+        elif data.get("end_time") is not None:
             data["end_time"] = load_datetime_tz(data["end_time"])
         # Instantiate a BackupInfo object using the converted fields
         return cls(server, **data)

barman/version.py

@@ -20,4 +20,4 @@
 This module contains the current Barman version.
 """
 
-__version__ = "3.12.0"
+__version__ = "3.12.1"

docs/_build/man/barman-archive-wal.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-ARCHIVE-WAL" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-ARCHIVE-WAL" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-archive-wal \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-backup.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-BACKUP" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-BACKUP" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-backup \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-check-backup.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CHECK-BACKUP" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CHECK-BACKUP" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-check-backup \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-check.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CHECK" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CHECK" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-check \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-cloud-backup-delete.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CLOUD-BACKUP-DELETE" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CLOUD-BACKUP-DELETE" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-cloud-backup-delete \- Barman-cloud Commands
 .sp

docs/_build/man/barman-cloud-backup-keep.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CLOUD-BACKUP-KEEP" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CLOUD-BACKUP-KEEP" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-cloud-backup-keep \- Barman-cloud Commands
 .sp

docs/_build/man/barman-cloud-backup-list.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CLOUD-BACKUP-LIST" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CLOUD-BACKUP-LIST" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-cloud-backup-list \- Barman-cloud Commands
 .sp

docs/_build/man/barman-cloud-backup-show.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CLOUD-BACKUP-SHOW" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CLOUD-BACKUP-SHOW" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-cloud-backup-show \- Barman-cloud Commands
 .sp

docs/_build/man/barman-cloud-backup.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CLOUD-BACKUP" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CLOUD-BACKUP" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-cloud-backup \- Barman-cloud Commands
 .sp
@@ -199,7 +199,7 @@ Instance where the disks to be backed up as snapshots are attached.
 Name of a disk from which snapshots should be taken.
 .TP
 .B \fB\-\-tags\fP
-Tags to be added to archived WAL files in cloud storage and to snapshots created, if
+Tags to be added to all uploaded files in cloud storage, and/or to snapshots created, if
 snapshots are used.
 .UNINDENT
 .sp

docs/_build/man/barman-cloud-check-wal-archive.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CLOUD-CHECK-WAL-ARCHIVE" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CLOUD-CHECK-WAL-ARCHIVE" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-cloud-check-wal-archive \- Barman-cloud Commands
 .sp

docs/_build/man/barman-cloud-restore.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CLOUD-RESTORE" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CLOUD-RESTORE" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-cloud-restore \- Barman-cloud Commands
 .sp

docs/_build/man/barman-cloud-wal-archive.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CLOUD-WAL-ARCHIVE" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CLOUD-WAL-ARCHIVE" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-cloud-wal-archive \- Barman-cloud Commands
 .sp
@@ -43,9 +43,7 @@ barman\-cloud\-wal\-archive
                 [ { \-q | \-\-quiet } ]
                 [ { \-t | \-\-test } ]
                 [ \-\-cloud\-provider { aws\-s3 | azure\-blob\-storage | google\-cloud\-storage } ]
-                [ { \-z | \-\-gzip } ]
-                [ { \-j | \-\-bzip2 } ]
-                [ \-\-snappy ]
+                [ { { \-z | \-\-gzip } | { \-j | \-\-bzip2 } | \-\-xz | \-\-snappy | \-\-zstd | \-\-lz4 } ]
                 [ \-\-tags [ TAGS ... ] ]
                 [ \-\-history\-tags [ HISTORY_TAGS ... ] ]
                 [ \-\-endpoint\-url ENDPOINT_URL ]
@@ -137,10 +135,21 @@ gzip\-compress the WAL while uploading to the cloud (should not be used with pyt
 bzip2\-compress the WAL while uploading to the cloud (should not be used with python <
 3.3).
 .TP
+.B \fB\-\-xz\fP
+xz\-compress the WAL while uploading to the cloud (should not be used with python <
+3.3).
+.TP
 .B \fB\-\-snappy\fP
 snappy\-compress the WAL while uploading to the cloud (requires optional
 \fBpython\-snappy\fP library).
 .TP
+.B \fB\-\-zstd\fP
+zstd\-compress the WAL while uploading to the cloud (requires optional \fBzstandard\fP
+library).
+.TP
+.B \fB\-\-lz4\fP
+lz4\-compress the WAL while uploading to the cloud (requires optional \fBlz4\fP library).
+.TP
 .B \fB\-\-tags\fP
 Tags to be added to archived WAL files in cloud storage.
 .TP

docs/_build/man/barman-cloud-wal-restore.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CLOUD-WAL-RESTORE" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CLOUD-WAL-RESTORE" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-cloud-wal-restore \- Barman-cloud Commands
 .sp

docs/_build/man/barman-config-switch.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CONFIG-SWITCH" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CONFIG-SWITCH" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-config-switch \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-config-update.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CONFIG-UPDATE" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CONFIG-UPDATE" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-config-update \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-cron.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-CRON" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-CRON" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-cron \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-delete.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-DELETE" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-DELETE" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-delete \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-diagnose.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-DIAGNOSE" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-DIAGNOSE" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-diagnose \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-generate-manifest.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-GENERATE-MANIFEST" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-GENERATE-MANIFEST" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-generate-manifest \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-get-wal.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-GET-WAL" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-GET-WAL" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-get-wal \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-keep.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-KEEP" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-KEEP" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-keep \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-list-files.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-LIST-FILES" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-LIST-FILES" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-list-files \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-list-servers.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-LIST-SERVERS" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-LIST-SERVERS" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-list-servers \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-list_backups.1

@@ -28,7 +28,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-LIST_BACKUPS" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-LIST_BACKUPS" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-list_backups \- Barman Sub-Commands
 .SH SYNOPSIS

docs/_build/man/barman-lock-directory-cleanup.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "BARMAN-LOCK-DIRECTORY-CLEANUP" "1" "Nov 21, 2024" "3.12" "Barman"
+.TH "BARMAN-LOCK-DIRECTORY-CLEANUP" "1" "Dec 09, 2024" "3.12" "Barman"
 .SH NAME
 barman-lock-directory-cleanup \- Barman Sub-Commands
 .SH SYNOPSIS