Rewrite executor for standalone restic

Signed-off-by: Anisur Rahman <anisur@appscode.com>

Author: anisurrahman75

Dockerfile

@@ -1,5 +1,5 @@
 # Build topolvm
-FROM --platform=$BUILDPLATFORM golang:1.24-bookworm AS build-topolvm
+FROM --platform=$BUILDPLATFORM golang:1.25-bookworm AS build-topolvm
 
 # Get argument
 ARG TOPOLVM_VERSION

api/legacy/v1/logicalvolume_types.go

@@ -72,10 +72,10 @@ type SnapshotStatus struct {
 	// Error contains details if the operation encountered an error.
 	// +optional
 	Error *SnapshotError `json:"error,omitempty"`
-	// Paths are the paths that were backed up or restored
+	// Path represents the directory inside the SnapshotStorage where this backup was stored.
 	// +optional
-	Paths []string `json:"paths,omitempty"`
-	// Repository is the Restic repository path where the snapshot is stored
+	Path string `json:"path,omitempty"`
+	// Repository is the Restic repository path/url where the snapshot is stored
 	// +optional
 	Repository string `json:"repository,omitempty"`
 	// SnapshotID is the identifier of the Restic snapshot involved in the operation.

api/legacy/v1/zz_generated.deepcopy.go

@@ -72,10 +72,10 @@ type SnapshotStatus struct {
 	// Error contains details if the operation encountered an error.
 	// +optional
 	Error *SnapshotError `json:"error,omitempty"`
-	// Paths are the paths that were backed up or restored
+	// Path represents the directory inside the SnapshotStorage where this backup was stored.
 	// +optional
-	Paths []string `json:"paths,omitempty"`
-	// Repository is the Restic repository path where the snapshot is stored
+	Path string `json:"path,omitempty"`
+	// Repository is the Restic repository path/url where the snapshot is stored
 	// +optional
 	Repository string `json:"repository,omitempty"`
 	// SnapshotID is the identifier of the Restic snapshot involved in the operation.

api/v1/logicalvolume_types.go

@@ -0,0 +1,62 @@
+package v1
+
+import (
+	"context"
+	"fmt"
+
+	core "k8s.io/api/core/v1"
+	"kubestash.dev/apimachinery/pkg/restic"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// NewSnapshotStorageResolver creates a StorageConfigResolver that resolves storage configuration
+func NewSnapshotStorageResolver(kbClient client.Client, bs *SnapshotBackupStorage) restic.StorageConfigResolver {
+	return func(backend *restic.Backend) error {
+		var storageSecretName string
+		switch {
+		case bs.Spec.Storage.S3 != nil:
+			s3 := bs.Spec.Storage.S3
+			storageSecretName = s3.SecretName
+			backend.StorageConfig = &restic.StorageConfig{
+				Provider:       string(ProviderS3),
+				Bucket:         s3.Bucket,
+				Endpoint:       s3.Endpoint,
+				Region:         s3.Region,
+				Prefix:         s3.Prefix,
+				InsecureTLS:    s3.InsecureTLS,
+				MaxConnections: s3.MaxConnections,
+			}
+		case bs.Spec.Storage.GCS != nil:
+			gcs := bs.Spec.Storage.GCS
+			storageSecretName = gcs.SecretName
+			backend.StorageConfig = &restic.StorageConfig{
+				Provider:       string(ProviderGCS),
+				Bucket:         gcs.Bucket,
+				Prefix:         gcs.Prefix,
+				MaxConnections: gcs.MaxConnections,
+			}
+		case bs.Spec.Storage.Azure != nil:
+			azure := bs.Spec.Storage.Azure
+			storageSecretName = azure.SecretName
+			backend.StorageConfig = &restic.StorageConfig{
+				Provider:            string(ProviderAzure),
+				Bucket:              azure.Container,
+				Prefix:              azure.Prefix,
+				AzureStorageAccount: azure.StorageAccount,
+				MaxConnections:      azure.MaxConnections,
+			}
+		default:
+			return fmt.Errorf("no storage backend configured in BackupStorage %s/%s", bs.Namespace, bs.Name)
+		}
+
+		if storageSecretName != "" {
+			secret := &core.Secret{}
+			if err := kbClient.Get(context.Background(), client.ObjectKey{Name: storageSecretName, Namespace: bs.Namespace}, secret); err != nil {
+				return fmt.Errorf("failed to get storage Secret %s/%s: %w", bs.Namespace, storageSecretName, err)
+			}
+			backend.StorageSecret = secret
+			backend.EncryptionSecret = secret
+		}
+		return nil
+	}
+}

api/v1/snapshotbackupstorage_helpers.go

@@ -177,11 +177,10 @@ spec:
                     description: Operation indicates whether this status is for a
                       backup or a restore.
                     type: string
-                  paths:
-                    description: Paths are the paths that were backed up or restored
-                    items:
-                      type: string
-                    type: array
+                  path:
+                    description: Path represents the directory inside the SnapshotStorage
+                      where this backup was stored.
+                    type: string
                   phase:
                     description: Phase represents the current phase of the backup
                       or restore operation.
@@ -202,8 +201,8 @@ spec:
                         type: integer
                     type: object
                   repository:
-                    description: Repository is the Restic repository path where the
-                      snapshot is stored
+                    description: Repository is the Restic repository path/url where
+                      the snapshot is stored
                     type: string
                   snapshotID:
                     description: SnapshotID is the identifier of the Restic snapshot

api/v1/zz_generated.deepcopy.go

@@ -177,11 +177,10 @@ spec:
                     description: Operation indicates whether this status is for a
                       backup or a restore.
                     type: string
-                  paths:
-                    description: Paths are the paths that were backed up or restored
-                    items:
-                      type: string
-                    type: array
+                  path:
+                    description: Path represents the directory inside the SnapshotStorage
+                      where this backup was stored.
+                    type: string
                   phase:
                     description: Phase represents the current phase of the backup
                       or restore operation.
@@ -202,8 +201,8 @@ spec:
                         type: integer
                     type: object
                   repository:
-                    description: Repository is the Restic repository path where the
-                      snapshot is stored
+                    description: Repository is the Restic repository path/url where
+                      the snapshot is stored
                     type: string
                   snapshotID:
                     description: SnapshotID is the identifier of the Restic snapshot

charts/topolvm-15.7.1.tgz

@@ -45,7 +45,7 @@ func newBackupCommand() *cobra.Command {
 		Use:   "backup",
 		Short: "Take an online snapshot of a logical volume",
 		Long: `The backup command performs an online snapshot of a logical volume.
-		It backs up the mounted filesystem to a remote repository using Restic or Kopia.`,
+		It backs up the mounted filesystem to a remote repoPath using Restic or Kopia.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
 			bOpt.log = ctrl.Log.WithName("backup")
@@ -152,13 +152,7 @@ func (opt *BackupOptions) performBackup(ctx context.Context) error {
 		"nodeName", opt.nodeName,
 		"mountPath", opt.mountPath)
 
-	pvider, err := opt.getBackupProvider()
-	if err != nil {
-		opt.handleBackupError(ctx, "failed to initialize backup provider", err)
-		return err
-	}
-
-	result, err := opt.executeBackup(ctx, pvider)
+	result, err := opt.executeBackup(ctx)
 	if err != nil {
 		opt.handleBackupError(ctx, "backup execution failed", err)
 		return err
@@ -170,24 +164,16 @@ func (opt *BackupOptions) performBackup(ctx context.Context) error {
 	return nil
 }
 
-func (opt *BackupOptions) getBackupProvider() (provider.Provider, error) {
-	pvider, err := provider.GetProvider(opt.client, opt.snapshotStorage)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get snapshot provider: %w", err)
-	}
-	opt.log.Info("backup provider initialized", "engine", opt.snapshotStorage.Spec.Engine)
-	return pvider, nil
-}
-
-func (opt *BackupOptions) executeBackup(ctx context.Context, pvider provider.Provider) (*provider.BackupResult, error) {
+func (opt *BackupOptions) executeBackup(ctx context.Context) (*provider.BackupResult, error) {
 	params := opt.buildBackupParams()
 	opt.log.Info("executing backup with params",
-		"repository", params.Suffix,
-		"paths", params.BackupPaths,
-		"exclude", params.Exclude,
-		"args", params.Args,
+		"repo-name", params.Repo.Name, "repo-path", params.Repo.Path,
+		"backup-paths", params.BackupPaths, "exclude", params.Exclude, "args", params.Args,
 	)
-
+	pvider, err := getProvider(opt.client, opt.log, opt.snapshotStorage, params.Repo)
+	if err != nil {
+		return nil, fmt.Errorf("failed to initialize backup provider: %w", err)
+	}
 	result, err := pvider.Backup(ctx, params)
 	if err != nil {
 		return nil, fmt.Errorf("backup operation failed: %w", err)
@@ -204,7 +190,7 @@ func (opt *BackupOptions) handleBackupError(ctx context.Context, message string,
 	opt.log.Error(err, message, "lvName", opt.lvName)
 
 	errorMsg := err.Error()
-	if updateErr := setStatusFailed(ctx, opt.client, opt.logicalVol, errorMsg); updateErr != nil {
+	if updateErr := setStatusFailed(ctx, opt.client, opt.logicalVol, backupErrorCode, errorMsg); updateErr != nil {
 		opt.log.Error(updateErr, "failed to update error status", "originalError", errorMsg)
 	}
 
@@ -228,12 +214,15 @@ func (opt *BackupOptions) handleBackupSuccess(ctx context.Context, result *provi
 	return nil
 }
 
-func (opt *BackupOptions) buildBackupParams() provider.BackupParam {
-	return provider.BackupParam{
-		RepoRef: provider.RepoRef{
-			Suffix: filepath.Join(opt.targetedPVCRef.Namespace, opt.targetedPVCRef.Name),
+func (opt *BackupOptions) buildBackupParams() *provider.BackupParam {
+	return &provider.BackupParam{
+		Client:    opt.client,
+		Namespace: getNamespace(),
+		Repo: &provider.RepoInf{
+			Name: filepath.Join(opt.targetedPVCRef.Namespace, opt.targetedPVCRef.Name),
+			Path: filepath.Join(opt.targetedPVCRef.Namespace, opt.targetedPVCRef.Name),
 		},
-		BackupPaths: []string{opt.mountPath},
+		BackupPaths: []string{filepath.Join("/", opt.mountPath)},
 	}
 }
 
@@ -272,6 +261,7 @@ func (opt *BackupOptions) setStatusSuccess(ctx context.Context, result *provider
 	lv.Status.Snapshot.Duration = result.Duration
 	lv.Status.Snapshot.Version = result.Provider
 	lv.Status.Snapshot.Error = nil
+	lv.Status.Snapshot.Path = result.Path
 	lv.Status.Snapshot.Repository = result.Repository
 	if err := opt.client.Status().Update(ctx, lv); err != nil {
 		return fmt.Errorf("failed to update status: %w", err)