From 344054ce17e39f90df7ea7a436930b823a985924 Mon Sep 17 00:00:00 2001 From: Giuseppe Lo Presti Date: Wed, 29 Jul 2020 16:33:24 +0200 Subject: [PATCH] Fixed error messages due to copy/paste (too much boiler-plate coding?) --- internal/grpc/services/gateway/appregistry.go | 4 ++-- internal/grpc/services/gateway/usershareprovider.go | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/internal/grpc/services/gateway/appregistry.go b/internal/grpc/services/gateway/appregistry.go index bf9054b0f26..0c38ce76300 100644 --- a/internal/grpc/services/gateway/appregistry.go +++ b/internal/grpc/services/gateway/appregistry.go @@ -30,7 +30,7 @@ import ( func (s *svc) GetAppProviders(ctx context.Context, req *registry.GetAppProvidersRequest) (*registry.GetAppProvidersResponse, error) { c, err := pool.GetAppRegistryClient(s.c.AppRegistryEndpoint) if err != nil { - err = errors.Wrap(err, "gateway: error calling GetOCMShareProviderClient") + err = errors.Wrap(err, "gateway: error calling GetAppRegistryClient") return ®istry.GetAppProvidersResponse{ Status: status.NewInternal(ctx, err, "error getting user share provider client"), }, nil @@ -47,7 +47,7 @@ func (s *svc) GetAppProviders(ctx context.Context, req *registry.GetAppProviders func (s *svc) ListAppProviders(ctx context.Context, req *registry.ListAppProvidersRequest) (*registry.ListAppProvidersResponse, error) { c, err := pool.GetAppRegistryClient(s.c.AppRegistryEndpoint) if err != nil { - err = errors.Wrap(err, "gateway: error calling GetOCMShareProviderClient") + err = errors.Wrap(err, "gateway: error calling GetAppRegistryClient") return ®istry.ListAppProvidersResponse{ Status: status.NewInternal(ctx, err, "error getting user share provider client"), }, nil diff --git a/internal/grpc/services/gateway/usershareprovider.go b/internal/grpc/services/gateway/usershareprovider.go index 4bb6aff17cc..7ef63548bb4 100644 --- a/internal/grpc/services/gateway/usershareprovider.go +++ b/internal/grpc/services/gateway/usershareprovider.go @@ -367,15 +367,12 @@ func (s *svc) createReference(ctx context.Context, resourceID *provider.Resource statRes, err := c.Stat(ctx, statReq) if err != nil { - log.Err(err).Msg("gateway: error calling Stat for the share resource id:" + resourceID.String()) - return &rpc.Status{ - Code: rpc.Code_CODE_INTERNAL, - }, nil + return status.NewInternal(ctx, err, "gateway: error calling Stat for the share resource id: "+resourceID.String()), nil } if statRes.Status.Code != rpc.Code_CODE_OK { err := status.NewErrorFromCode(statRes.Status.GetCode(), "gateway") - log.Err(err).Msg("gateway: error calling Stat for the share resource id:" + resourceID.String()) + log.Err(err).Msg("gateway: Stat failed on the share resource id: " + resourceID.String()) return status.NewInternal(ctx, err, "error updating received share"), nil }