fix: include all volume group names in the error message

Signed-off-by: Suleyman Akbas <[email protected]>
openshift · Mar 3, 2023 · 496a3e0 · 496a3e0
1 parent d378bf2
commit 496a3e0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/api/v1alpha1/lvmcluster_webhook.go b/api/v1alpha1/lvmcluster_webhook.go
@@ -190,17 +190,19 @@ func (l *LVMCluster) verifySingleDefaultDeviceClass() error {
 
 func (l *LVMCluster) verifyPathsAreNotEmpty() error {
 
+	var deviceClassWithoutPaths []string
 	for _, deviceClass := range l.Spec.Storage.DeviceClasses {
 		if deviceClass.DeviceSelector != nil {
 			if len(deviceClass.DeviceSelector.Paths) == 0 {
 				return fmt.Errorf("path list should not be empty when DeviceSelector is specified")
 			}
 		} else {
-			if len(l.Spec.Storage.DeviceClasses) > 1 {
-				return fmt.Errorf("path list should not be empty when there are multiple deviceClasses. Please specify device path(s) under deviceSelector.paths for %s deviceClass", deviceClass.Name)
-			}
+			deviceClassWithoutPaths = append(deviceClassWithoutPaths, deviceClass.Name)
 		}
 	}
+	if len(l.Spec.Storage.DeviceClasses) > 1 && len(deviceClassWithoutPaths) > 0 {
+		return fmt.Errorf("path list should not be empty when there are multiple deviceClasses. Please specify device path(s) under deviceSelector.paths for %s deviceClass(es)", strings.Join(deviceClassWithoutPaths, `,`))
+	}
 
 	return nil
 }