From c214a3eafac888a8d89514637881c629d75f6af6 Mon Sep 17 00:00:00 2001 From: Antoon Prins Date: Wed, 7 Oct 2020 15:07:08 +0200 Subject: [PATCH 1/5] New gateway datatx service. --- internal/grpc/services/gateway/datatx.go | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 internal/grpc/services/gateway/datatx.go diff --git a/internal/grpc/services/gateway/datatx.go b/internal/grpc/services/gateway/datatx.go new file mode 100644 index 0000000000..c20b64ef8e --- /dev/null +++ b/internal/grpc/services/gateway/datatx.go @@ -0,0 +1,45 @@ +// Copyright 2018-2020 CERN +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// In applying this license, CERN does not waive the privileges and immunities +// granted to it by virtue of its status as an Intergovernmental Organization +// or submit itself to any jurisdiction. + +package gateway + +import ( + "context" + + tx "github.com/cs3org/go-cs3apis/cs3/tx/v1beta1" + "github.com/cs3org/reva/pkg/rgrpc/status" + "github.com/pkg/errors" +) + +func (s *svc) CreateTransfer(ctx context.Context, req *tx.CreateTransferRequest) (*tx.CreateTransferResponse, error) { + return &tx.CreateTransferResponse{ + Status: status.NewUnimplemented(ctx, errors.New("CreateTransfer not implemented"), "CreateTransfer not implemented"), + }, nil +} + +func (s *svc) GetTransferStatus(ctx context.Context, in *tx.GetTransferStatusRequest) (*tx.GetTransferStatusResponse, error) { + return &tx.GetTransferStatusResponse{ + Status: status.NewUnimplemented(ctx, errors.New("CreateTransfer not implemented"), "CreateTransfer not implemented"), + }, nil +} + +func (s *svc) CancelTransfer(ctx context.Context, in *tx.CancelTransferRequest) (*tx.CancelTransferResponse, error) { + return &tx.CancelTransferResponse{ + Status: status.NewUnimplemented(ctx, errors.New("CreateTransfer not implemented"), "CreateTransfer not implemented"), + }, nil +} From 457ab9912cd45588e856ee5f6c8d40e583c5f859 Mon Sep 17 00:00:00 2001 From: Antoon Prins Date: Wed, 7 Oct 2020 15:15:54 +0200 Subject: [PATCH 2/5] changelog added --- changelog/unreleased/new-gateway-datatx-service.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/unreleased/new-gateway-datatx-service.md diff --git a/changelog/unreleased/new-gateway-datatx-service.md b/changelog/unreleased/new-gateway-datatx-service.md new file mode 100644 index 0000000000..57a5f78ea5 --- /dev/null +++ b/changelog/unreleased/new-gateway-datatx-service.md @@ -0,0 +1,5 @@ +Enhancement: New gateway datatx service + +Represents the CS3 datatx module in the gateway. + +https://github.com/cs3org/reva/pull/1229 \ No newline at end of file From df384c13e3c553c35d3acfcfaa0fced4cb159992 Mon Sep 17 00:00:00 2001 From: Antoon Prins Date: Wed, 7 Oct 2020 15:27:09 +0200 Subject: [PATCH 3/5] Correct cs3 lib added. --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 183435cdf5..201f1f8dc5 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/cheggaaa/pb v1.0.29 github.com/coreos/go-oidc v2.2.1+incompatible github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e - github.com/cs3org/go-cs3apis v0.0.0-20200903142434-7dfeb0059208 + github.com/cs3org/go-cs3apis v0.0.0-20200929101248-821df597ec8d github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59 github.com/go-ldap/ldap/v3 v3.2.3 From 2e26010103dc594fc8b4b2881c27ee23a47cce17 Mon Sep 17 00:00:00 2001 From: Antoon Prins Date: Wed, 7 Oct 2020 15:28:29 +0200 Subject: [PATCH 4/5] Error messages corrected. --- internal/grpc/services/gateway/datatx.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/grpc/services/gateway/datatx.go b/internal/grpc/services/gateway/datatx.go index c20b64ef8e..0bbafbc6b7 100644 --- a/internal/grpc/services/gateway/datatx.go +++ b/internal/grpc/services/gateway/datatx.go @@ -34,12 +34,12 @@ func (s *svc) CreateTransfer(ctx context.Context, req *tx.CreateTransferRequest) func (s *svc) GetTransferStatus(ctx context.Context, in *tx.GetTransferStatusRequest) (*tx.GetTransferStatusResponse, error) { return &tx.GetTransferStatusResponse{ - Status: status.NewUnimplemented(ctx, errors.New("CreateTransfer not implemented"), "CreateTransfer not implemented"), + Status: status.NewUnimplemented(ctx, errors.New("GetTransfer not implemented"), "GetTransfer not implemented"), }, nil } func (s *svc) CancelTransfer(ctx context.Context, in *tx.CancelTransferRequest) (*tx.CancelTransferResponse, error) { return &tx.CancelTransferResponse{ - Status: status.NewUnimplemented(ctx, errors.New("CreateTransfer not implemented"), "CreateTransfer not implemented"), + Status: status.NewUnimplemented(ctx, errors.New("CancelTransfer not implemented"), "CancelTransfer not implemented"), }, nil } From 504833da7bf3df1c508fa778ef86635e12dcf15b Mon Sep 17 00:00:00 2001 From: Antoon Prins Date: Wed, 7 Oct 2020 15:30:11 +0200 Subject: [PATCH 5/5] Error messages corrected. --- internal/grpc/services/gateway/datatx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/grpc/services/gateway/datatx.go b/internal/grpc/services/gateway/datatx.go index 0bbafbc6b7..48bad5366e 100644 --- a/internal/grpc/services/gateway/datatx.go +++ b/internal/grpc/services/gateway/datatx.go @@ -34,7 +34,7 @@ func (s *svc) CreateTransfer(ctx context.Context, req *tx.CreateTransferRequest) func (s *svc) GetTransferStatus(ctx context.Context, in *tx.GetTransferStatusRequest) (*tx.GetTransferStatusResponse, error) { return &tx.GetTransferStatusResponse{ - Status: status.NewUnimplemented(ctx, errors.New("GetTransfer not implemented"), "GetTransfer not implemented"), + Status: status.NewUnimplemented(ctx, errors.New("GetTransferStatus not implemented"), "GetTransferStatus not implemented"), }, nil }