Skip to content

functies hernoemd #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shalucik merged 1 commit into from
Jun 4, 2025
Merged

functies hernoemd #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions api/v3/atom_validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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{
Expand All @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions api/v3/atom_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sigs.k8s.io/yaml"
)

func TestValidateAtomWithoutClusterChecks(t *testing.T) {
func TestValidateAtom(t *testing.T) {

tests := []struct {
name string
Expand Down Expand Up @@ -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)
Expand Down
Loading