From 8828e25b749fd973b51b9b348a4abcd4ea081260 Mon Sep 17 00:00:00 2001 From: Mustafa Abdelrahman Date: Tue, 28 Nov 2023 16:16:45 +0100 Subject: [PATCH] Address comments Signed-off-by: Mustafa Abdelrahman --- .../kubernetes/definitions/ingressvalidator.go | 4 ++-- .../kubernetes/definitions/routegroupvalidator.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dataclients/kubernetes/definitions/ingressvalidator.go b/dataclients/kubernetes/definitions/ingressvalidator.go index 538cbc66f4..3269b4bb73 100644 --- a/dataclients/kubernetes/definitions/ingressvalidator.go +++ b/dataclients/kubernetes/definitions/ingressvalidator.go @@ -14,7 +14,7 @@ func (igv *IngressV1Validator) Validate(item *IngressV1Item) error { errs = append(errs, igv.validateFilterAnnotation(item.Metadata.Annotations)) errs = append(errs, igv.validatePredicateAnnotation(item.Metadata.Annotations)) errs = append(errs, igv.validateRoutesAnnotation(item.Metadata.Annotations)) - errs = append(errs, igv.validateDuplicateHosts(item)) + errs = append(errs, igv.validateHosts(item)) return errorsJoin(errs...) } @@ -52,7 +52,7 @@ func (igv *IngressV1Validator) validateRoutesAnnotation(annotations map[string]s return nil } -func (igv *IngressV1Validator) validateDuplicateHosts(item *IngressV1Item) error { +func (igv *IngressV1Validator) validateHosts(item *IngressV1Item) error { var errs []error uniqueHosts := make(map[string]struct{}, len(item.Spec.Rules)) for _, rule := range item.Spec.Rules { diff --git a/dataclients/kubernetes/definitions/routegroupvalidator.go b/dataclients/kubernetes/definitions/routegroupvalidator.go index e6a4c1dfe5..ad1479da24 100644 --- a/dataclients/kubernetes/definitions/routegroupvalidator.go +++ b/dataclients/kubernetes/definitions/routegroupvalidator.go @@ -39,7 +39,7 @@ func (rgv *RouteGroupValidator) Validate(item *RouteGroupItem) error { errs = append(errs, rgv.validateFilters(item)) errs = append(errs, rgv.validatePredicates(item)) errs = append(errs, rgv.validateBackends(item)) - errs = append(errs, rgv.validateDuplicateHosts(item)) + errs = append(errs, rgv.validateHosts(item)) return errorsJoin(errs...) } @@ -109,14 +109,14 @@ func (rgv *RouteGroupValidator) validateBackends(item *RouteGroupItem) error { return errorsJoin(errs...) } -func (rgv *RouteGroupValidator) validateDuplicateHosts(item *RouteGroupItem) error { +func (rgv *RouteGroupValidator) validateHosts(item *RouteGroupItem) error { var errs []error uniqueHosts := make(map[string]struct{}, len(item.Spec.Hosts)) - for _, hosts := range item.Spec.Hosts { - if _, ok := uniqueHosts[hosts]; ok { - errs = append(errs, fmt.Errorf("duplicate host %q", hosts)) + for _, host := range item.Spec.Hosts { + if _, ok := uniqueHosts[host]; ok { + errs = append(errs, fmt.Errorf("duplicate host %q", host)) } - uniqueHosts[hosts] = struct{}{} + uniqueHosts[host] = struct{}{} } return errorsJoin(errs...) }