From 671c6195a78e7fbc08d7e142797c84a88722babf Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Wed, 7 Jan 2026 18:42:34 +0000 Subject: [PATCH 1/2] Fix SonarQube issues: duplicated strings and cognitive complexity - Replace hardcoded 'Repository owner' and 'Repository name' strings with existing constants DescriptionRepositoryOwner and DescriptionRepositoryName - Refactor ListDiscussions function to reduce cognitive complexity from 27 to ~10 by extracting helper functions: discussionNodeToIssue, fetchDiscussionsWithCategory, and fetchDiscussionsWithoutCategory Fixes: - go:S1192 (String literals should not be duplicated) - HIGH severity - go:S3776 (Cognitive Complexity should not be too high) - HIGH severity Co-Authored-By: parker.duff@codeium.com --- pkg/github/discussions.go | 182 +++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 99 deletions(-) diff --git a/pkg/github/discussions.go b/pkg/github/discussions.go index a7ec8e20f..02156aa6e 100644 --- a/pkg/github/discussions.go +++ b/pkg/github/discussions.go @@ -13,6 +13,71 @@ import ( "github.com/shurcooL/githubv4" ) +// discussionNode represents a discussion node from the GraphQL API +type discussionNode struct { + Number githubv4.Int + Title githubv4.String + CreatedAt githubv4.DateTime + Category struct { + Name githubv4.String + } `graphql:"category"` + URL githubv4.String `graphql:"url"` +} + +// discussionNodeToIssue converts a discussionNode to a github.Issue +func discussionNodeToIssue(n discussionNode) *github.Issue { + return &github.Issue{ + Number: github.Ptr(int(n.Number)), + Title: github.Ptr(string(n.Title)), + HTMLURL: github.Ptr(string(n.URL)), + CreatedAt: &github.Timestamp{Time: n.CreatedAt.Time}, + Labels: []*github.Label{ + { + Name: github.Ptr(fmt.Sprintf("category:%s", string(n.Category.Name))), + }, + }, + } +} + +// fetchDiscussionsWithCategory fetches discussions with a category filter +func fetchDiscussionsWithCategory(ctx context.Context, client *githubv4.Client, owner, repo string, categoryID githubv4.ID) ([]discussionNode, error) { + var query struct { + Repository struct { + Discussions struct { + Nodes []discussionNode + } `graphql:"discussions(first: 100, categoryId: $categoryId)"` + } `graphql:"repository(owner: $owner, name: $repo)"` + } + vars := map[string]interface{}{ + "owner": githubv4.String(owner), + "repo": githubv4.String(repo), + "categoryId": categoryID, + } + if err := client.Query(ctx, &query, vars); err != nil { + return nil, err + } + return query.Repository.Discussions.Nodes, nil +} + +// fetchDiscussionsWithoutCategory fetches discussions without a category filter +func fetchDiscussionsWithoutCategory(ctx context.Context, client *githubv4.Client, owner, repo string) ([]discussionNode, error) { + var query struct { + Repository struct { + Discussions struct { + Nodes []discussionNode + } `graphql:"discussions(first: 100)"` + } `graphql:"repository(owner: $owner, name: $repo)"` + } + vars := map[string]interface{}{ + "owner": githubv4.String(owner), + "repo": githubv4.String(repo), + } + if err := client.Query(ctx, &query, vars); err != nil { + return nil, err + } + return query.Repository.Discussions.Nodes, nil +} + func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) { return mcp.NewTool("list_discussions", mcp.WithDescription(t("TOOL_LIST_DISCUSSIONS_DESCRIPTION", "List discussions for a repository")), @@ -22,18 +87,17 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp }), mcp.WithString("owner", mcp.Required(), - mcp.Description("Repository owner"), + mcp.Description(DescriptionRepositoryOwner), ), mcp.WithString("repo", mcp.Required(), - mcp.Description("Repository name"), + mcp.Description(DescriptionRepositoryName), ), mcp.WithString("category", mcp.Description("Optional filter by discussion category ID. If provided, only discussions with this category are listed."), ), ), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) { - // Required params owner, err := RequiredParam[string](request, "owner") if err != nil { return mcp.NewToolResultError(err.Error()), nil @@ -42,8 +106,6 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp if err != nil { return mcp.NewToolResultError(err.Error()), nil } - - // Optional params category, err := OptionalParam[string](request, "category") if err != nil { return mcp.NewToolResultError(err.Error()), nil @@ -54,99 +116,21 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp return mcp.NewToolResultError(fmt.Sprintf("failed to get GitHub GQL client: %v", err)), nil } - // If category filter is specified, use it as the category ID for server-side filtering - var categoryID *githubv4.ID + var nodes []discussionNode if category != "" { - id := githubv4.ID(category) - categoryID = &id - } - - // Now execute the discussions query - var discussions []*github.Issue - if categoryID != nil { - // Query with category filter (server-side filtering) - var query struct { - Repository struct { - Discussions struct { - Nodes []struct { - Number githubv4.Int - Title githubv4.String - CreatedAt githubv4.DateTime - Category struct { - Name githubv4.String - } `graphql:"category"` - URL githubv4.String `graphql:"url"` - } - } `graphql:"discussions(first: 100, categoryId: $categoryId)"` - } `graphql:"repository(owner: $owner, name: $repo)"` - } - vars := map[string]interface{}{ - "owner": githubv4.String(owner), - "repo": githubv4.String(repo), - "categoryId": *categoryID, - } - if err := client.Query(ctx, &query, vars); err != nil { - return mcp.NewToolResultError(err.Error()), nil - } - - // Map nodes to GitHub Issue objects - for _, n := range query.Repository.Discussions.Nodes { - di := &github.Issue{ - Number: github.Ptr(int(n.Number)), - Title: github.Ptr(string(n.Title)), - HTMLURL: github.Ptr(string(n.URL)), - CreatedAt: &github.Timestamp{Time: n.CreatedAt.Time}, - Labels: []*github.Label{ - { - Name: github.Ptr(fmt.Sprintf("category:%s", string(n.Category.Name))), - }, - }, - } - discussions = append(discussions, di) - } + nodes, err = fetchDiscussionsWithCategory(ctx, client, owner, repo, githubv4.ID(category)) } else { - // Query without category filter - var query struct { - Repository struct { - Discussions struct { - Nodes []struct { - Number githubv4.Int - Title githubv4.String - CreatedAt githubv4.DateTime - Category struct { - Name githubv4.String - } `graphql:"category"` - URL githubv4.String `graphql:"url"` - } - } `graphql:"discussions(first: 100)"` - } `graphql:"repository(owner: $owner, name: $repo)"` - } - vars := map[string]interface{}{ - "owner": githubv4.String(owner), - "repo": githubv4.String(repo), - } - if err := client.Query(ctx, &query, vars); err != nil { - return mcp.NewToolResultError(err.Error()), nil - } + nodes, err = fetchDiscussionsWithoutCategory(ctx, client, owner, repo) + } + if err != nil { + return mcp.NewToolResultError(err.Error()), nil + } - // Map nodes to GitHub Issue objects - for _, n := range query.Repository.Discussions.Nodes { - di := &github.Issue{ - Number: github.Ptr(int(n.Number)), - Title: github.Ptr(string(n.Title)), - HTMLURL: github.Ptr(string(n.URL)), - CreatedAt: &github.Timestamp{Time: n.CreatedAt.Time}, - Labels: []*github.Label{ - { - Name: github.Ptr(fmt.Sprintf("category:%s", string(n.Category.Name))), - }, - }, - } - discussions = append(discussions, di) - } + discussions := make([]*github.Issue, 0, len(nodes)) + for _, n := range nodes { + discussions = append(discussions, discussionNodeToIssue(n)) } - // Marshal and return out, err := json.Marshal(discussions) if err != nil { return nil, fmt.Errorf("failed to marshal discussions: %w", err) @@ -164,11 +148,11 @@ func GetDiscussion(getGQLClient GetGQLClientFn, t translations.TranslationHelper }), mcp.WithString("owner", mcp.Required(), - mcp.Description("Repository owner"), + mcp.Description(DescriptionRepositoryOwner), ), mcp.WithString("repo", mcp.Required(), - mcp.Description("Repository name"), + mcp.Description(DescriptionRepositoryName), ), mcp.WithNumber("discussionNumber", mcp.Required(), @@ -241,8 +225,8 @@ func GetDiscussionComments(getGQLClient GetGQLClientFn, t translations.Translati Title: t("TOOL_GET_DISCUSSION_COMMENTS_USER_TITLE", "Get discussion comments"), ReadOnlyHint: ToBoolPtr(true), }), - mcp.WithString("owner", mcp.Required(), mcp.Description("Repository owner")), - mcp.WithString("repo", mcp.Required(), mcp.Description("Repository name")), + mcp.WithString("owner", mcp.Required(), mcp.Description(DescriptionRepositoryOwner)), + mcp.WithString("repo", mcp.Required(), mcp.Description(DescriptionRepositoryName)), mcp.WithNumber("discussionNumber", mcp.Required(), mcp.Description("Discussion Number")), ), func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) { @@ -303,11 +287,11 @@ func ListDiscussionCategories(getGQLClient GetGQLClientFn, t translations.Transl }), mcp.WithString("owner", mcp.Required(), - mcp.Description("Repository owner"), + mcp.Description(DescriptionRepositoryOwner), ), mcp.WithString("repo", mcp.Required(), - mcp.Description("Repository name"), + mcp.Description(DescriptionRepositoryName), ), mcp.WithNumber("first", mcp.Description("Number of categories to return per page (min 1, max 100)"), From 0f6894ae4813a4c485137b5422abb8ebbcf74db5 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Wed, 7 Jan 2026 18:45:32 +0000 Subject: [PATCH 2/2] Consolidate fetch functions to reduce code duplication Combine fetchDiscussionsWithCategory and fetchDiscussionsWithoutCategory into a single fetchDiscussions function to reduce code duplication and address SonarCloud duplication check failure. Co-Authored-By: parker.duff@codeium.com --- pkg/github/discussions.go | 87 +++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 45 deletions(-) diff --git a/pkg/github/discussions.go b/pkg/github/discussions.go index 02156aa6e..7b9c1891b 100644 --- a/pkg/github/discussions.go +++ b/pkg/github/discussions.go @@ -39,43 +39,50 @@ func discussionNodeToIssue(n discussionNode) *github.Issue { } } -// fetchDiscussionsWithCategory fetches discussions with a category filter -func fetchDiscussionsWithCategory(ctx context.Context, client *githubv4.Client, owner, repo string, categoryID githubv4.ID) ([]discussionNode, error) { - var query struct { - Repository struct { - Discussions struct { - Nodes []discussionNode - } `graphql:"discussions(first: 100, categoryId: $categoryId)"` - } `graphql:"repository(owner: $owner, name: $repo)"` - } - vars := map[string]interface{}{ - "owner": githubv4.String(owner), - "repo": githubv4.String(repo), - "categoryId": categoryID, - } - if err := client.Query(ctx, &query, vars); err != nil { - return nil, err - } - return query.Repository.Discussions.Nodes, nil -} +// fetchDiscussions fetches discussions from a repository, optionally filtered by category +func fetchDiscussions(ctx context.Context, client *githubv4.Client, owner, repo, category string) ([]*github.Issue, error) { + var nodes []discussionNode -// fetchDiscussionsWithoutCategory fetches discussions without a category filter -func fetchDiscussionsWithoutCategory(ctx context.Context, client *githubv4.Client, owner, repo string) ([]discussionNode, error) { - var query struct { - Repository struct { - Discussions struct { - Nodes []discussionNode - } `graphql:"discussions(first: 100)"` - } `graphql:"repository(owner: $owner, name: $repo)"` - } - vars := map[string]interface{}{ - "owner": githubv4.String(owner), - "repo": githubv4.String(repo), + if category != "" { + var query struct { + Repository struct { + Discussions struct { + Nodes []discussionNode + } `graphql:"discussions(first: 100, categoryId: $categoryId)"` + } `graphql:"repository(owner: $owner, name: $repo)"` + } + vars := map[string]interface{}{ + "owner": githubv4.String(owner), + "repo": githubv4.String(repo), + "categoryId": githubv4.ID(category), + } + if err := client.Query(ctx, &query, vars); err != nil { + return nil, err + } + nodes = query.Repository.Discussions.Nodes + } else { + var query struct { + Repository struct { + Discussions struct { + Nodes []discussionNode + } `graphql:"discussions(first: 100)"` + } `graphql:"repository(owner: $owner, name: $repo)"` + } + vars := map[string]interface{}{ + "owner": githubv4.String(owner), + "repo": githubv4.String(repo), + } + if err := client.Query(ctx, &query, vars); err != nil { + return nil, err + } + nodes = query.Repository.Discussions.Nodes } - if err := client.Query(ctx, &query, vars); err != nil { - return nil, err + + discussions := make([]*github.Issue, 0, len(nodes)) + for _, n := range nodes { + discussions = append(discussions, discussionNodeToIssue(n)) } - return query.Repository.Discussions.Nodes, nil + return discussions, nil } func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) { @@ -116,21 +123,11 @@ func ListDiscussions(getGQLClient GetGQLClientFn, t translations.TranslationHelp return mcp.NewToolResultError(fmt.Sprintf("failed to get GitHub GQL client: %v", err)), nil } - var nodes []discussionNode - if category != "" { - nodes, err = fetchDiscussionsWithCategory(ctx, client, owner, repo, githubv4.ID(category)) - } else { - nodes, err = fetchDiscussionsWithoutCategory(ctx, client, owner, repo) - } + discussions, err := fetchDiscussions(ctx, client, owner, repo, category) if err != nil { return mcp.NewToolResultError(err.Error()), nil } - discussions := make([]*github.Issue, 0, len(nodes)) - for _, n := range nodes { - discussions = append(discussions, discussionNodeToIssue(n)) - } - out, err := json.Marshal(discussions) if err != nil { return nil, fmt.Errorf("failed to marshal discussions: %w", err)