backup: move common functions and types to backupstore lib

Longhorn 6138

Signed-off-by: Derek Su <[email protected]>

app/cmd/backup.go

@@ -10,6 +10,7 @@ import (
 	"github.com/urfave/cli"
 
 	"github.com/longhorn/backupstore/cmd"
+	butil "github.com/longhorn/backupstore/util"
 
 	replicaClient "github.com/longhorn/longhorn-engine/pkg/replica/client"
 	"github.com/longhorn/longhorn-engine/pkg/sync"
@@ -262,7 +263,7 @@ func createBackup(c *cli.Context) error {
 		}
 	}
 
-	credential, err := util.GetBackupCredential(dest)
+	credential, err := butil.GetBackupCredential(dest)
 	if err != nil {
 		return err
 	}
@@ -308,7 +309,7 @@ func restoreBackup(c *cli.Context) error {
 	}
 	backupURL := util.UnescapeURL(backup)
 
-	credential, err := util.GetBackupCredential(backup)
+	credential, err := butil.GetBackupCredential(backup)
 	if err != nil {
 		return err
 	}

pkg/backup/main.go

@@ -31,7 +31,7 @@ type CreateBackupParameters struct {
 	BackingImageChecksum string
 	CompressionMethod    string
 	ConcurrentLimit      int32
-	StorageClassname     string
+	StorageClassName     string
 	Labels               []string
 }
 
@@ -110,7 +110,7 @@ func DoBackupInit(params *CreateBackupParameters) (*replica.BackupStatus, *backu
 		BackingImageName:     params.BackingImageName,
 		BackingImageChecksum: params.BackingImageChecksum,
 		CompressionMethod:    params.CompressionMethod,
-		StorageClassName:     params.StorageClassname,
+		StorageClassName:     params.StorageClassName,
 		CreatedTime:          util.Now(),
 	}
 

pkg/replica/backup.go

@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/longhorn/backupstore"
+	btypes "github.com/longhorn/backupstore/types"
 	butil "github.com/longhorn/backupstore/util"
 
 	"github.com/longhorn/longhorn-engine/pkg/backingfile"
@@ -288,7 +288,7 @@ func (rb *BackupStatus) CloseSnapshot(snapID, volumeID string) error {
 	return err
 }
 
-func (rb *BackupStatus) CompareSnapshot(snapID, compareSnapID, volumeID string) (*backupstore.Mappings, error) {
+func (rb *BackupStatus) CompareSnapshot(snapID, compareSnapID, volumeID string) (*btypes.Mappings, error) {
 	id := diskutil.GenerateSnapshotDiskName(snapID)
 	compareID := ""
 	if compareSnapID != "" {
@@ -314,10 +314,10 @@ func (rb *BackupStatus) CompareSnapshot(snapID, compareSnapID, volumeID string)
 		return nil, fmt.Errorf("failed to find snapshot %s in chain", compareID)
 	}
 
-	mappings := &backupstore.Mappings{
+	mappings := &btypes.Mappings{
 		BlockSize: snapBlockSize,
 	}
-	mapping := backupstore.Mapping{
+	mapping := btypes.Mapping{
 		Offset: -1,
 	}
 
@@ -331,7 +331,7 @@ func (rb *BackupStatus) CompareSnapshot(snapID, compareSnapID, volumeID string)
 			// align
 			offset -= (offset % snapBlockSize)
 			if mapping.Offset != offset {
-				mapping = backupstore.Mapping{
+				mapping = btypes.Mapping{
 					Offset: offset,
 					Size:   snapBlockSize,
 				}

pkg/sync/rpc/server.go

@@ -22,6 +22,7 @@ import (
 	"google.golang.org/grpc/reflection"
 
 	"github.com/longhorn/backupstore"
+	butil "github.com/longhorn/backupstore/util"
 	"github.com/longhorn/sparse-tools/sparse"
 	sparserest "github.com/longhorn/sparse-tools/sparse/rest"
 
@@ -681,12 +682,12 @@ func (s *SyncAgentServer) SnapshotCloneStatus(ctx context.Context, req *empty.Em
 }
 
 func (s *SyncAgentServer) BackupCreate(ctx context.Context, req *ptypes.BackupCreateRequest) (*ptypes.BackupCreateResponse, error) {
-	backupType, err := util.CheckBackupType(req.BackupTarget)
+	backupType, err := butil.CheckBackupType(req.BackupTarget)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := util.SetupCredential(backupType, req.Credential); err != nil {
+	if err := butil.SetupCredential(backupType, req.Credential); err != nil {
 		return nil, err
 	}
 
@@ -706,7 +707,7 @@ func (s *SyncAgentServer) BackupCreate(ctx context.Context, req *ptypes.BackupCr
 		BackingImageChecksum: req.BackingImageChecksum,
 		CompressionMethod:    req.CompressionMethod,
 		ConcurrentLimit:      req.ConcurrentLimit,
-		StorageClassname:     req.StorageClassName,
+		StorageClassName:     req.StorageClassName,
 		Labels:               req.Labels,
 	})
 	if err != nil {
@@ -815,12 +816,12 @@ func (s *SyncAgentServer) BackupRestore(ctx context.Context, req *ptypes.BackupR
 		return nil, fmt.Errorf("empty backup URL for the restore")
 	}
 
-	backupType, err := util.CheckBackupType(req.Backup)
+	backupType, err := butil.CheckBackupType(req.Backup)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to check the type for backup %v", req.Backup)
 	}
 
-	if err := util.SetupCredential(backupType, req.Credential); err != nil {
+	if err := butil.SetupCredential(backupType, req.Credential); err != nil {
 		return nil, errors.Wrapf(err, "failed to setup credential for backup %v", req.Backup)
 	}