From 1dcebd176ca9182d3504fe5079d352d478f7a69e Mon Sep 17 00:00:00 2001 From: rodman10 <1181591811hzr@gmail.com> Date: Mon, 31 Jul 2023 12:14:23 +0800 Subject: [PATCH] refactor: rename source file and function. --- internal/dataplane/parser/translate_utils.go | 2 +- .../translators/{tcproute_atc.go => l4route_atc.go} | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) rename internal/dataplane/parser/translators/{tcproute_atc.go => l4route_atc.go} (80%) diff --git a/internal/dataplane/parser/translate_utils.go b/internal/dataplane/parser/translate_utils.go index 3c64bfe8e4..f219d06d52 100644 --- a/internal/dataplane/parser/translate_utils.go +++ b/internal/dataplane/parser/translate_utils.go @@ -185,7 +185,7 @@ func maybePrependRegexPrefix(path, controllerPrefix string, applyLegacyHeuristic func applyExpressionToIngressRules(result *ingressRules) { for _, svc := range result.ServiceNameToServices { for i := range svc.Routes { - translators.ApplyExpressionToKongRoute(&svc.Routes[i]) + translators.ApplyExpressionToL4KongRoute(&svc.Routes[i]) } } } diff --git a/internal/dataplane/parser/translators/tcproute_atc.go b/internal/dataplane/parser/translators/l4route_atc.go similarity index 80% rename from internal/dataplane/parser/translators/tcproute_atc.go rename to internal/dataplane/parser/translators/l4route_atc.go index 2c524eece8..fbc7606aa3 100644 --- a/internal/dataplane/parser/translators/tcproute_atc.go +++ b/internal/dataplane/parser/translators/l4route_atc.go @@ -1,12 +1,15 @@ package translators import ( + "github.com/samber/lo" + "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/kongstate" "github.com/kong/kubernetes-ingress-controller/v2/internal/dataplane/parser/atc" - "github.com/samber/lo" ) -func ApplyExpressionToKongRoute(r *kongstate.Route) { +// ApplyExpressionToL4KongRoute convert route flavor from traditional to expressions +// against protocols, snis and ports. +func ApplyExpressionToL4KongRoute(r *kongstate.Route) { matchers := []atc.Matcher{} protocolMatcher := protocolMatcherFromProtocols(lo.Map(r.Route.Protocols, func(item *string, _ int) string { return *item })) @@ -15,7 +18,7 @@ func ApplyExpressionToKongRoute(r *kongstate.Route) { sniMatcher := sniMatcherFromSNIs(lo.Map(r.Route.SNIs, func(item *string, _ int) string { return *item })) matchers = append(matchers, sniMatcher) - //TODO(rodman10): replace with helper function. + // TODO(rodman10): replace with helper function. portMatchers := make([]atc.Matcher, 0, len(r.Destinations)) for _, dst := range r.Destinations { portMatchers = append(portMatchers, atc.NewPredicate(atc.FieldNetDstPort, atc.OpEqual, atc.IntLiteral(*dst.Port)))