ds-querier: return QDR instead of k8s error (#95184)

* ds-querier: return QDR instead of k8s error

After parseQuery we know the request is a valid k8s request but we don't
know if the query is valid, therefore this change returns a QDR that
other systems, e.g. alerting ruler, can de-serialize properly.

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>

* ds-querier: fix tests

Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>

* tweak status

* refactor refID to empty

---------

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>

pkg/registry/apis/query/errors.go

@@ -77,3 +77,20 @@ func makeCyclicError(refID string) error {
 	}
 	return cyclicErr.Build(data)
 }
+
+type ErrorWithRefID struct {
+	err   error
+	refId string
+}
+
+func (ewr ErrorWithRefID) Error() string {
+	return ewr.err.Error()
+}
+
+func NewErrorWithRefID(refId string, err error) error {
+	ewr := ErrorWithRefID{
+		err:   err,
+		refId: refId,
+	}
+	return ewr
+}

pkg/registry/apis/query/parser.go

@@ -101,7 +101,7 @@ func (p *queryParser) parseRequest(ctx context.Context, input *query.QueryDataRe
 			}
 			exp, err := p.reader.ReadQuery(q, iter)
 			if err != nil {
-				return rsp, err
+				return rsp, NewErrorWithRefID(q.RefID, err)
 			}
 			exp.GraphID = int64(len(expressions) + 1)
 			expressions[q.RefID] = &exp

pkg/registry/apis/query/query.go

@@ -10,12 +10,12 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
+	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"golang.org/x/sync/errgroup"
 	errorsK8s "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/endpoints/request"
@@ -24,7 +24,6 @@ import (
 	query "github.com/grafana/grafana/pkg/apis/query/v0alpha1"
 	"github.com/grafana/grafana/pkg/expr/mathexp"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/web"
 )
 
@@ -122,23 +121,32 @@ func (r *queryREST) Connect(connectCtx context.Context, name string, _ runtime.O
 		// Parses the request and splits it into multiple sub queries (if necessary)
 		req, err := b.parser.parseRequest(ctx, raw)
 		if err != nil {
-			reason := metav1.StatusReasonInvalid
+			var refError ErrorWithRefID
-			message := err.Error()
+			statusCode := http.StatusBadRequest
+			message := err
+			refID := ""
 
 			if errors.Is(err, datasources.ErrDataSourceNotFound) {
-				reason = metav1.StatusReasonNotFound
+				statusCode = http.StatusNotFound
-				// TODO, can we wrap the error somehow?
+				message = errors.New("datasource not found")
-				message = "datasource not found"
 			}
 
-			err = &errorsK8s.StatusError{ErrStatus: metav1.Status{
+			if errors.As(err, &refError) {
-				Status:  metav1.StatusFailure,
+				refID = refError.refId
-				Code:    http.StatusBadRequest,
+			}
-				Reason:  reason,
-				Message: message,
-			}}
 
-			responder.Error(err)
+			qdr := &query.QueryDataResponse{
+				QueryDataResponse: backend.QueryDataResponse{
+					Responses: backend.Responses{
+						refID: {
+							Error:  message,
+							Status: backend.Status(statusCode),
+						},
+					},
+				},
+			}
+
+			responder.Object(statusCode, qdr)
 			return
 		}
 

pkg/tests/apis/query/query_test.go

@@ -139,14 +139,14 @@ func TestIntegrationSimpleQuery(t *testing.T) {
 
 		require.Error(t, err, "expecting a 400")
 		require.JSONEq(t, `{
-			"kind": "Status",
+			"results": {
-			"apiVersion": "v1",
+				"": {
-			"metadata": {},
+					"error": "[sse.dependencyError] did not execute expression [Y] due to a failure to of the dependent expression or query [X]",
-			"status": "Failure",
+					"status": 400,
-			"message": "[sse.dependencyError] did not execute expression [Y] due to a failure to of the dependent expression or query [X]",
+					"errorSource": ""
-			"reason": "Invalid",
+				}
-			"code": 400
+			}
-		  }`, string(body))
+		}`, string(body))
 		// require.JSONEq(t, `{
 		// 	"status": "Failure",
 		// 	"metadata": {},