tests(helpers): reorganize grpc target service

kong/tools/grpc.lua

@@ -72,7 +72,7 @@ function _M.new()
     "/usr/local/opt/protobuf/include/", -- homebrew
     "/usr/include",
     "kong/include",
-    "spec/fixtures/grpc",
+    "spec/fixtures/grpc/proto",
   } do
     protoc_instance:addpath(v)
   end

spec/02-integration/05-proxy/19-grpc_proxy_spec.lua

@@ -30,6 +30,8 @@ for _, strategy in helpers.each_strategy() do
     reload_router(flavor)
 
     lazy_setup(function()
+      assert(helpers.start_grpc_target())
+
       local bp = helpers.get_db_utils(strategy, {
         "routes",
         "services",
@@ -47,12 +49,16 @@ for _, strategy in helpers.each_strategy() do
 
       local mock_grpc_service = assert(bp.services:insert {
         name = "mock_grpc_service",
-        url = "grpc://localhost:8765",
+        protocol = "grpc",
+        host = "127.0.0.1",
+        port = helpers.get_grpc_target_port(),
       })
 
       local mock_grpc_service_retry = assert(bp.services:insert {
         name = "mock_grpc_service_retry",
-        url = "grpc://grpc_retry",
+        protocol = "grpc",
+        host = "127.0.0.1",
+        port = helpers.get_grpc_target_port(),
       })
 
       local upstream_retry = assert(bp.upstreams:insert {
@@ -111,30 +117,10 @@ for _, strategy in helpers.each_strategy() do
         },
       })
 
-      local fixtures = {
-        http_mock = {}
-      }
-
-      fixtures.http_mock.my_server_block = [[
-        server {
-          server_name myserver;
-          listen 8765;
-          http2 on;
-
-          location ~ / {
-            content_by_lua_block {
-              ngx.header.content_type = "application/grpc"
-              ngx.header.received_host = ngx.req.get_headers()["Host"]
-            }
-          }
-        }
-      ]]
-
       assert(helpers.start_kong({
         router_flavor = flavor,
         database = strategy,
-        nginx_conf       = "spec/fixtures/custom_nginx.template",
-      }, nil, nil, fixtures))
+      }))
 
       proxy_client_grpc = helpers.proxy_client_grpc()
       proxy_client_grpcs = helpers.proxy_client_grpcs()
@@ -150,6 +136,7 @@ for _, strategy in helpers.each_strategy() do
 
     lazy_teardown(function()
       helpers.stop_kong()
+      helpers.stop_grpc_target()
     end)
 
     it("proxies grpc", function()
@@ -228,32 +215,33 @@ for _, strategy in helpers.each_strategy() do
 
     it("proxies :authority header if `preserve_host` is set", function()
       local _, resp = proxy_client_grpc({
-        service = "hello.HelloService.SayHello",
+        service = "targetservice.Bouncer.EchoHeaders",
         body = {
-          greeting = "world!"
         },
         opts = {
+          ["-proto"] = "./spec/fixtures/grpc/proto/targetservice.proto",
+          ["-import-path"] = "./spec/fixtures/grpc/proto",
           ["-authority"] = "grpc_authority_1.example",
-          ["-v"] = true,
         }
       })
-
-      assert.matches("received%-host: grpc_authority_1.example", resp)
+      local headers = cjson.decode(resp).headers
+      assert.matches("grpc_authority_1.example", headers[":authority"])
     end)
 
     it("sets default :authority header if `preserve_host` isn't set", function()
       local _, resp = proxy_client_grpc({
-        service = "hello.HelloService.SayHello",
+        service = "targetservice.Bouncer.EchoHeaders",
         body = {
-          greeting = "world!"
         },
         opts = {
+          ["-proto"] = "./spec/fixtures/grpc/proto/targetservice.proto",
+          ["-import-path"] = "./spec/fixtures/grpc/proto",
           ["-authority"] = "grpc_authority_2.example",
-          ["-v"] = true,
         }
       })
 
-      assert.matches("received%-host: localhost:8765", resp)
+      local headers = cjson.decode(resp).headers
+      assert.matches("127.0.0.1:15010", headers[":authority"])
     end)
 
     it("proxies :authority header on balancer retry", function()

spec/03-plugins/28-grpc-gateway/01-proxy_spec.lua

@@ -44,7 +44,7 @@ for _, strategy in helpers.each_strategy() do
         route = route1,
         name = "grpc-gateway",
         config = {
-          proto = "./spec/fixtures/grpc/targetservice.proto",
+          proto = "./spec/fixtures/grpc/proto/targetservice.proto",
         },
       })
 
@@ -64,7 +64,7 @@ for _, strategy in helpers.each_strategy() do
         route = mock_grpc_route,
         name = "grpc-gateway",
         config = {
-          proto = "./spec/fixtures/grpc/targetservice.proto",
+          proto = "./spec/fixtures/grpc/proto/targetservice.proto",
         },
       })
 

spec/fixtures/grpc/.gitignore

@@ -0,0 +1 @@
+target

spec/fixtures/grpc/Makefile

@@ -0,0 +1,20 @@
+ALL= targetservice/targetservice.pb.go targetservice/targetservice_grpc.pb.go target
+
+all: $(ALL)
+
+.PHONY: go
+
+clean:
+	rm -rf $(ALL)
+
+go:
+	go mod tidy && go mod download all
+
+target: go targetservice/targetservice.pb.go targetservice/targetservice_grpc.pb.go target.go
+	go build -o $@
+
+targetservice/targetservice.pb.go: proto/targetservice.proto
+	protoc -I proto/ --go_out=. --go-grpc_out=. proto/targetservice.proto
+
+targetservice/targetservice_grpc.pb.go: proto/targetservice.proto
+	protoc -I proto/ --go_out=. --go-grpc_out=. proto/targetservice.proto

spec/fixtures/grpc/go.mod

@@ -0,0 +1,18 @@
+module grpc
+
+go 1.21
+
+toolchain go1.22.10
+
+require (
+	github.com/golang/protobuf v1.5.4
+	google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea
+	google.golang.org/grpc v1.65.1
+	google.golang.org/protobuf v1.34.1
+)
+
+require (
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+)