Skip to content

Commit 56d8cce

Browse files
authored
feat: upgrade Barman to 3.13.0 (#209)
Upgrade Barman to 3.13.0 and adjust the argument order in `barman-cloud-restore` to work around the regression described in cloudnative-pg/cloudnative-pg#6932. Closes #208 Signed-off-by: Marco Nenciarini <[email protected]>
1 parent 795313f commit 56d8cce

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

containers/sidecar-requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
barman[azure,cloud,google,snappy,zstandard,lz4]==3.12.1
1+
barman[azure,cloud,google,snappy,zstandard,lz4]==3.13.0
22
setuptools==75.8.2
33
boto3==1.35.99

containers/sidecar-requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ azure-storage-blob==12.24.1 \
1818
--hash=sha256:052b2a1ea41725ba12e2f4f17be85a54df1129e13ea0321f5a2fcc851cbf47d4 \
1919
--hash=sha256:77fb823fdbac7f3c11f7d86a5892e2f85e161e8440a7489babe2195bf248f09e
2020
# via barman
21-
barman==3.12.1 \
22-
--hash=sha256:258ef7100717f66032402e0abe03c977089c50fc47143df5708e92aa1d772937 \
23-
--hash=sha256:9dd7be219b6f74954b80cdc28f9a72f2acb923e7da65edd0f41cdc82fd32e169
21+
barman==3.13.0 \
22+
--hash=sha256:4c040d65f80dcd69876063781524ffa4f7918969d98b461eb43123ac5f96f260 \
23+
--hash=sha256:b2ff8af2bacc6958efeec23fa26295f035658ab55d815d7f3c583cef1d8bfdfe
2424
# via -r sidecar-requirements.in
2525
boto3==1.35.99 \
2626
--hash=sha256:83e560faaec38a956dfb3d62e05e1703ee50432b45b788c09e25107c5058bd71 \

internal/cnpgi/restore/restore.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,17 @@ func (impl JobHookImpl) restoreDataDir(
153153
) error {
154154
var options []string
155155

156+
options, err := barmanCommand.AppendCloudProviderOptionsFromConfiguration(ctx, options, barmanConfiguration)
157+
if err != nil {
158+
return err
159+
}
160+
156161
if backup.Status.EndpointURL != "" {
157162
options = append(options, "--endpoint-url", backup.Status.EndpointURL)
158163
}
159164
options = append(options, backup.Status.DestinationPath)
160165
options = append(options, backup.Status.ServerName)
161166
options = append(options, backup.Status.BackupID)
162-
163-
options, err := barmanCommand.AppendCloudProviderOptionsFromConfiguration(ctx, options, barmanConfiguration)
164-
if err != nil {
165-
return err
166-
}
167-
168167
options = append(options, impl.PgDataPath)
169168

170169
log.Info("Starting barman-cloud-restore",

0 commit comments

Comments
 (0)