Removing storage class flag

Author: Shlok Chaudhari

cmd/rootCmd.go

@@ -118,7 +118,6 @@ var (
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return CsiSnapshotBrowse(context.Background(), args[0],
 				namespace,
-				storageClass,
 				csiCheckRunAsUser,
 				browseLocalPort,
 			)
@@ -202,8 +201,6 @@ func init() {
 	_ = browsePvcCmd.MarkFlagRequired("volumesnapshotclass")
 
 	browseCmd.AddCommand(browseSnapshotCmd)
-	browseSnapshotCmd.Flags().StringVarP(&storageClass, "storageclass", "s", "", "The name of a StorageClass. (Required)")
-	_ = browseSnapshotCmd.MarkFlagRequired("storageclass")
 
 	rootCmd.AddCommand(blockMountCmd)
 	blockMountCmd.Flags().StringVarP(&storageClass, "storageclass", "s", "", "The name of a StorageClass. (Required)")
@@ -395,7 +392,6 @@ func CsiPvcBrowse(ctx context.Context,
 func CsiSnapshotBrowse(ctx context.Context,
 	snapshotName string,
 	namespace string,
-	storageClass string,
 	runAsUser int64,
 	localPort int,
 ) error {
@@ -414,11 +410,10 @@ func CsiSnapshotBrowse(ctx context.Context,
 		DynCli:  dyncli,
 	}
 	err = browseRunner.RunSnapshotBrowse(ctx, &csitypes.SnapshotBrowseArgs{
-		SnapshotName:     snapshotName,
-		Namespace:        namespace,
-		StorageClassName: storageClass,
-		RunAsUser:        runAsUser,
-		LocalPort:        localPort,
+		SnapshotName: snapshotName,
+		Namespace:    namespace,
+		RunAsUser:    runAsUser,
+		LocalPort:    localPort,
 	})
 	if err != nil {
 		fmt.Printf("Failed to run Snapshot browser (%s)\n", err.Error())

pkg/csi/mocks/mock_snapshot_browser_stepper.go

@@ -62,16 +62,12 @@ func (r *SnapshotBrowseRunner) RunSnapshotBrowseHelper(ctx context.Context, args
 		return fmt.Errorf("cli uninitialized")
 	}
 
-	sc, err := r.browserSteps.ValidateArgs(ctx, args)
-	if err != nil {
-		return errors.Wrap(err, "Failed to validate arguments.")
-	}
-
 	fmt.Println("Fetching the snapshot.")
-	r.snapshot, err = r.browserSteps.FetchVS(ctx, args)
+	vs, sc, err := r.browserSteps.ValidateArgs(ctx, args)
 	if err != nil {
-		return errors.Wrap(err, "Failed to fetch VolumeSnapshot.")
+		return errors.Wrap(err, "Failed to validate arguments.")
 	}
+	r.snapshot = vs
 
 	fmt.Println("Creating the file browser application.")
 	r.pod, r.pvc, err = r.browserSteps.CreateInspectorApplication(ctx, args, r.snapshot, sc)
@@ -90,8 +86,7 @@ func (r *SnapshotBrowseRunner) RunSnapshotBrowseHelper(ctx context.Context, args
 
 //go:generate go run github.com/golang/mock/mockgen -destination=mocks/mock_snapshot_browser_stepper.go -package=mocks . SnapshotBrowserStepper
 type SnapshotBrowserStepper interface {
-	ValidateArgs(ctx context.Context, args *types.SnapshotBrowseArgs) (*sv1.StorageClass, error)
-	FetchVS(ctx context.Context, args *types.SnapshotBrowseArgs) (*snapv1.VolumeSnapshot, error)
+	ValidateArgs(ctx context.Context, args *types.SnapshotBrowseArgs) (*snapv1.VolumeSnapshot, *sv1.StorageClass, error)
 	CreateInspectorApplication(ctx context.Context, args *types.SnapshotBrowseArgs, snapshot *snapv1.VolumeSnapshot, storageClass *sv1.StorageClass) (*v1.Pod, *v1.PersistentVolumeClaim, error)
 	PortForwardAPod(ctx context.Context, pod *v1.Pod, localPort int) error
 	Cleanup(ctx context.Context, pvc *v1.PersistentVolumeClaim, pod *v1.Pod)
@@ -107,47 +102,39 @@ type snapshotBrowserSteps struct {
 	SnapshotGroupVersion *metav1.GroupVersionForDiscovery
 }
 
-func (s *snapshotBrowserSteps) ValidateArgs(ctx context.Context, args *types.SnapshotBrowseArgs) (*sv1.StorageClass, error) {
+func (s *snapshotBrowserSteps) ValidateArgs(ctx context.Context, args *types.SnapshotBrowseArgs) (*snapv1.VolumeSnapshot, *sv1.StorageClass, error) {
 	if err := args.Validate(); err != nil {
-		return nil, errors.Wrap(err, "Failed to validate input arguments")
+		return nil, nil, errors.Wrap(err, "Failed to validate input arguments")
 	}
 	if err := s.validateOps.ValidateNamespace(ctx, args.Namespace); err != nil {
-		return nil, errors.Wrap(err, "Failed to validate Namespace")
-	}
-	sc, err := s.validateOps.ValidateStorageClass(ctx, args.StorageClassName)
-	if err != nil {
-		return nil, errors.Wrap(err, "Failed to validate SC")
+		return nil, nil, errors.Wrap(err, "Failed to validate Namespace")
 	}
 	groupVersion, err := s.versionFetchOps.GetCSISnapshotGroupVersion()
 	if err != nil {
-		return nil, errors.Wrap(err, "Failed to fetch groupVersion")
+		return nil, nil, errors.Wrap(err, "Failed to fetch groupVersion")
 	}
 	s.SnapshotGroupVersion = groupVersion
 	snapshot, err := s.validateOps.ValidateVolumeSnapshot(ctx, args.SnapshotName, args.Namespace, groupVersion)
 	if err != nil {
-		return nil, errors.Wrap(err, "Failed to validate VolumeSnapshot")
+		return nil, nil, errors.Wrap(err, "Failed to validate VolumeSnapshot")
 	}
-	uVSC, err := s.validateOps.ValidateVolumeSnapshotClass(ctx, *snapshot.Spec.VolumeSnapshotClassName, groupVersion)
+	pvc, err := s.validateOps.ValidatePVC(ctx, *snapshot.Spec.Source.PersistentVolumeClaimName, args.Namespace)
 	if err != nil {
-		return nil, errors.Wrap(err, "Failed to validate VolumeSnapshotClass")
+		return nil, nil, errors.Wrap(err, "Failed to validate source PVC")
 	}
-	vscDriver := getDriverNameFromUVSC(*uVSC, groupVersion.GroupVersion)
-	if sc.Provisioner != vscDriver {
-		return nil, fmt.Errorf("StorageClass provisioner (%s) and VolumeSnapshotClass driver (%s) are different.", sc.Provisioner, vscDriver)
+	sc, err := s.validateOps.ValidateStorageClass(ctx, *pvc.Spec.StorageClassName)
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "Failed to validate SC")
 	}
-	return sc, nil
-}
-
-func (s *snapshotBrowserSteps) FetchVS(ctx context.Context, args *types.SnapshotBrowseArgs) (*snapv1.VolumeSnapshot, error) {
-	snapshotter, err := s.snapshotFetchOps.NewSnapshotter()
+	uVSC, err := s.validateOps.ValidateVolumeSnapshotClass(ctx, *snapshot.Spec.VolumeSnapshotClassName, groupVersion)
 	if err != nil {
-		return nil, errors.Wrap(err, "Failed to load snapshotter")
+		return nil, nil, errors.Wrap(err, "Failed to validate VolumeSnapshotClass")
 	}
-	snapArgs := &types.FetchSnapshotArgs{
-		Namespace:    args.Namespace,
-		SnapshotName: args.SnapshotName,
+	vscDriver := getDriverNameFromUVSC(*uVSC, groupVersion.GroupVersion)
+	if sc.Provisioner != vscDriver {
+		return nil, nil, fmt.Errorf("StorageClass provisioner (%s) and VolumeSnapshotClass driver (%s) are different.", sc.Provisioner, vscDriver)
 	}
-	return s.snapshotFetchOps.GetVolumeSnapshot(ctx, snapshotter, snapArgs)
+	return snapshot, sc, nil
 }
 
 func (s *snapshotBrowserSteps) CreateInspectorApplication(ctx context.Context, args *types.SnapshotBrowseArgs, snapshot *snapv1.VolumeSnapshot, storageClass *sv1.StorageClass) (*v1.Pod, *v1.PersistentVolumeClaim, error) {