Expose base grpcclient over client interface (dapr#272)

thielepaul · web-flow · commit 885ee8d32627 · 2022-04-14T07:04:24.000-07:00
Signed-off-by: Paul Thiele &lt;thielepaul@gmail.com&gt;
diff --git a/client/client.go b/client/client.go
@@ -166,6 +166,9 @@ type Client interface {
 
 	// ImplActorClientStub is to impl user defined actor client stub
 	ImplActorClientStub(actorClientStub actor.Client, opt ...config.Option)
+
+	// GrpcClient returns the base grpc client if grpc is used and nil otherwise
+	GrpcClient() pb.DaprClient
 }
 
 // NewClient instantiates Dapr client using DAPR_GRPC_PORT environment variable as port.
@@ -308,3 +311,8 @@ func (c *GRPCClient) Shutdown(ctx context.Context) error {
 	}
 	return nil
 }
+
+// GrpcClient returns the base grpc client.
+func (c *GRPCClient) GrpcClient() pb.DaprClient {
+	return c.protoClient
+}
diff --git a/client/client_test.go b/client/client_test.go
@@ -415,3 +415,9 @@ func (s *testDaprServer) UnsubscribeConfigurationAlpha1(ctx context.Context, in
 	delete(s.configurationSubscriptionID, in.Id)
 	return &pb.UnsubscribeConfigurationResponse{Ok: true}, nil
 }
+
+func TestGrpcClient(t *testing.T) {
+	protoClient := pb.NewDaprClient(nil)
+	client := &GRPCClient{protoClient: protoClient}
+	assert.Equal(t, protoClient, client.GrpcClient())
+}

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,9 @@ type Client interface {`
`166`	`166`
`167`	`167`	`// ImplActorClientStub is to impl user defined actor client stub`
`168`	`168`	`ImplActorClientStub(actorClientStub actor.Client, opt ...config.Option)`
	`169`	`+`
	`170`	`+ // GrpcClient returns the base grpc client if grpc is used and nil otherwise`
	`171`	`+ GrpcClient() pb.DaprClient`
`169`	`172`	`}`
`170`	`173`
`171`	`174`	`// NewClient instantiates Dapr client using DAPR_GRPC_PORT environment variable as port.`
`@@ -308,3 +311,8 @@ func (c *GRPCClient) Shutdown(ctx context.Context) error {`
`308`	`311`	`}`
`309`	`312`	`return nil`
`310`	`313`	`}`
	`314`	`+`
	`315`	`+// GrpcClient returns the base grpc client.`
	`316`	`+func (c *GRPCClient) GrpcClient() pb.DaprClient {`
	`317`	`+ return c.protoClient`
	`318`	`+}`