validateVMClusterRefOrSpec: fix error message when both ref and spec are set

Author: vrutkovs

internal/controller/operator/factory/vmdistributedcluster/vmdistributedcluster.go

@@ -174,7 +174,7 @@ func CreateOrUpdate(ctx context.Context, cr *vmv1alpha1.VMDistributedCluster, rc
 // validateVMClusterRefOrSpec checks for mutual exclusivity and required fields for VMClusterRefOrSpec.
 func validateVMClusterRefOrSpec(i int, refOrSpec vmv1alpha1.VMClusterRefOrSpec) error {
 	if refOrSpec.Spec != nil && refOrSpec.Ref != nil {
-		return fmt.Errorf("VMClusterRefOrSpec at index %d must have either Ref or Spec set, got: %+v", i, refOrSpec)
+		return fmt.Errorf("VMClusterRefOrSpec at index %d must specify either Ref or Spec, got: %+v", i, refOrSpec)
 	}
 	if refOrSpec.Spec == nil && refOrSpec.Ref == nil {
 		return fmt.Errorf("VMClusterRefOrSpec at index %d must have either Ref or Spec set, got: %+v", i, refOrSpec)
@@ -185,9 +185,6 @@ func validateVMClusterRefOrSpec(i int, refOrSpec vmv1alpha1.VMClusterRefOrSpec)
 	if refOrSpec.Ref != nil && refOrSpec.Ref.Name == "" {
 		return fmt.Errorf("VMClusterRefOrSpec.Ref.Name must be set for reference at index %d", i)
 	}
-	if refOrSpec.Spec != nil && refOrSpec.OverrideSpec != nil {
-		return fmt.Errorf("VMClusterRefOrSpec at index %d cannot have both Spec and OverrideSpec set, got: %+v", i, refOrSpec)
-	}
 	return nil
 }
 

internal/controller/operator/factory/vmdistributedcluster/vmdistributedcluster_test.go

@@ -549,14 +549,14 @@ func TestValidateVMClusterRefOrSpec(t *testing.T) {
 		}
 		err := validateVMClusterRefOrSpec(0, refOrSpec)
 		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "must have either Ref or Spec set")
+		assert.Contains(t, err.Error(), "VMClusterRefOrSpec at index 0 must specify either Ref or Spec")
 	})
 
 	t.Run("Error: Neither Ref nor Spec set", func(t *testing.T) {
 		refOrSpec := vmv1alpha1.VMClusterRefOrSpec{}
 		err := validateVMClusterRefOrSpec(0, refOrSpec)
 		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "must have either Ref or Spec set")
+		assert.Contains(t, err.Error(), "VMClusterRefOrSpec at index 0 must have either Ref or Spec set")
 	})
 
 	t.Run("Error: Spec set but Name missing", func(t *testing.T) {
@@ -565,7 +565,7 @@ func TestValidateVMClusterRefOrSpec(t *testing.T) {
 		}
 		err := validateVMClusterRefOrSpec(0, refOrSpec)
 		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "Name must be set when Spec is provided")
+		assert.Contains(t, err.Error(), "VMClusterRefOrSpec.Name must be set when Spec is provided for index 0")
 	})
 
 	t.Run("Error: Ref set but Name missing in Ref", func(t *testing.T) {
@@ -574,7 +574,7 @@ func TestValidateVMClusterRefOrSpec(t *testing.T) {
 		}
 		err := validateVMClusterRefOrSpec(0, refOrSpec)
 		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "Ref.Name must be set for reference")
+		assert.Contains(t, err.Error(), "VMClusterRefOrSpec.Ref.Name must be set for reference at index 0")
 	})
 
 	t.Run("Error: Spec and OverrideSpec set", func(t *testing.T) {