Address review comments

pkg/driver/constants.go

@@ -33,6 +33,8 @@ const (
 	ParameterNodeID = "node_id"
 	// ParameterDeviceName is the device name parameter
 	ParameterDeviceName = "device_name"
+	// ParameterReadOnly is the read only parameter
+	ParameterReadOnly = "readOnly"
 	// ParameterMkfsOptions is the name of the parameter used to specify the options for the mkfs command
 	ParameterMkfsOptions = "mkfs_options"
 

pkg/driver/controller.go

@@ -467,7 +467,7 @@ func validateDeviceName(volume *storagev1alpha1.Volume, machine *computev1alpha1
 			}
 		}
 	}
-	return "", fmt.Errorf("failed to get device name of volume %s name from machine %s", client.ObjectKeyFromObject(volume), client.ObjectKeyFromObject(machine))
+	return "", fmt.Errorf("failed to get device name of volume %s from machine %s", client.ObjectKeyFromObject(volume), client.ObjectKeyFromObject(machine))
 }
 
 func isValidVolumeCapabilities(volCaps []*csi.VolumeCapability) bool {

pkg/driver/node.go

@@ -44,16 +44,10 @@ func (d *driver) NodeStageVolume(_ context.Context, req *csi.NodeStageVolumeRequ
 			// We will requeue here since the device path is not ready yet.
 			return nil, status.Errorf(codes.Unavailable, "Device path %s does not exist: %v", devicePath, err)
 		} else {
-			return nil, status.Errorf(codes.Internal, "Failed to determine wether the device path %s exists: %v", devicePath, err)
+			return nil, status.Errorf(codes.Internal, "Failed to determine whether the device path %s exists: %v", devicePath, err)
 		}
 	}
 
-	readOnly := false
-	if volumeContext["readOnly"] == "true" {
-		readOnly = true
-	}
-	mountOptions := req.GetVolumeCapability().GetMount().GetMountFlags()
-
 	targetPath := req.GetStagingTargetPath()
 	klog.InfoS("Validate mount point", "MountPoint", targetPath)
 	notMnt, err := d.mounter.IsLikelyNotMountPoint(targetPath)
@@ -70,17 +64,22 @@ func (d *driver) NodeStageVolume(_ context.Context, req *csi.NodeStageVolumeRequ
 		return nil, status.Errorf(codes.Internal, "Failed to create target directory %s for volume %s: %v", targetPath, req.GetVolumeId(), err)
 	}
 
+	mountOptions := req.GetVolumeCapability().GetMount().GetMountFlags()
+
+	readOnly, ok := volumeContext[ParameterReadOnly]
+	readOnlyFlag := ok && readOnly == "true"
+
 	var options []string
-	if readOnly {
+	if readOnlyFlag {
 		options = append(options, "ro")
 	} else {
 		options = append(options, "rw")
 	}
 	options = append(options, mountOptions...)
 
 	var formatOptions []string
-	mkfsOptions, exists := volumeContext[ParameterMkfsOptions]
-	if exists && mkfsOptions != "" {
+	mkfsOptions, ok := volumeContext[ParameterMkfsOptions]
+	if ok && mkfsOptions != "" {
 		formatOptions = append(formatOptions, strings.Split(mkfsOptions, " ")...)
 	}