EPMRPP-108935 || MCP Server. Tools. Fix rp project parameter configuration

Author: AleksandrParamonoff

cmd/reportportal-mcp-server/main.go

@@ -203,7 +203,6 @@ func buildHTTPServerConfig(cmd *cli.Command) (mcpreportportal.HTTPServerConfig,
 	// Retrieve required parameters from CLI flags
 	host := cmd.String("rp-host")
 	token := cmd.String("token")
-	project := cmd.String("project")
 	userID := cmd.String("user-id")
 	analyticsAPISecret := mcpreportportal.GetAnalyticArg()
 	analyticsOff := cmd.Bool("analytics-off")
@@ -226,7 +225,6 @@ func buildHTTPServerConfig(cmd *cli.Command) (mcpreportportal.HTTPServerConfig,
 		Version:               fmt.Sprintf("%s (%s) %s", version, commit, date),
 		HostURL:               hostUrl,
 		FallbackRPToken:       token,
-		DefaultProject:        project,
 		UserID:                userID,
 		GA4Secret:             analyticsAPISecret,
 		AnalyticsOn:           !analyticsOff,
@@ -239,7 +237,6 @@ func newMCPServer(cmd *cli.Command) (*server.MCPServer, *mcpreportportal.Analyti
 	// Retrieve required parameters from the command flags
 	token := cmd.String("token")                           // API token
 	host := cmd.String("rp-host")                          // ReportPortal host URL
-	project := cmd.String("project")                       // ReportPortal project name
 	userID := cmd.String("user-id")                        // Unified user ID for analytics
 	analyticsAPISecret := mcpreportportal.GetAnalyticArg() // Analytics API secret
 	analyticsOff := cmd.Bool("analytics-off")              // Disable analytics flag
@@ -254,7 +251,6 @@ func newMCPServer(cmd *cli.Command) (*server.MCPServer, *mcpreportportal.Analyti
 		version,
 		hostUrl,
 		token,
-		project,
 		userID,
 		analyticsAPISecret,
 		!analyticsOff, // Convert analyticsOff to analyticsOn
@@ -267,6 +263,11 @@ func newMCPServer(cmd *cli.Command) (*server.MCPServer, *mcpreportportal.Analyti
 
 // runStdioServer starts the ReportPortal MCP server in stdio mode.
 func runStdioServer(ctx context.Context, cmd *cli.Command) error {
+	rpProject := cmd.String("project")
+	if rpProject != "" {
+		// Add project to request context default project name from Environment variable
+		ctx = mcpreportportal.WithProjectInContext(ctx, rpProject)
+	}
 	mcpServer, analytics, err := newMCPServer(cmd)
 	if err != nil {
 		return fmt.Errorf("failed to create ReportPortal MCP server: %w", err)

internal/reportportal/http_server.go

@@ -40,7 +40,6 @@ type HTTPServerConfig struct {
 	Version         string
 	HostURL         *url.URL
 	FallbackRPToken string
-	DefaultProject  string
 	UserID          string
 	GA4Secret       string
 	AnalyticsOn     bool
@@ -141,7 +140,7 @@ func (hs *HTTPServer) initializeTools() error {
 	rpClient.APIClient.GetConfig().Middleware = QueryParamsMiddleware
 
 	// Add launch management tools with analytics
-	launches := NewLaunchResources(rpClient, hs.config.DefaultProject, hs.analytics)
+	launches := NewLaunchResources(rpClient, hs.analytics)
 
 	hs.mcpServer.AddTool(launches.toolGetLaunches())
 	hs.mcpServer.AddTool(launches.toolGetLastLaunchByName())
@@ -154,7 +153,7 @@ func (hs *HTTPServer) initializeTools() error {
 	hs.mcpServer.AddResourceTemplate(launches.resourceLaunch())
 
 	// Add test item tools
-	testItems := NewTestItemResources(rpClient, hs.config.DefaultProject, hs.analytics)
+	testItems := NewTestItemResources(rpClient, hs.analytics)
 
 	hs.mcpServer.AddTool(testItems.toolGetTestItemById())
 	hs.mcpServer.AddTool(testItems.toolGetTestItemsByFilter())

internal/reportportal/integration_project_test.go

@@ -18,33 +18,40 @@ func TestIntegration_ProjectExtractionFlow(t *testing.T) {
 		expectError     bool
 	}{
 		{
-			name:            "HTTP header project takes precedence",
+			name:            "request project takes precedence over HTTP header",
 			httpHeaders:     map[string]string{"X-Project": "http-project"},
 			requestProject:  "request-project",
-			expectedProject: "http-project",
+			expectedProject: "request-project",
 			expectError:     false,
 		},
 		{
-			name:            "fallback to request when no HTTP header",
+			name:            "use request project when no HTTP header",
 			httpHeaders:     map[string]string{},
 			requestProject:  "request-project",
 			expectedProject: "request-project",
 			expectError:     false,
 		},
 		{
-			name:            "fallback to request when empty HTTP header",
+			name:            "use request project when empty HTTP header",
 			httpHeaders:     map[string]string{"X-Project": ""},
 			requestProject:  "request-project",
 			expectedProject: "request-project",
 			expectError:     false,
 		},
 		{
-			name:            "fallback to request when whitespace HTTP header",
+			name:            "use request project when whitespace HTTP header",
 			httpHeaders:     map[string]string{"X-Project": "   "},
 			requestProject:  "request-project",
 			expectedProject: "request-project",
 			expectError:     false,
 		},
+		{
+			name:            "fallback to HTTP header when no request project",
+			httpHeaders:     map[string]string{"X-Project": "http-project"},
+			requestProject:  "",
+			expectedProject: "http-project",
+			expectError:     false,
+		},
 		{
 			name:            "error when no project anywhere",
 			httpHeaders:     map[string]string{},
@@ -53,12 +60,19 @@ func TestIntegration_ProjectExtractionFlow(t *testing.T) {
 			expectError:     true,
 		},
 		{
-			name:            "HTTP header with whitespace is trimmed",
+			name:            "HTTP header with whitespace is trimmed when used",
 			httpHeaders:     map[string]string{"X-Project": "  http-project  "},
-			requestProject:  "request-project",
+			requestProject:  "",
 			expectedProject: "http-project",
 			expectError:     false,
 		},
+		{
+			name:            "request project with whitespace is trimmed",
+			httpHeaders:     map[string]string{"X-Project": "http-project"},
+			requestProject:  "  request-project  ",
+			expectedProject: "request-project",
+			expectError:     false,
+		},
 	}
 
 	for _, tt := range tests {
@@ -101,17 +115,19 @@ func TestIntegration_ProjectExtractionFlow(t *testing.T) {
 
 func TestIntegration_CompleteHTTPFlow(t *testing.T) {
 	// Test the complete flow from HTTP request to tool execution
+	// Request parameter should take precedence over HTTP header
 	req := httptest.NewRequest("GET", "/test", nil)
-	req.Header.Set("X-Project", "integration-test-project")
+	req.Header.Set("X-Project", "header-project")
 
 	var capturedProject string
 	var projectFound bool
 
 	// Create a handler that simulates the MCP tool execution
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// Simulate MCP tool request
+		// Simulate MCP tool request with explicit project parameter
+		// This should take precedence over the HTTP header
 		mcpRequest := MockCallToolRequest{
-			project: "fallback-project",
+			project: "request-project",
 		}
 
 		// Extract project using our function
@@ -133,8 +149,8 @@ func TestIntegration_CompleteHTTPFlow(t *testing.T) {
 	// Execute request
 	middleware.ServeHTTP(rr, req)
 
-	// Verify results
+	// Verify results - request parameter should win
 	assert.Equal(t, http.StatusOK, rr.Code)
 	assert.True(t, projectFound)
-	assert.Equal(t, "integration-test-project", capturedProject)
+	assert.Equal(t, "request-project", capturedProject)
 }

internal/reportportal/items.go

@@ -24,13 +24,14 @@ type TestItemResources struct {
 
 func NewTestItemResources(
 	client *gorp.Client,
-	defaultProject string,
 	analytics *Analytics,
 ) *TestItemResources {
 	return &TestItemResources{
-		client:           client,
-		projectParameter: newProjectParameter(defaultProject),
-		analytics:        analytics,
+		client: client,
+		projectParameter: mcp.WithString("project", // Parameter for specifying the project name)
+			mcp.Description("Project name"),
+		),
+		analytics: analytics,
 	}
 }
 

internal/reportportal/launches.go

@@ -24,13 +24,14 @@ type LaunchResources struct {
 
 func NewLaunchResources(
 	client *gorp.Client,
-	defaultProject string,
 	analytics *Analytics,
 ) *LaunchResources {
 	return &LaunchResources{
-		client:           client,
-		projectParameter: newProjectParameter(defaultProject),
-		analytics:        analytics,
+		client: client,
+		projectParameter: mcp.WithString("project", // Parameter for specifying the project name)
+			mcp.Description("Project name"),
+		),
+		analytics: analytics,
 	}
 }
 

internal/reportportal/launches_test.go

@@ -43,7 +43,7 @@ func TestListLaunchesTool(t *testing.T) {
 	srv := mcptest.NewUnstartedServer(t)
 
 	serverURL, _ := url.Parse(mockServer.URL)
-	launchTools := NewLaunchResources(gorp.NewClient(serverURL, ""), testProject, nil)
+	launchTools := NewLaunchResources(gorp.NewClient(serverURL, ""), nil)
 	srv.AddTool(launchTools.toolGetLaunches())
 
 	err := srv.Start(ctx)

internal/reportportal/mock_test.go

@@ -59,12 +59,15 @@ func (m MockCallToolRequest) RequireStringSlice(key string) ([]string, error) {
 }
 
 // extractProjectWithMock is a test helper that works with MockCallToolRequest
+// This mimics the actual extractProject function's priority order
 func extractProjectWithMock(ctx context.Context, rq MockCallToolRequest) (string, error) {
-	// First try to get project from context (from HTTP header)
+	// Use project parameter from request (highest priority)
+	if project := strings.TrimSpace(rq.GetString("project", "")); project != "" {
+		return project, nil
+	}
+	// Fallback to project from context (request's HTTP header or environment variable, depends on MCP mode)
 	if project, ok := GetProjectFromContext(ctx); ok {
 		return project, nil
 	}
-
-	project, err := rq.RequireString("project")
-	return strings.TrimSpace(project), err
+	return "", assert.AnError
 }

internal/reportportal/server.go

@@ -19,7 +19,7 @@ var promptFiles embed.FS
 func NewServer(
 	version string,
 	hostUrl *url.URL,
-	token, defaultProject string,
+	token,
 	userID, analyticsAPISecret string,
 	analyticsOn bool,
 ) (*server.MCPServer, *Analytics, error) {
@@ -47,7 +47,7 @@ func NewServer(
 		}
 	}
 
-	launches := NewLaunchResources(rpClient, defaultProject, analytics)
+	launches := NewLaunchResources(rpClient, analytics)
 	s.AddTool(launches.toolGetLaunches())
 	s.AddTool(launches.toolGetLastLaunchByName())
 	s.AddTool(launches.toolForceFinishLaunch())
@@ -57,7 +57,7 @@ func NewServer(
 	s.AddTool(launches.toolRunQualityGate())
 	s.AddResourceTemplate(launches.resourceLaunch())
 
-	testItems := NewTestItemResources(rpClient, defaultProject, analytics)
+	testItems := NewTestItemResources(rpClient, analytics)
 	s.AddTool(testItems.toolGetTestItemById())
 	s.AddTool(testItems.toolGetTestItemsByFilter())
 	s.AddTool(testItems.toolGetTestItemLogsByFilter())

internal/reportportal/utils.go

@@ -83,22 +83,18 @@ func applyPaginationOptions[T PaginatedRequest[T]](
 		PageSort(pageSort)
 }
 
-func newProjectParameter(defaultProject string) mcp.ToolOption {
-	return mcp.WithString("project", // Parameter for specifying the project name)
-		mcp.Description("Project name"),
-		mcp.DefaultString(defaultProject),
-		mcp.Required(),
-	)
-}
-
 func extractProject(ctx context.Context, rq mcp.CallToolRequest) (string, error) {
-	// First try to get project from context (from HTTP header)
+	// Use project parameter from request
+	if project := strings.TrimSpace(rq.GetString("project", "")); project != "" {
+		return project, nil
+	}
+	// Fallback to project from context (request's HTTP header or environment variable, depends on MCP mode)
 	if project, ok := GetProjectFromContext(ctx); ok {
 		return project, nil
 	}
-
-	project, err := rq.RequireString("project")
-	return strings.TrimSpace(project), err
+	return "", fmt.Errorf(
+		"no project parameter found in request, HTTP header, or environment variable",
+	)
 }
 
 func extractResponseError(err error, rs *http.Response) (errText string) {