refactor: DRY the code

cs3org · May 9, 2022 · be5ab2e · be5ab2e
1 parent cbb61b8
commit be5ab2e
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 37 deletions.
diff --git a/internal/grpc/services/gateway/groupprovider.go b/internal/grpc/services/gateway/groupprovider.go
@@ -24,17 +24,18 @@ import (
 	group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
 	"github.com/cs3org/reva/pkg/rgrpc/status"
 	"github.com/cs3org/reva/pkg/rgrpc/todo/pool"
+	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
 )
 
 func (s *svc) GetGroup(ctx context.Context, req *group.GetGroupRequest) (*group.GetGroupResponse, error) {
-	c, err := pool.GetGroupProviderServiceClient(
-		pool.Endpoint(s.c.GroupProviderEndpoint),
-		pool.Insecure(s.c.Insecure),
-		pool.SkipVerify(s.c.SkipVerify),
-		pool.CACertFile(s.c.CACertFile),
-		pool.MaxCallRecvMsgSize(s.c.MaxCallRecvMsgSize),
-	)
+	var poolConf map[string]interface{}
+	err := mapstructure.Decode(s.c, poolConf)
+	if err != nil {
+		return nil, errors.Wrap(err, "error decoding pool config")
+	}
+	options := pool.NewOptions(poolConf, pool.Endpoint(s.c.GroupProviderEndpoint))
+	c, err := pool.GetGroupProviderServiceClient(options)
 	if err != nil {
 		return &group.GetGroupResponse{
 			Status: status.NewInternal(ctx, err, "error getting auth client"),
@@ -53,13 +54,13 @@ func (s *svc) GetGroupByClaim(
 	ctx context.Context,
 	req *group.GetGroupByClaimRequest,
 ) (*group.GetGroupByClaimResponse, error) {
-	c, err := pool.GetGroupProviderServiceClient(
-		pool.Endpoint(s.c.GroupProviderEndpoint),
-		pool.Insecure(s.c.Insecure),
-		pool.SkipVerify(s.c.SkipVerify),
-		pool.CACertFile(s.c.CACertFile),
-		pool.MaxCallRecvMsgSize(s.c.MaxCallRecvMsgSize),
-	)
+	var poolConf map[string]interface{}
+	err := mapstructure.Decode(s.c, poolConf)
+	if err != nil {
+		return nil, errors.Wrap(err, "error decoding pool config")
+	}
+	options := pool.NewOptions(poolConf, pool.Endpoint(s.c.GroupProviderEndpoint))
+	c, err := pool.GetGroupProviderServiceClient(options)
 	if err != nil {
 		return &group.GetGroupByClaimResponse{
 			Status: status.NewInternal(ctx, err, "error getting auth client"),
@@ -75,13 +76,13 @@ func (s *svc) GetGroupByClaim(
 }
 
 func (s *svc) FindGroups(ctx context.Context, req *group.FindGroupsRequest) (*group.FindGroupsResponse, error) {
-	c, err := pool.GetGroupProviderServiceClient(
-		pool.Endpoint(s.c.GroupProviderEndpoint),
-		pool.Insecure(s.c.Insecure),
-		pool.SkipVerify(s.c.SkipVerify),
-		pool.CACertFile(s.c.CACertFile),
-		pool.MaxCallRecvMsgSize(s.c.MaxCallRecvMsgSize),
-	)
+	var poolConf map[string]interface{}
+	err := mapstructure.Decode(s.c, poolConf)
+	if err != nil {
+		return nil, errors.Wrap(err, "error decoding pool config")
+	}
+	options := pool.NewOptions(poolConf, pool.Endpoint(s.c.GroupProviderEndpoint))
+	c, err := pool.GetGroupProviderServiceClient(options)
 	if err != nil {
 		return &group.FindGroupsResponse{
 			Status: status.NewInternal(ctx, err, "error getting auth client"),
@@ -97,13 +98,13 @@ func (s *svc) FindGroups(ctx context.Context, req *group.FindGroupsRequest) (*gr
 }
 
 func (s *svc) GetMembers(ctx context.Context, req *group.GetMembersRequest) (*group.GetMembersResponse, error) {
-	c, err := pool.GetGroupProviderServiceClient(
-		pool.Endpoint(s.c.GroupProviderEndpoint),
-		pool.Insecure(s.c.Insecure),
-		pool.SkipVerify(s.c.SkipVerify),
-		pool.CACertFile(s.c.CACertFile),
-		pool.MaxCallRecvMsgSize(s.c.MaxCallRecvMsgSize),
-	)
+	var poolConf map[string]interface{}
+	err := mapstructure.Decode(s.c, poolConf)
+	if err != nil {
+		return nil, errors.Wrap(err, "error decoding pool config")
+	}
+	options := pool.NewOptions(poolConf, pool.Endpoint(s.c.GroupProviderEndpoint))
+	c, err := pool.GetGroupProviderServiceClient(options)
 	if err != nil {
 		return &group.GetMembersResponse{
 			Status: status.NewInternal(ctx, err, "error getting auth client"),
@@ -119,13 +120,13 @@ func (s *svc) GetMembers(ctx context.Context, req *group.GetMembersRequest) (*gr
 }
 
 func (s *svc) HasMember(ctx context.Context, req *group.HasMemberRequest) (*group.HasMemberResponse, error) {
-	c, err := pool.GetGroupProviderServiceClient(
-		pool.Endpoint(s.c.GroupProviderEndpoint),
-		pool.Insecure(s.c.Insecure),
-		pool.SkipVerify(s.c.SkipVerify),
-		pool.CACertFile(s.c.CACertFile),
-		pool.MaxCallRecvMsgSize(s.c.MaxCallRecvMsgSize),
-	)
+	var poolConf map[string]interface{}
+	err := mapstructure.Decode(s.c, poolConf)
+	if err != nil {
+		return nil, errors.Wrap(err, "error decoding pool config")
+	}
+	options := pool.NewOptions(poolConf, pool.Endpoint(s.c.GroupProviderEndpoint))
+	c, err := pool.GetGroupProviderServiceClient(options)
 	if err != nil {
 		return &group.HasMemberResponse{
 			Status: status.NewInternal(ctx, err, "error getting auth client"),

diff --git a/pkg/rgrpc/todo/pool/option.go b/pkg/rgrpc/todo/pool/option.go
@@ -48,6 +48,20 @@ func newOptions(opts ...Option) Options {
 	return opt
 }
 
+// NewOptions initializes the available default options.
+func NewOptions(conf map[string]interface{}, opts ...Option) Options {
+	opt := Options{
+		MaxCallRecvMsgSize: defaultMaxCallRecvMsgSize,
+		Insecure:           true,
+	}
+
+	for _, o := range opts {
+		o(&opt)
+	}
+
+	return opt
+}
+
 // Endpoint provides a function to set the endpoint option.
 func Endpoint(val string) Option {
 	return func(o *Options) {

diff --git a/pkg/rgrpc/todo/pool/pool.go b/pkg/rgrpc/todo/pool/pool.go
@@ -208,11 +208,10 @@ func GetUserProviderServiceClient(opts ...Option) (user.UserAPIClient, error) {
 }
 
 // GetGroupProviderServiceClient returns a GroupProviderServiceClient.
-func GetGroupProviderServiceClient(opts ...Option) (group.GroupAPIClient, error) {
+func GetGroupProviderServiceClient(options Options) (group.GroupAPIClient, error) {
 	groupProviders.m.Lock()
 	defer groupProviders.m.Unlock()
 
-	options := newOptions(opts...)
 	if val, ok := groupProviders.conn[options.Endpoint]; ok {
 		return val.(group.GroupAPIClient), nil
 	}