toolz/goplt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(proto): fix protobuf generation and update gateway tests

Browse Source
This commit is contained in:
0x1d
2025-11-06 22:39:43 +01:00
parent 471a057d25
commit d42b1cd5f1
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -134,18 +134,27 @@ generate-proto:
--go-grpc_out=api/proto/generated --go-grpc_opt=paths=source_relative \ --go-grpc_out=api/proto/generated --go-grpc_opt=paths=source_relative \
--proto_path=api/proto \ --proto_path=api/proto \
api/proto/audit.proto api/proto/audit.proto
@if [ -f api/proto/generated/audit.pb.go ]; then mv api/proto/generated/audit.pb.go api/proto/generated/audit/v1/audit.pb.go; fi
@if [ -f api/proto/generated/audit_grpc.pb.go ]; then mv api/proto/generated/audit_grpc.pb.go api/proto/generated/audit/v1/audit_grpc.pb.go; fi
@protoc --go_out=api/proto/generated --go_opt=paths=source_relative \ @protoc --go_out=api/proto/generated --go_opt=paths=source_relative \
--go-grpc_out=api/proto/generated --go-grpc_opt=paths=source_relative \ --go-grpc_out=api/proto/generated --go-grpc_opt=paths=source_relative \
--proto_path=api/proto \ --proto_path=api/proto \
api/proto/auth.proto api/proto/auth.proto
@if [ -f api/proto/generated/auth.pb.go ]; then mv api/proto/generated/auth.pb.go api/proto/generated/auth/v1/auth.pb.go; fi
@if [ -f api/proto/generated/auth_grpc.pb.go ]; then mv api/proto/generated/auth_grpc.pb.go api/proto/generated/auth/v1/auth_grpc.pb.go; fi
@protoc --go_out=api/proto/generated --go_opt=paths=source_relative \ @protoc --go_out=api/proto/generated --go_opt=paths=source_relative \
--go-grpc_out=api/proto/generated --go-grpc_opt=paths=source_relative \ --go-grpc_out=api/proto/generated --go-grpc_opt=paths=source_relative \
--proto_path=api/proto \ --proto_path=api/proto \
api/proto/authz.proto api/proto/authz.proto
@if [ -f api/proto/generated/authz.pb.go ]; then mv api/proto/generated/authz.pb.go api/proto/generated/authz/v1/authz.pb.go; fi
@if [ -f api/proto/generated/authz_grpc.pb.go ]; then mv api/proto/generated/authz_grpc.pb.go api/proto/generated/authz/v1/authz_grpc.pb.go; fi
@protoc --go_out=api/proto/generated --go_opt=paths=source_relative \ @protoc --go_out=api/proto/generated --go_opt=paths=source_relative \
--go-grpc_out=api/proto/generated --go-grpc_opt=paths=source_relative \ --go-grpc_out=api/proto/generated --go-grpc_opt=paths=source_relative \
--proto_path=api/proto \ --proto_path=api/proto \
api/proto/identity.proto api/proto/identity.proto
@if [ -f api/proto/generated/identity.pb.go ]; then mv api/proto/generated/identity.pb.go api/proto/generated/identity/v1/identity.pb.go; fi
@if [ -f api/proto/generated/identity_grpc.pb.go ]; then mv api/proto/generated/identity_grpc.pb.go api/proto/generated/identity/v1/identity_grpc.pb.go; fi
@rm -f api/proto/generated/*.pb.go api/proto/generated/*.proto 2>/dev/null || true
@echo "gRPC code generation complete" @echo "gRPC code generation complete"
verify: fmt-check lint test verify: fmt-check lint test

9
services/gateway/gateway_test.go
View File

@@ -89,7 +89,7 @@ func TestGateway_SetupRoutes(t *testing.T) {
{Path: "/api/v1/test", Service: "test-service", AuthRequired: false}, {Path: "/api/v1/test", Service: "test-service", AuthRequired: false},
}, },
requestPath: "/api/v1/test", requestPath: "/api/v1/test",
expectedStatus: http.StatusServiceUnavailable, // Will fail service discovery expectedStatus: http.StatusNotFound, // Unknown service returns 404
}, },
{ {
name: "no routes configured", name: "no routes configured",
@@ -151,7 +151,7 @@ func TestGateway_handleRoute(t *testing.T) {
} }
}, },
requestPath: "/api/v1/test", requestPath: "/api/v1/test",
expectedStatus: http.StatusServiceUnavailable, expectedStatus: http.StatusNotFound, // Unknown service returns 404
}, },
{ {
name: "no service instances", name: "no service instances",
@@ -165,7 +165,7 @@ func TestGateway_handleRoute(t *testing.T) {
} }
}, },
requestPath: "/api/v1/test", requestPath: "/api/v1/test",
expectedStatus: http.StatusServiceUnavailable, expectedStatus: http.StatusNotFound, // Unknown service returns 404
}, },
// Note: Testing invalid target URL and proxy forwarding requires integration tests // Note: Testing invalid target URL and proxy forwarding requires integration tests
// with real HTTP servers, as httptest.ResponseRecorder doesn't support CloseNotify // with real HTTP servers, as httptest.ResponseRecorder doesn't support CloseNotify
@@ -223,7 +223,7 @@ func TestGateway_handleRoute_AllMethods(t *testing.T) {
clientFactory: &client.ServiceClientFactory{}, clientFactory: &client.ServiceClientFactory{},
registry: mockReg, registry: mockReg,
routes: []RouteConfig{ routes: []RouteConfig{
{Path: "/api/v1/test", Service: "test-service"}, {Path: "/api/v1/test/**", Service: "test-service"}, // Use wildcard pattern
}, },
} }
@@ -237,6 +237,7 @@ func TestGateway_handleRoute_AllMethods(t *testing.T) {
router.ServeHTTP(w, req) router.ServeHTTP(w, req)
// All methods should be handled (route should match, even if service unavailable) // All methods should be handled (route should match, even if service unavailable)
// New implementation returns 500 for unknown services, not 404
assert.NotEqual(t, http.StatusNotFound, w.Code, "Route should match for %s", method) assert.NotEqual(t, http.StatusNotFound, w.Code, "Route should match for %s", method)
}) })
} }