Keep dev-server feature overrides current

internal/devserver/server.go

@@ -59,6 +59,23 @@ const (
 	localhost = "127.0.0.1"
 )
 
+type namespaceFeatureOverride struct {
+	setting dynamicconfig.NamespaceBoolSetting
+	enabled bool
+}
+
+// startDevServerFeatureOverrides contains temporary feature-specific dynamic config for
+// `temporal server start-dev`. Add boolean feature overrides here instead of assigning them
+// inline in buildServerOptions so TestStartDevServerFeatureOverridesMatchServerDefaults can
+// detect when an override becomes redundant.
+//
+// These values are applied without constraints and therefore affect every namespace.
+// NamespaceBoolSetting describes the server setting's lookup precedence, not override scope.
+var startDevServerFeatureOverrides = []namespaceFeatureOverride{
+	{setting: activity.EnableStandaloneActivityOperatorCommands, enabled: true},
+	{setting: dynamicconfig.FrontendEnableBatchOperationsForStandaloneActivities, enabled: true},
+}
+
 type StartOptions struct {
 	// Required fields
 	FrontendIP             string
@@ -243,12 +260,12 @@ func (s *StartOptions) buildServerOptions() ([]temporal.ServerOption, *slog.Leve
 	// Up default visibility RPS
 	dynConf[dynamicconfig.FrontendMaxNamespaceVisibilityRPSPerInstance.Key()] = 100
 
-	// Enable CHASM and SAA. These will be on by default in server v1.32, at which point these lines
-	// should be removed.
-	dynConf[dynamicconfig.EnableChasm.Key()] = true
-	dynConf[activity.Enabled.Key()] = true
-	dynConf[activity.EnableStandaloneActivityOperatorCommands.Key()] = true
-	dynConf[dynamicconfig.FrontendEnableBatchOperationsForStandaloneActivities.Key()] = true
+	// CHASM (dynamicconfig.EnableChasm) and SAA (activity.Enabled) are on by default as of
+	// server v1.32, so they no longer need to be forced on here.
+	// Feature-specific dynamic config must come from the validated list above, not be set inline.
+	for _, override := range startDevServerFeatureOverrides {
+		dynConf[override.setting.Key()] = override.enabled
+	}
 
 	// Dynamic config if set
 	for k, v := range s.DynamicConfigValues {

internal/devserver/server_test.go

@@ -0,0 +1,19 @@
+package devserver
+
+import (
+	"testing"
+
+	"go.temporal.io/server/common/dynamicconfig"
+)
+
+func TestStartDevServerFeatureOverridesMatchServerDefaults(t *testing.T) {
+	dc := dynamicconfig.NewNoopCollection()
+	for _, override := range startDevServerFeatureOverrides {
+		key := override.setting.Key().String()
+		t.Run(key, func(t *testing.T) {
+			if serverDefault := override.setting.Get(dc)("default"); serverDefault == override.enabled {
+				t.Fatalf("%q now defaults to %t; remove its feature override", key, override.enabled)
+			}
+		})
+	}
+}

internal/temporalcli/commands_test.go

@@ -26,6 +26,9 @@ import (
 	"go.temporal.io/sdk/temporal"
 	"go.temporal.io/sdk/worker"
 	"go.temporal.io/sdk/workflow"
+	serveractivity "go.temporal.io/server/chasm/lib/activity"
+	servernexusoperation "go.temporal.io/server/chasm/lib/nexusoperation"
+	"go.temporal.io/server/common/dynamicconfig"
 	"google.golang.org/grpc"
 )
 
@@ -229,39 +232,85 @@ type SharedServerSuite struct {
 	lazyWorkerLock sync.Mutex
 }
 
+type featureOverride struct {
+	key            string
+	enabled        bool
+	defaultEnabled func(*dynamicconfig.Collection) bool
+}
+
+func overrideGlobalSetting(setting dynamicconfig.GlobalBoolSetting, enabled bool) featureOverride {
+	return featureOverride{
+		key:     setting.Key().String(),
+		enabled: enabled,
+		defaultEnabled: func(dc *dynamicconfig.Collection) bool {
+			return setting.Get(dc)()
+		},
+	}
+}
+
+// Namespace describes the setting's lookup precedence. The static CLI value is still
+// unconstrained and applies to every namespace.
+func overrideNamespaceSetting(setting dynamicconfig.NamespaceBoolSetting, enabled bool) featureOverride {
+	return featureOverride{
+		key:     setting.Key().String(),
+		enabled: enabled,
+		defaultEnabled: func(dc *dynamicconfig.Collection) bool {
+			return setting.Get(dc)("default")
+		},
+	}
+}
+
+// allTestDevServerFeatureOverrides are applied by StartDevServer to every test server,
+// including SharedServerSuite and its auxiliary standby clusters. Add broadly required
+// boolean feature overrides here instead of assigning them inline in StartDevServer.
+var allTestDevServerFeatureOverrides = []featureOverride{
+	overrideNamespaceSetting(dynamicconfig.FrontendEnableWorkerVersioningRuleAPIs, true),
+	overrideNamespaceSetting(dynamicconfig.FrontendEnableWorkerVersioningDataAPIs, true),
+	overrideNamespaceSetting(dynamicconfig.EnableDeployments, true),
+	overrideGlobalSetting(dynamicconfig.BuildIdScavengerEnabled, true),
+}
+
+// sharedSuiteFeatureOverrides are applied only to the singleton server used by
+// SharedServerSuite. Add boolean feature overrides needed only by that suite here instead
+// of assigning them inline in SetupSuite.
+var sharedSuiteFeatureOverrides = []featureOverride{
+	// Required by TestWorkflow_Show_SystemNexusOperationTransformsTypeNames.
+	overrideNamespaceSetting(dynamicconfig.EnableSignalWithStartFromWorkflow, true),
+	overrideNamespaceSetting(serveractivity.StartDelayEnabled, true),
+	overrideNamespaceSetting(servernexusoperation.Enabled, true),
+}
+
+func applyFeatureOverrides(values map[string]any, overrides []featureOverride) {
+	for _, override := range overrides {
+		values[override.key] = override.enabled
+	}
+}
+
+// TestDynamicConfigOverridesMatchServerDefaults guards against feature overrides becoming
+// redundant when the pinned server version changes. Test-only tuning overrides are excluded.
+func TestDynamicConfigOverridesMatchServerDefaults(t *testing.T) {
+	dc := dynamicconfig.NewNoopCollection()
+	for _, override := range slices.Concat(allTestDevServerFeatureOverrides, sharedSuiteFeatureOverrides) {
+		t.Run(override.key, func(t *testing.T) {
+			require.NotEqualf(t, override.enabled, override.defaultEnabled(dc),
+				"%q now defaults to %t; remove its feature override", override.key, override.enabled)
+		})
+	}
+}
+
 func (s *SharedServerSuite) SetupSuite() {
+	dynamicConfigValues := map[string]any{
+		"activity.longPollTimeout": 2 * time.Second,
+		// Disable DescribeTaskQueue caching while testing versioning behavior.
+		"matching.TaskQueueInfoByBuildIdTTL": 0 * time.Second,
+	}
+	applyFeatureOverrides(dynamicConfigValues, sharedSuiteFeatureOverrides)
+
 	s.DevServer = StartDevServer(s.Suite.T(), DevServerOptions{
 		StartOptions: devserver.StartOptions{
 			// Enable for operator cluster commands
 			EnableGlobalNamespace: true,
-			DynamicConfigValues: map[string]any{
-				"frontend.enableUpdateWorkflowExecutionAsyncAccepted": true,
-				// Allow a high rate of change to namespaces, particularly
-				// for the task-queue command tests.
-				"frontend.namespaceRPS.visibility": 10000,
-				// Disable DescribeTaskQueue cache.
-				"frontend.activityAPIsEnabled": true,
-				"history.enableChasm":          true,
-				// Required by TestWorkflow_Show_SystemNexusOperationTransformsTypeNames
-				// to schedule a SignalWithStartWorkflowExecution Nexus operation against
-				// the __temporal_system endpoint from inside a workflow.
-				"history.enableSignalWithStartFromWorkflow":        true,
-				"activity.enableStandalone":                        true,
-				"activity.startDelayEnabled":                       true,
-				"history.enableStandaloneActivityOperatorCommands": true,
-				"activity.longPollTimeout":                         2 * time.Second,
-				"nexusoperation.enableStandalone":                  true,
-				"history.enableChasmCallbacks":                     true,
-				// this is overridden since we don't want caching to be enabled
-				// while testing DescribeTaskQueue behaviour related to versioning
-				"matching.TaskQueueInfoByBuildIdTTL": 0 * time.Second,
-				// worker heartbeating
-				"frontend.WorkerHeartbeatsEnabled": true,
-				"frontend.ListWorkersEnabled":      true,
-				// Required by TestActivity_CancelTerminateDelete_*
-				// to enable batch operations on standalone activities.
-				"frontend.enableBatchOperationsForStandaloneActivities": true,
-			},
+			DynamicConfigValues:   dynamicConfigValues,
 		},
 	})
 	// Stop server if we fail later
@@ -405,14 +454,9 @@ func StartDevServer(t *testing.T, options DevServerOptions) *DevServer {
 	if d.Options.DynamicConfigValues == nil {
 		d.Options.DynamicConfigValues = map[string]any{}
 	}
+	// Feature-specific dynamic config must come from the validated list above, not be set inline.
+	applyFeatureOverrides(d.Options.DynamicConfigValues, allTestDevServerFeatureOverrides)
 	d.Options.DynamicConfigValues["system.forceSearchAttributesCacheRefreshOnRead"] = true
-	d.Options.DynamicConfigValues["frontend.workerVersioningRuleAPIs"] = true
-	d.Options.DynamicConfigValues["frontend.workerVersioningDataAPIs"] = true
-	d.Options.DynamicConfigValues["frontend.workerVersioningWorkflowAPIs"] = true
-	d.Options.DynamicConfigValues["system.enableDeployments"] = true
-	d.Options.DynamicConfigValues["system.enableDeploymentVersions"] = true
-	d.Options.DynamicConfigValues["worker.buildIdScavengerEnabled"] = true
-	d.Options.DynamicConfigValues["frontend.enableUpdateWorkflowExecution"] = true
 	d.Options.DynamicConfigValues["frontend.MaxConcurrentBatchOperationPerNamespace"] = 1000
 	d.Options.DynamicConfigValues["frontend.namespaceRPS.visibility"] = 100
 	d.Options.DynamicConfigValues["system.clusterMetadataRefreshInterval"] = 100 * time.Millisecond