test: add tests for review fix behaviors (resource lifecycle, meta merge, namespace dedup)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: manusa

pkg/mcp/text_result_test.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/containers/kubernetes-mcp-server/pkg/mcpapps"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"github.com/stretchr/testify/suite"
 )
@@ -114,3 +115,70 @@ func (s *TextResultSuite) TestNewStructuredResult() {
 func TestTextResult(t *testing.T) {
 	suite.Run(t, new(TextResultSuite))
 }
+
+type RegisterMCPAppResourcesSuite struct {
+	suite.Suite
+}
+
+func (s *RegisterMCPAppResourcesSuite) newServer() *Server {
+	return &Server{
+		server: mcp.NewServer(
+			&mcp.Implementation{Name: "test"},
+			&mcp.ServerOptions{
+				Capabilities: &mcp.ServerCapabilities{
+					Resources: &mcp.ResourceCapabilities{},
+				},
+			},
+		),
+	}
+}
+
+func (s *RegisterMCPAppResourcesSuite) TestTracksRegisteredURIs() {
+	srv := s.newServer()
+	srv.registerMCPAppResources([]string{"pods_list", "nodes_top"})
+	s.ElementsMatch(
+		[]string{
+			mcpapps.ToolResourceURI("pods_list"),
+			mcpapps.ToolResourceURI("nodes_top"),
+		},
+		srv.registeredAppURIs,
+	)
+}
+
+func (s *RegisterMCPAppResourcesSuite) TestRemovesStaleResources() {
+	srv := s.newServer()
+	// First registration: two tools
+	srv.registerMCPAppResources([]string{"pods_list", "nodes_top"})
+	s.Len(srv.registeredAppURIs, 2)
+	// Second registration: only one tool remains — stale nodes_top should be cleaned up
+	srv.registerMCPAppResources([]string{"pods_list"})
+	s.Equal(
+		[]string{mcpapps.ToolResourceURI("pods_list")},
+		srv.registeredAppURIs,
+	)
+}
+
+func (s *RegisterMCPAppResourcesSuite) TestUpdatesTrackingOnReRegister() {
+	srv := s.newServer()
+	srv.registerMCPAppResources([]string{"pods_list"})
+	srv.registerMCPAppResources([]string{"pods_list", "namespaces_list"})
+	s.ElementsMatch(
+		[]string{
+			mcpapps.ToolResourceURI("pods_list"),
+			mcpapps.ToolResourceURI("namespaces_list"),
+		},
+		srv.registeredAppURIs,
+	)
+}
+
+func (s *RegisterMCPAppResourcesSuite) TestEmptyListClearsAll() {
+	srv := s.newServer()
+	srv.registerMCPAppResources([]string{"pods_list"})
+	s.Len(srv.registeredAppURIs, 1)
+	srv.registerMCPAppResources([]string{})
+	s.Empty(srv.registeredAppURIs)
+}
+
+func TestRegisterMCPAppResources(t *testing.T) {
+	suite.Run(t, new(RegisterMCPAppResourcesSuite))
+}

pkg/mcp/tool_mutator_test.go

@@ -307,3 +307,62 @@ func (s *TargetListToolMutatorSuite) TestHandlerWithGetTargetsError() {
 func TestTargetListToolMutator(t *testing.T) {
 	suite.Run(t, new(TargetListToolMutatorSuite))
 }
+
+type AppsMetaMutatorSuite struct {
+	suite.Suite
+}
+
+func (s *AppsMetaMutatorSuite) TestInjectsMetaWhenNil() {
+	tool := createTestTool("pods_list")
+	s.Nil(tool.Tool.Meta)
+	mutator := WithAppsMeta()
+	result := mutator(tool)
+	s.Run("sets Meta", func() {
+		s.NotNil(result.Tool.Meta)
+	})
+	s.Run("contains ui key", func() {
+		_, hasUI := result.Tool.Meta["ui"]
+		s.True(hasUI)
+	})
+	s.Run("contains legacy flat key", func() {
+		_, hasLegacy := result.Tool.Meta["ui/resourceUri"]
+		s.True(hasLegacy)
+	})
+}
+
+func (s *AppsMetaMutatorSuite) TestMergesIntoExistingMeta() {
+	tool := createTestTool("pods_list")
+	tool.Tool.Meta = map[string]any{"custom": "value"}
+	mutator := WithAppsMeta()
+	result := mutator(tool)
+	s.Run("preserves existing keys", func() {
+		s.Equal("value", result.Tool.Meta["custom"])
+	})
+	s.Run("adds ui key", func() {
+		_, hasUI := result.Tool.Meta["ui"]
+		s.True(hasUI)
+	})
+	s.Run("adds legacy flat key", func() {
+		_, hasLegacy := result.Tool.Meta["ui/resourceUri"]
+		s.True(hasLegacy)
+	})
+}
+
+func (s *AppsMetaMutatorSuite) TestSkipsWhenUIKeyExists() {
+	existingUI := map[string]any{"resourceUri": "ui://custom/resource"}
+	tool := createTestTool("pods_list")
+	tool.Tool.Meta = map[string]any{"ui": existingUI}
+	mutator := WithAppsMeta()
+	result := mutator(tool)
+	s.Run("does not overwrite existing ui key", func() {
+		s.Equal(existingUI, result.Tool.Meta["ui"])
+	})
+	s.Run("does not add legacy flat key", func() {
+		_, hasLegacy := result.Tool.Meta["ui/resourceUri"]
+		s.False(hasLegacy)
+	})
+}
+
+func TestAppsMetaMutator(t *testing.T) {
+	suite.Run(t, new(AppsMetaMutatorSuite))
+}

pkg/output/output_test.go

@@ -6,7 +6,9 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 var podListJSON = `{
@@ -111,6 +113,51 @@ func (s *OutputSuite) TestTableToStructured() {
 		result := tableToStructured(nil)
 		s.Nil(result)
 	})
+	s.Run("returns nil for table with no rows", func() {
+		t := &metav1.Table{
+			ColumnDefinitions: []metav1.TableColumnDefinition{{Name: "Name"}},
+		}
+		result := tableToStructured(t)
+		s.Nil(result)
+	})
+	s.Run("does not duplicate Namespace from embedded object when column exists", func() {
+		t := &metav1.Table{
+			ColumnDefinitions: []metav1.TableColumnDefinition{
+				{Name: "Name"},
+				{Name: "Namespace"},
+			},
+			Rows: []metav1.TableRow{{
+				Cells: []any{"my-pod", "from-column"},
+				Object: runtime.RawExtension{
+					Object: &unstructured.Unstructured{Object: map[string]any{
+						"metadata": map[string]any{"namespace": "from-object"},
+					}},
+				},
+			}},
+		}
+		result := tableToStructured(t)
+		s.Require().Len(result, 1)
+		s.Equal("from-column", result[0]["Namespace"], "column value should take precedence over embedded object")
+	})
+	s.Run("adds Namespace from embedded object when no column exists", func() {
+		t := &metav1.Table{
+			ColumnDefinitions: []metav1.TableColumnDefinition{
+				{Name: "Name"},
+			},
+			Rows: []metav1.TableRow{{
+				Cells: []any{"my-pod"},
+				Object: runtime.RawExtension{
+					Object: &unstructured.Unstructured{Object: map[string]any{
+						"metadata": map[string]any{"namespace": "default"},
+					}},
+				},
+			}},
+		}
+		result := tableToStructured(t)
+		s.Require().Len(result, 1)
+		s.Equal("my-pod", result[0]["Name"])
+		s.Equal("default", result[0]["Namespace"])
+	})
 }
 
 func TestOutput(t *testing.T) {