Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: simplify settings env logic
Kyle Mendellc6d13f8f7889
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex b3f059da8..2d00ad356 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -597,43 +597,8 @@ func (s *SettingsService) PersistEnvSettingsIfMissing(ctx context.Context) errorif err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {for i := 0; i < rt.NumField(); i++ {field := rt.Field(i)- tag := field.Tag.Get("key")- key, attrs, _ := strings.Cut(tag, ",")-- if key == "" || strings.Contains(attrs, "internal") {- continue- }-- // If not in env-only mode, only persist if it's explicitly marked as envOverride- if !isEnvOnlyMode && !strings.Contains(attrs, "envOverride") {- continue- }-- envVarName := utils.CamelCaseToScreamingSnakeCase(key)- envVal, ok := os.LookupEnv(envVarName)- if !ok {- continue- }- envVal = utils.TrimQuotes(envVal)-- var existing models.SettingVariable- err := tx.Where("key = ?", key).First(&existing).Error- switch {- case errors.Is(err, gorm.ErrRecordNotFound):- newVar := models.SettingVariable{Key: key, Value: envVal}- if err := tx.Create(&newVar).Error; err != nil {- return fmt.Errorf("persist env setting %s: %w", key, err)- }- slog.DebugContext(ctx, "Created setting from environment", "key", key)- case err != nil:- return fmt.Errorf("check setting %s: %w", key, err)- default:- if existing.Value != envVal {- if err := tx.Model(&existing).Update("value", envVal).Error; err != nil {- return fmt.Errorf("update env setting %s: %w", key, err)- }- slog.DebugContext(ctx, "Updated setting from environment", "key", key)- }+ if err := s.processEnvField(ctx, tx, field, isEnvOnlyMode); err != nil {+ return err}}return nil@@ -645,6 +610,62 @@ func (s *SettingsService) PersistEnvSettingsIfMissing(ctx context.Context) errorreturn s.LoadDatabaseSettings(ctx)}+func (s *SettingsService) processEnvField(ctx context.Context, tx *gorm.DB, field reflect.StructField, isEnvOnlyMode bool) error {+ tag := field.Tag.Get("key")+ key, attrs, _ := strings.Cut(tag, ",")++ if !s.shouldProcessField(key, attrs, isEnvOnlyMode) {+ return nil+ }++ envVarName := utils.CamelCaseToScreamingSnakeCase(key)+ envVal, ok := os.LookupEnv(envVarName)+ if !ok {+ return nil+ }+ envVal = utils.TrimQuotes(envVal)++ return s.upsertEnvSetting(ctx, tx, key, envVal)+}++func (s *SettingsService) shouldProcessField(key, attrs string, isEnvOnlyMode bool) bool {+ if key == "" || strings.Contains(attrs, "internal") {+ return false+ }++ // If not in env-only mode, only persist if it's explicitly marked as envOverride+ if !isEnvOnlyMode && !strings.Contains(attrs, "envOverride") {+ return false+ }++ return true+}++func (s *SettingsService) upsertEnvSetting(ctx context.Context, tx *gorm.DB, key, envVal string) error {+ var existing models.SettingVariable+ err := tx.Where("key = ?", key).First(&existing).Error++ switch {+ case errors.Is(err, gorm.ErrRecordNotFound):+ newVar := models.SettingVariable{Key: key, Value: envVal}+ if err := tx.Create(&newVar).Error; err != nil {+ return fmt.Errorf("persist env setting %s: %w", key, err)+ }+ slog.DebugContext(ctx, "Created setting from environment", "key", key)+ case err != nil:+ return fmt.Errorf("check setting %s: %w", key, err)+ default:+ if existing.Value != envVal {+ if err := tx.Model(&existing).Update("value", envVal).Error; err != nil {+ return fmt.Errorf("update env setting %s: %w", key, err)+ }+ slog.DebugContext(ctx, "Updated setting from environment", "key", key)+ }+ }++ return nil+}+func (s *SettingsService) ListSettings(all bool) []models.SettingVariable {return s.GetSettingsConfig().ToSettingVariableSlice(all, true)}