refactor: move MCP tools to a separate package (#29)

tembleking · web-flow · commit ca84c3262377 · 2025-11-21T16:00:37.000+01:00
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -12,6 +12,7 @@ import (
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/config"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/clock"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp"
+	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp/tools"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig"
 )
 
@@ -88,11 +89,11 @@ func setupHandler(sysdigClient sysdig.ExtendedClientWithResponsesInterface) *mcp
 	systemClock := clock.NewSystemClock()
 	handler := mcp.NewHandler(Version, sysdigClient)
 	handler.RegisterTools(
-		mcp.NewToolListRuntimeEvents(sysdigClient, systemClock),
-		mcp.NewToolGetEventInfo(sysdigClient),
-		mcp.NewToolGetEventProcessTree(sysdigClient),
-		mcp.NewToolRunSysql(sysdigClient),
-		mcp.NewToolGenerateSysql(sysdigClient),
+		tools.NewToolListRuntimeEvents(sysdigClient, systemClock),
+		tools.NewToolGetEventInfo(sysdigClient),
+		tools.NewToolGetEventProcessTree(sysdigClient),
+		tools.NewToolRunSysql(sysdigClient),
+		tools.NewToolGenerateSysql(sysdigClient),
 	)
 	return handler
 }
diff --git a/internal/infra/mcp/mcp_handler.go b/internal/infra/mcp/mcp_handler.go
@@ -11,6 +11,7 @@ import (
 	"github.com/mark3labs/mcp-go/client"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
+	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp/tools"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig"
 )
 
@@ -23,7 +24,7 @@ type mcpTool interface {
 }
 
 func toolPermissionFiltering(sysdigClient sysdig.ExtendedClientWithResponsesInterface) server.ToolFilterFunc {
-	return func(ctx context.Context, tools []mcp.Tool) []mcp.Tool {
+	return func(ctx context.Context, mcpTools []mcp.Tool) []mcp.Tool {
 		allowedTools := []mcp.Tool{}
 		slog.Debug("filtering tools")
 
@@ -47,8 +48,8 @@ func toolPermissionFiltering(sysdigClient sysdig.ExtendedClientWithResponsesInte
 			return true
 		}
 
-		for _, tool := range tools {
-			requiredPermissions := RequiredPermissionsFromTool(tool)
+		for _, tool := range mcpTools {
+			requiredPermissions := tools.RequiredPermissionsFromTool(tool)
 			if userHasAllRequiredPermissions(requiredPermissions...) {
 				slog.Debug("tool meets all the required permissions", "name", tool.Name)
 				allowedTools = append(allowedTools, tool)
diff --git a/internal/infra/mcp/mcp_handler_test.go b/internal/infra/mcp/mcp_handler_test.go
@@ -19,6 +19,7 @@ import (
 	"go.uber.org/mock/gomock"
 
 	localmcp "github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp"
+	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp/tools"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig/mocks"
 )
@@ -38,7 +39,7 @@ func (d *dummyTool) RegisterInServer(s *server.MCPServer) {
 		}
 	}
 	if len(d.requiredPermissions) > 0 {
-		localmcp.WithRequiredPermissions(d.requiredPermissions...)(&tool)
+		tools.WithRequiredPermissions(d.requiredPermissions...)(&tool)
 	}
 	s.AddTool(tool, func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 		return mcp.NewToolResultText("success"), nil
diff --git a/internal/infra/mcp/tools/tool_generate_sysql.go b/internal/infra/mcp/tools/tool_generate_sysql.go
@@ -1,4 +1,4 @@
-package mcp
+package tools
 
 import (
 	"context"
diff --git a/internal/infra/mcp/tools/tool_generate_sysql_test.go b/internal/infra/mcp/tools/tool_generate_sysql_test.go
@@ -1,4 +1,4 @@
-package mcp
+package tools_test
 
 import (
 	"context"
@@ -11,16 +11,18 @@ import (
 	. "github.com/onsi/gomega"
 	"go.uber.org/mock/gomock"
 
+	inframcp "github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp"
+	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp/tools"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig/mocks"
 )
 
 var _ = Describe("ToolGenerateSysql", func() {
 	var (
 		mockClient *mocks.MockExtendedClientWithResponsesInterface
-		tool       *ToolGenerateSysql
+		tool       *tools.ToolGenerateSysql
 		ctrl       *gomock.Controller
-		handler    *Handler
+		handler    *inframcp.Handler
 		mcpClient  *client.Client
 	)
 
@@ -35,8 +37,8 @@ var _ = Describe("ToolGenerateSysql", func() {
 				Permissions: []string{"sage.exec"},
 			},
 		}, nil).AnyTimes()
-		tool = NewToolGenerateSysql(mockClient)
-		handler = NewHandler("dev", mockClient)
+		tool = tools.NewToolGenerateSysql(mockClient)
+		handler = inframcp.NewHandler("dev", mockClient)
 		handler.RegisterTools(tool)
 
 		var err error
diff --git a/internal/infra/mcp/tools/tool_get_event_info.go b/internal/infra/mcp/tools/tool_get_event_info.go
@@ -1,4 +1,4 @@
-package mcp
+package tools
 
 import (
 	"context"
diff --git a/internal/infra/mcp/tools/tool_get_event_info_test.go b/internal/infra/mcp/tools/tool_get_event_info_test.go
@@ -1,4 +1,4 @@
-package mcp
+package tools_test
 
 import (
 	"context"
@@ -11,16 +11,18 @@ import (
 	. "github.com/onsi/gomega"
 	"go.uber.org/mock/gomock"
 
+	inframcp "github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp"
+	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp/tools"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig/mocks"
 )
 
 var _ = Describe("ToolGetEventInfo", func() {
 	var (
 		mockClient *mocks.MockExtendedClientWithResponsesInterface
-		tool       *ToolGetEventInfo
+		tool       *tools.ToolGetEventInfo
 		ctrl       *gomock.Controller
-		handler    *Handler
+		handler    *inframcp.Handler
 		mcpClient  *client.Client
 	)
 
@@ -35,8 +37,8 @@ var _ = Describe("ToolGetEventInfo", func() {
 				Permissions: []string{"policy-events.read"},
 			},
 		}, nil).AnyTimes()
-		tool = NewToolGetEventInfo(mockClient)
-		handler = NewHandler("dev", mockClient)
+		tool = tools.NewToolGetEventInfo(mockClient)
+		handler = inframcp.NewHandler("dev", mockClient)
 		handler.RegisterTools(tool)
 
 		var err error
diff --git a/internal/infra/mcp/tools/tool_get_event_process_tree.go b/internal/infra/mcp/tools/tool_get_event_process_tree.go
@@ -1,4 +1,4 @@
-package mcp
+package tools
 
 import (
 	"context"
diff --git a/internal/infra/mcp/tools/tool_get_event_process_tree_test.go b/internal/infra/mcp/tools/tool_get_event_process_tree_test.go
@@ -1,4 +1,4 @@
-package mcp
+package tools_test
 
 import (
 	"context"
@@ -12,16 +12,18 @@ import (
 	. "github.com/onsi/gomega"
 	"go.uber.org/mock/gomock"
 
+	inframcp "github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp"
+	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp/tools"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig/mocks"
 )
 
 var _ = Describe("ToolGetEventProcessTree", func() {
 	var (
 		mockClient *mocks.MockExtendedClientWithResponsesInterface
-		tool       *ToolGetEventProcessTree
+		tool       *tools.ToolGetEventProcessTree
 		ctrl       *gomock.Controller
-		handler    *Handler
+		handler    *inframcp.Handler
 		mcpClient  *client.Client
 	)
 
@@ -36,8 +38,8 @@ var _ = Describe("ToolGetEventProcessTree", func() {
 				Permissions: []string{"policy-events.read"},
 			},
 		}, nil).AnyTimes()
-		tool = NewToolGetEventProcessTree(mockClient)
-		handler = NewHandler("dev", mockClient)
+		tool = tools.NewToolGetEventProcessTree(mockClient)
+		handler = inframcp.NewHandler("dev", mockClient)
 		handler.RegisterTools(tool)
 
 		var err error
diff --git a/internal/infra/mcp/tools/tool_list_runtime_events.go b/internal/infra/mcp/tools/tool_list_runtime_events.go
@@ -1,4 +1,4 @@
-package mcp
+package tools
 
 import (
 	"context"
diff --git a/internal/infra/mcp/tools/tool_list_runtime_events_test.go b/internal/infra/mcp/tools/tool_list_runtime_events_test.go
@@ -1,4 +1,4 @@
-package mcp
+package tools_test
 
 import (
 	"context"
@@ -13,6 +13,8 @@ import (
 	"go.uber.org/mock/gomock"
 
 	mocks_clock "github.com/sysdiglabs/sysdig-mcp-server/internal/infra/clock/mocks"
+	inframcp "github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp"
+	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp/tools"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig/mocks"
 )
@@ -21,9 +23,9 @@ var _ = Describe("ToolListRuntimeEvents", func() {
 	var (
 		mockClient *mocks.MockExtendedClientWithResponsesInterface
 		mockClock  *mocks_clock.MockClock
-		tool       *ToolListRuntimeEvents
+		tool       *tools.ToolListRuntimeEvents
 		ctrl       *gomock.Controller
-		handler    *Handler
+		handler    *inframcp.Handler
 		mcpClient  *client.Client
 	)
 
@@ -40,8 +42,8 @@ var _ = Describe("ToolListRuntimeEvents", func() {
 		}, nil).AnyTimes()
 		mockClock = mocks_clock.NewMockClock(ctrl)
 		mockClock.EXPECT().Now().AnyTimes().Return(time.Date(2000, time.January, 1, 0, 0, 0, 0, time.UTC))
-		tool = NewToolListRuntimeEvents(mockClient, mockClock)
-		handler = NewHandler("dev", mockClient)
+		tool = tools.NewToolListRuntimeEvents(mockClient, mockClock)
+		handler = inframcp.NewHandler("dev", mockClient)
 		handler.RegisterTools(tool)
 
 		var err error
diff --git a/internal/infra/mcp/tools/tool_run_sysql.go b/internal/infra/mcp/tools/tool_run_sysql.go
@@ -1,4 +1,4 @@
-package mcp
+package tools
 
 import (
 	"context"
diff --git a/internal/infra/mcp/tools/tool_run_sysql_test.go b/internal/infra/mcp/tools/tool_run_sysql_test.go
@@ -1,4 +1,4 @@
-package mcp
+package tools_test
 
 import (
 	"context"
@@ -11,16 +11,18 @@ import (
 	. "github.com/onsi/gomega"
 	"go.uber.org/mock/gomock"
 
+	inframcp "github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp"
+	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp/tools"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig"
 	"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig/mocks"
 )
 
 var _ = Describe("ToolRunSysql", func() {
 	var (
 		mockClient *mocks.MockExtendedClientWithResponsesInterface
-		tool       *ToolRunSysql
+		tool       *tools.ToolRunSysql
 		ctrl       *gomock.Controller
-		handler    *Handler
+		handler    *inframcp.Handler
 		mcpClient  *client.Client
 	)
 
@@ -35,8 +37,8 @@ var _ = Describe("ToolRunSysql", func() {
 				Permissions: []string{"sage.exec", "risks.read"},
 			},
 		}, nil).AnyTimes()
-		tool = NewToolRunSysql(mockClient)
-		handler = NewHandler("dev", mockClient)
+		tool = tools.NewToolRunSysql(mockClient)
+		handler = inframcp.NewHandler("dev", mockClient)
 		handler.RegisterTools(tool)
 
 		var err error
diff --git a/internal/infra/mcp/tools/tools_suite_test.go b/internal/infra/mcp/tools/tools_suite_test.go
@@ -0,0 +1,13 @@
+package tools_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestTools(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Tools Suite")
+}
diff --git a/internal/infra/mcp/tools/utils.go b/internal/infra/mcp/tools/utils.go
@@ -1,4 +1,4 @@
-package mcp
+package tools
 
 import (
 	"log/slog"

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import (`
`19`	`19`	`"go.uber.org/mock/gomock"`
`20`	`20`
`21`	`21`	`localmcp "github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp"`
	`22`	`+ "github.com/sysdiglabs/sysdig-mcp-server/internal/infra/mcp/tools"`
`22`	`23`	`"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig"`
`23`	`24`	`"github.com/sysdiglabs/sysdig-mcp-server/internal/infra/sysdig/mocks"`
`24`	`25`	`)`
`@@ -38,7 +39,7 @@ func (d dummyTool) RegisterInServer(s server.MCPServer) {`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`	`if len(d.requiredPermissions) > 0 {`
`41`		`- localmcp.WithRequiredPermissions(d.requiredPermissions...)(&tool)`
	`42`	`+ tools.WithRequiredPermissions(d.requiredPermissions...)(&tool)`
`42`	`43`	`}`
`43`	`44`	`s.AddTool(tool, func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {`
`44`	`45`	`return mcp.NewToolResultText("success"), nil`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package mcp`
	`1`	`+package tools`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`