Validate drive ID args as UUIDs (#792)

Signed-off-by: Bala.FA <bala@minio.io>

cmd/kubectl-directpv/flags.go

@@ -186,6 +186,9 @@ func validateDriveIDArgs() error {
 		if driveIDArgs[i] == "" {
 			return fmt.Errorf("empty drive ID")
 		}
+		if !utils.IsUUID(driveIDArgs[i]) {
+			return fmt.Errorf("invalid drive ID %v", driveIDArgs[i])
+		}
 		driveIDSelectors = append(driveIDSelectors, directpvtypes.DriveID(driveIDArgs[i]))
 	}
 	return nil

pkg/installer/migrate.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"regexp"
 	"strings"
 
 	directpvtypes "github.com/minio/directpv/pkg/apis/directpv.min.io/types"
@@ -48,8 +47,6 @@ const (
 	legacyPurgeProtection    = legacyclient.GroupName + "/purge-protection"
 )
 
-var uuidRegex = regexp.MustCompile("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$")
-
 type migrateTask struct{}
 
 func (migrateTask) Name() string {
@@ -99,7 +96,7 @@ func migrateDrives(ctx context.Context, dryRun bool, progressCh chan<- Message)
 			continue // ignore other than Ready/InUse drives
 		}
 
-		if !uuidRegex.MatchString(result.Drive.Status.FilesystemUUID) {
+		if !utils.IsUUID(result.Drive.Status.FilesystemUUID) {
 			legacyDriveErrors[result.Drive.Name] = fmt.Errorf(
 				"invalid filesystem UUID %v in legacy drive %v",
 				result.Drive.Status.FilesystemUUID, result.Drive.Name,

pkg/utils/utils.go

@@ -21,12 +21,20 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
 
 	"github.com/fatih/color"
 	"sigs.k8s.io/yaml"
 )
 
+var uuidRegex = regexp.MustCompile("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$")
+
+// IsUUID checks whether value is UUID string.
+func IsUUID(value string) bool {
+	return uuidRegex.MatchString(value)
+}
+
 // Contains checks whether value in the slice.
 func Contains[ctype comparable](slice []ctype, value ctype) bool {
 	for _, s := range slice {