Remove unneeded nested types from datasource tools

Author: sd2k

tools/datasources.go

@@ -6,19 +6,19 @@ import (
 
 	"github.com/mark3labs/mcp-go/server"
 
-	"github.com/grafana/grafana-openapi-client-go/client/datasources"
+	"github.com/grafana/grafana-openapi-client-go/models"
 	mcpgrafana "github.com/grafana/mcp-grafana"
 )
 
 type ListDatasourcesParams struct{}
 
-func listDatasources(ctx context.Context, args ListDatasourcesParams) (*datasources.GetDataSourcesOK, error) {
+func listDatasources(ctx context.Context, args ListDatasourcesParams) (models.DataSourceList, error) {
 	c := mcpgrafana.GrafanaClientFromContext(ctx)
 	datasources, err := c.Datasources.GetDataSources()
 	if err != nil {
 		return nil, fmt.Errorf("list datasources: %w", err)
 	}
-	return datasources, nil
+	return datasources.Payload, nil
 }
 
 var ListDatasources = mcpgrafana.MustTool(
@@ -31,13 +31,13 @@ type GetDatasourceByUIDParams struct {
 	UID string `json:"uid" jsonschema:"required,description=The uid of the datasource"`
 }
 
-func getDatasourceByUID(ctx context.Context, args GetDatasourceByUIDParams) (*datasources.GetDataSourceByUIDOK, error) {
+func getDatasourceByUID(ctx context.Context, args GetDatasourceByUIDParams) (*models.DataSource, error) {
 	c := mcpgrafana.GrafanaClientFromContext(ctx)
 	datasource, err := c.Datasources.GetDataSourceByUID(args.UID)
 	if err != nil {
 		return nil, fmt.Errorf("get datasource by uid %s: %w", args.UID, err)
 	}
-	return datasource, nil
+	return datasource.Payload, nil
 }
 
 var GetDatasourceByUID = mcpgrafana.MustTool(
@@ -50,13 +50,13 @@ type GetDatasourceByNameParams struct {
 	Name string `json:"name" jsonschema:"required,description=The name of the datasource"`
 }
 
-func getDatasourceByName(ctx context.Context, args GetDatasourceByNameParams) (*datasources.GetDataSourceByNameOK, error) {
+func getDatasourceByName(ctx context.Context, args GetDatasourceByNameParams) (*models.DataSource, error) {
 	c := mcpgrafana.GrafanaClientFromContext(ctx)
 	datasource, err := c.Datasources.GetDataSourceByName(args.Name)
 	if err != nil {
 		return nil, fmt.Errorf("get datasource by name %s: %w", args.Name, err)
 	}
-	return datasource, nil
+	return datasource.Payload, nil
 }
 
 var GetDatasourceByName = mcpgrafana.MustTool(

tools/datasources_test.go

@@ -1,4 +1,5 @@
-// Requires a Prometheus instance running on localhost:9090.
+// Requires a Grafana instance running on localhost:3000,
+// with a Prometheus datasource provisioned.
 // Run with `go test -tags integration`.
 //go:build integration
 
@@ -52,7 +53,7 @@ func TestDatasourcesTools(t *testing.T) {
 		ctx := newTestContext()
 		result, err := listDatasources(ctx, ListDatasourcesParams{})
 		require.NoError(t, err)
-		assert.Len(t, result.Payload, 1)
+		assert.Len(t, result, 1)
 	})
 
 	t.Run("get datasource by uid", func(t *testing.T) {
@@ -61,7 +62,7 @@ func TestDatasourcesTools(t *testing.T) {
 			UID: "prometheus",
 		})
 		require.NoError(t, err)
-		assert.Equal(t, "Prometheus", result.Payload.Name)
+		assert.Equal(t, "Prometheus", result.Name)
 	})
 
 	t.Run("get datasource by name", func(t *testing.T) {
@@ -70,6 +71,6 @@ func TestDatasourcesTools(t *testing.T) {
 			Name: "Prometheus",
 		})
 		require.NoError(t, err)
-		assert.Equal(t, "Prometheus", result.Payload.Name)
+		assert.Equal(t, "Prometheus", result.Name)
 	})
 }