Skip to content

Commit d0a97c0

Browse files
committed
Add WithRegisterFunc and WithAuthenticator methods to GRPCServerBuilder
- Move grpc package to pkg/grpc/builder/ for better organization - Add WithRegisterFunc method to support custom gRPC service registration - Add WithAuthenticator method to support authentication chain - Update tests to cover new methods and remove references to non-existent methods - Add TODO for future authorizers support Signed-off-by: xuezhaojun <zxue@redhat.com>
1 parent 998114c commit d0a97c0

11 files changed

Lines changed: 7 additions & 625 deletions

File tree

pkg/cloudevents/server/grpc/authz/interface.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types"
77
)
88

9+
// TODO: @xuezhaojun Migration to pkg/grpc/authz later.
910
type Authorizer interface {
1011
Authorize(ctx context.Context, cluster string, eventsType types.CloudEventsType) error
1112
}

pkg/cloudevents/server/grpc/broker.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/cloudevents/sdk-go/v2/binding"
1414
cloudeventstypes "github.com/cloudevents/sdk-go/v2/types"
1515
"github.com/google/uuid"
16-
"google.golang.org/grpc"
1716
"google.golang.org/grpc/codes"
1817
"google.golang.org/grpc/status"
1918
"google.golang.org/protobuf/types/known/emptypb"
@@ -56,10 +55,6 @@ func NewGRPCBroker() *GRPCBroker {
5655
return broker
5756
}
5857

59-
func (bkr *GRPCBroker) Register(grpcServer *grpc.Server) {
60-
pbv1.RegisterCloudEventServiceServer(grpcServer, bkr)
61-
}
62-
6358
func (bkr *GRPCBroker) RegisterService(t types.CloudEventsDataType, service server.Service) {
6459
bkr.services[t] = service
6560
service.RegisterHandler(bkr)

pkg/cloudevents/server/grpc/broker_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
cloudevents "github.com/cloudevents/sdk-go/v2"
1010
"google.golang.org/grpc"
1111
grpccli "open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/grpc"
12+
pbv1 "open-cluster-management.io/sdk-go/pkg/cloudevents/generic/options/grpc/protobuf/v1"
1213
cetypes "open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types"
1314
"open-cluster-management.io/sdk-go/pkg/cloudevents/server"
1415
)
@@ -61,7 +62,7 @@ func TestServer(t *testing.T) {
6162
grpcServerOptions := []grpc.ServerOption{}
6263
grpcServer := grpc.NewServer(grpcServerOptions...)
6364
grpcEventServer := NewGRPCBroker()
64-
grpcEventServer.Register(grpcServer)
65+
pbv1.RegisterCloudEventServiceServer(grpcServer, grpcEventServer)
6566

6667
svc := &testService{evts: make(map[string]*cloudevents.Event)}
6768
grpcEventServer.RegisterService(dataType, svc)

pkg/cloudevents/server/grpc/options/options_test.go

Lines changed: 0 additions & 179 deletions
This file was deleted.

0 commit comments

Comments
 (0)