refactor: use experiment.Experiment type as experiments map key

mwbrooks · mwbrooks · commit a70d3ee5f5bb · 2026-03-17T09:23:10.000-07:00
Use the stricter experiment.Experiment type instead of string for the
internal Config.experiments map key to improve type safety.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -15,6 +15,7 @@
 package config
 
 import (
+	"github.com/slackapi/slack-cli/internal/experiment"
 	"github.com/slackapi/slack-cli/internal/shared/types"
 	"github.com/spf13/afero"
 	"github.com/spf13/pflag"
@@ -62,7 +63,7 @@ type Config struct {
 
 	// Feature experiments
 	ExperimentsFlag []string
-	experiments     map[string]bool
+	experiments     map[experiment.Experiment]bool
 
 	// Eventually this will also load the global and project slack config files
 	DomainAuthTokens string
diff --git a/internal/config/experiments.go b/internal/config/experiments.go
@@ -31,37 +31,37 @@ func (c *Config) LoadExperiments(
 	ctx context.Context,
 	printDebug func(ctx context.Context, format string, a ...interface{}),
 ) {
-	experiments := map[string]bool{}
+	experiments := map[experiment.Experiment]bool{}
 	// Load from flags
 	for _, flagValue := range c.ExperimentsFlag {
-		experiments[flagValue] = true
+		experiments[experiment.Experiment(flagValue)] = true
 	}
 	printDebug(ctx, fmt.Sprintf("active flag experiments: %s", formatExperimentMap(experiments)))
 	// Load from project config file
 	projectConfig, err := ReadProjectConfigFile(ctx, c.fs, c.os)
 	if err != nil && slackerror.ToSlackError(err).Code != slackerror.ErrInvalidAppDirectory {
 		printDebug(ctx, fmt.Sprintf("failed to parse project-level config file: %s", err))
 	} else if err == nil {
-		printDebug(ctx, fmt.Sprintf("active project experiments: %s", formatExperimentMap(projectConfig.Experiments)))
-		maps.Copy(experiments, projectConfig.Experiments)
+		printDebug(ctx, fmt.Sprintf("active project experiments: %s", formatExperimentMap(toExperimentMap(projectConfig.Experiments))))
+		maps.Copy(experiments, toExperimentMap(projectConfig.Experiments))
 	}
 	// Load from system config file
 	userConfig, err := c.SystemConfig.UserConfig(ctx)
 	if err != nil {
 		printDebug(ctx, fmt.Sprintf("failed to parse system-level config file: %s", err))
 	} else {
-		printDebug(ctx, fmt.Sprintf("active system experiments: %s", formatExperimentMap(userConfig.Experiments)))
-		maps.Copy(experiments, userConfig.Experiments)
+		printDebug(ctx, fmt.Sprintf("active system experiments: %s", formatExperimentMap(toExperimentMap(userConfig.Experiments))))
+		maps.Copy(experiments, toExperimentMap(userConfig.Experiments))
 	}
 	// Load from permanently enabled list
 	for _, exp := range experiment.EnabledExperiments {
-		experiments[string(exp)] = true
+		experiments[exp] = true
 	}
 	printDebug(ctx, fmt.Sprintf("active permanently enabled experiments: %s", experiment.EnabledExperiments))
 	// Audit the experiments
 	c.experiments = experiments
 	for name := range c.experiments {
-		if !experiment.Includes(experiment.Experiment(name)) {
+		if !experiment.Includes(name) {
 			printDebug(ctx, fmt.Sprintf("invalid experiment found: %s", name))
 		}
 	}
@@ -72,7 +72,7 @@ func (c *Config) GetExperiments() []experiment.Experiment {
 	result := make([]experiment.Experiment, 0, len(c.experiments))
 	for name, enabled := range c.experiments {
 		if enabled {
-			result = append(result, experiment.Experiment(name))
+			result = append(result, name)
 		}
 	}
 	sort.Slice(result, func(i, j int) bool {
@@ -83,19 +83,28 @@ func (c *Config) GetExperiments() []experiment.Experiment {
 
 // WithExperimentOn checks whether an experiment is currently toggled on
 func (c *Config) WithExperimentOn(experimentToCheck experiment.Experiment) bool {
-	return c.experiments[string(experimentToCheck)]
+	return c.experiments[experimentToCheck]
+}
+
+// toExperimentMap converts a map[string]bool to map[experiment.Experiment]bool
+func toExperimentMap(m map[string]bool) map[experiment.Experiment]bool {
+	result := make(map[experiment.Experiment]bool, len(m))
+	for name, enabled := range m {
+		result[experiment.Experiment(name)] = enabled
+	}
+	return result
 }
 
 // formatExperimentMap returns a string representation of the experiments map
 // for debug logging, formatted similar to the old slice format.
-func formatExperimentMap(m map[string]bool) string {
+func formatExperimentMap(m map[experiment.Experiment]bool) string {
 	if len(m) == 0 {
 		return "[]"
 	}
 	names := make([]string, 0, len(m))
 	for name, enabled := range m {
 		if enabled {
-			names = append(names, name)
+			names = append(names, string(name))
 		}
 	}
 	sort.Strings(names)
