Refactor and dedupe routes

Author: ciarams87

go.sum

@@ -32,6 +32,7 @@ github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBj
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=

internal/mode/static/handler.go

@@ -245,23 +245,18 @@ func (h *eventHandlerImpl) updateStatuses(ctx context.Context, logger logr.Logge
 	if h.cfg.updateGatewayClassStatus {
 		gcReqs = status.PrepareGatewayClassRequests(graph.GatewayClass, graph.IgnoredGatewayClasses, transitionTime)
 	}
-	hrReqs := status.PrepareHTTPRouteRequests(
-		graph.HTTPRoutes,
+	routeReqs := status.PrepareRouteRequests(
+		graph.Routes,
 		transitionTime,
 		h.latestReloadResult,
 		h.cfg.gatewayCtlrName,
 	)
-	grReqs := status.PrepareGRPCRouteRequests(
-		graph.GRPCRoutes, transitionTime,
-		h.latestReloadResult,
-		h.cfg.gatewayCtlrName,
-	)
+
 	polReqs := status.PrepareBackendTLSPolicyRequests(graph.BackendTLSPolicies, transitionTime, h.cfg.gatewayCtlrName)
 
-	reqs := make([]frameworkStatus.UpdateRequest, 0, len(gcReqs)+len(hrReqs)+len(grReqs)+len(polReqs))
+	reqs := make([]frameworkStatus.UpdateRequest, 0, len(gcReqs)+len(routeReqs)+len(polReqs))
 	reqs = append(reqs, gcReqs...)
-	reqs = append(reqs, hrReqs...)
-	reqs = append(reqs, grReqs...)
+	reqs = append(reqs, routeReqs...)
 	reqs = append(reqs, polReqs...)
 
 	h.cfg.statusUpdater.UpdateGroup(ctx, groupAllExceptGateways, reqs...)

internal/mode/static/nginx/config/http/config.go

@@ -20,7 +20,7 @@ type Location struct {
 	HTTPMatchVar    string
 	Rewrites        []string
 	ProxySetHeaders []Header
-	IsGRPC          bool
+	GRPC            bool
 }
 
 // Header defines an HTTP header to be passed to the proxied server.

internal/mode/static/nginx/config/servers.go

@@ -66,7 +66,7 @@ func createSSLServer(virtualServer dataplane.VirtualServer) http.Server {
 		}
 	}
 
-	locs, http2 := createLocations(virtualServer.PathRules, virtualServer.Port)
+	locs, grpc := createLocations(virtualServer.PathRules, virtualServer.Port)
 
 	return http.Server{
 		ServerName: virtualServer.Hostname,
@@ -76,7 +76,7 @@ func createSSLServer(virtualServer dataplane.VirtualServer) http.Server {
 		},
 		Locations: locs,
 		Port:      virtualServer.Port,
-		GRPC:      http2,
+		GRPC:      grpc,
 	}
 }
 
@@ -88,13 +88,13 @@ func createServer(virtualServer dataplane.VirtualServer) http.Server {
 		}
 	}
 
-	locs, http2 := createLocations(virtualServer.PathRules, virtualServer.Port)
+	locs, grpc := createLocations(virtualServer.PathRules, virtualServer.Port)
 
 	return http.Server{
 		ServerName: virtualServer.Hostname,
 		Locations:  locs,
 		Port:       virtualServer.Port,
-		GRPC:       http2,
+		GRPC:       grpc,
 	}
 }
 
@@ -109,7 +109,7 @@ func createLocations(pathRules []dataplane.PathRule, listenerPort int32) ([]http
 	maxLocs, pathsAndTypes := getMaxLocationCountAndPathMap(pathRules)
 	locs := make([]http.Location, 0, maxLocs)
 	var rootPathExists bool
-	var http2 bool
+	var grpc bool
 
 	for pathRuleIdx, rule := range pathRules {
 		matches := make([]httpMatch, 0, len(rule.MatchRules))
@@ -119,7 +119,7 @@ func createLocations(pathRules []dataplane.PathRule, listenerPort int32) ([]http
 		}
 
 		if rule.GRPC {
-			http2 = true
+			grpc = true
 		}
 
 		extLocations := initializeExternalLocations(rule, pathsAndTypes)
@@ -149,7 +149,7 @@ func createLocations(pathRules []dataplane.PathRule, listenerPort int32) ([]http
 		locs = append(locs, createDefaultRootLocation())
 	}
 
-	return locs, http2
+	return locs, grpc
 }
 
 // pathAndTypeMap contains a map of paths and any path types defined for that path
@@ -274,7 +274,7 @@ func updateLocationsForFilters(
 			GRPC,
 		)
 		buildLocations[i].ProxyPass = proxyPass
-		buildLocations[i].IsGRPC = GRPC
+		buildLocations[i].GRPC = GRPC
 	}
 
 	return buildLocations

internal/mode/static/nginx/config/servers_template.go

@@ -46,9 +46,9 @@ server {
         js_content httpmatches.redirect;
         {{- end }}
 
-        {{ $proxyOrGRPC := "proxy" }}{{ if $l.IsGRPC }}{{ $proxyOrGRPC = "grpc" }}{{ end }}
+        {{ $proxyOrGRPC := "proxy" }}{{ if $l.GRPC }}{{ $proxyOrGRPC = "grpc" }}{{ end }}
 
-        {{- if $l.IsGRPC }}
+        {{- if $l.GRPC }}
         include /etc/nginx/grpc-error-pages.conf;
         {{- end }}
 

internal/mode/static/nginx/config/servers_test.go

@@ -820,7 +820,7 @@ func TestCreateServers(t *testing.T) {
 			{
 				Path:            "= /grpc/method",
 				ProxyPass:       "grpc://test_foo_80",
-				IsGRPC:          true,
+				GRPC:            true,
 				ProxySetHeaders: []http.Header{},
 			},
 			{
@@ -830,7 +830,7 @@ func TestCreateServers(t *testing.T) {
 					Name:               "test-btp.example.com",
 					TrustedCertificate: "/etc/nginx/secrets/test-btp.crt",
 				},
-				IsGRPC:          true,
+				GRPC:            true,
 				ProxySetHeaders: []http.Header{},
 			},
 		}