Merge branch 'main' into fix/908

grafana · Nov 22, 2024 · 99bd078 · 99bd078
2 parents e2e2254 + d44d3bd
commit 99bd078
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.changeset/friendly-panthers-yell.md b/.changeset/friendly-panthers-yell.md
@@ -0,0 +1,5 @@
+---
+'grafana-infinity-datasource': patch
+---
+
+Fix error source for invalid queries
diff --git a/pkg/models/query.go b/pkg/models/query.go
@@ -303,8 +303,7 @@ func LoadQuery(ctx context.Context, backendQuery backend.DataQuery, pluginContex
 	var query Query
 	err := json.Unmarshal(backendQuery.JSON, &query)
 	if err != nil {
-		// Plugin error as the user should not have been able to send a bad query
-		return query, errorsource.PluginError(fmt.Errorf("error while parsing the query json. %w", err), false)
+		return query, errorsource.DownstreamError(fmt.Errorf("error while parsing the query json. %w", err), false)
 	}
 	query = ApplyDefaultsToQuery(ctx, query, settings)
 	if query.PageMode == PaginationModeList && strings.TrimSpace(query.PageParamListFieldName) == "" {