Skip to content

refactor: move MCP tools to a separate package #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2025
Merged

refactor: move MCP tools to a separate package #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions cmd/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
}
Expand Down
7 changes: 4 additions & 3 deletions internal/infra/mcp/mcp_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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")

Expand All @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion internal/infra/mcp/mcp_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/infra/mcp/tool_generate_sysql.go → ...al/infra/mcp/tools/tool_generate_sysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools

import (
"context"
Expand Down
12 changes: 7 additions & 5 deletions ...nal/infra/mcp/tool_generate_sysql_test.go → ...fra/mcp/tools/tool_generate_sysql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools_test

import (
"context"
Expand All @@ -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
)

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/infra/mcp/tool_get_event_info.go → ...al/infra/mcp/tools/tool_get_event_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools

import (
"context"
Expand Down
12 changes: 7 additions & 5 deletions ...nal/infra/mcp/tool_get_event_info_test.go → ...fra/mcp/tools/tool_get_event_info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools_test

import (
"context"
Expand All @@ -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
)

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../infra/mcp/tool_get_event_process_tree.go → .../mcp/tools/tool_get_event_process_tree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools

import (
"context"
Expand Down
12 changes: 7 additions & 5 deletions ...a/mcp/tool_get_event_process_tree_test.go → ...tools/tool_get_event_process_tree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools_test

import (
"context"
Expand All @@ -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
)

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...nal/infra/mcp/tool_list_runtime_events.go → ...fra/mcp/tools/tool_list_runtime_events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools

import (
"context"
Expand Down
12 changes: 7 additions & 5 deletions ...nfra/mcp/tool_list_runtime_events_test.go → ...cp/tools/tool_list_runtime_events_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools_test

import (
"context"
Expand All @@ -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"
)
Expand All @@ -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
)

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/infra/mcp/tool_run_sysql.go → internal/infra/mcp/tools/tool_run_sysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools

import (
"context"
Expand Down
12 changes: 7 additions & 5 deletions internal/infra/mcp/tool_run_sysql_test.go → ...al/infra/mcp/tools/tool_run_sysql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools_test

import (
"context"
Expand All @@ -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
)

Expand All @@ -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
Expand Down
13 changes: 13 additions & 0 deletions internal/infra/mcp/tools/tools_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
2 changes: 1 addition & 1 deletion internal/infra/mcp/utils.go → internal/infra/mcp/tools/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mcp
package tools

import (
"log/slog"
Expand Down