Skip to content

Fix SonarQube issues: string duplication and cognitive complexity #25

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix SonarQube issues: string duplication and cognitive complexity #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6760d30
Fix SonarQube issues: string duplication and cognitive complexity
devin-ai-integration[bot] Sep 22, 2025
95f8186
Refactor search.go to eliminate structural duplication
devin-ai-integration[bot] Sep 22, 2025
770f23f
Comprehensive refactoring to eliminate structural duplication
devin-ai-integration[bot] Sep 22, 2025
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
54 changes: 30 additions & 24 deletions cmd/mcpcurl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import (
"github.com/spf13/viper"
)

const (
stdioServerCmdFlag = "stdio-server-cmd"
)

type (
// SchemaResponse represents the top-level response containing tools
SchemaResponse struct {
Expand Down Expand Up @@ -107,9 +111,9 @@ var (
}

// Check if the required global flag is provided
serverCmd, _ := cmd.Flags().GetString("stdio-server-cmd")
serverCmd, _ := cmd.Flags().GetString(stdioServerCmdFlag)
if serverCmd == "" {
return fmt.Errorf("--stdio-server-cmd is required")
return fmt.Errorf("--%s is required", stdioServerCmdFlag)
}
return nil
},
Expand All @@ -121,9 +125,9 @@ var (
Short: "Fetch schema from MCP server",
Long: "Fetches the tools schema from the MCP server specified by --stdio-server-cmd",
RunE: func(cmd *cobra.Command, _ []string) error {
serverCmd, _ := cmd.Flags().GetString("stdio-server-cmd")
serverCmd, _ := cmd.Flags().GetString(stdioServerCmdFlag)
if serverCmd == "" {
return fmt.Errorf("--stdio-server-cmd is required")
return fmt.Errorf("--%s is required", stdioServerCmdFlag)
}

// Build the JSON-RPC request for tools/list
Expand Down Expand Up @@ -156,8 +160,8 @@ func main() {
rootCmd.AddCommand(schemaCmd)

// Add global flag for stdio server command
rootCmd.PersistentFlags().String("stdio-server-cmd", "", "Shell command to invoke MCP server via stdio (required)")
_ = rootCmd.MarkPersistentFlagRequired("stdio-server-cmd")
rootCmd.PersistentFlags().String(stdioServerCmdFlag, "", "Shell command to invoke MCP server via stdio (required)")
_ = rootCmd.MarkPersistentFlagRequired(stdioServerCmdFlag)

// Add global flag for pretty printing
rootCmd.PersistentFlags().Bool("pretty", true, "Pretty print MCP response (only for JSON or JSONL responses)")
Expand All @@ -175,23 +179,9 @@ func main() {
os.Exit(1)
}
// Get server command
serverCmd, err := rootCmd.Flags().GetString("stdio-server-cmd")
serverCmd, err := rootCmd.Flags().GetString(stdioServerCmdFlag)
if err == nil && serverCmd != "" {
// Fetch schema from server
jsonRequest, err := buildJSONRPCRequest("tools/list", "", nil)
if err == nil {
response, err := executeServerCommand(serverCmd, jsonRequest)
if err == nil {
// Parse the schema response
var schemaResp SchemaResponse
if err := json.Unmarshal([]byte(response), &schemaResp); err == nil {
// Add all the generated commands as subcommands of tools
for _, tool := range schemaResp.Result.Tools {
addCommandFromTool(toolsCmd, &tool, prettyPrint)
}
}
}
}
loadSchemaAndAddCommands(serverCmd, prettyPrint)
}

// Execute
Expand All @@ -201,6 +191,22 @@ func main() {
}
}

// loadSchemaAndAddCommands fetches schema from server and adds tool commands
func loadSchemaAndAddCommands(serverCmd string, prettyPrint bool) {
jsonRequest, err := buildJSONRPCRequest("tools/list", "", nil)
if err == nil {
response, err := executeServerCommand(serverCmd, jsonRequest)
if err == nil {
var schemaResp SchemaResponse
if err := json.Unmarshal([]byte(response), &schemaResp); err == nil {
for _, tool := range schemaResp.Result.Tools {
addCommandFromTool(toolsCmd, &tool, prettyPrint)
}
}
}
}
}

// addCommandFromTool creates a cobra command from a tool schema
func addCommandFromTool(toolsCmd *cobra.Command, tool *Tool, prettyPrint bool) {
// Create command from tool
Expand All @@ -222,9 +228,9 @@ func addCommandFromTool(toolsCmd *cobra.Command, tool *Tool, prettyPrint bool) {
}

// Execute the server command
serverCmd, err := cmd.Flags().GetString("stdio-server-cmd")
serverCmd, err := cmd.Flags().GetString(stdioServerCmdFlag)
if err != nil {
_, _ = fmt.Fprintf(os.Stderr, "failed to get stdio-server-cmd: %v\n", err)
_, _ = fmt.Fprintf(os.Stderr, "failed to get %s: %v\n", stdioServerCmdFlag, err)
return
}
response, err := executeServerCommand(serverCmd, jsonData)
Expand Down
Loading