Merge pull request #53 from PDOK/wr/consitent-naming

functies hernoemd

Author: Shalucik

api/v3/atom_validation.go

@@ -25,7 +25,8 @@ func (atom *Atom) ValidateCreate(c client.Client) ([]string, error) {
 		allErrs = append(allErrs, err)
 	}
 
-	ValidateAtom(c, atom, &warnings, &allErrs)
+	ValidateAtom(atom, &warnings, &allErrs)
+	ValidateOwnerInfo(c, atom, &allErrs)
 
 	if len(allErrs) == 0 {
 		return warnings, nil
@@ -57,7 +58,8 @@ func (atom *Atom) ValidateUpdate(c client.Client, atomOld *Atom) ([]string, erro
 
 	smoothoperatorvalidation.ValidateIngressRouteURLsNotRemoved(atomOld.Spec.IngressRouteURLs, atom.Spec.IngressRouteURLs, &allErrs, nil)
 
-	ValidateAtom(c, atom, &warnings, &allErrs)
+	ValidateAtom(atom, &warnings, &allErrs)
+	ValidateOwnerInfo(c, atom, &allErrs)
 
 	if len(allErrs) == 0 {
 		return warnings, nil
@@ -68,9 +70,7 @@ func (atom *Atom) ValidateUpdate(c client.Client, atomOld *Atom) ([]string, erro
 		atom.Name, allErrs)
 }
 
-func ValidateAtom(c client.Client, atom *Atom, warnings *[]string, allErrs *field.ErrorList) {
-	ValidateAtomWithoutClusterChecks(atom, warnings, allErrs)
-
+func ValidateOwnerInfo(c client.Client, atom *Atom, allErrs *field.ErrorList) {
 	ownerInfoRef := atom.Spec.Service.OwnerInfoRef
 	ownerInfo := &smoothoperatorv1.OwnerInfo{}
 	objectKey := client.ObjectKey{
@@ -90,7 +90,7 @@ func ValidateAtom(c client.Client, atom *Atom, warnings *[]string, allErrs *fiel
 	}
 }
 
-func ValidateAtomWithoutClusterChecks(atom *Atom, warnings *[]string, allErrs *field.ErrorList) {
+func ValidateAtom(atom *Atom, warnings *[]string, allErrs *field.ErrorList) {
 	var fieldPath *field.Path
 	if strings.Contains(atom.GetName(), "atom") {
 		fieldPath = field.NewPath("metadata").Child("name")

api/v3/atom_validation_test.go

@@ -9,7 +9,7 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-func TestValidateAtomWithoutClusterChecks(t *testing.T) {
+func TestValidateAtom(t *testing.T) {
 
 	tests := []struct {
 		name             string
@@ -91,7 +91,7 @@ func TestValidateAtomWithoutClusterChecks(t *testing.T) {
 		}
 
 		t.Run(tt.name, func(t *testing.T) {
-			ValidateAtomWithoutClusterChecks(atom, &actualWarnings, &actualAllErrors)
+			ValidateAtom(atom, &actualWarnings, &actualAllErrors)
 			diffWarnings := cmp.Diff(tt.expectedWarnings, &actualWarnings)
 			if diffWarnings != "" {
 				t.Errorf("Testing validation has different warnings: \n%v\n%v\n%v", diffWarnings, tt.expectedWarnings, actualWarnings)