rename Config to EnvironmentConfig

tmacro · tmacro · commit 490f7520390d · 2025-09-01T15:38:24.000-07:00
diff --git a/cmd/config.go b/cmd/config.go
@@ -43,7 +43,7 @@ func RuntimeConfigFromFlags(envDir, envName string) RuntimeConfig {
 	}
 }
 
-type Config struct {
+type EnvironmentConfig struct {
 	Global        GlobalConfig      `yaml:"global"`
 	Features      FeatureConfig     `yaml:"features"`
 	Cloudserver   CloudserverConfig `yaml:"cloudserver"`
@@ -190,8 +190,8 @@ type RedisConfig struct {
 	LogLevel string `yaml:"log_level"`
 }
 
-func DefaultConfig() Config {
-	return Config{
+func DefaultEnvironmentConfig() EnvironmentConfig {
+	return EnvironmentConfig{
 		Global: GlobalConfig{
 			LogLevel: "info",
 			// Profile:  "default",
@@ -238,8 +238,8 @@ func DefaultConfig() Config {
 	}
 }
 
-func LoadConfig(path string) (Config, error) {
-	cfg := DefaultConfig()
+func LoadEnvironmentConfig(path string) (EnvironmentConfig, error) {
+	cfg := DefaultEnvironmentConfig()
 
 	if path == "" {
 		return cfg, nil
@@ -252,7 +252,7 @@ func LoadConfig(path string) (Config, error) {
 	}
 
 	// Parse the YAML into a temporary config
-	var fileCfg Config
+	var fileCfg EnvironmentConfig
 	if err := yaml.Unmarshal(data, &fileCfg); err != nil {
 		return cfg, fmt.Errorf("failed to parse config file: %w", err)
 	}
diff --git a/cmd/configure.go b/cmd/configure.go
@@ -13,15 +13,15 @@ type ConfigureCmd struct {
 	Name   string `help:"Name of the environment to create.  default: 'default'" short:"n"`
 }
 
-type configGenFunc func(cfg Config, path string) error
+type configGenFunc func(cfg EnvironmentConfig, path string) error
 
 func (c *ConfigureCmd) Run() error {
 	rc := RuntimeConfigFromFlags(c.EnvDir, c.Name)
 	envPath := filepath.Join(rc.EnvDir, rc.EnvName)
 	configPath := filepath.Join(envPath, "config.yaml")
 
 	// Load the global configuration
-	cfg, err := LoadConfig(configPath)
+	cfg, err := LoadEnvironmentConfig(configPath)
 	if err != nil {
 		return fmt.Errorf("failed to load config: %w", err)
 	}
@@ -49,7 +49,7 @@ func createLogDirectories(envDir string) error {
 	return nil
 }
 
-func configureEnv(cfg Config, envDir string) error {
+func configureEnv(cfg EnvironmentConfig, envDir string) error {
 	log.Info().Msgf("Configuring environment %s", envDir)
 
 	if err := createLogDirectories(envDir); err != nil {
@@ -86,16 +86,16 @@ func configureEnv(cfg Config, envDir string) error {
 	return nil
 }
 
-func generateDefaultsEnv(cfg Config, envDir string) error {
+func generateDefaultsEnv(cfg EnvironmentConfig, envDir string) error {
 	defaultsEnvPath := filepath.Join(envDir, "defaults.env")
 	return renderTemplateToFile(getTemplates(), "templates/global/defaults.env", cfg, defaultsEnvPath)
 }
 
-func generateCloudserverConfig(cfg Config, path string) error {
+func generateCloudserverConfig(cfg EnvironmentConfig, path string) error {
 	return renderTemplateToFile(getTemplates(), "templates/cloudserver/config.json", cfg, filepath.Join(path, "cloudserver", "config.json"))
 }
 
-func generateBackbeatConfig(cfg Config, path string) error {
+func generateBackbeatConfig(cfg EnvironmentConfig, path string) error {
 	templates := []string{
 		"env",
 		"supervisord.conf",
@@ -107,7 +107,7 @@ func generateBackbeatConfig(cfg Config, path string) error {
 	return renderTemplates(cfg, "templates/backbeat", filepath.Join(path, "backbeat"), templates)
 }
 
-func generateVaultConfig(cfg Config, path string) error {
+func generateVaultConfig(cfg EnvironmentConfig, path string) error {
 	templates := []string{
 		"config.json",
 		"create-management-account.sh",
@@ -118,7 +118,7 @@ func generateVaultConfig(cfg Config, path string) error {
 	return renderTemplates(cfg, "templates/vault", filepath.Join(path, "vault"), templates)
 }
 
-func generateScubaConfig(cfg Config, path string) error {
+func generateScubaConfig(cfg EnvironmentConfig, path string) error {
 	templates := []string{
 		"config.json",
 		"create-service-user.sh",
@@ -133,17 +133,17 @@ func generateMetadataConfig(cfg MetadataConfig, path string) error {
 	return renderTemplateToFile(getTemplates(), "templates/metadata/config.json", cfg, filepath.Join(path, "config.json"))
 }
 
-func generateS3MetadataConfig(cfg Config, path string) error {
+func generateS3MetadataConfig(cfg EnvironmentConfig, path string) error {
 	cfgPath := filepath.Join(path, "metadata-s3")
 	return generateMetadataConfig(cfg.S3Metadata, cfgPath)
 }
 
-func generateScubaMetadataConfig(cfg Config, path string) error {
+func generateScubaMetadataConfig(cfg EnvironmentConfig, path string) error {
 	cfgPath := filepath.Join(path, "metadata-scuba")
 	return generateMetadataConfig(cfg.ScubaMetadata, cfgPath)
 }
 
-func generateKafkaConfig(cfg Config, path string) error {
+func generateKafkaConfig(cfg EnvironmentConfig, path string) error {
 	templates := []string{
 		"Dockerfile",
 		"setup.sh",
@@ -156,6 +156,6 @@ func generateKafkaConfig(cfg Config, path string) error {
 	return renderTemplates(cfg, "templates/kafka", filepath.Join(path, "kafka"), templates)
 }
 
-func generateUtapiConfig(cfg Config, path string) error {
+func generateUtapiConfig(cfg EnvironmentConfig, path string) error {
 	return renderTemplateToFile(getTemplates(), "templates/utapi/config.json", cfg, filepath.Join(path, "utapi", "config.json"))
 }
diff --git a/cmd/create-env.go b/cmd/create-env.go
@@ -23,14 +23,14 @@ func (c *CreateEnvCmd) Run() error {
 		return fmt.Errorf("failed to create environment: %w", err)
 	}
 
-	var cfg Config
+	var cfg EnvironmentConfig
 	if c.WithConfig != "" {
-		cfg, err = LoadConfig(c.WithConfig)
+		cfg, err = LoadEnvironmentConfig(c.WithConfig)
 		if err != nil {
 			return fmt.Errorf("failed to load custom config: %w", err)
 		}
 	} else {
-		cfg, err = LoadConfig(filepath.Join(envPath, "config.yaml"))
+		cfg, err = LoadEnvironmentConfig(filepath.Join(envPath, "config.yaml"))
 		if err != nil {
 			return fmt.Errorf("failed to load config: %w", err)
 		}
diff --git a/cmd/destroy.go b/cmd/destroy.go
@@ -35,7 +35,7 @@ func (c *DestroyCmd) Run() error {
 	}
 
 	cfgPath := filepath.Join(envPath, "config.yaml")
-	cfg, err := LoadConfig(cfgPath)
+	cfg, err := LoadEnvironmentConfig(cfgPath)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/down.go b/cmd/down.go
@@ -34,7 +34,7 @@ func (c *DownCmd) Run() error {
 	}
 
 	cfgPath := filepath.Join(envPath, "config.yaml")
-	cfg, err := LoadConfig(cfgPath)
+	cfg, err := LoadEnvironmentConfig(cfgPath)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/logs.go b/cmd/logs.go
@@ -24,7 +24,7 @@ func (c *LogsCmd) Run() error {
 	envPath := filepath.Join(rc.EnvDir, rc.EnvName)
 
 	cfgPath := filepath.Join(envPath, "config.yaml")
-	cfg, err := LoadConfig(cfgPath)
+	cfg, err := LoadEnvironmentConfig(cfgPath)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/up.go b/cmd/up.go
@@ -35,7 +35,7 @@ func (c *UpCmd) Run() error {
 	}
 
 	cfgPath := filepath.Join(envPath, "config.yaml")
-	cfg, err := LoadConfig(cfgPath)
+	cfg, err := LoadEnvironmentConfig(cfgPath)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/util.go b/cmd/util.go
@@ -51,7 +51,7 @@ func renderTemplateToFile(templates fs.FS, tmplPath string, data any, outPath st
 	return nil
 }
 
-func renderTemplates(cfg Config, srcDir, destDir string, templates []string) error {
+func renderTemplates(cfg EnvironmentConfig, srcDir, destDir string, templates []string) error {
 	templateFS := getTemplates()
 	for _, tmpl := range templates {
 		templatePath := filepath.Join(srcDir, tmpl)
@@ -63,7 +63,7 @@ func renderTemplates(cfg Config, srcDir, destDir string, templates []string) err
 	return nil
 }
 
-func getComposeProfiles(cfg Config) []string {
+func getComposeProfiles(cfg EnvironmentConfig) []string {
 	profiles := []string{"base"}
 
 	if cfg.Features.Scuba.Enabled {
@@ -81,7 +81,7 @@ func getComposeProfiles(cfg Config) []string {
 	return profiles
 }
 
-func buildDockerComposeCommand(cfg Config, args ...string) []string {
+func buildDockerComposeCommand(cfg EnvironmentConfig, args ...string) []string {
 	profiles := getComposeProfiles(cfg)
 
 	dockerComposeCmd := []string{

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func RuntimeConfigFromFlags(envDir, envName string) RuntimeConfig {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`-type Config struct {`
	`46`	`+type EnvironmentConfig struct {`
`47`	`47`	Global GlobalConfig `yaml:"global"`
`48`	`48`	Features FeatureConfig `yaml:"features"`
`49`	`49`	Cloudserver CloudserverConfig `yaml:"cloudserver"`
`@@ -190,8 +190,8 @@ type RedisConfig struct {`
`190`	`190`	LogLevel string `yaml:"log_level"`
`191`	`191`	`}`
`192`	`192`
`193`		`-func DefaultConfig() Config {`
`194`		`- return Config{`
	`193`	`+func DefaultEnvironmentConfig() EnvironmentConfig {`
	`194`	`+ return EnvironmentConfig{`
`195`	`195`	`Global: GlobalConfig{`
`196`	`196`	`LogLevel: "info",`
`197`	`197`	`// Profile: "default",`
`@@ -238,8 +238,8 @@ func DefaultConfig() Config {`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`
`241`		`-func LoadConfig(path string) (Config, error) {`
`242`		`- cfg := DefaultConfig()`
	`241`	`+func LoadEnvironmentConfig(path string) (EnvironmentConfig, error) {`
	`242`	`+ cfg := DefaultEnvironmentConfig()`
`243`	`243`
`244`	`244`	`if path == "" {`
`245`	`245`	`return cfg, nil`
`@@ -252,7 +252,7 @@ func LoadConfig(path string) (Config, error) {`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`// Parse the YAML into a temporary config`
`255`		`- var fileCfg Config`
	`255`	`+ var fileCfg EnvironmentConfig`
`256`	`256`	`if err := yaml.Unmarshal(data, &fileCfg); err != nil {`
`257`	`257`	`return cfg, fmt.Errorf("failed to parse config file: %w", err)`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@ func (c *CreateEnvCmd) Run() error {`
`23`	`23`	`return fmt.Errorf("failed to create environment: %w", err)`
`24`	`24`	`}`
`25`	`25`
`26`		`- var cfg Config`
	`26`	`+ var cfg EnvironmentConfig`
`27`	`27`	`if c.WithConfig != "" {`
`28`		`- cfg, err = LoadConfig(c.WithConfig)`
	`28`	`+ cfg, err = LoadEnvironmentConfig(c.WithConfig)`
`29`	`29`	`if err != nil {`
`30`	`30`	`return fmt.Errorf("failed to load custom config: %w", err)`
`31`	`31`	`}`
`32`	`32`	`} else {`
`33`		`- cfg, err = LoadConfig(filepath.Join(envPath, "config.yaml"))`
	`33`	`+ cfg, err = LoadEnvironmentConfig(filepath.Join(envPath, "config.yaml"))`
`34`	`34`	`if err != nil {`
`35`	`35`	`return fmt.Errorf("failed to load config: %w", err)`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func (c *DestroyCmd) Run() error {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`cfgPath := filepath.Join(envPath, "config.yaml")`
`38`		`- cfg, err := LoadConfig(cfgPath)`
	`38`	`+ cfg, err := LoadEnvironmentConfig(cfgPath)`
`39`	`39`	`if err != nil {`
`40`	`40`	`return err`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (c *DownCmd) Run() error {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`cfgPath := filepath.Join(envPath, "config.yaml")`
`37`		`- cfg, err := LoadConfig(cfgPath)`
	`37`	`+ cfg, err := LoadEnvironmentConfig(cfgPath)`
`38`	`38`	`if err != nil {`
`39`	`39`	`return err`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func (c *LogsCmd) Run() error {`
`24`	`24`	`envPath := filepath.Join(rc.EnvDir, rc.EnvName)`
`25`	`25`
`26`	`26`	`cfgPath := filepath.Join(envPath, "config.yaml")`
`27`		`- cfg, err := LoadConfig(cfgPath)`
	`27`	`+ cfg, err := LoadEnvironmentConfig(cfgPath)`
`28`	`28`	`if err != nil {`
`29`	`29`	`return err`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func (c *UpCmd) Run() error {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`cfgPath := filepath.Join(envPath, "config.yaml")`
`38`		`- cfg, err := LoadConfig(cfgPath)`
	`38`	`+ cfg, err := LoadEnvironmentConfig(cfgPath)`
`39`	`39`	`if err != nil {`
`40`	`40`	`return err`
`41`	`41`	`}`