tests(helpers): reorganize grpc target service

Kong · Jan 22, 2025 · cd9ac02 · cd9ac02
1 parent 78c6923
commit cd9ac02
Show file tree

Hide file tree

Showing 29 changed files with 428 additions and 276 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
 
     - name: Install packages
       if: steps.cache-deps.outputs.cache-hit != 'true'
-      run: sudo apt update && sudo apt install libyaml-dev valgrind libprotobuf-dev
+      run: sudo apt update && sudo apt install libyaml-dev valgrind libprotobuf-dev protobuf-compiler
 
     - name: Build Kong
       if: steps.cache-deps.outputs.cache-hit != 'true'

diff --git a/spec/03-plugins/28-grpc-gateway/01-proxy_spec.lua b/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",
         },
       })
 

diff --git a/spec/fixtures/grpc/.gitignore b/spec/fixtures/grpc/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/spec/fixtures/grpc/go.mod b/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
+)
diff --git a/spec/fixtures/grpc/target/go.sum → spec/fixtures/grpc/go.sum b/spec/fixtures/grpc/target/go.sum → spec/fixtures/grpc/go.sum
diff --git a/spec/fixtures/grpc/direct_imports.proto → .../fixtures/grpc/proto/direct_imports.proto b/spec/fixtures/grpc/direct_imports.proto → .../fixtures/grpc/proto/direct_imports.proto
diff --git a/...ixtures/grpc/google/api/annotations.proto → ...s/grpc/proto/google/api/annotations.proto b/...ixtures/grpc/google/api/annotations.proto → ...s/grpc/proto/google/api/annotations.proto
diff --git a/spec/fixtures/grpc/google/api/http.proto → ...fixtures/grpc/proto/google/api/http.proto b/spec/fixtures/grpc/google/api/http.proto → ...fixtures/grpc/proto/google/api/http.proto
diff --git a/spec/fixtures/grpc/google/api/httpbody.proto → ...ures/grpc/proto/google/api/httpbody.proto b/spec/fixtures/grpc/google/api/httpbody.proto → ...ures/grpc/proto/google/api/httpbody.proto
diff --git a/spec/fixtures/grpc/google/protobuf/any.proto → ...ures/grpc/proto/google/protobuf/any.proto b/spec/fixtures/grpc/google/protobuf/any.proto → ...ures/grpc/proto/google/protobuf/any.proto
diff --git a/spec/fixtures/grpc/google/protobuf/api.proto → ...ures/grpc/proto/google/protobuf/api.proto b/spec/fixtures/grpc/google/protobuf/api.proto → ...ures/grpc/proto/google/protobuf/api.proto
diff --git a/...res/grpc/google/protobuf/descriptor.proto → ...pc/proto/google/protobuf/descriptor.proto b/...res/grpc/google/protobuf/descriptor.proto → ...pc/proto/google/protobuf/descriptor.proto
diff --git a/...tures/grpc/google/protobuf/duration.proto → ...grpc/proto/google/protobuf/duration.proto b/...tures/grpc/google/protobuf/duration.proto → ...grpc/proto/google/protobuf/duration.proto
diff --git a/...fixtures/grpc/google/protobuf/empty.proto → ...es/grpc/proto/google/protobuf/empty.proto b/...fixtures/grpc/google/protobuf/empty.proto → ...es/grpc/proto/google/protobuf/empty.proto
diff --git a/...res/grpc/google/protobuf/field_mask.proto → ...pc/proto/google/protobuf/field_mask.proto b/...res/grpc/google/protobuf/field_mask.proto → ...pc/proto/google/protobuf/field_mask.proto
diff --git a/...grpc/google/protobuf/source_context.proto → ...roto/google/protobuf/source_context.proto b/...grpc/google/protobuf/source_context.proto → ...roto/google/protobuf/source_context.proto
diff --git a/...ixtures/grpc/google/protobuf/struct.proto → ...s/grpc/proto/google/protobuf/struct.proto b/...ixtures/grpc/google/protobuf/struct.proto → ...s/grpc/proto/google/protobuf/struct.proto
diff --git a/...ures/grpc/google/protobuf/timestamp.proto → ...rpc/proto/google/protobuf/timestamp.proto b/...ures/grpc/google/protobuf/timestamp.proto → ...rpc/proto/google/protobuf/timestamp.proto
diff --git a/.../fixtures/grpc/google/protobuf/type.proto → ...res/grpc/proto/google/protobuf/type.proto b/.../fixtures/grpc/google/protobuf/type.proto → ...res/grpc/proto/google/protobuf/type.proto
diff --git a/...tures/grpc/google/protobuf/wrappers.proto → ...grpc/proto/google/protobuf/wrappers.proto b/...tures/grpc/google/protobuf/wrappers.proto → ...grpc/proto/google/protobuf/wrappers.proto
diff --git a/spec/fixtures/grpc/hello.proto → spec/fixtures/grpc/proto/hello.proto b/spec/fixtures/grpc/hello.proto → spec/fixtures/grpc/proto/hello.proto
diff --git a/spec/fixtures/grpc/helloworld.proto → spec/fixtures/grpc/proto/helloworld.proto b/spec/fixtures/grpc/helloworld.proto → spec/fixtures/grpc/proto/helloworld.proto
diff --git a/.../fixtures/grpc/second_level_imports.proto → ...res/grpc/proto/second_level_imports.proto b/.../fixtures/grpc/second_level_imports.proto → ...res/grpc/proto/second_level_imports.proto
diff --git a/spec/fixtures/grpc/targetservice.proto → spec/fixtures/grpc/proto/targetservice.proto b/spec/fixtures/grpc/targetservice.proto → spec/fixtures/grpc/proto/targetservice.proto
@@ -51,6 +51,12 @@ service Bouncer {
       body: "*"
     };
   }
+
+  rpc EchoHeaders(Void)  returns (Headers) {
+    option (google.api.http) = {
+      get: "/v1/echoheaders"
+    };
+  }
 }
 
 
@@ -93,3 +99,5 @@ message EchoMsg {
   repeated string array = 1;
   string nullable = 2;
 }
+
+message Void {}
diff --git a/spec/fixtures/grpc/target/grpc-target.go → spec/fixtures/grpc/target.go b/spec/fixtures/grpc/target/grpc-target.go → spec/fixtures/grpc/target.go
@@ -7,14 +7,14 @@ import (
 	"net"
 	"time"
 
-	pb "target/targetservice"
+	pb "grpc/targetservice"
 
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
-	port = ":15010"
+	port = "localhost:15010"
 )
 
 type server struct {

diff --git a/spec/fixtures/grpc/target/go.mod b/spec/fixtures/grpc/target/go.mod