From 32434fa96c6c7d4b0bb4cd94a13efdfff1464971 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 20 Aug 2020 16:04:52 +0200 Subject: [PATCH] adjust error codes --- pkg/service/v0/service.go | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkg/service/v0/service.go b/pkg/service/v0/service.go index 79ec67ae00..179b921bfa 100644 --- a/pkg/service/v0/service.go +++ b/pkg/service/v0/service.go @@ -52,11 +52,11 @@ func NewService(cfg *config.Config, logger log.Logger) Service { func (g Service) SaveBundle(c context.Context, req *proto.SaveBundleRequest, res *proto.SaveBundleResponse) error { cleanUpResource(c, req.Bundle.Resource) if validationError := validateSaveBundle(req); validationError != nil { - return merrors.FromError(merrors.BadRequest("ocis-settings", "%s", validationError)) + return merrors.BadRequest("ocis-settings", "%s", validationError) } r, err := g.manager.WriteBundle(req.Bundle) if err != nil { - return merrors.FromError(merrors.BadRequest("ocis-settings", "%s", err)) + return merrors.BadRequest("ocis-settings", "%s", err) } res.Bundle = r return nil @@ -65,11 +65,11 @@ func (g Service) SaveBundle(c context.Context, req *proto.SaveBundleRequest, res // GetBundle implements the BundleServiceHandler interface func (g Service) GetBundle(c context.Context, req *proto.GetBundleRequest, res *proto.GetBundleResponse) error { if validationError := validateGetBundle(req); validationError != nil { - return merrors.FromError(validationError) + return merrors.BadRequest("ocis-settings", "%s", validationError) } r, err := g.manager.ReadBundle(req.BundleId) if err != nil { - return merrors.FromError(err) + return merrors.NotFound("ocis-settings", "%s", err) } res.Bundle = r return nil @@ -80,11 +80,11 @@ func (g Service) ListBundles(c context.Context, req *proto.ListBundlesRequest, r // fetch all bundles req.AccountUuid = getValidatedAccountUUID(c, req.AccountUuid) if validationError := validateListBundles(req); validationError != nil { - return merrors.FromError(validationError) + return merrors.BadRequest("ocis-settings", "%s", validationError) } bundles, err := g.manager.ListBundles(proto.Bundle_TYPE_DEFAULT) if err != nil { - return merrors.FromError(err) + return merrors.NotFound("ocis-settings", "%s", err) } res.Bundles = bundles return nil @@ -94,11 +94,11 @@ func (g Service) ListBundles(c context.Context, req *proto.ListBundlesRequest, r func (g Service) AddSettingToBundle(c context.Context, req *proto.AddSettingToBundleRequest, res *proto.AddSettingToBundleResponse) error { cleanUpResource(c, req.Setting.Resource) if validationError := validateAddSettingToBundle(req); validationError != nil { - return merrors.FromError(validationError) + return merrors.BadRequest("ocis-settings", "%s", validationError) } r, err := g.manager.AddSettingToBundle(req.BundleId, req.Setting) if err != nil { - return merrors.FromError(err) + return merrors.BadRequest("ocis-settings", "%s", err) } res.Setting = r return nil @@ -107,7 +107,7 @@ func (g Service) AddSettingToBundle(c context.Context, req *proto.AddSettingToBu // RemoveSettingFromBundle implements the BundleServiceHandler interface func (g Service) RemoveSettingFromBundle(c context.Context, req *proto.RemoveSettingFromBundleRequest, _ *empty.Empty) error { if validationError := validateRemoveSettingFromBundle(req); validationError != nil { - return merrors.FromError(validationError) + return merrors.BadRequest("ocis-settings", "%s", validationError) } return g.manager.RemoveSettingFromBundle(req.BundleId, req.SettingId) } @@ -118,15 +118,15 @@ func (g Service) SaveValue(c context.Context, req *proto.SaveValueRequest, res * cleanUpResource(c, req.Value.Resource) // TODO: we need to check, if the authenticated user has permission to write the value for the specified resource (e.g. global, file with id xy, ...) if validationError := validateSaveValue(req); validationError != nil { - return merrors.FromError(merrors.BadRequest("ocis-settings", "%s", validationError)) + return merrors.BadRequest("ocis-settings", "%s", validationError) } r, err := g.manager.WriteValue(req.Value) if err != nil { - return merrors.FromError(merrors.BadRequest("ocis-settings", "%s", err)) + return merrors.BadRequest("ocis-settings", "%s", err) } valueWithIdentifier, err := g.getValueWithIdentifier(r) if err != nil { - return merrors.FromError(merrors.NotFound("ocis-settings", "%s", err)) + return merrors.NotFound("ocis-settings", "%s", err) } res.Value = valueWithIdentifier return nil @@ -135,15 +135,15 @@ func (g Service) SaveValue(c context.Context, req *proto.SaveValueRequest, res * // GetValue implements the ValueServiceHandler interface func (g Service) GetValue(c context.Context, req *proto.GetValueRequest, res *proto.GetValueResponse) error { if validationError := validateGetValue(req); validationError != nil { - return merrors.FromError(validationError) + return merrors.BadRequest("ocis-settings", "%s", validationError) } r, err := g.manager.ReadValue(req.Id) if err != nil { - return merrors.FromError(err) + return merrors.NotFound("ocis-settings", "%s", err) } valueWithIdentifier, err := g.getValueWithIdentifier(r) if err != nil { - return merrors.FromError(err) + return merrors.NotFound("ocis-settings", "%s", err) } res.Value = valueWithIdentifier return nil @@ -153,13 +153,13 @@ func (g Service) GetValue(c context.Context, req *proto.GetValueRequest, res *pr func (g Service) GetValueByUniqueIdentifiers(ctx context.Context, in *proto.GetValueByUniqueIdentifiersRequest, res *proto.GetValueResponse) error { v, err := g.manager.ReadValueByUniqueIdentifiers(in.AccountUuid, in.SettingId) if err != nil { - return merrors.FromError(err) + return merrors.NotFound("ocis-settings", "%s", err) } if v.BundleId != "" { valueWithIdentifier, err := g.getValueWithIdentifier(v) if err != nil { - return merrors.FromError(err) + return merrors.NotFound("ocis-settings", "%s", err) } res.Value = valueWithIdentifier @@ -171,11 +171,11 @@ func (g Service) GetValueByUniqueIdentifiers(ctx context.Context, in *proto.GetV func (g Service) ListValues(c context.Context, req *proto.ListValuesRequest, res *proto.ListValuesResponse) error { req.AccountUuid = getValidatedAccountUUID(c, req.AccountUuid) if validationError := validateListValues(req); validationError != nil { - return merrors.FromError(validationError) + return merrors.BadRequest("ocis-settings", "%s", validationError) } r, err := g.manager.ListValues(req.BundleId, req.AccountUuid) if err != nil { - return merrors.FromError(err) + return merrors.NotFound("ocis-settings", "%s", err) } var result []*proto.ValueWithIdentifier for _, value := range r {