diff --git a/internal/grpc/services/authregistry/authregistry.go b/internal/grpc/services/authregistry/authregistry.go index 0a51d93448..3df1d1852d 100644 --- a/internal/grpc/services/authregistry/authregistry.go +++ b/internal/grpc/services/authregistry/authregistry.go @@ -116,17 +116,19 @@ func (s *service) ListAuthProviders(ctx context.Context, req *registrypb.ListAut return res, nil } -func (s *service) GetAuthProvider(ctx context.Context, req *registrypb.GetAuthProviderRequest) (*registrypb.GetAuthProviderResponse, error) { +func (s *service) GetAuthProviders(ctx context.Context, req *registrypb.GetAuthProvidersRequest) (*registrypb.GetAuthProvidersResponse, error) { pinfo, err := s.reg.GetProvider(ctx, req.Type) if err != nil { - return ®istrypb.GetAuthProviderResponse{ + return ®istrypb.GetAuthProvidersResponse{ Status: status.NewInternal(ctx, "error getting auth provider for type: "+req.Type), }, nil } - res := ®istrypb.GetAuthProviderResponse{ - Status: status.NewOK(ctx), - Provider: pinfo, + res := ®istrypb.GetAuthProvidersResponse{ + Status: status.NewOK(ctx), + Providers: []*registrypb.ProviderInfo{ + pinfo, + }, } return res, nil } diff --git a/internal/grpc/services/datatx/datatx.go b/internal/grpc/services/datatx/datatx.go index c9649a6ca5..6898fa9811 100644 --- a/internal/grpc/services/datatx/datatx.go +++ b/internal/grpc/services/datatx/datatx.go @@ -81,9 +81,9 @@ func (s *service) UnprotectedEndpoints() []string { return []string{} } -func (s *service) CreateTransfer(ctx context.Context, req *datatx.CreateTransferRequest) (*datatx.CreateTransferResponse, error) { - return &datatx.CreateTransferResponse{ - Status: status.NewUnimplemented(ctx, errtypes.NotSupported("CreateTransfer not implemented"), "CreateTransfer not implemented"), +func (s *service) PullTransfer(ctx context.Context, req *datatx.PullTransferRequest) (*datatx.PullTransferResponse, error) { + return &datatx.PullTransferResponse{ + Status: status.NewUnimplemented(ctx, errtypes.NotSupported("PullTransfer not implemented"), "PullTransfer not implemented"), }, nil } @@ -93,6 +93,18 @@ func (s *service) GetTransferStatus(ctx context.Context, in *datatx.GetTransferS }, nil } +func (s *service) ListTransfers(ctx context.Context, in *datatx.ListTransfersRequest) (*datatx.ListTransfersResponse, error) { + return &datatx.ListTransfersResponse{ + Status: status.NewUnimplemented(ctx, errtypes.NotSupported("ListTransfers not implemented"), "ListTransfers not implemented"), + }, nil +} + +func (s *service) RetryTransfer(ctx context.Context, in *datatx.RetryTransferRequest) (*datatx.RetryTransferResponse, error) { + return &datatx.RetryTransferResponse{ + Status: status.NewUnimplemented(ctx, errtypes.NotSupported("RetryTransfer not implemented"), "RetryTransfer not implemented"), + }, nil +} + func (s *service) CancelTransfer(ctx context.Context, in *datatx.CancelTransferRequest) (*datatx.CancelTransferResponse, error) { return &datatx.CancelTransferResponse{ Status: status.NewUnimplemented(ctx, errtypes.NotSupported("CancelTransfer not implemented"), "CancelTransfer not implemented"), diff --git a/internal/grpc/services/gateway/authprovider.go b/internal/grpc/services/gateway/authprovider.go index f807099127..312164ee51 100644 --- a/internal/grpc/services/gateway/authprovider.go +++ b/internal/grpc/services/gateway/authprovider.go @@ -210,7 +210,7 @@ func (s *svc) findAuthProvider(ctx context.Context, authType string) (authpb.Pro return nil, err } - res, err := c.GetAuthProvider(ctx, ®istry.GetAuthProviderRequest{ + res, err := c.GetAuthProviders(ctx, ®istry.GetAuthProvidersRequest{ Type: authType, }) @@ -219,9 +219,9 @@ func (s *svc) findAuthProvider(ctx context.Context, authType string) (authpb.Pro return nil, err } - if res.Status.Code == rpc.Code_CODE_OK && res.Provider != nil { + 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.Provider.Address) + c, err := pool.GetAuthProviderServiceClient(res.Providers[0].Address) if err != nil { err = errors.Wrap(err, "gateway: error getting an auth provider client") return nil, err diff --git a/internal/grpc/services/gateway/datatx.go b/internal/grpc/services/gateway/datatx.go index c9309d1b74..491e4b04ca 100644 --- a/internal/grpc/services/gateway/datatx.go +++ b/internal/grpc/services/gateway/datatx.go @@ -27,17 +27,49 @@ import ( "github.com/pkg/errors" ) -func (s *svc) CreateTransfer(ctx context.Context, req *datatx.CreateTransferRequest) (*datatx.CreateTransferResponse, error) { +func (s *svc) PullTransfer(ctx context.Context, req *datatx.PullTransferRequest) (*datatx.PullTransferResponse, error) { c, err := pool.GetDataTxClient(s.c.DataTxEndpoint) if err != nil { - return &datatx.CreateTransferResponse{ + return &datatx.PullTransferResponse{ Status: status.NewInternal(ctx, "error getting data transfer client"), }, nil } - res, err := c.CreateTransfer(ctx, req) + res, err := c.PullTransfer(ctx, req) if err != nil { - return nil, errors.Wrap(err, "gateway: error calling CreateTransfer") + return nil, errors.Wrap(err, "gateway: error calling PullTransfer") + } + + return res, nil +} + +func (s *svc) ListTransfers(ctx context.Context, req *datatx.ListTransfersRequest) (*datatx.ListTransfersResponse, error) { + c, err := pool.GetDataTxClient(s.c.DataTxEndpoint) + if err != nil { + return &datatx.ListTransfersResponse{ + Status: status.NewInternal(ctx, "error getting data transfer client"), + }, nil + } + + res, err := c.ListTransfers(ctx, req) + if err != nil { + return nil, errors.Wrap(err, "gateway: error calling ListTransfers") + } + + return res, nil +} + +func (s *svc) RetryTransfer(ctx context.Context, req *datatx.RetryTransferRequest) (*datatx.RetryTransferResponse, error) { + c, err := pool.GetDataTxClient(s.c.DataTxEndpoint) + if err != nil { + return &datatx.RetryTransferResponse{ + Status: status.NewInternal(ctx, "error getting data transfer client"), + }, nil + } + + res, err := c.RetryTransfer(ctx, req) + if err != nil { + return nil, errors.Wrap(err, "gateway: error calling RetryTransfer") } return res, nil