internal/config/config.go

@@ -36,20 +36,18 @@ type ConfigParams struct {
 }
 
 type Config struct {
-	DBURL            string
-	Debug            bool
-	MaintenanceMode  bool
-	DevelopmentMode  bool
-	DevAdminUsername string
-	DevAdminPassword string
-	Environment      string
-	MetricsPassword  string
-	MetricsUsername  string
-	Port             int
-	SentryDSN        string
-	SessionKey       string
-	params           *ConfigParams
-	log              *slog.Logger
+	DBURL           string
+	Debug           bool
+	MaintenanceMode bool
+	DevelopmentMode bool
+	Environment     string
+	MetricsPassword string
+	MetricsUsername string
+	Port            int
+	SentryDSN       string
+	SessionKey      string
+	params          *ConfigParams
+	log             *slog.Logger
 }
 
 // IsDev returns true if running in development environment
@@ -117,20 +115,18 @@ func New(lc fx.Lifecycle, params ConfigParams) (*Config, error) {
 
 	// Load configuration values — env vars take precedence over config.yaml
 	s := &Config{
-		DBURL:            envString("DBURL", "dburl"),
-		Debug:            envBool("DEBUG", "debug"),
-		MaintenanceMode:  envBool("MAINTENANCE_MODE", "maintenanceMode"),
-		DevelopmentMode:  envBool("DEVELOPMENT_MODE", "developmentMode"),
-		DevAdminUsername: envString("DEV_ADMIN_USERNAME", "devAdminUsername"),
-		DevAdminPassword: envString("DEV_ADMIN_PASSWORD", "devAdminPassword"),
-		Environment:      environment,
-		MetricsUsername:  envString("METRICS_USERNAME", "metricsUsername"),
-		MetricsPassword:  envString("METRICS_PASSWORD", "metricsPassword"),
-		Port:             envInt("PORT", "port", 8080),
-		SentryDSN:        envSecretString("SENTRY_DSN", "sentryDSN"),
-		SessionKey:       envSecretString("SESSION_KEY", "sessionKey"),
-		log:              log,
-		params:           &params,
+		DBURL:           envString("DBURL", "dburl"),
+		Debug:           envBool("DEBUG", "debug"),
+		MaintenanceMode: envBool("MAINTENANCE_MODE", "maintenanceMode"),
+		DevelopmentMode: envBool("DEVELOPMENT_MODE", "developmentMode"),
+		Environment:     environment,
+		MetricsUsername: envString("METRICS_USERNAME", "metricsUsername"),
+		MetricsPassword: envString("METRICS_PASSWORD", "metricsPassword"),
+		Port:            envInt("PORT", "port", 8080),
+		SentryDSN:       envSecretString("SENTRY_DSN", "sentryDSN"),
+		SessionKey:      envSecretString("SESSION_KEY", "sessionKey"),
+		log:             log,
+		params:          &params,
 	}
 
 	// Validate database URL

internal/config/config_test.go

@@ -53,8 +53,6 @@ configDefaults:
   environment: dev
   metricsUsername: ""
   metricsPassword: ""
-  devAdminUsername: ""
-  devAdminPassword: ""
 `
 	return afero.WriteFile(fs, "config.yaml", []byte(configYAML), 0644)
 }