Skip to content

Commit 79d4abf

Browse files
arnab-baishnabarnab-baishnab
authored
Incorporate changes for the AWS credless feature (#85)
Signed-off-by: Arnab Baishnab Nipun <nipun@appscode.com>
1 parent d78f06e commit 79d4abf

File tree

92 files changed

+2422
-558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2422
-558
lines changed

‎.DS_Store‎

6 KB
Binary file not shown.

‎go.mod‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ require (
2525
kmodules.xyz/client-go v0.34.3
2626
kmodules.xyz/offshoot-api v0.34.0
2727
kmodules.xyz/prober v0.34.0
28-
kubedb.dev/apimachinery v0.61.0
29-
kubestash.dev/apimachinery v0.26.0
28+
kubedb.dev/apimachinery v0.63.0
29+
kubestash.dev/apimachinery v0.26.1-0.20260407065046-0532bb60c9dd
3030
sigs.k8s.io/controller-runtime v0.22.4
3131
sigs.k8s.io/yaml v1.6.0
3232
stash.appscode.dev/apimachinery v0.42.1
@@ -63,14 +63,14 @@ require (
6363
cloud.google.com/go/monitoring v1.24.2 // indirect
6464
cloud.google.com/go/storage v1.51.0 // indirect
6565
filippo.io/edwards25519 v1.1.1 // indirect
66-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 // indirect
67-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0 // indirect
66+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 // indirect
67+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.0-beta.3 // indirect
6868
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
6969
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.3 // indirect
7070
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
7171
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
7272
github.com/Azure/go-autorest/autorest/to v0.4.1 // indirect
73-
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
73+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
7474
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
7575
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
7676
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
@@ -99,7 +99,8 @@ require (
9999
github.com/aws/smithy-go v1.23.2 // indirect
100100
github.com/beorn7/perks v1.0.1 // indirect
101101
github.com/blang/semver/v4 v4.0.0 // indirect
102-
github.com/cert-manager/cert-manager v1.19.3 // indirect
102+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
103+
github.com/cert-manager/cert-manager v1.19.4 // indirect
103104
github.com/cespare/xxhash/v2 v2.3.0 // indirect
104105
github.com/chai2010/gettext-go v1.0.2 // indirect
105106
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect

‎go.sum‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
3636
filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw=
3737
filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
3838
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
39-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 h1:5YTBM8QDVIBN3sxBil89WfdAAqDZbyJTgh688DSxX5w=
40-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1/go.mod h1:YD5h/ldMsG0XiIw7PdyNhLxaM317eFh5yNLccNfGdyw=
41-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0 h1:KpMC6LFL7mqpExyMC9jVOYRiVhLmamjeZfRsUpB7l4s=
42-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0/go.mod h1:J7MUC/wtRpfGVbQ5sIItY5/FuVWmvzlY21WAOfQnq/I=
39+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 h1:JXg2dwJUmPB9JmtVmdEB16APJ7jurfbY5jnfXpJoRMc=
40+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0/go.mod h1:YD5h/ldMsG0XiIw7PdyNhLxaM317eFh5yNLccNfGdyw=
41+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.0-beta.3 h1:0g4UTtvRA9goC37cmD9ZHdW6CCNJR4cOXBnHz0r4ubM=
42+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.0-beta.3/go.mod h1:fEiHi0sbYqbo3shUkIF1SNxm8GyeEJl+Poc/djOvbdE=
4343
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
4444
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
4545
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
@@ -56,8 +56,8 @@ github.com/Azure/go-autorest/autorest/to v0.4.1 h1:CxNHBqdzTr7rLtdrtb5CMjJcDut+W
5656
github.com/Azure/go-autorest/autorest/to v0.4.1/go.mod h1:EtaofgU4zmtvn1zT2ARsjRFdq9vXx0YWtmElwL+GZ9M=
5757
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
5858
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
59-
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 h1:XkkQbfMyuH2jTSjQjSoihryI8GINRcs4xp8lNawg0FI=
60-
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
59+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs=
60+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
6161
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
6262
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
6363
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 h1:UQUsRi8WTzhZntp5313l+CHIAT95ojUI2lpP/ExlZa4=
@@ -130,9 +130,11 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
130130
github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
131131
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
132132
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
133+
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
134+
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
133135
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
134-
github.com/cert-manager/cert-manager v1.19.3 h1:3d0Nk/HO3BOmAdBJNaBh+6YgaO3Ciey3xCpOjiX5Obs=
135-
github.com/cert-manager/cert-manager v1.19.3/go.mod h1:e9NzLtOKxTw7y99qLyWGmPo6mrC1Nh0EKKcMkRfK+GE=
136+
github.com/cert-manager/cert-manager v1.19.4 h1:7lOkSYj+nJNjgGFfAznQzPpOfWX+1Kgz6xUXwTa/K5k=
137+
github.com/cert-manager/cert-manager v1.19.4/go.mod h1:9uBnn3IK9NxjjuXmQDYhwOwFUU5BtGVB1g/voPvvcVw=
136138
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
137139
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
138140
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -906,16 +908,16 @@ kmodules.xyz/offshoot-api v0.34.0 h1:HnOOp8FrCjTWjtNApRDo6Ahe79tOlLrJmyye4xxO4Kk
906908
kmodules.xyz/offshoot-api v0.34.0/go.mod h1:F+B59yYw4CZJ4uD4xu6C+mMLzIXUtuH7E+SbDICl9jE=
907909
kmodules.xyz/prober v0.34.0 h1:ElZkZYCjLaytAA0M8EH42To7i9gh1IIX+d0qfaIohys=
908910
kmodules.xyz/prober v0.34.0/go.mod h1:rsu/fxxfNxY70GDbH6Ju8G66459hi7AhWSSBoiIp8ic=
909-
kubedb.dev/apimachinery v0.61.0 h1:gYI8RFr6W9k9+961fwoWz/6DVGmX0NwPXlTzPBYKxB4=
910-
kubedb.dev/apimachinery v0.61.0/go.mod h1:LaumaEPYGkieolZcvmT75qqZxKbcN0mZ4xIuA85TZaY=
911+
kubedb.dev/apimachinery v0.63.0 h1:YnHHiNJbpeTk7Y+WInG5NLuLfupF/RT1qTPRa6MONBo=
912+
kubedb.dev/apimachinery v0.63.0/go.mod h1:l3qXJvsiSUEZZ9DIF539BADcUwVA4Nz2SGdOLTrtDRM=
911913
kubeops.dev/operator-shard-manager v0.0.5 h1:i7VnyUfIa9u3RQhSTVWNsooXcgmrWWxJyI9gJ10onE8=
912914
kubeops.dev/operator-shard-manager v0.0.5/go.mod h1:NE6GzlhwLRiwiUUpqi4Uf+J7e/gniITM0uJnE5r1mzY=
913915
kubeops.dev/petset v0.0.15 h1:iwTRFAp0RNw0A87sw2c97UZ6WIA9H/nhJBpDhXLa7fk=
914916
kubeops.dev/petset v0.0.15/go.mod h1:sw96WiXfzhpmKpXj4a5AdmEHs0Bx4QMhf+iW15zY4Gg=
915917
kubeops.dev/sidekick v0.0.12 h1:pmUjQLZDKxgREiM6z0PogLR1aDbgvkE9jRjbxG6dEt0=
916918
kubeops.dev/sidekick v0.0.12/go.mod h1:RU7QH3E8DOLw15rBYlOOJSyczuwAnVVtYyZjJb00UB8=
917-
kubestash.dev/apimachinery v0.26.0 h1:kcPrsHVCh6vKrK/veAzjNODfv2GiOsUuSehuIBFnDAo=
918-
kubestash.dev/apimachinery v0.26.0/go.mod h1:l82MTUNbJbQmjTWIVi3XW5miRt94Ut6YPbdi8BVxieo=
919+
kubestash.dev/apimachinery v0.26.1-0.20260407065046-0532bb60c9dd h1:LPKKAD56j3zIAtav1+oBgysZ0vwKVKE4LSsjW/x48XM=
920+
kubestash.dev/apimachinery v0.26.1-0.20260407065046-0532bb60c9dd/go.mod h1:Tg99lwRGd9yyADMJlt3M0XNeHN0/v/o7IX+Jb9st6hc=
919921
open-cluster-management.io/api v1.2.0 h1:+yeQgJiErrur5S4s205UM37EcZ2XbC9pFSm0xgV5/hU=
920922
open-cluster-management.io/api v1.2.0/go.mod h1:YcmA6SpGEekIMxdoeVIIyOaBhMA6ImWRLXP4g8n8T+4=
921923
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

‎pkg/add_key.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/klog/v2"
2929
kmapi "kmodules.xyz/client-go/api/v1"
3030
v1 "kmodules.xyz/offshoot-api/api/v1"
31-
storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
31+
"kubestash.dev/apimachinery/pkg/resolver"
3232
)
3333

3434
func NewCmdAddKey(opt *keyOptions) *cobra.Command {
@@ -131,6 +131,11 @@ func (opt *keyOptions) addResticKeyViaDocker() error {
131131
}
132132
}()
133133

134+
backupStorage, err := getBackupStorage(opt.repo.Spec.StorageRef)
135+
if err != nil {
136+
return fmt.Errorf("failed to get backup storage. Reason: %w", err)
137+
}
138+
134139
encryptSecret, err := getEncryptionSecret(klient, opt.repo.Spec.EncryptionSecret)
135140
if err != nil {
136141
return fmt.Errorf("failed to get encryption secret. Reason: %w", err)
@@ -139,7 +144,7 @@ func (opt *keyOptions) addResticKeyViaDocker() error {
139144
setupOptions := &restic.SetupOptions{
140145
Backends: []*restic.Backend{
141146
{
142-
ConfigResolver: storageapi.NewBackupStorageResolver(klient, &opt.repo.Spec.StorageRef),
147+
ConfigResolver: resolver.NewBackupStorageResolver(klient, backupStorage),
143148
Repository: opt.repo.Name,
144149
EncryptionSecret: encryptSecret,
145150
},

‎pkg/download.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
v1 "kmodules.xyz/offshoot-api/api/v1"
3636
storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
3737
"kubestash.dev/apimachinery/pkg"
38+
"kubestash.dev/apimachinery/pkg/resolver"
3839
)
3940

4041
type downloadOptions struct {
@@ -148,7 +149,7 @@ func NewCmdDownload(clientGetter genericclioptions.RESTClientGetter) *cobra.Comm
148149
ScratchDir: ScratchDir,
149150
Backends: []*restic.Backend{
150151
{
151-
ConfigResolver: storageapi.NewBackupStorageResolver(klient, &repository.Spec.StorageRef),
152+
ConfigResolver: resolver.NewBackupStorageResolver(klient, backupStorage),
152153
Repository: repository.Name,
153154
EncryptionSecret: encryptSecret,
154155
},

‎pkg/list_key.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/klog/v2"
2929
kmapi "kmodules.xyz/client-go/api/v1"
3030
v1 "kmodules.xyz/offshoot-api/api/v1"
31-
storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
31+
"kubestash.dev/apimachinery/pkg/resolver"
3232
)
3333

3434
func NewCmdListKey(opt *keyOptions) *cobra.Command {
@@ -120,6 +120,11 @@ func (opt *keyOptions) listResticKeysViaDocker() error {
120120
}
121121
}()
122122

123+
backupStorage, err := getBackupStorage(opt.repo.Spec.StorageRef)
124+
if err != nil {
125+
return fmt.Errorf("failed to get backup storage. Reason: %w", err)
126+
}
127+
123128
encryptionSecret, err := getEncryptionSecret(klient, opt.repo.Spec.EncryptionSecret)
124129
if err != nil {
125130
return fmt.Errorf("failed to get encryption secret. Reason: %w", err)
@@ -129,7 +134,7 @@ func (opt *keyOptions) listResticKeysViaDocker() error {
129134
setupOptions := &restic.SetupOptions{
130135
Backends: []*restic.Backend{
131136
{
132-
ConfigResolver: storageapi.NewBackupStorageResolver(klient, &opt.repo.Spec.StorageRef),
137+
ConfigResolver: resolver.NewBackupStorageResolver(klient, backupStorage),
133138
Directory: filepath.Join(opt.repo.Spec.Path, path),
134139
Repository: opt.repo.Name,
135140
EncryptionSecret: encryptionSecret,

‎pkg/remove_key.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/klog/v2"
3030
kmapi "kmodules.xyz/client-go/api/v1"
3131
v1 "kmodules.xyz/offshoot-api/api/v1"
32-
storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
32+
"kubestash.dev/apimachinery/pkg/resolver"
3333
)
3434

3535
func NewCmdRemoveKey(opt *keyOptions) *cobra.Command {
@@ -137,6 +137,11 @@ func (opt *keyOptions) removeResticKeyViaDocker() error {
137137
}
138138
}()
139139

140+
backupStorage, err := getBackupStorage(opt.repo.Spec.StorageRef)
141+
if err != nil {
142+
return fmt.Errorf("failed to get backup storage. Reason: %w", err)
143+
}
144+
140145
encryptionSecret, err := getEncryptionSecret(klient, opt.repo.Spec.EncryptionSecret)
141146
if err != nil {
142147
return fmt.Errorf("failed to get encryption secret. Reason: %w", err)
@@ -145,7 +150,7 @@ func (opt *keyOptions) removeResticKeyViaDocker() error {
145150
setupOptions := &restic.SetupOptions{
146151
Backends: []*restic.Backend{
147152
{
148-
ConfigResolver: storageapi.NewBackupStorageResolver(klient, &opt.repo.Spec.StorageRef),
153+
ConfigResolver: resolver.NewBackupStorageResolver(klient, backupStorage),
149154
Repository: opt.repo.Name,
150155
EncryptionSecret: encryptionSecret,
151156
},

‎pkg/restore.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"k8s.io/klog/v2"
3434
kmapi "kmodules.xyz/client-go/api/v1"
3535
v1 "kmodules.xyz/offshoot-api/api/v1"
36-
storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
36+
"kubestash.dev/apimachinery/pkg/resolver"
3737
"kubestash.dev/cli/pkg/common"
3838
"kubestash.dev/cli/pkg/common/dump"
3939
)
@@ -169,7 +169,7 @@ func NewCmdManifestRestore(clientGetter genericclioptions.RESTClientGetter) *cob
169169
ScratchDir: ScratchDir,
170170
Backends: []*restic.Backend{
171171
{
172-
ConfigResolver: storageapi.NewBackupStorageResolver(klient, &repository.Spec.StorageRef),
172+
ConfigResolver: resolver.NewBackupStorageResolver(klient, backupStorage),
173173
Repository: repository.Name,
174174
EncryptionSecret: encryptSecret,
175175
},

‎pkg/unlock.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
v1 "kmodules.xyz/offshoot-api/api/v1"
3535
storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
3636
"kubestash.dev/apimachinery/pkg"
37+
"kubestash.dev/apimachinery/pkg/resolver"
3738
)
3839

3940
type unlockOptions struct {
@@ -142,6 +143,11 @@ func (opt *unlockOptions) unlockRepositoryViaPod(pod *core.Pod) error {
142143
}
143144

144145
func (opt *unlockOptions) unlockRepositoryViaDocker() error {
146+
backupStorage, err := getBackupStorage(opt.repo.Spec.StorageRef)
147+
if err != nil {
148+
return fmt.Errorf("failed to get backup storage. Reason: %v", err)
149+
}
150+
145151
encryptSecret, err := getEncryptionSecret(klient, opt.repo.Spec.EncryptionSecret)
146152
if err != nil {
147153
return fmt.Errorf("failed to get encryption secret. Reason: %w", err)
@@ -150,7 +156,7 @@ func (opt *unlockOptions) unlockRepositoryViaDocker() error {
150156
setupOptions := &restic.SetupOptions{
151157
Backends: []*restic.Backend{
152158
{
153-
ConfigResolver: storageapi.NewBackupStorageResolver(klient, &opt.repo.Spec.StorageRef),
159+
ConfigResolver: resolver.NewBackupStorageResolver(klient, backupStorage),
154160
Repository: opt.repo.Name,
155161
EncryptionSecret: encryptSecret,
156162
},

‎pkg/update_key.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"k8s.io/klog/v2"
2828
kmapi "kmodules.xyz/client-go/api/v1"
2929
v1 "kmodules.xyz/offshoot-api/api/v1"
30-
storageapi "kubestash.dev/apimachinery/apis/storage/v1alpha1"
30+
"kubestash.dev/apimachinery/pkg/resolver"
3131
)
3232

3333
func NewCmdUpdateKey(opt *keyOptions) *cobra.Command {
@@ -126,6 +126,11 @@ func (opt *keyOptions) updateResticKeyViaDocker() error {
126126
}
127127
}()
128128

129+
backupStorage, err := getBackupStorage(opt.repo.Spec.StorageRef)
130+
if err != nil {
131+
return fmt.Errorf("failed to get backup storage. Reason: %w", err)
132+
}
133+
129134
encryptionSecret, err := getEncryptionSecret(klient, opt.repo.Spec.EncryptionSecret)
130135
if err != nil {
131136
return fmt.Errorf("failed to get encryption secret. Reason: %w", err)
@@ -135,7 +140,7 @@ func (opt *keyOptions) updateResticKeyViaDocker() error {
135140
setupOptions := &restic.SetupOptions{
136141
Backends: []*restic.Backend{
137142
{
138-
ConfigResolver: storageapi.NewBackupStorageResolver(klient, &opt.repo.Spec.StorageRef),
143+
ConfigResolver: resolver.NewBackupStorageResolver(klient, backupStorage),
139144
Directory: filepath.Join(opt.repo.Spec.Path, path),
140145
Repository: opt.repo.Name,
141146
EncryptionSecret: encryptionSecret,

0 commit comments

Comments
 (0)