xds: allow http match criteria to be applied to routes on services using grpc protocols (#6149)

agent/xds/routes.go

@@ -186,13 +186,6 @@ func makeUpstreamRouteForDiscoveryChain(
 }
 
 func makeRouteMatchForDiscoveryRoute(discoveryRoute *structs.DiscoveryRoute, protocol string) envoyroute.RouteMatch {
-	switch protocol {
-	case "http", "http2":
-		// The only match stanza is HTTP.
-	default:
-		return makeDefaultRouteMatch()
-	}
-
 	match := discoveryRoute.Definition.Match
 	if match == nil || match.IsEmpty() {
 		return makeDefaultRouteMatch()

agent/xds/routes_test.go

@@ -79,6 +79,32 @@ func TestRoutesFromSnapshot(t *testing.T) {
 			},
 			setup: nil,
 		},
+		{
+			name: "connect-proxy-with-grpc-router",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotDiscoveryChainWithEntries(t,
+					&structs.ProxyConfigEntry{
+						Kind: structs.ProxyDefaults,
+						Name: structs.ProxyConfigGlobal,
+						Config: map[string]interface{}{
+							"protocol": "grpc",
+						},
+					},
+					&structs.ServiceRouterConfigEntry{
+						Kind: structs.ServiceRouter,
+						Name: "db",
+						Routes: []structs.ServiceRoute{
+							{
+								Match: httpMatch(&structs.ServiceRouteHTTPMatch{
+									PathExact: "/fgrpc.PingServer/Ping",
+								}),
+								Destination: toService("prefix"),
+							},
+						},
+					},
+				)
+			},
+		},
 		{
 			name: "connect-proxy-with-chain-and-router",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {

agent/xds/testdata/routes/connect-proxy-with-grpc-router.golden

@@ -0,0 +1,38 @@
+{
+  "versionInfo": "00000001",
+  "resources": [
+    {
+      "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
+      "name": "db",
+      "virtualHosts": [
+        {
+          "name": "db",
+          "domains": [
+            "*"
+          ],
+          "routes": [
+            {
+              "match": {
+                "path": "/fgrpc.PingServer/Ping"
+              },
+              "route": {
+                "cluster": "prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+              }
+            },
+            {
+              "match": {
+                "prefix": "/"
+              },
+              "route": {
+                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters": true
+    }
+  ],
+  "typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
+  "nonce": "00000001"
+}