Merge pull request #9858 from linghengqian/fix-e2e

Add fallback to Linux config when Windows config absent in WSL

Author: mook-as

src/go/rdctl/pkg/config/config.go

@@ -60,17 +60,19 @@ var (
 // DefineGlobalFlags sets up the global flags, available for all sub-commands
 func DefineGlobalFlags(rootCmd *cobra.Command) {
 	var configDir string
-	var err error
 	if runtime.GOOS == "linux" && isWSLDistro() {
 		ctx := rootCmd.Context()
 		if ctx == nil {
 			ctx = context.Background()
 		}
-		if configDir, err = wslifyConfigDir(ctx); err != nil {
-			log.Fatalf("Can't get WSL config-dir: %v", err)
+		if wslConfigDir, err := wslifyConfigDir(ctx); err == nil {
+			windowsConfigPath := filepath.Join(wslConfigDir, "rancher-desktop", "rd-engine.json")
+			if _, statErr := os.Stat(windowsConfigPath); statErr == nil {
+				configDir = filepath.Join(wslConfigDir, "rancher-desktop")
+			}
 		}
-		configDir = filepath.Join(configDir, "rancher-desktop")
-	} else {
+	}
+	if configDir == "" {
 		appPaths, err := paths.GetPaths()
 		if err != nil {
 			log.Fatalf("failed to get paths: %s", err)

src/go/rdctl/pkg/config/config_test.go

@@ -1,13 +1,16 @@
 package config
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 type fakeFileInfo struct {
@@ -39,6 +42,208 @@ func saveWSLEnvs(t *testing.T) {
 	})
 }
 
+func TestGetConnectionInfo_ValidConfigFile(t *testing.T) {
+	tmpDir := t.TempDir()
+	configFile := filepath.Join(tmpDir, "rd-engine.json")
+
+	config := ConnectionInfo{
+		User:     "example_user",
+		Password: "example_password",
+		Host:     "192.168.1.1",
+		Port:     8080,
+	}
+
+	data, err := json.Marshal(config)
+	require.NoError(t, err)
+	err = os.WriteFile(configFile, data, 0600)
+	require.NoError(t, err)
+
+	originalConfigPath := configPath
+	originalDefaultConfigPath := DefaultConfigPath
+	t.Cleanup(func() {
+		configPath = originalConfigPath
+		DefaultConfigPath = originalDefaultConfigPath
+	})
+
+	configPath = configFile
+	DefaultConfigPath = configFile
+
+	result, err := GetConnectionInfo(false)
+	require.NoError(t, err)
+	assert.Equal(t, "example_user", result.User)
+	assert.Equal(t, "example_password", result.Password)
+	assert.Equal(t, "192.168.1.1", result.Host)
+	assert.Equal(t, 8080, result.Port)
+}
+
+func TestGetConnectionInfo_MissingConfigFile_MayBeMissing(t *testing.T) {
+	tmpDir := t.TempDir()
+	nonExistentFile := filepath.Join(tmpDir, "nonexistent.json")
+
+	originalConfigPath := configPath
+	originalDefaultConfigPath := DefaultConfigPath
+	t.Cleanup(func() {
+		configPath = originalConfigPath
+		DefaultConfigPath = originalDefaultConfigPath
+	})
+
+	configPath = ""
+	DefaultConfigPath = nonExistentFile
+
+	result, err := GetConnectionInfo(true)
+	assert.Nil(t, result)
+	assert.Nil(t, err)
+}
+
+func TestGetConnectionInfo_MissingConfigFile_Required(t *testing.T) {
+	tmpDir := t.TempDir()
+	nonExistentFile := filepath.Join(tmpDir, "nonexistent.json")
+
+	originalConfigPath := configPath
+	originalDefaultConfigPath := DefaultConfigPath
+	t.Cleanup(func() {
+		configPath = originalConfigPath
+		DefaultConfigPath = originalDefaultConfigPath
+	})
+
+	configPath = nonExistentFile
+	DefaultConfigPath = nonExistentFile
+
+	result, err := GetConnectionInfo(false)
+	assert.Nil(t, result)
+	assert.Error(t, err)
+}
+
+func TestGetConnectionInfo_InvalidJSON(t *testing.T) {
+	tmpDir := t.TempDir()
+	configFile := filepath.Join(tmpDir, "rd-engine.json")
+
+	err := os.WriteFile(configFile, []byte("not valid json"), 0600)
+	require.NoError(t, err)
+
+	originalConfigPath := configPath
+	originalDefaultConfigPath := DefaultConfigPath
+	t.Cleanup(func() {
+		configPath = originalConfigPath
+		DefaultConfigPath = originalDefaultConfigPath
+	})
+
+	configPath = configFile
+	DefaultConfigPath = configFile
+
+	result, err := GetConnectionInfo(false)
+	assert.Nil(t, result)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "error parsing config file")
+}
+
+func TestGetConnectionInfo_CLIOverrides(t *testing.T) {
+	tmpDir := t.TempDir()
+	configFile := filepath.Join(tmpDir, "rd-engine.json")
+
+	config := ConnectionInfo{
+		User:     "config_user",
+		Password: "config_password",
+		Host:     "config_host",
+		Port:     9999,
+	}
+
+	data, err := json.Marshal(config)
+	require.NoError(t, err)
+	err = os.WriteFile(configFile, data, 0600)
+	require.NoError(t, err)
+
+	originalConfigPath := configPath
+	originalDefaultConfigPath := DefaultConfigPath
+	originalConnectionSettings := connectionSettings
+	t.Cleanup(func() {
+		configPath = originalConfigPath
+		DefaultConfigPath = originalDefaultConfigPath
+		connectionSettings = originalConnectionSettings
+	})
+
+	configPath = configFile
+	DefaultConfigPath = configFile
+	connectionSettings = ConnectionInfo{
+		User:     "override_user",
+		Password: "override_password",
+		Host:     "override_host",
+		Port:     1234,
+	}
+
+	result, err := GetConnectionInfo(false)
+	require.NoError(t, err)
+	assert.Equal(t, "override_user", result.User)
+	assert.Equal(t, "override_password", result.Password)
+	assert.Equal(t, "override_host", result.Host)
+	assert.Equal(t, 1234, result.Port)
+}
+
+func TestGetConnectionInfo_DefaultHost(t *testing.T) {
+	tmpDir := t.TempDir()
+	configFile := filepath.Join(tmpDir, "rd-engine.json")
+
+	config := ConnectionInfo{
+		User:     "example_user",
+		Password: "example_password",
+		Port:     8080,
+	}
+
+	data, err := json.Marshal(config)
+	require.NoError(t, err)
+	err = os.WriteFile(configFile, data, 0600)
+	require.NoError(t, err)
+
+	originalConfigPath := configPath
+	originalDefaultConfigPath := DefaultConfigPath
+	originalConnectionSettings := connectionSettings
+	t.Cleanup(func() {
+		configPath = originalConfigPath
+		DefaultConfigPath = originalDefaultConfigPath
+		connectionSettings = originalConnectionSettings
+	})
+
+	configPath = configFile
+	DefaultConfigPath = configFile
+	connectionSettings = ConnectionInfo{}
+
+	result, err := GetConnectionInfo(false)
+	require.NoError(t, err)
+	assert.Equal(t, "127.0.0.1", result.Host)
+}
+
+func TestGetConnectionInfo_MissingRequiredFields(t *testing.T) {
+	tmpDir := t.TempDir()
+	configFile := filepath.Join(tmpDir, "rd-engine.json")
+
+	config := ConnectionInfo{
+		Host: "example_host",
+	}
+
+	data, err := json.Marshal(config)
+	require.NoError(t, err)
+	err = os.WriteFile(configFile, data, 0600)
+	require.NoError(t, err)
+
+	originalConfigPath := configPath
+	originalDefaultConfigPath := DefaultConfigPath
+	originalConnectionSettings := connectionSettings
+	t.Cleanup(func() {
+		configPath = originalConfigPath
+		DefaultConfigPath = originalDefaultConfigPath
+		connectionSettings = originalConnectionSettings
+	})
+
+	configPath = configFile
+	DefaultConfigPath = configFile
+	connectionSettings = ConnectionInfo{}
+
+	result, err := GetConnectionInfo(false)
+	assert.Nil(t, result)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "insufficient connection settings")
+}
+
 func TestIsWSLDistro(t *testing.T) {
 	for _, symlinkMode := range []os.FileMode{os.ModeSymlink, 0} {
 		symlinkText := map[os.FileMode]string{