Enable empty configuration merging

MatteoPologruto · MatteoPologruto · commit fcd9beeeb821 · 2023-11-22T11:41:47.000+01:00
diff --git a/commands/daemon/settings.go b/commands/daemon/settings.go
@@ -79,9 +79,13 @@ func (s *ArduinoCoreServerImpl) SettingsMerge(ctx context.Context, req *rpc.Sett
 	// Set each value individually.
 	// This is done because Viper ignores empty strings or maps when
 	// using the MergeConfigMap function.
+	updatedSettings := configuration.Init("")
 	for k, v := range mapped {
-		configuration.Settings.Set(k, v)
+		updatedSettings.Set(k, v)
 	}
+	configPath := configuration.Settings.ConfigFileUsed()
+	updatedSettings.SetConfigFile(configPath)
+	configuration.Settings = updatedSettings
 
 	return &rpc.SettingsMergeResponse{}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,13 @@ func (s ArduinoCoreServerImpl) SettingsMerge(ctx context.Context, req rpc.Sett`
`79`	`79`	`// Set each value individually.`
`80`	`80`	`// This is done because Viper ignores empty strings or maps when`
`81`	`81`	`// using the MergeConfigMap function.`
	`82`	`+ updatedSettings := configuration.Init("")`
`82`	`83`	`for k, v := range mapped {`
`83`		`- configuration.Settings.Set(k, v)`
	`84`	`+ updatedSettings.Set(k, v)`
`84`	`85`	`}`
	`86`	`+ configPath := configuration.Settings.ConfigFileUsed()`
	`87`	`+ updatedSettings.SetConfigFile(configPath)`
	`88`	`+ configuration.Settings = updatedSettings`
`85`	`89`
`86`	`90`	`return &rpc.SettingsMergeResponse{}, nil`
`87`	`91`	`}`