--user-configured-catalogs is now the default

Author: slimslenderslacks

cmd/docker-mcp/commands/feature.go

@@ -37,7 +37,6 @@ func featureEnableCommand(dockerCli command.Cli) *cobra.Command {
 		Long: `Enable an experimental feature.
 
 Available features:
-  configured-catalogs    Allow gateway to use user-managed catalogs alongside Docker catalog
   oauth-interceptor      Enable GitHub OAuth flow interception for automatic authentication
   dynamic-tools          Enable internal MCP management tools (mcp-find, mcp-add, mcp-remove)`,
 		Args: cobra.ExactArgs(1),
@@ -46,7 +45,7 @@ Available features:
 
 			// Validate feature name
 			if !isKnownFeature(featureName) {
-				return fmt.Errorf("unknown feature: %s\n\nAvailable features:\n  configured-catalogs    Allow gateway to use user-managed catalogs\n  oauth-interceptor      Enable GitHub OAuth flow interception\n  dynamic-tools          Enable internal MCP management tools", featureName)
+				return fmt.Errorf("unknown feature: %s\n\nAvailable features:\n  oauth-interceptor      Enable GitHub OAuth flow interception\n  dynamic-tools          Enable internal MCP management tools", featureName)
 			}
 
 			// Enable the feature
@@ -65,12 +64,6 @@ Available features:
 
 			// Provide usage hints for features
 			switch featureName {
-			case "configured-catalogs":
-				fmt.Println("\nTo use configured catalogs with the gateway, run:")
-				fmt.Println("  docker mcp gateway run --use-configured-catalogs")
-				fmt.Println("\nTo create and manage catalogs, use:")
-				fmt.Println("  docker mcp catalog create <name>")
-				fmt.Println("  docker mcp catalog add <catalog> <server-name> <server-file>")
 			case "oauth-interceptor":
 				fmt.Println("\nThis feature enables automatic GitHub OAuth interception when 401 errors occur.")
 				fmt.Println("When enabled, the gateway will automatically provide OAuth URLs for authentication.")
@@ -135,7 +128,7 @@ func featureListCommand(dockerCli command.Cli) *cobra.Command {
 			fmt.Println()
 
 			// Show all known features
-			knownFeatures := []string{"configured-catalogs", "oauth-interceptor", "dynamic-tools"}
+			knownFeatures := []string{"oauth-interceptor", "dynamic-tools"}
 			for _, feature := range knownFeatures {
 				status := "disabled"
 				if isFeatureEnabledFromCli(dockerCli, feature) {
@@ -146,8 +139,6 @@ func featureListCommand(dockerCli command.Cli) *cobra.Command {
 
 				// Add description for each feature
 				switch feature {
-				case "configured-catalogs":
-					fmt.Printf("  %-20s %s\n", "", "Allow gateway to use user-managed catalogs alongside Docker catalog")
 				case "oauth-interceptor":
 					fmt.Printf("  %-20s %s\n", "", "Enable GitHub OAuth flow interception for automatic authentication")
 				case "dynamic-tools":
@@ -212,7 +203,6 @@ func isFeatureEnabledFromConfig(configFile *configfile.ConfigFile, feature strin
 // isKnownFeature checks if the feature name is valid
 func isKnownFeature(feature string) bool {
 	knownFeatures := []string{
-		"configured-catalogs",
 		"oauth-interceptor",
 		"dynamic-tools",
 	}

cmd/docker-mcp/commands/feature_test.go

@@ -1,226 +1,79 @@
 package commands
 
 import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"strconv"
 	"testing"
 
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
-func TestIsFeatureEnabledTrue(t *testing.T) {
-	// Create temporary config directory
-	tempDir := t.TempDir()
-	configFile := filepath.Join(tempDir, "config.json")
-
-	// Create config with enabled feature
-	config := map[string]any{
-		"features": map[string]string{
-			"configured-catalogs": "enabled",
-		},
-	}
-	configData, err := json.Marshal(config)
-	require.NoError(t, err)
-	err = os.WriteFile(configFile, configData, 0o644)
-	require.NoError(t, err)
-
-	// Load config file
-	configFile2 := &configfile.ConfigFile{
-		Filename: configFile,
-	}
-	_ = configFile2.LoadFromReader(os.Stdin) // This will load from the filename
-
-	// Test directly with Features map
-	configFile2.Features = map[string]string{
-		"configured-catalogs": "enabled",
-	}
-
-	enabled := isFeatureEnabled(configFile2, "configured-catalogs")
-	assert.True(t, enabled)
-}
-
-func TestIsFeatureEnabledFalse(t *testing.T) {
-	configFile := &configfile.ConfigFile{
-		Features: map[string]string{
-			"configured-catalogs": "disabled",
-		},
-	}
-
-	enabled := isFeatureEnabled(configFile, "configured-catalogs")
-	assert.False(t, enabled)
-}
-
-func TestIsFeatureEnabledMissing(t *testing.T) {
-	configFile := &configfile.ConfigFile{
-		Features: make(map[string]string),
-	}
-
-	enabled := isFeatureEnabled(configFile, "configured-catalogs")
-	assert.False(t, enabled, "missing features should default to disabled")
+func TestIsFeatureEnabledOAuthInterceptor(t *testing.T) {
+	t.Run("enabled", func(t *testing.T) {
+		configFile := &configfile.ConfigFile{
+			Features: map[string]string{
+				"oauth-interceptor": "enabled",
+			},
+		}
+		enabled := isFeatureEnabledFromConfig(configFile, "oauth-interceptor")
+		assert.True(t, enabled)
+	})
+
+	t.Run("disabled", func(t *testing.T) {
+		configFile := &configfile.ConfigFile{
+			Features: map[string]string{
+				"oauth-interceptor": "disabled",
+			},
+		}
+		enabled := isFeatureEnabledFromConfig(configFile, "oauth-interceptor")
+		assert.False(t, enabled)
+	})
+
+	t.Run("missing", func(t *testing.T) {
+		configFile := &configfile.ConfigFile{
+			Features: make(map[string]string),
+		}
+		enabled := isFeatureEnabledFromConfig(configFile, "oauth-interceptor")
+		assert.False(t, enabled, "missing features should default to disabled")
+	})
 }
 
-func TestIsFeatureEnabledCorrupt(t *testing.T) {
-	configFile := &configfile.ConfigFile{
-		Features: map[string]string{
-			"configured-catalogs": "invalid-boolean",
-		},
-	}
-
-	enabled := isFeatureEnabled(configFile, "configured-catalogs")
-	assert.False(t, enabled, "corrupted feature values should default to disabled")
+func TestIsFeatureEnabledDynamicTools(t *testing.T) {
+	t.Run("enabled", func(t *testing.T) {
+		configFile := &configfile.ConfigFile{
+			Features: map[string]string{
+				"dynamic-tools": "enabled",
+			},
+		}
+		enabled := isFeatureEnabledFromConfig(configFile, "dynamic-tools")
+		assert.True(t, enabled)
+	})
+
+	t.Run("disabled", func(t *testing.T) {
+		configFile := &configfile.ConfigFile{
+			Features: map[string]string{
+				"dynamic-tools": "disabled",
+			},
+		}
+		enabled := isFeatureEnabledFromConfig(configFile, "dynamic-tools")
+		assert.False(t, enabled)
+	})
+
+	t.Run("missing", func(t *testing.T) {
+		configFile := &configfile.ConfigFile{
+			Features: make(map[string]string),
+		}
+		enabled := isFeatureEnabledFromConfig(configFile, "dynamic-tools")
+		assert.False(t, enabled, "missing features should default to disabled")
+	})
 }
 
-func TestEnableFeature(t *testing.T) {
-	// Create temporary config directory
-	tempDir := t.TempDir()
-	configPath := filepath.Join(tempDir, "config.json")
-
-	// Create initial config
-	configFile := &configfile.ConfigFile{
-		Filename: configPath,
-		Features: make(map[string]string),
-	}
-
-	// Test enabling configured-catalogs feature
-	err := enableFeature(configFile, "configured-catalogs")
-	require.NoError(t, err)
-
-	// Verify feature was enabled
-	enabled := isFeatureEnabled(configFile, "configured-catalogs")
-	assert.True(t, enabled, "configured-catalogs feature should be enabled")
-}
-
-func TestDisableFeature(t *testing.T) {
-	// Create temporary config directory
-	tempDir := t.TempDir()
-	configPath := filepath.Join(tempDir, "config.json")
-
-	// Create config with feature already enabled
-	configFile := &configfile.ConfigFile{
-		Filename: configPath,
-		Features: map[string]string{
-			"configured-catalogs": "enabled",
-		},
-	}
-
-	// Test disabling configured-catalogs feature
-	err := disableFeature(configFile, "configured-catalogs")
-	require.NoError(t, err)
-
-	// Verify feature was disabled
-	enabled := isFeatureEnabled(configFile, "configured-catalogs")
-	assert.False(t, enabled, "configured-catalogs feature should be disabled")
-}
-
-func TestListFeatures(t *testing.T) {
-	// Create config with mixed features
-	configFile := &configfile.ConfigFile{
-		Features: map[string]string{
-			"configured-catalogs": "enabled",
-			"other-feature":       "disabled",
-		},
-	}
-
-	// Test listing features
-	features := listFeatures(configFile)
-
-	// Should contain our feature with correct status
-	assert.Contains(t, features, "configured-catalogs")
-	assert.Contains(t, features, "other-feature")
-	assert.Equal(t, "enabled", features["configured-catalogs"])
-	assert.Equal(t, "disabled", features["other-feature"])
-}
-
-func TestInvalidFeature(t *testing.T) {
-	configFile := &configfile.ConfigFile{
-		Features: make(map[string]string),
-	}
-
-	// Test enabling invalid feature
-	err := enableFeature(configFile, "invalid-feature")
-	require.Error(t, err, "should reject invalid feature names")
-	assert.Contains(t, err.Error(), "unknown feature")
-}
-
-// Feature management functions that need to be implemented
-func enableFeature(configFile *configfile.ConfigFile, feature string) error {
-	// Validate feature name
-	if !isKnownFeature(feature) {
-		return &featureError{feature: feature, message: "unknown feature"}
-	}
-
-	// Enable the feature
-	if configFile.Features == nil {
-		configFile.Features = make(map[string]string)
-	}
-	configFile.Features[feature] = "enabled"
-
-	// Save config file
-	return configFile.Save()
-}
-
-func disableFeature(configFile *configfile.ConfigFile, feature string) error {
-	// Validate feature name
-	if !isKnownFeature(feature) {
-		return &featureError{feature: feature, message: "unknown feature"}
-	}
-
-	// Disable the feature
-	if configFile.Features == nil {
-		configFile.Features = make(map[string]string)
-	}
-	configFile.Features[feature] = "disabled"
-
-	// Save config file
-	return configFile.Save()
-}
-
-func listFeatures(configFile *configfile.ConfigFile) map[string]string {
-	if configFile.Features == nil {
-		return make(map[string]string)
-	}
-
-	// Return copy of features map
-	result := make(map[string]string)
-	for k, v := range configFile.Features {
-		result[k] = v
-	}
-	return result
-}
-
-func isFeatureEnabled(configFile *configfile.ConfigFile, _ string) bool {
-	if configFile.Features == nil {
-		return false
-	}
-
-	value, exists := configFile.Features["configured-catalogs"]
-	if !exists {
-		return false
-	}
-
-	// Handle both boolean string values and "enabled"/"disabled" strings
-	if value == "enabled" {
-		return true
-	}
-	if value == "disabled" {
-		return false
-	}
-
-	// Fallback to parsing as boolean
-	enabled, err := strconv.ParseBool(value)
-	return err == nil && enabled
-}
-
-// Feature error type
-type featureError struct {
-	feature string
-	message string
-}
+func TestIsKnownFeature(t *testing.T) {
+	// Test valid features
+	assert.True(t, isKnownFeature("oauth-interceptor"))
+	assert.True(t, isKnownFeature("dynamic-tools"))
 
-func (e *featureError) Error() string {
-	return e.message + ": " + e.feature
+	// Test invalid features
+	assert.False(t, isKnownFeature("invalid-feature"))
+	assert.False(t, isKnownFeature("configured-catalogs")) // No longer supported
+	assert.False(t, isKnownFeature(""))
 }