From 986e54c127d877c69631fef09052b96aa2ddc8b1 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 27 May 2021 12:47:05 +0100 Subject: [PATCH] SSE/Chore: cleanup some error messages (#34738) (#34743) removes "rpc error: code = InvalidArgument desc =" like strings from error messages. This came from old grpc stuff left from when SSE was a plugin (that probably should not have been used even when it was a plugin) (cherry picked from commit 9016d20c4c63e77faddf3e72cf2c9d1f989c496b) Co-authored-by: Kyle Brandt --- pkg/expr/transform.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/expr/transform.go b/pkg/expr/transform.go index 204f701ba40..c5d31560862 100644 --- a/pkg/expr/transform.go +++ b/pkg/expr/transform.go @@ -13,8 +13,6 @@ import ( "github.com/grafana/grafana/pkg/plugins" "github.com/prometheus/client_golang/prometheus" "golang.org/x/net/context" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) var ( @@ -91,7 +89,7 @@ type TimeRange struct { // or are datasource requests. func (s *Service) TransformData(ctx context.Context, req *Request) (r *backend.QueryDataResponse, err error) { if s.isDisabled() { - return nil, status.Error(codes.PermissionDenied, "Expressions are disabled") + return nil, fmt.Errorf("server side expressions are disabled") } start := time.Now() @@ -111,20 +109,20 @@ func (s *Service) TransformData(ctx context.Context, req *Request) (r *backend.Q // and parsing graph nodes from the queries. pipeline, err := s.BuildPipeline(req) if err != nil { - return nil, status.Error(codes.InvalidArgument, err.Error()) + return nil, err } // Execute the pipeline responses, err := s.ExecutePipeline(ctx, pipeline) if err != nil { - return nil, status.Error(codes.Unknown, err.Error()) + return nil, err } // Get which queries have the Hide property so they those queries' results // can be excluded from the response. hidden, err := hiddenRefIDs(req.Queries) if err != nil { - return nil, status.Error((codes.Internal), err.Error()) + return nil, err } if len(hidden) != 0 {