优化

internal/data/config_store.go

@@ -113,6 +113,30 @@ func yamlMappingValue(node *yaml.Node, keys ...string) *yaml.Node {
 	return node
 }
 
+func deleteYAMLMapping(node *yaml.Node, keys ...string) {
+	if len(keys) == 0 || node == nil {
+		return
+	}
+	if node.Kind == yaml.DocumentNode && len(node.Content) > 0 {
+		node = node.Content[0]
+	}
+	if node.Kind != yaml.MappingNode {
+		return
+	}
+	key := keys[0]
+	for i := 0; i+1 < len(node.Content); i += 2 {
+		if node.Content[i].Value != key {
+			continue
+		}
+		if len(keys) == 1 {
+			node.Content = append(node.Content[:i], node.Content[i+2:]...)
+			return
+		}
+		deleteYAMLMapping(node.Content[i+1], keys[1:]...)
+		return
+	}
+}
+
 func setServerHTTPPort(document *yaml.Node, port int32) error {
 	if port <= 0 {
 		return nil
@@ -154,7 +178,10 @@ func (d *Data) persistConfigValuesLocked(dataConfig *conf.Data, adminConfig *con
 	if err != nil {
 		return err
 	}
-	adminValue, err := protoMap(adminConfig)
+	fileAdmin := cloneAdminConfig(adminConfig)
+	fileAdmin.Storage = nil
+	fileAdmin.Email = nil
+	adminValue, err := protoMap(fileAdmin)
 	if err != nil {
 		return err
 	}
@@ -164,6 +191,8 @@ func (d *Data) persistConfigValuesLocked(dataConfig *conf.Data, adminConfig *con
 	if err = setYAMLMapping(&document, "admin", adminValue); err != nil {
 		return err
 	}
+	deleteYAMLMapping(&document, "admin", "storage")
+	deleteYAMLMapping(&document, "admin", "email")
 	if adminConfig.System != nil {
 		if err = setServerHTTPPort(&document, adminConfig.System.Addr); err != nil {
 			return err
@@ -221,6 +250,31 @@ func (d *Data) persistDatabaseConfig(database *conf.Data_Database, signingKey st
 			return err
 		}
 	}
+	deleteYAMLMapping(&document, "admin", "storage")
+	deleteYAMLMapping(&document, "admin", "email")
+	return writeConfigDocument(configPath, &document)
+}
+
+func (d *Data) removeIntegrationConfigFromFile() error {
+	d.configMu.Lock()
+	defer d.configMu.Unlock()
+	configPath := d.runtime.ConfigPath()
+	if configPath == "" {
+		return nil
+	}
+	raw, err := os.ReadFile(configPath)
+	if err != nil {
+		return err
+	}
+	var document yaml.Node
+	if err = yaml.Unmarshal(raw, &document); err != nil {
+		return err
+	}
+	if yamlMappingValue(&document, "admin", "storage") == nil && yamlMappingValue(&document, "admin", "email") == nil {
+		return nil
+	}
+	deleteYAMLMapping(&document, "admin", "storage")
+	deleteYAMLMapping(&document, "admin", "email")
 	return writeConfigDocument(configPath, &document)
 }
 
@@ -300,6 +354,27 @@ func (d *Data) reloadConfig(ctx context.Context) error {
 			return fmt.Errorf("reload database migrations: %w", err)
 		}
 	}
+	legacyStorage := next.Admin.Storage
+	legacyEmail := next.Admin.Email
+	currentAdmin := d.runtime.Admin()
+	if legacyStorage == nil {
+		if currentAdmin != nil {
+			legacyStorage = currentAdmin.Storage
+		}
+	}
+	if legacyEmail == nil && currentAdmin != nil {
+		legacyEmail = currentAdmin.Email
+	}
+	storageConfig, err := resolveStorageIntegrationConfig(candidateDB.WithContext(ctx), legacyStorage)
+	if err != nil {
+		return fmt.Errorf("reload storage configuration: %w", err)
+	}
+	next.Admin.Storage = storageConfig
+	emailConfig, err := resolveEmailIntegrationConfig(candidateDB.WithContext(ctx), legacyEmail)
+	if err != nil {
+		return fmt.Errorf("reload email configuration: %w", err)
+	}
+	next.Admin.Email = emailConfig
 	candidateStorage, err := buildFileStorage(next.Admin)
 	if err != nil {
 		return fmt.Errorf("reload storage: %w", err)