Code shuffling

Author: peteski22

cmd/config/plugins/add.go

@@ -87,7 +87,7 @@ in the category, the command fails with an error. To update an existing plugin,
 		nil,
 		fmt.Sprintf(
 			"Flow during which, the plugin should execute (%s) (can be repeated)",
-			strings.Join(OrderedFlowNames(), ", "),
+			strings.Join(config.OrderedFlowNames(), ", "),
 		),
 	)
 	_ = cobraCmd.MarkFlagRequired(flagFlow)
@@ -133,7 +133,10 @@ func (c *AddCmd) run(cmd *cobra.Command, args []string) error {
 
 	flows := config.ParseFlowsDistinct(c.flows)
 	if len(flows) == 0 {
-		return fmt.Errorf("at least one valid flow is required (%s)", strings.Join(OrderedFlowNames(), ", "))
+		return fmt.Errorf(
+			"at least one valid flow is required (%s)",
+			strings.Join(config.OrderedFlowNames(), ", "),
+		)
 	}
 
 	entry := config.PluginEntry{
@@ -163,15 +166,3 @@ func (c *AddCmd) run(cmd *cobra.Command, args []string) error {
 
 	return nil
 }
-
-// OrderedFlowNames returns the names of allowed flows in order.
-func OrderedFlowNames() []string {
-	flows := slices.Sorted(maps.Keys(config.Flows()))
-
-	flowNames := make([]string, len(flows))
-	for i, f := range flows {
-		flowNames[i] = string(f)
-	}
-
-	return flowNames
-}

cmd/config/plugins/add_test.go

@@ -358,10 +358,3 @@ func TestAddCmd_RequiredFalseExplicitlySet(t *testing.T) {
 	require.NotNil(t, authPlugins[0].Required)
 	require.False(t, *authPlugins[0].Required)
 }
-
-func TestAddCmd_OrderedFlowNames(t *testing.T) {
-	flows := OrderedFlowNames()
-	require.Len(t, flows, 2)
-	require.Equal(t, "request", flows[0])
-	require.Equal(t, "response", flows[1])
-}

internal/config/plugin_config.go

@@ -244,12 +244,10 @@ func (e *PluginEntry) Validate() error {
 	} else {
 		seen := make(map[Flow]struct{})
 		for _, flow := range e.Flows {
-			// Check for valid flow values.
 			if !flow.IsValid() {
-				validationErrors = append(
-					validationErrors,
-					fmt.Errorf("invalid flow '%s', must be '%s' or '%s'", flow, FlowRequest, FlowResponse),
-				)
+				allowedFlows := strings.Join(OrderedFlowNames(), ", ")
+				err := fmt.Errorf("invalid flow '%s' (allowed: %s)", flow, allowedFlows)
+				validationErrors = append(validationErrors, err)
 			}
 
 			// Check for duplicates.
@@ -526,6 +524,18 @@ func OrderedCategories() Categories {
 	return slices.Clone(orderedCategories)
 }
 
+// OrderedFlowNames returns the names of allowed flows in order.
+func OrderedFlowNames() []string {
+	flows := slices.Sorted(maps.Keys(flows))
+
+	flowNames := make([]string, len(flows))
+	for i, f := range flows {
+		flowNames[i] = string(f)
+	}
+
+	return flowNames
+}
+
 // Set is used by Cobra to set the category value from a string.
 // NOTE: This is also required by Cobra as part of implementing flag.Value.
 func (c *Category) Set(v string) error {

internal/config/plugin_config_test.go

@@ -8,6 +8,16 @@ import (
 	"github.com/mozilla-ai/mcpd/v2/internal/context"
 )
 
+func testPluginStringPtr(t *testing.T, s string) *string {
+	t.Helper()
+	return &s
+}
+
+func testPluginBoolPtr(t *testing.T, b bool) *bool {
+	t.Helper()
+	return &b
+}
+
 func TestPluginEntry_Validate(t *testing.T) {
 	t.Parallel()
 
@@ -872,12 +882,9 @@ func TestParseFlows(t *testing.T) {
 	}
 }
 
-func testPluginStringPtr(t *testing.T, s string) *string {
-	t.Helper()
-	return &s
-}
-
-func testPluginBoolPtr(t *testing.T, b bool) *bool {
-	t.Helper()
-	return &b
+func TestAddCmd_OrderedFlowNames(t *testing.T) {
+	flows := OrderedFlowNames()
+	require.Len(t, flows, 2)
+	require.Equal(t, "request", flows[0])
+	require.Equal(t, "response", flows[1])
 }