feat(backupbackingimage): add parameters to backup backing image crea…

…te proto

ref: longhorn/longhorn 8884

Signed-off-by: Jack Lin <jack.lin@suse.com>

backupbackingimage/backupbackingimage.go

@@ -10,6 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
+	lhbackup "github.com/longhorn/go-common-libs/backup"
+
 	"github.com/longhorn/backupstore"
 	"github.com/longhorn/backupstore/common"
 	"github.com/longhorn/backupstore/types"
@@ -31,6 +33,8 @@ type BackupBackingImage struct {
 	CompressionMethod string
 	CreatedTime       string
 	CompleteTime      string
+	Secret            string
+	SecretNamespace   string
 
 	ProcessingBlocks *common.ProcessingBlocks
 
@@ -41,6 +45,7 @@ type BackupConfig struct {
 	Name            string
 	DestURL         string
 	ConcurrentLimit int32
+	Parameters      map[string]string
 }
 
 type RestoreConfig struct {
@@ -180,6 +185,8 @@ func performBackup(bsDriver backupstore.BackupStoreDriver, config *BackupConfig,
 	backupBackingImage.Blocks = common.SortBackupBlocks(backupBackingImage.Blocks, backupBackingImage.Size, mappings.BlockSize)
 	backupBackingImage.CompleteTime = util.Now()
 	backupBackingImage.BlockCount = totalBlockCounts
+	backupBackingImage.Secret = config.Parameters[lhbackup.LonghornBackupBackingImageParameterSecret]
+	backupBackingImage.SecretNamespace = config.Parameters[lhbackup.LonghornBackupBackingImageParameterSecretNamespace]
 	if err := saveBackingImageConfig(bsDriver, backupBackingImage); err != nil {
 		return progress.Progress, "", err
 	}

backupbackingimage/config.go

@@ -184,6 +184,8 @@ type BackupInfo struct {
 	Checksum          string
 	Labels            map[string]string
 	CompressionMethod string `json:",omitempty"`
+	Secret            string
+	SecretNamespace   string
 }
 
 func InspectBackupBackingImage(backupURL string) (*BackupInfo, error) {
@@ -217,5 +219,7 @@ func fillFullBackupBackingImageInfo(backupBackingImage *BackupBackingImage, dest
 		Checksum:          backupBackingImage.Checksum,
 		Labels:            backupBackingImage.Labels,
 		CompressionMethod: backupBackingImage.CompressionMethod,
+		Secret:            backupBackingImage.Secret,
+		SecretNamespace:   backupBackingImage.SecretNamespace,
 	}
 }

go.mod

@@ -10,43 +10,50 @@ require (
 	github.com/aws/aws-sdk-go v1.34.2
 	github.com/gammazero/workerpool v1.1.3
 	github.com/google/uuid v1.6.0
-	github.com/longhorn/go-common-libs v0.0.0-20240707062002-b9354601827e
+	github.com/longhorn/go-common-libs v0.0.0-20240820144159-94447d3f68d8
 	github.com/pierrec/lz4/v4 v4.1.21
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/slok/goresilience v0.2.0
 	github.com/spf13/afero v1.5.1
-	github.com/stretchr/testify v1.8.4
-	github.com/urfave/cli v1.20.0
-	golang.org/x/net v0.25.0
-	golang.org/x/sys v0.22.0
+	github.com/stretchr/testify v1.9.0
+	github.com/urfave/cli v1.22.1
+	golang.org/x/net v0.26.0
+	golang.org/x/sys v0.24.0
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
-	k8s.io/apimachinery v0.30.2
-	k8s.io/mount-utils v0.30.2
+	k8s.io/apimachinery v0.31.0
+	k8s.io/mount-utils v0.31.0
 )
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/gammazero/deque v0.2.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/jmespath/go-jmespath v0.3.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/moby/sys/mountinfo v0.6.2 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/moby/sys/mountinfo v0.7.1 // indirect
+	github.com/opencontainers/runc v1.1.13 // indirect
+	github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.11.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.26.0 // indirect
 	github.com/prometheus/procfs v0.6.0 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/russross/blackfriday/v2 v2.0.1 // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
 )