Commit fcd9bee

committed

Enable empty configuration merging

1 parent 8d3c23c commit fcd9beeCopy full SHA for fcd9bee

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

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`	`}`

Comments

(0)