make required args explicit instead of panic

mntlty · mntlty · commit 02ebdc75742e · 2025-04-02T07:20:11.000-07:00
diff --git a/pkg/github/repository_resource.go b/pkg/github/repository_resource.go
@@ -3,6 +3,7 @@ package github
 import (
 	"context"
 	"encoding/base64"
+	"errors"
 	"mime"
 	"path/filepath"
 	"strings"
@@ -60,30 +61,41 @@ func getRepositoryResourcePrContent(client *github.Client, t translations.Transl
 
 func repositoryResourceContentsHandler(client *github.Client) func(ctx context.Context, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
 	return func(ctx context.Context, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
+		// the matcher will give []string with one elemenent
+		// https://github.com/mark3labs/mcp-go/pull/54
+		o, ok := request.Params.Arguments["owner"].([]string)
+		if !ok || len(o) == 0 {
+			return nil, errors.New("owner is required")
+		}
+		owner := o[0]
+
+		r, ok := request.Params.Arguments["repo"].([]string)
+		if !ok || len(r) == 0 {
+			return nil, errors.New("repo is required")
+		}
+		repo := r[0]
 
-		owner := request.Params.Arguments["owner"].([]string)[0]
-		repo := request.Params.Arguments["repo"].([]string)[0]
 		// path should be a joined list of the path parts
 		path := strings.Join(request.Params.Arguments["path"].([]string), "/")
 
 		opts := &github.RepositoryContentGetOptions{}
 
 		sha, ok := request.Params.Arguments["sha"].([]string)
-		if ok {
+		if ok && len(sha) > 0 {
 			opts.Ref = sha[0]
 		}
 
 		branch, ok := request.Params.Arguments["branch"].([]string)
-		if ok {
+		if ok && len(branch) > 0 {
 			opts.Ref = "refs/heads/" + branch[0]
 		}
 
 		tag, ok := request.Params.Arguments["tag"].([]string)
-		if ok {
+		if ok && len(tag) > 0 {
 			opts.Ref = "refs/tags/" + tag[0]
 		}
 		prNumber, ok := request.Params.Arguments["pr_number"].([]string)
-		if ok {
+		if ok && len(prNumber) > 0 {
 			opts.Ref = "refs/pull/" + prNumber[0] + "/head"
 		}
 
diff --git a/pkg/github/repository_resource_test.go b/pkg/github/repository_resource_test.go
@@ -70,6 +70,30 @@ func Test_repositoryResourceContentsHandler(t *testing.T) {
 		expectedResult any
 		expectedErrMsg string
 	}{
+		{
+			name: "missing owner",
+			mockedClient: mock.NewMockedHTTPClient(
+				mock.WithRequestMatch(
+					mock.GetReposContentsByOwnerByRepoByPath,
+					mockFileContent,
+				),
+			),
+			requestArgs: map[string]any{},
+			expectError: true,
+		},
+		{
+			name: "missing repo",
+			mockedClient: mock.NewMockedHTTPClient(
+				mock.WithRequestMatch(
+					mock.GetReposContentsByOwnerByRepoByPath,
+					mockFileContent,
+				),
+			),
+			requestArgs: map[string]any{
+				"owner": []string{"owner"},
+			},
+			expectError: true,
+		},
 		{
 			name: "successful file content fetch",
 			mockedClient: mock.NewMockedHTTPClient(
