Merge pull request #105673 from andyzhangx/validate-windows-disk-num

support more than 100 disk mounts on Windows

staging/src/k8s.io/mount-utils/mount_helper_windows.go

@@ -85,15 +85,9 @@ func NormalizeWindowsPath(path string) string {
 
 // ValidateDiskNumber : disk number should be a number in [0, 99]
 func ValidateDiskNumber(disk string) error {
-	diskNum, err := strconv.Atoi(disk)
+	if _, err := strconv.Atoi(disk); err != nil {
-	if err != nil {
+		return fmt.Errorf("wrong disk number format: %q, err: %v", disk, err)
-		return fmt.Errorf("wrong disk number format: %q, err:%v", disk, err)
 	}
-
-	if diskNum < 0 || diskNum > 99 {
-		return fmt.Errorf("disk number out of range: %q", disk)
-	}
-
 	return nil
 }
 

staging/src/k8s.io/mount-utils/mount_helper_windows_test.go

@@ -44,23 +44,36 @@ func TestNormalizeWindowsPath(t *testing.T) {
 }
 
 func TestValidateDiskNumber(t *testing.T) {
-	diskNum := "0"
+	tests := []struct {
-	if err := ValidateDiskNumber(diskNum); err != nil {
+		diskNum     string
-		t.Errorf("TestValidateDiskNumber test failed, disk number : %s", diskNum)
+		expectError bool
+	}{
+		{
+			diskNum:     "0",
+			expectError: false,
+		},
+		{
+			diskNum:     "invalid",
+			expectError: true,
+		},
+		{
+			diskNum:     "99",
+			expectError: false,
+		},
+		{
+			diskNum:     "100",
+			expectError: false,
+		},
+		{
+			diskNum:     "200",
+			expectError: false,
+		},
 	}
 
-	diskNum = "99"
+	for _, test := range tests {
-	if err := ValidateDiskNumber(diskNum); err != nil {
+		err := ValidateDiskNumber(test.diskNum)
-		t.Errorf("TestValidateDiskNumber test failed, disk number : %s", diskNum)
+		if (err != nil) != test.expectError {
+			t.Errorf("TestValidateDiskNumber test failed, disk number: %s, error: %v", test.diskNum, err)
 		}
-
-	diskNum = "ab"
-	if err := ValidateDiskNumber(diskNum); err == nil {
-		t.Errorf("TestValidateDiskNumber test failed, disk number : %s", diskNum)
-	}
-
-	diskNum = "100"
-	if err := ValidateDiskNumber(diskNum); err == nil {
-		t.Errorf("TestValidateDiskNumber test failed, disk number : %s", diskNum)
 	}
 }