Update search tool; add test

Author: sd2k

tools/search.go

@@ -2,21 +2,20 @@ package tools
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
-	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 
 	"github.com/grafana/grafana-openapi-client-go/client/search"
+	"github.com/grafana/grafana-openapi-client-go/models"
 	mcpgrafana "github.com/grafana/mcp-grafana"
 )
 
 type SearchDashboardsParams struct {
 	Query string `json:"query" jsonschema:"description=The query to search for"`
 }
 
-func searchDashboards(ctx context.Context, args SearchDashboardsParams) (*mcp.CallToolResult, error) {
+func searchDashboards(ctx context.Context, args SearchDashboardsParams) (models.HitList, error) {
 	c := mcpgrafana.GrafanaClientFromContext(ctx)
 	params := search.NewSearchParamsWithContext(ctx)
 	if args.Query != "" {
@@ -26,11 +25,7 @@ func searchDashboards(ctx context.Context, args SearchDashboardsParams) (*mcp.Ca
 	if err != nil {
 		return nil, fmt.Errorf("search dashboards for %+v: %w", c, err)
 	}
-	b, err := json.Marshal(search.Payload)
-	if err != nil {
-		return nil, fmt.Errorf("marshal search results: %w", err)
-	}
-	return mcp.NewToolResultText(string(b)), nil
+	return search.Payload, nil
 }
 
 var SearchDashboards = mcpgrafana.MustTool(

tools/search_test.go

@@ -0,0 +1,24 @@
+// Requires a Grafana instance running on localhost:3000,
+// with a dashboard named "Demo" provisioned.
+// Run with `go test -tags integration`.
+//go:build integration
+
+package tools
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSearchTools(t *testing.T) {
+	t.Run("search dashboards", func(t *testing.T) {
+		ctx := newTestContext()
+		result, err := searchDashboards(ctx, SearchDashboardsParams{
+			Query: "Demo",
+		})
+		require.NoError(t, err)
+		assert.Len(t, result, 1)
+	})
+}