Get tests fully working

Author: omgitsads

cmd/github-mcp-server/generate_docs.go

@@ -14,7 +14,8 @@ import (
 	"github.com/github/github-mcp-server/pkg/toolsets"
 	"github.com/github/github-mcp-server/pkg/translations"
 	gogithub "github.com/google/go-github/v77/github"
-	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/google/jsonschema-go/jsonschema"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"github.com/shurcooL/githubv4"
 	"github.com/spf13/cobra"
 )
@@ -224,7 +225,12 @@ func generateToolDoc(tool mcp.Tool) string {
 	lines = append(lines, fmt.Sprintf("- **%s** - %s", tool.Name, tool.Annotations.Title))
 
 	// Parameters
-	schema := tool.InputSchema
+	schema, ok := tool.InputSchema.(*jsonschema.Schema)
+	if !ok {
+		lines = append(lines, "  - No parameters required")
+		return strings.Join(lines, "\n")
+	}
+
 	if len(schema.Properties) > 0 {
 		// Get parameter names and sort them for deterministic order
 		var paramNames []string
@@ -245,26 +251,19 @@ func generateToolDoc(tool mcp.Tool) string {
 			typeStr := "unknown"
 			description := ""
 
-			if propMap, ok := prop.(map[string]interface{}); ok {
-				if typeVal, ok := propMap["type"].(string); ok {
-					if typeVal == "array" {
-						if items, ok := propMap["items"].(map[string]interface{}); ok {
-							if itemType, ok := items["type"].(string); ok {
-								typeStr = itemType + "[]"
-							}
-						} else {
-							typeStr = "array"
-						}
-					} else {
-						typeStr = typeVal
-					}
-				}
-
-				if desc, ok := propMap["description"].(string); ok {
-					description = desc
+			switch prop.Type {
+			case "array":
+				if prop.Items != nil {
+					typeStr = prop.Items.Type + "[]"
+				} else {
+					typeStr = "array"
 				}
+			default:
+				typeStr = prop.Type
 			}
 
+			description = prop.Description
+
 			paramLine := fmt.Sprintf("  - `%s`: %s (%s, %s)", propName, description, typeStr, requiredStr)
 			lines = append(lines, paramLine)
 		}

pkg/github/__toolsnaps__/get_me.snap

@@ -1,12 +1,9 @@
 {
   "annotations": {
-    "title": "Get my user profile",
-    "readOnlyHint": true
+    "readOnlyHint": true,
+    "title": "Get my user profile"
   },
   "description": "Get details of the authenticated GitHub user. Use this when a request is about the user's own profile for GitHub. Or when information is missing to build other tool calls.",
-  "inputSchema": {
-    "properties": {},
-    "type": "object"
-  },
+  "inputSchema": null,
   "name": "get_me"
 }

pkg/github/__toolsnaps__/get_team_members.snap

@@ -1,25 +1,25 @@
 {
   "annotations": {
-    "title": "Get team members",
-    "readOnlyHint": true
+    "readOnlyHint": true,
+    "title": "Get team members"
   },
   "description": "Get member usernames of a specific team in an organization. Limited to organizations accessible with current credentials",
   "inputSchema": {
+    "type": "object",
+    "required": [
+      "org",
+      "team_slug"
+    ],
     "properties": {
       "org": {
-        "description": "Organization login (owner) that contains the team.",
-        "type": "string"
+        "type": "string",
+        "description": "Organization login (owner) that contains the team."
       },
       "team_slug": {
-        "description": "Team slug",
-        "type": "string"
+        "type": "string",
+        "description": "Team slug"
       }
-    },
-    "required": [
-      "org",
-      "team_slug"
-    ],
-    "type": "object"
+    }
   },
   "name": "get_team_members"
 }

pkg/github/__toolsnaps__/get_teams.snap

@@ -1,17 +1,17 @@
 {
   "annotations": {
-    "title": "Get teams",
-    "readOnlyHint": true
+    "readOnlyHint": true,
+    "title": "Get teams"
   },
   "description": "Get details of the teams the user is a member of. Limited to organizations accessible with current credentials",
   "inputSchema": {
+    "type": "object",
     "properties": {
       "user": {
-        "description": "Username to get teams for. If not provided, uses the authenticated user.",
-        "type": "string"
+        "type": "string",
+        "description": "Username to get teams for. If not provided, uses the authenticated user."
       }
-    },
-    "type": "object"
+    }
   },
   "name": "get_teams"
 }

pkg/github/context_tools.go

@@ -112,6 +112,15 @@ func GetTeams(getClient GetClientFn, getGQLClient GetGQLClientFn, t translations
 				Title:        t("TOOL_GET_TEAMS_TITLE", "Get teams"),
 				ReadOnlyHint: true,
 			},
+			InputSchema: &jsonschema.Schema{
+				Type: "object",
+				Properties: map[string]*jsonschema.Schema{
+					"user": {
+						Type:        "string",
+						Description: t("TOOL_GET_TEAMS_USER_DESCRIPTION", "Username to get teams for. If not provided, uses the authenticated user."),
+					},
+				},
+			},
 		},
 		func(ctx context.Context, request *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) {
 			user, err := OptionalParam[string](args, "user")

pkg/github/context_tools_test.go

@@ -112,10 +112,10 @@ func Test_GetMe(t *testing.T) {
 
 			request := createMCPRequest(tc.requestArgs)
 			result, _, err := handler(context.Background(), &request, tc.requestArgs)
-			require.NoError(t, err)
 			textContent := getTextResult(t, result)
 
 			if tc.expectToolError {
+				assert.Error(t, err)
 				assert.True(t, result.IsError, "expected tool call result to be an error")
 				assert.Contains(t, textContent.Text, tc.expectedToolErrMsg)
 				return

pkg/github/helper_test.go

@@ -133,8 +133,8 @@ func getTextResult(t *testing.T, result *mcp.CallToolResult) *mcp.TextContent {
 	t.Helper()
 	assert.NotNil(t, result)
 	require.Len(t, result.Content, 1)
-	require.IsType(t, mcp.TextContent{}, result.Content[0])
-	textContent := result.Content[0].(*mcp.TextContent)
+	textContent, ok := result.Content[0].(*mcp.TextContent)
+	require.True(t, ok, "expected content to be of type TextContent")
 	return textContent
 }
 
@@ -151,7 +151,8 @@ func getTextResourceResult(t *testing.T, result *mcp.CallToolResult) *mcp.Resour
 	require.Len(t, result.Content, 2)
 	content := result.Content[1]
 	require.IsType(t, mcp.EmbeddedResource{}, content)
-	resource := content.(*mcp.EmbeddedResource)
+	resource, ok := content.(*mcp.EmbeddedResource)
+	require.True(t, ok, "expected content to be of type EmbeddedResource")
 
 	require.IsType(t, mcp.ResourceContents{}, resource.Resource)
 	require.NotEmpty(t, resource.Resource.Text)