Adding "./kubestr file-restore" command

cmd/rootCmd.go

@@ -128,6 +128,25 @@ var (
 		},
 	}
 
+	fromSnapshot   string
+	toPVC          string
+	path           string
+	restoreFileCmd = &cobra.Command{
+		Use:   "file-restore",
+		Short: "Restore file(s) from a VolumeSnapshot to it's source PVC",
+		Long:  "Restore file(s) from a given CSI provisioned VolumeSnapshot to a PVC.",
+		Args:  cobra.ExactArgs(0),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return FileRestore(context.Background(),
+				fromSnapshot,
+				toPVC,
+				namespace,
+				csiCheckRunAsUser,
+				browseLocalPort,
+				path)
+		},
+	}
+
 	blockMountRunAsUser          int64
 	blockMountCleanup            bool
 	blockMountCleanupOnly        bool
@@ -207,6 +226,15 @@ func init() {
 
 	browseCmd.AddCommand(browseSnapshotCmd)
 
+	rootCmd.AddCommand(restoreFileCmd)
+	restoreFileCmd.Flags().StringVarP(&fromSnapshot, "fromSnapshot", "f", "", "The name of a VolumeSnapshot. (Required)")
+	_ = restoreFileCmd.MarkFlagRequired("fromSnapshot")
+	restoreFileCmd.Flags().StringVarP(&toPVC, "toPVC", "t", "", "The name of a PersistentVolumeClaim.")
+	restoreFileCmd.Flags().StringVarP(&namespace, "namespace", "n", fio.DefaultNS, "The namespace of both the given PVC & VS.")
+	restoreFileCmd.Flags().Int64VarP(&csiCheckRunAsUser, "runAsUser", "u", 0, "Runs the inspector pod as a user (int)")
+	restoreFileCmd.Flags().IntVarP(&browseLocalPort, "localport", "l", 8080, "The local port to expose the inspector")
+	restoreFileCmd.Flags().StringVarP(&path, "path", "p", "", "Path of a file or directory that needs to be restored")
+
 	rootCmd.AddCommand(blockMountCmd)
 	blockMountCmd.Flags().StringVarP(&storageClass, "storageclass", "s", "", "The name of a StorageClass. (Required)")
 	_ = blockMountCmd.MarkFlagRequired("storageclass")
@@ -430,6 +458,42 @@ func CsiSnapshotBrowse(ctx context.Context,
 	return err
 }
 
+func FileRestore(ctx context.Context,
+	snapshotName string,
+	pvcName string,
+	namespace string,
+	runAsUser int64,
+	localPort int,
+	path string,
+) error {
+	kubecli, err := kubestr.LoadKubeCli()
+	if err != nil {
+		fmt.Printf("Failed to load kubeCli (%s)", err.Error())
+		return err
+	}
+	dyncli, err := kubestr.LoadDynCli()
+	if err != nil {
+		fmt.Printf("Failed to load dynCli (%s)", err.Error())
+		return err
+	}
+	fileRestoreRunner := &csi.FileRestoreRunner{
+		KubeCli: kubecli,
+		DynCli:  dyncli,
+	}
+	err = fileRestoreRunner.RunFileRestore(ctx, &csitypes.FileRestoreArgs{
+		SnapshotName: snapshotName,
+		PVCName:      pvcName,
+		Namespace:    namespace,
+		RunAsUser:    runAsUser,
+		LocalPort:    localPort,
+		Path:         path,
+	})
+	if err != nil {
+		fmt.Printf("Failed to run file-restore (%s)\n", err.Error())
+	}
+	return err
+}
+
 func BlockMountCheck(ctx context.Context, output, outfile string, cleanupOnly bool, checkerArgs block.BlockMountCheckerArgs) error {
 	kubecli, err := kubestr.LoadKubeCli()
 	if err != nil {

pkg/csi/csi_ops.go

@@ -332,41 +332,6 @@ func (c *applicationCreate) getErrorFromEvents(ctx context.Context, namespace, n
 	return nil
 }
 
-//go:generate go run github.com/golang/mock/mockgen -destination=mocks/mock_snapshot_fetcher.go -package=mocks . SnapshotFetcher
-type SnapshotFetcher interface {
-	NewSnapshotter() (kansnapshot.Snapshotter, error)
-	GetVolumeSnapshot(ctx context.Context, snapshotter kansnapshot.Snapshotter, args *types.FetchSnapshotArgs) (*snapv1.VolumeSnapshot, error)
-}
-
-type snapshotFetch struct {
-	kubeCli kubernetes.Interface
-	dynCli  dynamic.Interface
-}
-
-func (f *snapshotFetch) NewSnapshotter() (kansnapshot.Snapshotter, error) {
-	if f.kubeCli == nil {
-		return nil, fmt.Errorf("kubeCli not initialized")
-	}
-	if f.dynCli == nil {
-		return nil, fmt.Errorf("dynCli not initialized")
-	}
-	return kansnapshot.NewSnapshotter(f.kubeCli, f.dynCli)
-}
-
-func (f *snapshotFetch) GetVolumeSnapshot(ctx context.Context, snapshotter kansnapshot.Snapshotter, args *types.FetchSnapshotArgs) (*snapv1.VolumeSnapshot, error) {
-	if snapshotter == nil || args == nil {
-		return nil, fmt.Errorf("snapshotter or args are empty")
-	}
-	if err := args.Validate(); err != nil {
-		return nil, err
-	}
-	snap, err := snapshotter.Get(ctx, args.SnapshotName, args.Namespace)
-	if err != nil {
-		return nil, errors.Wrapf(err, "Failed to get CSI snapshot (%s) in Namespace (%s)", args.SnapshotName, args.Namespace)
-	}
-	return snap, nil
-}
-
 //go:generate go run github.com/golang/mock/mockgen -destination=mocks/mock_snapshot_creator.go -package=mocks . SnapshotCreator
 type SnapshotCreator interface {
 	NewSnapshotter() (kansnapshot.Snapshotter, error)