From 4aa7d67edd04c92b24506fabb4ecb508a01d772b Mon Sep 17 00:00:00 2001
From: Sam Jewell <2903904+samjewell@users.noreply.github.com>
Date: Mon, 14 Apr 2025 22:14:03 +0100
Subject: [PATCH] Server-side expressions: Improve error message (#103968)

This error message is more correct
---
 pkg/expr/errors.go                 | 4 ++--
 pkg/registry/apis/query/errors.go  | 4 ++--
 pkg/tests/apis/query/query_test.go | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/expr/errors.go b/pkg/expr/errors.go
index 6e2d3e3e89b..c14e550f972 100644
--- a/pkg/expr/errors.go
+++ b/pkg/expr/errors.go
@@ -58,7 +58,7 @@ func MakeQueryError(refID, datasourceUID string, err error) error {
 	return QueryError.Build(data)
 }
 
-var depErrStr = "did not execute expression [{{ .Public.refId }}] due to a failure to of the dependent expression or query [{{.Public.depRefId}}]"
+var depErrStr = "did not execute expression [{{ .Public.refId }}] due to a failure of the dependent expression or query [{{.Public.depRefId}}]"
 
 var DependencyError = errutil.NewBase(
 	errutil.StatusBadRequest, "sse.dependencyError").MustTemplate(
@@ -71,7 +71,7 @@ func MakeDependencyError(refID, depRefID string) error {
 			"refId":    refID,
 			"depRefId": depRefID,
 		},
-		Error: fmt.Errorf("did not execute expression %v due to a failure to of the dependent expression or query %v", refID, depRefID),
+		Error: fmt.Errorf("did not execute expression %v due to a failure of the dependent expression or query %v", refID, depRefID),
 	}
 
 	return DependencyError.Build(data)
diff --git a/pkg/registry/apis/query/errors.go b/pkg/registry/apis/query/errors.go
index fb7a35a0336..ddfc1ae84ee 100644
--- a/pkg/registry/apis/query/errors.go
+++ b/pkg/registry/apis/query/errors.go
@@ -44,7 +44,7 @@ func MakePublicQueryError(refID, err string) error {
 	return QueryError.Build(data)
 }
 
-var depErrStr = "did not execute expression [{{ .Public.refId }}] due to a failure to of the dependent expression or query [{{.Public.depRefId}}]"
+var depErrStr = "did not execute expression [{{ .Public.refId }}] due to a failure of the dependent expression or query [{{.Public.depRefId}}]"
 
 var dependencyError = errutil.BadRequest("sse.dependencyError").MustTemplate(
 	depErrStr,
@@ -56,7 +56,7 @@ func makeDependencyError(refID, depRefID string) error {
 			"refId":    refID,
 			"depRefId": depRefID,
 		},
-		Error: fmt.Errorf("did not execute expression %v due to a failure to of the dependent expression or query %v", refID, depRefID),
+		Error: fmt.Errorf("did not execute expression %v due to a failure of the dependent expression or query %v", refID, depRefID),
 	}
 
 	return dependencyError.Build(data)
diff --git a/pkg/tests/apis/query/query_test.go b/pkg/tests/apis/query/query_test.go
index 37c744b06b0..4d89c1729c3 100644
--- a/pkg/tests/apis/query/query_test.go
+++ b/pkg/tests/apis/query/query_test.go
@@ -140,7 +140,7 @@ func TestIntegrationSimpleQuery(t *testing.T) {
 		require.JSONEq(t, `{
 			"results": {
 				"A": {
-					"error": "[sse.dependencyError] did not execute expression [Y] due to a failure to of the dependent expression or query [X]",
+					"error": "[sse.dependencyError] did not execute expression [Y] due to a failure of the dependent expression or query [X]",
 					"status": 400,
 					"errorSource": ""
 				}
@@ -149,7 +149,7 @@ func TestIntegrationSimpleQuery(t *testing.T) {
 		// require.JSONEq(t, `{
 		// 	"status": "Failure",
 		// 	"metadata": {},
-		// 	"message": "did not execute expression [Y] due to a failure to of the dependent expression or query [X]",
+		// 	"message": "did not execute expression [Y] due to a failure of the dependent expression or query [X]",
 		// 	"reason": "BadRequest",
 		// 	"details": { "group": "query.grafana.app" },
 		// 	"code": 400,