Eitanya/cli testing (#1456)

Signed-off-by: Eitan Yarmush <eitan.yarmush@solo.io>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: EItanya

go/core/cli/TESTING.md

@@ -15,6 +15,7 @@ import (
 	"github.com/kagent-dev/kagent/go/core/cli/internal/profiles"
 	"github.com/kagent-dev/kagent/go/core/cli/internal/tui"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 func main() {
@@ -324,7 +325,18 @@ Examples:
 		Run: func(cmd *cobra.Command, args []string) {
 			deployCfg.ProjectDir = args[0]
 
-			if err := cli.DeployCmd(cmd.Context(), deployCfg); err != nil {
+			// Create Kubernetes client (skip in dry-run mode)
+			var k8sClient client.Client
+			var err error
+			if !deployCfg.DryRun {
+				k8sClient, err = cli.CreateKubernetesClient()
+				if err != nil {
+					fmt.Fprintf(os.Stderr, "Error creating Kubernetes client: %v\n", err)
+					os.Exit(1)
+				}
+			}
+
+			if err := cli.DeployCmd(cmd.Context(), k8sClient, deployCfg); err != nil {
 				fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 				os.Exit(1)
 			}

go/core/cli/cmd/kagent/main.go

@@ -0,0 +1,164 @@
+package cli
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/kagent-dev/kagent/go/core/cli/internal/config"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"gopkg.in/yaml.v3"
+)
+
+func TestAddMcpCmd_AddRemoteServer(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	// Create initial manifest without MCP servers
+	manifestContent := `agentName: test-agent
+description: Test agent
+framework: adk
+language: python
+modelProvider: anthropic
+`
+	manifestPath := filepath.Join(tmpDir, "kagent.yaml")
+	err := os.WriteFile(manifestPath, []byte(manifestContent), 0644)
+	require.NoError(t, err)
+
+	cfg := &AddMcpCfg{
+		ProjectDir: tmpDir,
+		Name:       "github-server",
+		RemoteURL:  "https://api.github.com/mcp",
+		Headers:    []string{"Authorization=Bearer ${GITHUB_TOKEN}"},
+		Config:     &config.Config{},
+	}
+
+	// Call AddMcpCmd
+	err = AddMcpCmd(cfg)
+	require.NoError(t, err)
+
+	// Verify manifest was updated
+	content, err := os.ReadFile(manifestPath)
+	require.NoError(t, err)
+
+	var manifest map[string]any
+	err = yaml.Unmarshal(content, &manifest)
+	require.NoError(t, err)
+
+	mcpServers, ok := manifest["mcpServers"].([]any)
+	require.True(t, ok, "mcpServers should be an array")
+	require.Len(t, mcpServers, 1)
+
+	server := mcpServers[0].(map[string]any)
+	assert.Equal(t, "github-server", server["name"])
+	assert.Equal(t, "remote", server["type"])
+	assert.Equal(t, "https://api.github.com/mcp", server["url"])
+}
+
+func TestAddMcpCmd_AddCommandServer(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	manifestContent := `agentName: test-agent
+description: Test agent
+framework: adk
+language: python
+`
+	manifestPath := filepath.Join(tmpDir, "kagent.yaml")
+	err := os.WriteFile(manifestPath, []byte(manifestContent), 0644)
+	require.NoError(t, err)
+
+	cfg := &AddMcpCfg{
+		ProjectDir: tmpDir,
+		Name:       "filesystem-server",
+		Command:    "npx",
+		Args:       []string{"-y", "@modelcontextprotocol/server-filesystem", "/tmp"},
+		Config:     &config.Config{},
+	}
+
+	err = AddMcpCmd(cfg)
+	require.NoError(t, err)
+
+	// Verify manifest was updated
+	content, err := os.ReadFile(manifestPath)
+	require.NoError(t, err)
+
+	var manifest map[string]any
+	err = yaml.Unmarshal(content, &manifest)
+	require.NoError(t, err)
+
+	mcpServers := manifest["mcpServers"].([]any)
+	require.Len(t, mcpServers, 1)
+
+	server := mcpServers[0].(map[string]any)
+	assert.Equal(t, "filesystem-server", server["name"])
+	assert.Equal(t, "command", server["type"])
+	assert.Equal(t, "npx", server["command"])
+}
+
+func TestAddMcpCmd_MissingManifest(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	cfg := &AddMcpCfg{
+		ProjectDir: tmpDir,
+		Name:       "test-server",
+		RemoteURL:  "http://example.com",
+		Config:     &config.Config{},
+	}
+
+	err := AddMcpCmd(cfg)
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "failed to load kagent.yaml")
+}
+
+func TestAddMcpCmd_AddMultipleServers(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	manifestContent := `agentName: test-agent
+description: Test agent
+framework: adk
+language: python
+`
+	manifestPath := filepath.Join(tmpDir, "kagent.yaml")
+	err := os.WriteFile(manifestPath, []byte(manifestContent), 0644)
+	require.NoError(t, err)
+
+	// Add first server (remote)
+	cfg1 := &AddMcpCfg{
+		ProjectDir: tmpDir,
+		Name:       "server-1",
+		RemoteURL:  "http://server1.com",
+		Config:     &config.Config{},
+	}
+	err = AddMcpCmd(cfg1)
+	require.NoError(t, err)
+
+	// Add second server (command)
+	cfg2 := &AddMcpCfg{
+		ProjectDir: tmpDir,
+		Name:       "server-2",
+		Command:    "python",
+		Args:       []string{"server.py"},
+		Config:     &config.Config{},
+	}
+	err = AddMcpCmd(cfg2)
+	require.NoError(t, err)
+
+	// Verify both servers exist
+	content, err := os.ReadFile(manifestPath)
+	require.NoError(t, err)
+
+	var manifest map[string]any
+	err = yaml.Unmarshal(content, &manifest)
+	require.NoError(t, err)
+
+	mcpServers := manifest["mcpServers"].([]any)
+	require.Len(t, mcpServers, 2)
+
+	// Verify first server
+	server1 := mcpServers[0].(map[string]any)
+	assert.Equal(t, "server-1", server1["name"])
+
+	// Verify second server
+	server2 := mcpServers[1].(map[string]any)
+	assert.Equal(t, "server-2", server2["name"])
+}

go/core/cli/internal/cli/agent/add_mcp_test.go

@@ -0,0 +1,187 @@
+package cli
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/kagent-dev/kagent/go/core/cli/internal/config"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestBuildCmd_Validation(t *testing.T) {
+	tests := []struct {
+		name    string
+		cfg     *BuildCfg
+		setup   func(t *testing.T) string // Returns temp dir path
+		wantErr bool
+		errMsg  string
+	}{
+		{
+			name: "missing project directory",
+			cfg: &BuildCfg{
+				ProjectDir: "",
+				Config:     &config.Config{},
+			},
+			setup:   func(t *testing.T) string { return "" },
+			wantErr: true,
+			errMsg:  "project directory is required",
+		},
+		{
+			name: "non-existent project directory",
+			cfg: &BuildCfg{
+				ProjectDir: "/nonexistent/path",
+				Config:     &config.Config{},
+			},
+			setup:   func(t *testing.T) string { return "" },
+			wantErr: true,
+			errMsg:  "project directory does not exist",
+		},
+		{
+			name: "missing Dockerfile",
+			cfg: &BuildCfg{
+				Config: &config.Config{},
+			},
+			setup: func(t *testing.T) string {
+				tmpDir := t.TempDir()
+				return tmpDir
+			},
+			wantErr: true,
+			errMsg:  "dockerfile not found",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.setup != nil {
+				dir := tt.setup(t)
+				if dir != "" && tt.cfg.ProjectDir == "" {
+					tt.cfg.ProjectDir = dir
+				}
+			}
+
+			err := BuildCmd(tt.cfg)
+			if tt.wantErr {
+				require.Error(t, err)
+				if tt.errMsg != "" {
+					assert.Contains(t, err.Error(), tt.errMsg)
+				}
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
+
+func TestConstructImageName(t *testing.T) {
+	tests := []struct {
+		name      string
+		cfg       *BuildCfg
+		setupFile func(t *testing.T, dir string) // Create kagent.yaml if needed
+		want      string
+	}{
+		{
+			name: "custom image name provided",
+			cfg: &BuildCfg{
+				Image:      "myregistry/myagent:v1.0",
+				ProjectDir: "",
+			},
+			setupFile: nil,
+			want:      "myregistry/myagent:v1.0",
+		},
+		{
+			name: "fallback to directory name",
+			cfg: &BuildCfg{
+				Image:      "",
+				ProjectDir: "/path/to/my-agent",
+			},
+			setupFile: nil,
+			want:      "localhost:5001/my-agent:latest",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.setupFile != nil {
+				tmpDir := t.TempDir()
+				tt.cfg.ProjectDir = tmpDir
+				tt.setupFile(t, tmpDir)
+			}
+
+			got := constructImageName(tt.cfg)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
+
+func TestGetAgentNameFromManifest(t *testing.T) {
+	tests := []struct {
+		name         string
+		manifestYAML string
+		want         string
+	}{
+		{
+			name: "valid manifest with agent name",
+			manifestYAML: `agentName: test-agent
+description: Test agent
+framework: adk
+language: python
+`,
+			want: "test-agent",
+		},
+		{
+			name:         "no manifest file",
+			manifestYAML: "",
+			want:         "",
+		},
+		{
+			name: "invalid yaml",
+			manifestYAML: `invalid: yaml: content:
+  - broken`,
+			want: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tmpDir := t.TempDir()
+
+			if tt.manifestYAML != "" {
+				manifestPath := filepath.Join(tmpDir, "kagent.yaml")
+				err := os.WriteFile(manifestPath, []byte(tt.manifestYAML), 0644)
+				require.NoError(t, err)
+			}
+
+			got := getAgentNameFromManifest(tmpDir)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
+
+func TestConstructMcpServerImageName(t *testing.T) {
+	tests := []struct {
+		name       string
+		projectDir string
+		serverName string
+		want       string
+	}{
+		{
+			name:       "basic mcp server image",
+			projectDir: "/path/to/my-agent",
+			serverName: "weather-server",
+			want:       "localhost:5001/my-agent-weather-server:latest",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cfg := &BuildCfg{
+				ProjectDir: tt.projectDir,
+			}
+
+			got := constructMcpServerImageName(cfg, tt.serverName)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}