From ea340f5d9575aa13e60694c311c56bae9f88df3a Mon Sep 17 00:00:00 2001
From: Steve Kriss <krisss@vmware.com>
Date: Fri, 28 Oct 2022 15:53:02 -0600
Subject: [PATCH] internal/gatewayapi: support HTTP method matching

Closes #655.

Signed-off-by: Steve Kriss <krisss@vmware.com>
---
 ...single-rule-with-http-method-match.in.yaml | 31 +++++++
 ...ingle-rule-with-http-method-match.out.yaml | 87 +++++++++++++++++++
 internal/gatewayapi/translator.go             |  7 ++
 3 files changed, 125 insertions(+)
 create mode 100644 internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.in.yaml
 create mode 100644 internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml

diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.in.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.in.yaml
new file mode 100644
index 0000000000..3d372e82c8
--- /dev/null
+++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.in.yaml
@@ -0,0 +1,31 @@
+gateways:
+  - apiVersion: gateway.networking.k8s.io/v1beta1
+    kind: Gateway
+    metadata:
+      namespace: envoy-gateway
+      name: gateway-1
+    spec:
+      gatewayClassName: envoy-gateway-class
+      listeners:
+        - name: http
+          protocol: HTTP
+          port: 80
+          allowedRoutes:
+            namespaces:
+              from: All
+httpRoutes:
+  - apiVersion: gateway.networking.k8s.io/v1beta1
+    kind: HTTPRoute
+    metadata:
+      namespace: default
+      name: httproute-1
+    spec:
+      parentRefs:
+        - namespace: envoy-gateway
+          name: gateway-1
+      rules:
+        - matches:
+            - method: POST
+          backendRefs:
+            - name: service-1
+              port: 8080
diff --git a/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml
new file mode 100644
index 0000000000..d98b703775
--- /dev/null
+++ b/internal/gatewayapi/testdata/httproute-with-single-rule-with-http-method-match.out.yaml
@@ -0,0 +1,87 @@
+gateways:
+  - apiVersion: gateway.networking.k8s.io/v1beta1
+    kind: Gateway
+    metadata:
+      namespace: envoy-gateway
+      name: gateway-1
+    spec:
+      gatewayClassName: envoy-gateway-class
+      listeners:
+        - name: http
+          protocol: HTTP
+          port: 80
+          allowedRoutes:
+            namespaces:
+              from: All
+    status:
+      listeners:
+        - name: http
+          supportedKinds:
+            - group: gateway.networking.k8s.io
+              kind: HTTPRoute
+          attachedRoutes: 1
+          conditions:
+            - type: Ready
+              status: "True"
+              reason: Ready
+              message: Listener is ready
+httpRoutes:
+  - apiVersion: gateway.networking.k8s.io/v1beta1
+    kind: HTTPRoute
+    metadata:
+      namespace: default
+      name: httproute-1
+    spec:
+      parentRefs:
+        - namespace: envoy-gateway
+          name: gateway-1
+      rules:
+        - matches:
+            - method: POST
+          backendRefs:
+            - name: service-1
+              port: 8080
+    status:
+      parents:
+        - parentRef:
+            namespace: envoy-gateway
+            name: gateway-1
+          controllerName: gateway.envoyproxy.io/gatewayclass-controller
+          conditions:
+            - type: Accepted
+              status: "True"
+              reason: Accepted
+              message: Route is accepted
+xdsIR:
+  envoy-gateway-gateway-1:
+    http:
+      - name: envoy-gateway-gateway-1-http
+        address: 0.0.0.0
+        port: 10080
+        hostnames:
+          - "*"
+        routes:
+          - name: default-httproute-1-rule-0-match-0-*
+            headerMatches:
+              - name: ":method"
+                exact: POST
+            destinations:
+              - host: 7.7.7.7
+                port: 8080
+                weight: 1
+infraIR:
+  envoy-gateway-gateway-1:
+    proxy:
+      metadata:
+        labels:
+          gateway.envoyproxy.io/owning-gateway-namespace: envoy-gateway
+          gateway.envoyproxy.io/owning-gateway-name: gateway-1
+      name: envoy-gateway-gateway-1
+      image: envoyproxy/envoy:translator-tests
+      listeners:
+        - address: ""
+          ports:
+            - name: http
+              protocol: "HTTP"
+              servicePort: 80
+              containerPort: 10080
diff --git a/internal/gatewayapi/translator.go b/internal/gatewayapi/translator.go
index a01bf1ba79..66f1f55b28 100644
--- a/internal/gatewayapi/translator.go
+++ b/internal/gatewayapi/translator.go
@@ -1095,6 +1095,13 @@ func (t *Translator) ProcessHTTPRoutes(httpRoutes []*v1beta1.HTTPRoute, gateways
 						}
 					}
 
+					if match.Method != nil {
+						irRoute.HeaderMatches = append(irRoute.HeaderMatches, &ir.StringMatch{
+							Name:  ":method",
+							Exact: StringPtr(string(*match.Method)),
+						})
+					}
+
 					// Add the redirect filter or direct response that were created earlier to all the irRoutes
 					if redirectResponse != nil {
 						irRoute.Redirect = redirectResponse