Revert "Remove sync.Map registry; tests run PreRunE to populate context"

This reverts commit e735470.

Author: simonfaltum

cmd/workspace/apps/overrides_test.go

@@ -11,10 +11,8 @@ import (
 
 func TestListTableConfig(t *testing.T) {
 	cmd := newList()
-	cmd.SetContext(t.Context())
-	require.NoError(t, cmd.PreRunE(cmd, nil))
 
-	cfg := tableview.GetTableConfig(cmd.Context())
+	cfg := tableview.GetTableConfigForCmd(cmd)
 	require.NotNil(t, cfg)
 	require.Len(t, cfg.Columns, 4)
 

cmd/workspace/jobs/overrides_test.go

@@ -11,10 +11,8 @@ import (
 
 func TestListTableConfig(t *testing.T) {
 	cmd := newList()
-	cmd.SetContext(t.Context())
-	require.NoError(t, cmd.PreRunE(cmd, nil))
 
-	cfg := tableview.GetTableConfig(cmd.Context())
+	cfg := tableview.GetTableConfigForCmd(cmd)
 	require.NotNil(t, cfg)
 	require.Len(t, cfg.Columns, 2)
 

cmd/workspace/pipelines/overrides_test.go

@@ -22,10 +22,8 @@ func TestLooksLikeUUID_resourceName(t *testing.T) {
 
 func TestListPipelinesTableConfig(t *testing.T) {
 	cmd := newListPipelines()
-	cmd.SetContext(t.Context())
-	require.NoError(t, cmd.PreRunE(cmd, nil))
 
-	cfg := tableview.GetTableConfig(cmd.Context())
+	cfg := tableview.GetTableConfigForCmd(cmd)
 	require.NotNil(t, cfg)
 	require.Len(t, cfg.Columns, 3)
 	require.NotNil(t, cfg.Search)
@@ -43,10 +41,8 @@ func TestListPipelinesTableConfig(t *testing.T) {
 
 func TestListPipelinesSearchEscapesLikeWildcards(t *testing.T) {
 	cmd := newListPipelines()
-	cmd.SetContext(t.Context())
-	require.NoError(t, cmd.PreRunE(cmd, nil))
 
-	cfg := tableview.GetTableConfig(cmd.Context())
+	cfg := tableview.GetTableConfigForCmd(cmd)
 	require.NotNil(t, cfg)
 	require.NotNil(t, cfg.Search)
 
@@ -63,26 +59,34 @@ func TestListPipelinesSearchEscapesLikeWildcards(t *testing.T) {
 
 func TestListPipelinesSearchDisabledWhenFilterSet(t *testing.T) {
 	cmd := newListPipelines()
-	cmd.SetContext(t.Context())
 
 	err := cmd.Flags().Set("filter", "state = 'RUNNING'")
 	require.NoError(t, err)
 
-	require.NoError(t, cmd.PreRunE(cmd, nil))
-	cfg := tableview.GetTableConfig(cmd.Context())
+	cfg := tableview.GetTableConfigForCmd(cmd)
 	require.NotNil(t, cfg)
+	require.NotNil(t, cfg.Search)
+
+	// Simulate context setup so disableSearchIfFilterSet can read the config.
+	cmd.SetContext(tableview.SetTableConfig(t.Context(), cfg))
+	disableSearchIfFilterSet(cmd)
 
-	// The config stored in context should have Search disabled (shallow-copied,
-	// so the registered config itself is not mutated).
-	assert.Nil(t, cfg.Search)
+	// The original config must not be mutated.
+	assert.NotNil(t, cfg.Search, "original config must not be mutated")
+	// The config stored in context should have Search disabled.
+	ctxCfg := tableview.GetTableConfig(cmd.Context())
+	require.NotNil(t, ctxCfg)
+	assert.Nil(t, ctxCfg.Search)
 }
 
 func TestListPipelinesSearchNotDisabledWithoutFilter(t *testing.T) {
 	cmd := newListPipelines()
-	cmd.SetContext(t.Context())
-	require.NoError(t, cmd.PreRunE(cmd, nil))
 
-	cfg := tableview.GetTableConfig(cmd.Context())
+	cfg := tableview.GetTableConfigForCmd(cmd)
 	require.NotNil(t, cfg)
+
+	// Simulate context setup so disableSearchIfFilterSet can read the config.
+	cmd.SetContext(tableview.SetTableConfig(t.Context(), cfg))
+	disableSearchIfFilterSet(cmd)
 	assert.NotNil(t, cfg.Search)
 }

cmd/workspace/serving-endpoints/overrides_test.go

@@ -11,10 +11,8 @@ import (
 
 func TestListTableConfig(t *testing.T) {
 	cmd := newList()
-	cmd.SetContext(t.Context())
-	require.NoError(t, cmd.PreRunE(cmd, nil))
 
-	cfg := tableview.GetTableConfig(cmd.Context())
+	cfg := tableview.GetTableConfigForCmd(cmd)
 	require.NotNil(t, cfg)
 	require.Len(t, cfg.Columns, 3)
 

libs/tableview/context.go

@@ -2,6 +2,7 @@ package tableview
 
 import (
 	"context"
+	"sync"
 
 	"github.com/spf13/cobra"
 )
@@ -19,9 +20,14 @@ func GetTableConfig(ctx context.Context) *TableConfig {
 	return cfg
 }
 
+// configByCmd holds configs registered via SetTableConfigOnCmd so they can
+// be looked up before the command's PreRunE has executed (useful in tests).
+var configByCmd sync.Map
+
 // SetTableConfigOnCmd arranges for cfg to be stored in the command's context
 // at execution time via PreRunE, preserving Cobra's context propagation.
 func SetTableConfigOnCmd(cmd *cobra.Command, cfg *TableConfig) {
+	configByCmd.Store(cmd, cfg)
 	prev := cmd.PreRunE
 	cmd.PreRunE = func(cmd *cobra.Command, args []string) error {
 		cmd.SetContext(SetTableConfig(cmd.Context(), cfg))
@@ -31,3 +37,14 @@ func SetTableConfigOnCmd(cmd *cobra.Command, cfg *TableConfig) {
 		return nil
 	}
 }
+
+// GetTableConfigForCmd returns the config registered on cmd via
+// SetTableConfigOnCmd. Unlike GetTableConfig (which reads from context),
+// this works before the command's PreRunE has executed.
+func GetTableConfigForCmd(cmd *cobra.Command) *TableConfig {
+	v, ok := configByCmd.Load(cmd)
+	if !ok {
+		return nil
+	}
+	return v.(*TableConfig)
+}