Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ench: use functional options for client gRPC connections #2801

Merged
merged 22 commits into from
May 3, 2022
Merged

ench: use functional options for client gRPC connections #2801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fcbabe9
pkg/rgprc: base refactor
amalthundiyil Apr 30, 2022
223b1a1
pkg/pool: use functional options
amalthundiyil Apr 30, 2022
3ed0e5f
gateway service client: use functional options
amalthundiyil Apr 30, 2022
a2cc0d1
pkg/pool: refactor pool to use functional options
amalthundiyil Apr 30, 2022
a235101
refactor: use func opts for user providers
amalthundiyil Apr 30, 2022
fa6b540
refactor: use func opts for group providers
amalthundiyil Apr 30, 2022
7c1f8e8
refactor: use func opts for storage providers
amalthundiyil Apr 30, 2022
536ec05
refactor: use func opts for auth registries
amalthundiyil Apr 30, 2022
23de0b6
refactor: use func opts for app auth providers
amalthundiyil Apr 30, 2022
632d2e9
refactor: use func opts for user share providers
amalthundiyil Apr 30, 2022
e33b86f
refactor: use func opts for ocm share providers
amalthundiyil Apr 30, 2022
389b6a8
refactor: use func opts for ocm invite managers
amalthundiyil Apr 30, 2022
7d933a4
refactor: use func opts for public share providers
amalthundiyil Apr 30, 2022
9b8d1c5
refactor: use func opts for preferences providers
amalthundiyil Apr 30, 2022
14bf8c0
refactor: use functional options for permission providers
amalthundiyil Apr 30, 2022
dee84f3
refactor: use functional options for app registries
amalthundiyil Apr 30, 2022
0d72478
refactor: use functional options for app providers
amalthundiyil Apr 30, 2022
cb79669
refactor: use functional options for ocm provider authorizers
amalthundiyil Apr 30, 2022
38509e0
refactor: use functional options for ocm cores
amalthundiyil Apr 30, 2022
466770f
refactor: use functional options for data txs
amalthundiyil Apr 30, 2022
b6cbe64
changelog: add
amalthundiyil Apr 30, 2022
676ce94
hound: review comments
amalthundiyil Apr 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/unreleased/func-opts-pool.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Enhancement: Use functional options for client gRPC connections

This will add more ability to configure the client side gRPC connections.

https://github.com/cs3org/reva/pull/2801
2 changes: 1 addition & 1 deletion internal/grpc/interceptors/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ func dismantleToken(ctx context.Context, tkn string, req interface{}, mgr token.
}

if sharedconf.SkipUserGroupsInToken() {
client, err := pool.GetGatewayServiceClient(gatewayAddr)
client, err := pool.GetGatewayServiceClient(pool.Endpoint(gatewayAddr))
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/grpc/interceptors/auth/scope.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const (

func expandAndVerifyScope(ctx context.Context, req interface{}, tokenScope map[string]*authpb.Scope, user *userpb.User, gatewayAddr string, mgr token.Manager) error {
log := appctx.GetLogger(ctx)
client, err := pool.GetGatewayServiceClient(gatewayAddr)
client, err := pool.GetGatewayServiceClient(pool.Endpoint(gatewayAddr))
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/grpc/services/appprovider/appprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func (s *service) registerProvider() {
pInfo.MimeTypes = mimeTypes
}

client, err := pool.GetGatewayServiceClient(s.conf.GatewaySvc)
client, err := pool.GetGatewayServiceClient(pool.Endpoint(s.conf.GatewaySvc))
if err != nil {
log.Error().Err(err).Msgf("error registering app provider: could not get gateway client")
return
Expand Down
8 changes: 4 additions & 4 deletions internal/grpc/services/gateway/applicationauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

func (s *svc) GenerateAppPassword(ctx context.Context, req *appauthpb.GenerateAppPasswordRequest) (*appauthpb.GenerateAppPasswordResponse, error) {
c, err := pool.GetAppAuthProviderServiceClient(s.c.ApplicationAuthEndpoint)
c, err := pool.GetAppAuthProviderServiceClient(pool.Endpoint(s.c.ApplicationAuthEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetAppAuthProviderServiceClient")
return &appauthpb.GenerateAppPasswordResponse{
Expand All @@ -45,7 +45,7 @@ func (s *svc) GenerateAppPassword(ctx context.Context, req *appauthpb.GenerateAp
}

func (s *svc) ListAppPasswords(ctx context.Context, req *appauthpb.ListAppPasswordsRequest) (*appauthpb.ListAppPasswordsResponse, error) {
c, err := pool.GetAppAuthProviderServiceClient(s.c.ApplicationAuthEndpoint)
c, err := pool.GetAppAuthProviderServiceClient(pool.Endpoint(s.c.ApplicationAuthEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetAppAuthProviderServiceClient")
return &appauthpb.ListAppPasswordsResponse{
Expand All @@ -62,7 +62,7 @@ func (s *svc) ListAppPasswords(ctx context.Context, req *appauthpb.ListAppPasswo
}

func (s *svc) InvalidateAppPassword(ctx context.Context, req *appauthpb.InvalidateAppPasswordRequest) (*appauthpb.InvalidateAppPasswordResponse, error) {
c, err := pool.GetAppAuthProviderServiceClient(s.c.ApplicationAuthEndpoint)
c, err := pool.GetAppAuthProviderServiceClient(pool.Endpoint(s.c.ApplicationAuthEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetAppAuthProviderServiceClient")
return &appauthpb.InvalidateAppPasswordResponse{
Expand All @@ -79,7 +79,7 @@ func (s *svc) InvalidateAppPassword(ctx context.Context, req *appauthpb.Invalida
}

func (s *svc) GetAppPassword(ctx context.Context, req *appauthpb.GetAppPasswordRequest) (*appauthpb.GetAppPasswordResponse, error) {
c, err := pool.GetAppAuthProviderServiceClient(s.c.ApplicationAuthEndpoint)
c, err := pool.GetAppAuthProviderServiceClient(pool.Endpoint(s.c.ApplicationAuthEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetAppAuthProviderServiceClient")
return &appauthpb.GetAppPasswordResponse{
Expand Down
4 changes: 2 additions & 2 deletions internal/grpc/services/gateway/appprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ func (s *svc) openLocalResources(ctx context.Context, ri *storageprovider.Resour
return nil, err
}

appProviderClient, err := pool.GetAppProviderClient(provider.Address)
appProviderClient, err := pool.GetAppProviderClient(pool.Endpoint(provider.Address))
if err != nil {
return nil, errors.Wrap(err, "gateway: error calling GetAppProviderClient")
}
Expand All @@ -209,7 +209,7 @@ func (s *svc) openLocalResources(ctx context.Context, ri *storageprovider.Resour
}

func (s *svc) findAppProvider(ctx context.Context, ri *storageprovider.ResourceInfo, app string) (*registry.ProviderInfo, error) {
c, err := pool.GetAppRegistryClient(s.c.AppRegistryEndpoint)
c, err := pool.GetAppRegistryClient(pool.Endpoint(s.c.AppRegistryEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error getting appregistry client")
return nil, err
Expand Down
12 changes: 6 additions & 6 deletions internal/grpc/services/gateway/appregistry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

func (s *svc) GetAppProviders(ctx context.Context, req *registry.GetAppProvidersRequest) (*registry.GetAppProvidersResponse, error) {
c, err := pool.GetAppRegistryClient(s.c.AppRegistryEndpoint)
c, err := pool.GetAppRegistryClient(pool.Endpoint(s.c.AppRegistryEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetAppRegistryClient")
return &registry.GetAppProvidersResponse{
Expand All @@ -45,7 +45,7 @@ func (s *svc) GetAppProviders(ctx context.Context, req *registry.GetAppProviders
}

func (s *svc) AddAppProvider(ctx context.Context, req *registry.AddAppProviderRequest) (*registry.AddAppProviderResponse, error) {
c, err := pool.GetAppRegistryClient(s.c.AppRegistryEndpoint)
c, err := pool.GetAppRegistryClient(pool.Endpoint(s.c.AppRegistryEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetAppRegistryClient")
return &registry.AddAppProviderResponse{
Expand All @@ -62,7 +62,7 @@ func (s *svc) AddAppProvider(ctx context.Context, req *registry.AddAppProviderRe
}

func (s *svc) ListAppProviders(ctx context.Context, req *registry.ListAppProvidersRequest) (*registry.ListAppProvidersResponse, error) {
c, err := pool.GetAppRegistryClient(s.c.AppRegistryEndpoint)
c, err := pool.GetAppRegistryClient(pool.Endpoint(s.c.AppRegistryEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetAppRegistryClient")
return &registry.ListAppProvidersResponse{
Expand All @@ -79,7 +79,7 @@ func (s *svc) ListAppProviders(ctx context.Context, req *registry.ListAppProvide
}

func (s *svc) ListSupportedMimeTypes(ctx context.Context, req *registry.ListSupportedMimeTypesRequest) (*registry.ListSupportedMimeTypesResponse, error) {
c, err := pool.GetAppRegistryClient(s.c.AppRegistryEndpoint)
c, err := pool.GetAppRegistryClient(pool.Endpoint(s.c.AppRegistryEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetAppRegistryClient")
return &registry.ListSupportedMimeTypesResponse{
Expand All @@ -96,7 +96,7 @@ func (s *svc) ListSupportedMimeTypes(ctx context.Context, req *registry.ListSupp
}

func (s *svc) GetDefaultAppProviderForMimeType(ctx context.Context, req *registry.GetDefaultAppProviderForMimeTypeRequest) (*registry.GetDefaultAppProviderForMimeTypeResponse, error) {
c, err := pool.GetAppRegistryClient(s.c.AppRegistryEndpoint)
c, err := pool.GetAppRegistryClient(pool.Endpoint(s.c.AppRegistryEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetAppRegistryClient")
return &registry.GetDefaultAppProviderForMimeTypeResponse{
Expand All @@ -113,7 +113,7 @@ func (s *svc) GetDefaultAppProviderForMimeType(ctx context.Context, req *registr
}

func (s *svc) SetDefaultAppProviderForMimeType(ctx context.Context, req *registry.SetDefaultAppProviderForMimeTypeRequest) (*registry.SetDefaultAppProviderForMimeTypeResponse, error) {
c, err := pool.GetAppRegistryClient(s.c.AppRegistryEndpoint)
c, err := pool.GetAppRegistryClient(pool.Endpoint(s.c.AppRegistryEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetAppRegistryClient")
return &registry.SetDefaultAppProviderForMimeTypeResponse{
Expand Down
4 changes: 2 additions & 2 deletions internal/grpc/services/gateway/authprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func (s *svc) WhoAmI(ctx context.Context, req *gateway.WhoAmIRequest) (*gateway.
}

func (s *svc) findAuthProvider(ctx context.Context, authType string) (authpb.ProviderAPIClient, error) {
c, err := pool.GetAuthRegistryServiceClient(s.c.AuthRegistryEndpoint)
c, err := pool.GetAuthRegistryServiceClient(pool.Endpoint(s.c.AuthRegistryEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error getting auth registry client")
return nil, err
Expand All @@ -224,7 +224,7 @@ func (s *svc) findAuthProvider(ctx context.Context, authType string) (authpb.Pro

if res.Status.Code == rpc.Code_CODE_OK && res.Providers != nil && len(res.Providers) > 0 {
// TODO(labkode): check for capabilities here
c, err := pool.GetAuthProviderServiceClient(res.Providers[0].Address)
c, err := pool.GetAuthProviderServiceClient(pool.Endpoint(res.Providers[0].Address))
if err != nil {
err = errors.Wrap(err, "gateway: error getting an auth provider client")
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion internal/grpc/services/gateway/authregistry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
)

func (s *svc) ListAuthProviders(ctx context.Context, req *registry.ListAuthProvidersRequest) (*gateway.ListAuthProvidersResponse, error) {
c, err := pool.GetAuthRegistryServiceClient(s.c.AuthRegistryEndpoint)
c, err := pool.GetAuthRegistryServiceClient(pool.Endpoint(s.c.AuthRegistryEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error getting auth registry client")
return &gateway.ListAuthProvidersResponse{
Expand Down
10 changes: 5 additions & 5 deletions internal/grpc/services/gateway/datatx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

func (s *svc) PullTransfer(ctx context.Context, req *datatx.PullTransferRequest) (*datatx.PullTransferResponse, error) {
c, err := pool.GetDataTxClient(s.c.DataTxEndpoint)
c, err := pool.GetDataTxClient(pool.Endpoint(s.c.DataTxEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetDataTxClient")
return &datatx.PullTransferResponse{
Expand All @@ -45,7 +45,7 @@ func (s *svc) PullTransfer(ctx context.Context, req *datatx.PullTransferRequest)
}

func (s *svc) GetTransferStatus(ctx context.Context, req *datatx.GetTransferStatusRequest) (*datatx.GetTransferStatusResponse, error) {
c, err := pool.GetDataTxClient(s.c.DataTxEndpoint)
c, err := pool.GetDataTxClient(pool.Endpoint(s.c.DataTxEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetDataTxClient")
return &datatx.GetTransferStatusResponse{
Expand All @@ -62,7 +62,7 @@ func (s *svc) GetTransferStatus(ctx context.Context, req *datatx.GetTransferStat
}

func (s *svc) CancelTransfer(ctx context.Context, req *datatx.CancelTransferRequest) (*datatx.CancelTransferResponse, error) {
c, err := pool.GetDataTxClient(s.c.DataTxEndpoint)
c, err := pool.GetDataTxClient(pool.Endpoint(s.c.DataTxEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetDataTxClient")
return &datatx.CancelTransferResponse{
Expand All @@ -79,7 +79,7 @@ func (s *svc) CancelTransfer(ctx context.Context, req *datatx.CancelTransferRequ
}

func (s *svc) ListTransfers(ctx context.Context, req *datatx.ListTransfersRequest) (*datatx.ListTransfersResponse, error) {
c, err := pool.GetDataTxClient(s.c.DataTxEndpoint)
c, err := pool.GetDataTxClient(pool.Endpoint(s.c.DataTxEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetDataTxClient")
return &datatx.ListTransfersResponse{
Expand All @@ -96,7 +96,7 @@ func (s *svc) ListTransfers(ctx context.Context, req *datatx.ListTransfersReques
}

func (s *svc) RetryTransfer(ctx context.Context, req *datatx.RetryTransferRequest) (*datatx.RetryTransferResponse, error) {
c, err := pool.GetDataTxClient(s.c.DataTxEndpoint)
c, err := pool.GetDataTxClient(pool.Endpoint(s.c.DataTxEndpoint))
if err != nil {
err = errors.Wrap(err, "gateway: error calling GetDataTxClient")
return &datatx.RetryTransferResponse{
Expand Down
10 changes: 5 additions & 5 deletions internal/grpc/services/gateway/groupprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

func (s *svc) GetGroup(ctx context.Context, req *group.GetGroupRequest) (*group.GetGroupResponse, error) {
c, err := pool.GetGroupProviderServiceClient(s.c.GroupProviderEndpoint)
c, err := pool.GetGroupProviderServiceClient(pool.Endpoint(s.c.GroupProviderEndpoint))
if err != nil {
return &group.GetGroupResponse{
Status: status.NewInternal(ctx, err, "error getting auth client"),
Expand All @@ -44,7 +44,7 @@ func (s *svc) GetGroup(ctx context.Context, req *group.GetGroupRequest) (*group.
}

func (s *svc) GetGroupByClaim(ctx context.Context, req *group.GetGroupByClaimRequest) (*group.GetGroupByClaimResponse, error) {
c, err := pool.GetGroupProviderServiceClient(s.c.GroupProviderEndpoint)
c, err := pool.GetGroupProviderServiceClient(pool.Endpoint(s.c.GroupProviderEndpoint))
if err != nil {
return &group.GetGroupByClaimResponse{
Status: status.NewInternal(ctx, err, "error getting auth client"),
Expand All @@ -60,7 +60,7 @@ func (s *svc) GetGroupByClaim(ctx context.Context, req *group.GetGroupByClaimReq
}

func (s *svc) FindGroups(ctx context.Context, req *group.FindGroupsRequest) (*group.FindGroupsResponse, error) {
c, err := pool.GetGroupProviderServiceClient(s.c.GroupProviderEndpoint)
c, err := pool.GetGroupProviderServiceClient(pool.Endpoint(s.c.GroupProviderEndpoint))
if err != nil {
return &group.FindGroupsResponse{
Status: status.NewInternal(ctx, err, "error getting auth client"),
Expand All @@ -76,7 +76,7 @@ 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(s.c.GroupProviderEndpoint)
c, err := pool.GetGroupProviderServiceClient(pool.Endpoint(s.c.GroupProviderEndpoint))
if err != nil {
return &group.GetMembersResponse{
Status: status.NewInternal(ctx, err, "error getting auth client"),
Expand All @@ -92,7 +92,7 @@ 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(s.c.GroupProviderEndpoint)
c, err := pool.GetGroupProviderServiceClient(pool.Endpoint(s.c.GroupProviderEndpoint))
if err != nil {
return &group.HasMemberResponse{
Status: status.NewInternal(ctx, err, "error getting auth client"),
Expand Down
2 changes: 1 addition & 1 deletion internal/grpc/services/gateway/ocmcore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

func (s *svc) CreateOCMCoreShare(ctx context.Context, req *ocmcore.CreateOCMCoreShareRequest) (*ocmcore.CreateOCMCoreShareResponse, error) {
c, err := pool.GetOCMCoreClient(s.c.OCMCoreEndpoint)
c, err := pool.GetOCMCoreClient(pool.Endpoint(s.c.OCMCoreEndpoint))
if err != nil {
return &ocmcore.CreateOCMCoreShareResponse{
Status: status.NewInternal(ctx, err, "error getting ocm core client"),
Expand Down
10 changes: 5 additions & 5 deletions internal/grpc/services/gateway/ocminvitemanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

func (s *svc) GenerateInviteToken(ctx context.Context, req *invitepb.GenerateInviteTokenRequest) (*invitepb.GenerateInviteTokenResponse, error) {
c, err := pool.GetOCMInviteManagerClient(s.c.OCMInviteManagerEndpoint)
c, err := pool.GetOCMInviteManagerClient(pool.Endpoint(s.c.OCMInviteManagerEndpoint))
if err != nil {
return &invitepb.GenerateInviteTokenResponse{
Status: status.NewInternal(ctx, err, "error getting user invite provider client"),
Expand All @@ -44,7 +44,7 @@ func (s *svc) GenerateInviteToken(ctx context.Context, req *invitepb.GenerateInv
}

func (s *svc) ForwardInvite(ctx context.Context, req *invitepb.ForwardInviteRequest) (*invitepb.ForwardInviteResponse, error) {
c, err := pool.GetOCMInviteManagerClient(s.c.OCMInviteManagerEndpoint)
c, err := pool.GetOCMInviteManagerClient(pool.Endpoint(s.c.OCMInviteManagerEndpoint))
if err != nil {
return &invitepb.ForwardInviteResponse{
Status: status.NewInternal(ctx, err, "error getting user invite provider client"),
Expand All @@ -60,7 +60,7 @@ func (s *svc) ForwardInvite(ctx context.Context, req *invitepb.ForwardInviteRequ
}

func (s *svc) AcceptInvite(ctx context.Context, req *invitepb.AcceptInviteRequest) (*invitepb.AcceptInviteResponse, error) {
c, err := pool.GetOCMInviteManagerClient(s.c.OCMInviteManagerEndpoint)
c, err := pool.GetOCMInviteManagerClient(pool.Endpoint(s.c.OCMInviteManagerEndpoint))
if err != nil {
return &invitepb.AcceptInviteResponse{
Status: status.NewInternal(ctx, err, "error getting user invite provider client"),
Expand All @@ -76,7 +76,7 @@ func (s *svc) AcceptInvite(ctx context.Context, req *invitepb.AcceptInviteReques
}

func (s *svc) GetAcceptedUser(ctx context.Context, req *invitepb.GetAcceptedUserRequest) (*invitepb.GetAcceptedUserResponse, error) {
c, err := pool.GetOCMInviteManagerClient(s.c.OCMInviteManagerEndpoint)
c, err := pool.GetOCMInviteManagerClient(pool.Endpoint(s.c.OCMInviteManagerEndpoint))
if err != nil {
return &invitepb.GetAcceptedUserResponse{
Status: status.NewInternal(ctx, err, "error getting user invite provider client"),
Expand All @@ -92,7 +92,7 @@ func (s *svc) GetAcceptedUser(ctx context.Context, req *invitepb.GetAcceptedUser
}

func (s *svc) FindAcceptedUsers(ctx context.Context, req *invitepb.FindAcceptedUsersRequest) (*invitepb.FindAcceptedUsersResponse, error) {
c, err := pool.GetOCMInviteManagerClient(s.c.OCMInviteManagerEndpoint)
c, err := pool.GetOCMInviteManagerClient(pool.Endpoint(s.c.OCMInviteManagerEndpoint))
if err != nil {
return &invitepb.FindAcceptedUsersResponse{
Status: status.NewInternal(ctx, err, "error getting user invite provider client"),
Expand Down
6 changes: 3 additions & 3 deletions internal/grpc/services/gateway/ocmproviderauthorizer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

func (s *svc) IsProviderAllowed(ctx context.Context, req *ocmprovider.IsProviderAllowedRequest) (*ocmprovider.IsProviderAllowedResponse, error) {
c, err := pool.GetOCMProviderAuthorizerClient(s.c.OCMProviderAuthorizerEndpoint)
c, err := pool.GetOCMProviderAuthorizerClient(pool.Endpoint(s.c.OCMProviderAuthorizerEndpoint))
if err != nil {
return &ocmprovider.IsProviderAllowedResponse{
Status: status.NewInternal(ctx, err, "error getting ocm authorizer provider client"),
Expand All @@ -44,7 +44,7 @@ func (s *svc) IsProviderAllowed(ctx context.Context, req *ocmprovider.IsProvider
}

func (s *svc) GetInfoByDomain(ctx context.Context, req *ocmprovider.GetInfoByDomainRequest) (*ocmprovider.GetInfoByDomainResponse, error) {
c, err := pool.GetOCMProviderAuthorizerClient(s.c.OCMProviderAuthorizerEndpoint)
c, err := pool.GetOCMProviderAuthorizerClient(pool.Endpoint(s.c.OCMProviderAuthorizerEndpoint))
if err != nil {
return &ocmprovider.GetInfoByDomainResponse{
Status: status.NewInternal(ctx, err, "error getting ocm authorizer provider client"),
Expand All @@ -60,7 +60,7 @@ func (s *svc) GetInfoByDomain(ctx context.Context, req *ocmprovider.GetInfoByDom
}

func (s *svc) ListAllProviders(ctx context.Context, req *ocmprovider.ListAllProvidersRequest) (*ocmprovider.ListAllProvidersResponse, error) {
c, err := pool.GetOCMProviderAuthorizerClient(s.c.OCMProviderAuthorizerEndpoint)
c, err := pool.GetOCMProviderAuthorizerClient(pool.Endpoint(s.c.OCMProviderAuthorizerEndpoint))
if err != nil {
return &ocmprovider.ListAllProvidersResponse{
Status: status.NewInternal(ctx, err, "error getting ocm authorizer provider client"),
Expand Down
Loading