update map templates

Author: sarthyparty

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

@@ -18,4 +18,9 @@ map $http_upgrade $connection_upgrade {
     default upgrade;
     '' close;
 }
+
+## Returns just the path from the original request URI.
+map $request_uri $request_uri_path {
+  "~^(?P<path>[^?]*)(\?.*)?$"  $path;
+}
 `

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

@@ -49,5 +49,6 @@ func TestExecuteBaseHttp(t *testing.T) {
 		g.Expect(test.expCount).To(Equal(strings.Count(string(res[0].data), expSubStr)))
 		g.Expect(strings.Count(string(res[0].data), "map $http_host $gw_api_compliant_host {")).To(Equal(1))
 		g.Expect(strings.Count(string(res[0].data), "map $http_upgrade $connection_upgrade {")).To(Equal(1))
+		g.Expect(strings.Count(string(res[0].data), "map $request_uri $request_uri_path {")).To(Equal(1))
 	}
 }

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

@@ -11,25 +11,4 @@ map {{ $m.Source }} {{ $m.Variable }} {
 	{{ end }}
 }
 {{- end }}
-
-# Set $gw_api_compliant_host variable to the value of $http_host unless $http_host is empty, then set it to the value
-# of $host. We prefer $http_host because it contains the original value of the host header, which is required by the
-# Gateway API. However, in an HTTP/1.0 request, it's possible that $http_host can be empty. In this case, we will use
-# the value of $host. See http://nginx.org/en/docs/http/ngx_http_core_module.html#var_host.
-map $http_host $gw_api_compliant_host {
-    '' $host;
-    default $http_host;
-}
-
-# Set $connection_header variable to upgrade when the $http_upgrade header is set, otherwise, set it to close. This
-# allows support for websocket connections. See https://nginx.org/en/docs/http/websocket.html.
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    '' close;
-}
-
-## Returns just the path from the original request URI.
-map $request_uri $request_uri_path {
-  "~^(?P<path>[^?]*)(\?.*)?$"  $path;
-}
 `

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

@@ -85,9 +85,6 @@ func TestExecuteMaps(t *testing.T) {
 		"map ${http_my_second_add_header} $my_second_add_header_header_var {": 1,
 		"~.* ${http_my_second_add_header},;":                                  1,
 		"map ${http_my_set_header} $my_set_header_header_var {":               0,
-		"map $http_host $gw_api_compliant_host {":                             1,
-		"map $http_upgrade $connection_upgrade {":                             1,
-		"map $request_uri $request_uri_path {":                                1,
 	}
 
 	mapResult := executeMaps(conf)

internal/mode/static/state/dataplane/configuration_test.go

@@ -3285,6 +3285,7 @@ func TestCreateRatioVarName(t *testing.T) {
 	g := NewWithT(t)
 	g.Expect(CreateRatioVarName(25)).To(Equal("$otel_ratio_25"))
 }
+
 func TestCreatePassthroughServers(t *testing.T) {
 	getL4RouteKey := func(name string) graph.L4RouteKey {
 		return graph.L4RouteKey{