Skip to content

Commit 152145e

Browse files
jbattiatojbattiato
authored
Merge branch 'main' into dev/add_controller-gen
2 parents 6d4b1df + 74d4f5d commit 152145e

File tree

7 files changed

+75
-48
lines changed

7 files changed

+75
-48
lines changed

‎Taskfile.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ tasks:
1212
desc: Run golangci-lint
1313
env:
1414
# renovate: datasource=git-refs depName=golangci-lint lookupName=https://github.com/sagikazarmark/daggerverse currentValue=main
15-
DAGGER_GOLANGCI_LINT_SHA: 68e9daa611183f5334b4059bac6f4aad62da7a37
15+
DAGGER_GOLANGCI_LINT_SHA: 7fc77a4f8dd54d4d4c56e40517f7109e8585bcdd
1616
cmds:
1717
- >
1818
GITHUB_REF= dagger -s call -m github.com/sagikazarmark/daggerverse/golangci-lint@${DAGGER_GOLANGCI_LINT_SHA}
@@ -24,7 +24,7 @@ tasks:
2424
desc: Run spellcheck
2525
env:
2626
# renovate: datasource=git-refs depName=spellcheck lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
27-
DAGGER_SPELLCHECK_SHA: 32dae448c22c7b3207753334307a8e4c9870991a
27+
DAGGER_SPELLCHECK_SHA: d24d288a7219586f5ad2580f749ab4fe4226d51b
2828
cmds:
2929
- >
3030
GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/spellcheck@${DAGGER_SPELLCHECK_SHA}
@@ -38,7 +38,7 @@ tasks:
3838
desc: Check for conventional commits
3939
env:
4040
# renovate: datasource=git-refs depName=commitlint lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
41-
DAGGER_COMMITLINT_SHA: 32dae448c22c7b3207753334307a8e4c9870991a
41+
DAGGER_COMMITLINT_SHA: d24d288a7219586f5ad2580f749ab4fe4226d51b
4242
cmds:
4343
- >
4444
GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/commitlint@${DAGGER_COMMITLINT_SHA}
@@ -50,7 +50,7 @@ tasks:
5050
- manifest
5151
env:
5252
# renovate: datasource=git-refs depName=uncommitted lookupName=https://github.com/cloudnative-pg/daggerverse currentValue=main
53-
DAGGER_UNCOMMITTED_SHA: 32dae448c22c7b3207753334307a8e4c9870991a
53+
DAGGER_UNCOMMITTED_SHA: d24d288a7219586f5ad2580f749ab4fe4226d51b
5454
cmds:
5555
- GITHUB_REF= dagger -s call -m github.com/cloudnative-pg/daggerverse/uncommitted@${DAGGER_UNCOMMITTED_SHA} check-uncommitted --source . stdout
5656
sources:
@@ -60,11 +60,11 @@ tasks:
6060
desc: Run go test
6161
env:
6262
# renovate: datasource=docker depName=golang versioning=semver
63-
GOLANG_IMAGE_VERSION: 1.23.2
63+
GOLANG_IMAGE_VERSION: 1.23.3
6464
# renovate: datasource=git-refs depname=kubernetes packageName=https://github.com/kubernetes/kubernetes versioning=semver
6565
K8S_VERSION: 1.31.0
6666
# renovate: datasource=git-refs depName=controller-runtime packageName=https://github.com/kubernetes-sigs/controller-runtime versioning=semver
67-
SETUP_ENVTEST_VERSION: 0.19.0
67+
SETUP_ENVTEST_VERSION: 0.19.2
6868
cmds:
6969
- >
7070
GITHUB_REF= dagger -s call -m ./dagger/gotest
@@ -280,7 +280,7 @@ tasks:
280280
IMAGE_VERSION: '{{regexReplaceAll "(\\d+)/merge" .GITHUB_REF_NAME "pr-${1}"}}'
281281
env:
282282
# renovate: datasource=git-refs depName=kustomize lookupName=https://github.com/sagikazarmark/daggerverse currentValue=main
283-
DAGGER_KUSTOMIZE_SHA: 68e9daa611183f5334b4059bac6f4aad62da7a37
283+
DAGGER_KUSTOMIZE_SHA: 7fc77a4f8dd54d4d4c56e40517f7109e8585bcdd
284284
cmds:
285285
- >
286286
dagger -s call -m github.com/sagikazarmark/daggerverse/kustomize@${DAGGER_KUSTOMIZE_SHA}
@@ -303,7 +303,7 @@ tasks:
303303
- GITHUB_TOKEN
304304
env:
305305
# renovate: datasource=git-refs depName=gh lookupName=https://github.com/sagikazarmark/daggerverse
306-
DAGGER_GH_SHA: 68e9daa611183f5334b4059bac6f4aad62da7a37
306+
DAGGER_GH_SHA: 7fc77a4f8dd54d4d4c56e40517f7109e8585bcdd
307307
preconditions:
308308
- sh: "[[ {{.GITHUB_REF}} =~ 'refs/tags/v.*' ]]"
309309
msg: not a tag, failing

‎containers/Dockerfile.plugin‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS gobuilder
2+
FROM --platform=$BUILDPLATFORM golang:1.23.3 AS gobuilder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎containers/Dockerfile.sidecar‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Both components are built before going into a distroless container
66

77
# Build the manager binary
8-
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS gobuilder
8+
FROM --platform=$BUILDPLATFORM golang:1.23.3 AS gobuilder
99
ARG TARGETOS
1010
ARG TARGETARCH
1111

‎go.mod‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23
55
toolchain go1.23.3
66

77
require (
8-
github.com/cert-manager/cert-manager v1.16.1
8+
github.com/cert-manager/cert-manager v1.16.2
99
github.com/cloudnative-pg/barman-cloud v0.0.0-20241105055149-ae6c2408bd14
1010
github.com/cloudnative-pg/cloudnative-pg v1.24.1-0.20241113134512-8608232c2813
1111
github.com/cloudnative-pg/cnpg-i v0.0.0-20241109002750-8abd359df734
@@ -18,15 +18,15 @@ require (
1818
github.com/spf13/viper v1.19.0
1919
google.golang.org/grpc v1.68.0
2020
gopkg.in/yaml.v3 v3.0.1
21-
k8s.io/api v0.31.2
22-
k8s.io/apiextensions-apiserver v0.31.2
23-
k8s.io/apimachinery v0.31.2
24-
k8s.io/client-go v0.31.2
21+
k8s.io/api v0.31.3
22+
k8s.io/apiextensions-apiserver v0.31.3
23+
k8s.io/apimachinery v0.31.3
24+
k8s.io/client-go v0.31.3
2525
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
26-
sigs.k8s.io/controller-runtime v0.19.1
26+
sigs.k8s.io/controller-runtime v0.19.2
2727
sigs.k8s.io/kind v0.25.0
28-
sigs.k8s.io/kustomize/api v0.17.3
29-
sigs.k8s.io/kustomize/kyaml v0.17.2
28+
sigs.k8s.io/kustomize/api v0.18.0
29+
sigs.k8s.io/kustomize/kyaml v0.18.1
3030
)
3131

3232
require (
@@ -125,7 +125,6 @@ require (
125125
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
126126
go.opentelemetry.io/otel/trace v1.32.0 // indirect
127127
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
128-
go.starlark.net v0.0.0-20240925182052-1207426daebd // indirect
129128
go.uber.org/multierr v1.11.0 // indirect
130129
go.uber.org/zap v1.27.0 // indirect
131130
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
@@ -146,8 +145,8 @@ require (
146145
gopkg.in/ini.v1 v1.67.0 // indirect
147146
gopkg.in/yaml.v2 v2.4.0 // indirect
148147
gotest.tools/v3 v3.5.1 // indirect
149-
k8s.io/apiserver v0.31.2 // indirect
150-
k8s.io/component-base v0.31.2 // indirect
148+
k8s.io/apiserver v0.31.3 // indirect
149+
k8s.io/component-base v0.31.3 // indirect
151150
k8s.io/klog/v2 v2.130.1 // indirect
152151
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
153152
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect

‎go.sum‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM
2020
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
2121
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
2222
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
23-
github.com/cert-manager/cert-manager v1.16.1 h1:1ceFMqTtwiqY2vyfaRT85CNiVmK7pJjt3GebYCx9awY=
24-
github.com/cert-manager/cert-manager v1.16.1/go.mod h1:MfLVTL45hFZsqmaT1O0+b2ugaNNQQZttSFV9hASHUb0=
23+
github.com/cert-manager/cert-manager v1.16.2 h1:c9UU2E+8XWGruyvC/mdpc1wuLddtgmNr8foKdP7a8Jg=
24+
github.com/cert-manager/cert-manager v1.16.2/go.mod h1:MfLVTL45hFZsqmaT1O0+b2ugaNNQQZttSFV9hASHUb0=
2525
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
2626
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
2727
github.com/cloudnative-pg/api v0.0.0-20241004125129-98baa9f4957b h1:LZ9tIgKmWb8ZvyLg/J8ExXtmBtEWP2dr3Y4TU4nCq/w=
@@ -268,8 +268,6 @@ go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQD
268268
go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
269269
go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
270270
go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
271-
go.starlark.net v0.0.0-20240925182052-1207426daebd h1:S+EMisJOHklQxnS3kqsY8jl2y5aF0FDEdcLnOw3q22E=
272-
go.starlark.net v0.0.0-20240925182052-1207426daebd/go.mod h1:YKMCv9b1WrfWmeqdV5MAuEHWsu5iC+fe6kYl2sQjdI8=
273271
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
274272
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
275273
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
@@ -350,18 +348,18 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
350348
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
351349
gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
352350
gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
353-
k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
354-
k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
355-
k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0=
356-
k8s.io/apiextensions-apiserver v0.31.2/go.mod h1:i+Geh+nGCJEGiCGR3MlBDkS7koHIIKWVfWeRFiOsUcM=
357-
k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
358-
k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
359-
k8s.io/apiserver v0.31.2 h1:VUzOEUGRCDi6kX1OyQ801m4A7AUPglpsmGvdsekmcI4=
360-
k8s.io/apiserver v0.31.2/go.mod h1:o3nKZR7lPlJqkU5I3Ove+Zx3JuoFjQobGX1Gctw6XuE=
361-
k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc=
362-
k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs=
363-
k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA=
364-
k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ=
351+
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
352+
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
353+
k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=
354+
k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4=
355+
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
356+
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
357+
k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY=
358+
k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg=
359+
k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4=
360+
k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs=
361+
k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ=
362+
k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU=
365363
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
366364
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
367365
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 h1:1dWzkmJrrprYvjGwh9kEUxmcUV/CtNU8QM7h1FLWQOo=
@@ -370,18 +368,18 @@ k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 h1:jGnCPejIetjiy2gqaJ5V0NLwTpF4w
370368
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
371369
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
372370
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
373-
sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk=
374-
sigs.k8s.io/controller-runtime v0.19.1/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
371+
sigs.k8s.io/controller-runtime v0.19.2 h1:3sPrF58XQEPzbE8T81TN6selQIMGbtYwuaJ6eDssDF8=
372+
sigs.k8s.io/controller-runtime v0.19.2/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
375373
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
376374
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
377375
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
378376
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
379377
sigs.k8s.io/kind v0.25.0 h1:ugUvgesHKKA0yKmD6QtYTiEev+kPUpGxdTPbMGf8VTU=
380378
sigs.k8s.io/kind v0.25.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
381-
sigs.k8s.io/kustomize/api v0.17.3 h1:6GCuHSsxq7fN5yhF2XrC+AAr8gxQwhexgHflOAD/JJU=
382-
sigs.k8s.io/kustomize/api v0.17.3/go.mod h1:TuDH4mdx7jTfK61SQ/j1QZM/QWR+5rmEiNjvYlhzFhc=
383-
sigs.k8s.io/kustomize/kyaml v0.17.2 h1:+AzvoJUY0kq4QAhH/ydPHHMRLijtUKiyVyh7fOSshr0=
384-
sigs.k8s.io/kustomize/kyaml v0.17.2/go.mod h1:9V0mCjIEYjlXuCdYsSXvyoy2BTsLESH7TlGV81S282U=
379+
sigs.k8s.io/kustomize/api v0.18.0 h1:hTzp67k+3NEVInwz5BHyzc9rGxIauoXferXyjv5lWPo=
380+
sigs.k8s.io/kustomize/api v0.18.0/go.mod h1:f8isXnX+8b+SGLHQ6yO4JG1rdkZlvhaCf/uZbLVMb0U=
381+
sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E=
382+
sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo=
385383
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
386384
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
387385
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

‎internal/cnpgi/operator/config/config.go‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ func (e *ConfigurationError) IsEmpty() bool {
4444

4545
// PluginConfiguration is the configuration of the plugin
4646
type PluginConfiguration struct {
47-
BarmanObjectName string
47+
BarmanObjectName string
48+
RecoveryBarmanObjectName string
49+
RecoveryBarmanServerName string
4850
}
4951

5052
// NewFromCluster extracts the configuration from the cluster
@@ -54,22 +56,50 @@ func NewFromCluster(cluster *cnpgv1.Cluster) *PluginConfiguration {
5456
metadata.PluginName,
5557
)
5658

59+
recoveryServerName := ""
60+
recoveryBarmanObjectName := ""
61+
62+
if recoveryParameters := getRecoveryParameters(cluster); recoveryParameters != nil {
63+
recoveryBarmanObjectName = recoveryParameters["barmanObjectName"]
64+
recoveryServerName = recoveryParameters["serverName"]
65+
if len(recoveryServerName) == 0 {
66+
recoveryServerName = cluster.Name
67+
}
68+
}
69+
5770
result := &PluginConfiguration{
5871
// used for the backup/archive
5972
BarmanObjectName: helper.Parameters["barmanObjectName"],
73+
// used for restore/wal_restore
74+
RecoveryBarmanServerName: recoveryServerName,
75+
RecoveryBarmanObjectName: recoveryBarmanObjectName,
6076
}
6177

6278
return result
6379
}
6480

81+
func getRecoveryParameters(cluster *cnpgv1.Cluster) map[string]string {
82+
recoveryPluginConfiguration := cluster.GetRecoverySourcePlugin()
83+
if recoveryPluginConfiguration == nil {
84+
return nil
85+
}
86+
87+
if recoveryPluginConfiguration.Name != metadata.PluginName {
88+
return nil
89+
}
90+
91+
return recoveryPluginConfiguration.Parameters
92+
}
93+
6594
// Validate checks if the barmanObjectName is set
6695
func (p *PluginConfiguration) Validate() error {
6796
err := NewConfigurationError()
68-
if len(p.BarmanObjectName) != 0 {
69-
return nil
97+
98+
if len(p.BarmanObjectName) == 0 && len(p.RecoveryBarmanObjectName) == 0 {
99+
return err.WithMessage("no reference to barmanObjectName have been included")
70100
}
71101

72-
return err.WithMessage("Missing barmanObjectName parameter")
102+
return nil
73103
}
74104

75105
// Plugin represents a plugin with its associated cluster and parameters.

‎internal/cnpgi/restore/restore.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func (impl JobHookImpl) Restore(
160160
contextLogger.Info("sending restore response", "config", config, "env", env)
161161
return &restore.RestoreResponse{
162162
RestoreConfig: config,
163-
Envs: env,
163+
Envs: nil,
164164
}, nil
165165
}
166166

0 commit comments

Comments
 (0)