Skip to content

Allow empty configuration merging #2432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 11, 2024
Merged

Allow empty configuration merging #2432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85f222a
Enable empty configuration merging
MatteoPologruto Nov 14, 2023
96de3f7
Test that a default configuration is correctly deleted
MatteoPologruto Sep 25, 2023
c7719c1
Reset config after every merge test
MatteoPologruto Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion commands/daemon/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
9 changes: 9 additions & 0 deletions commands/daemon/settings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ func TestMerge(t *testing.T) {
require.Equal(t, "", configuration.Settings.GetString("foo"))
require.Equal(t, false, configuration.Settings.GetBool("sketch.always_export_binaries"))

bulkSettings = `{"network": {}}`
res, err = svc.SettingsMerge(context.Background(), &rpc.SettingsMergeRequest{JsonData: bulkSettings})
require.NotNil(t, res)
require.NoError(t, err)

require.Equal(t, "", configuration.Settings.GetString("proxy"))

reset()
}

Expand Down Expand Up @@ -113,6 +120,8 @@ func TestGetMergedValue(t *testing.T) {
res, err = svc.SettingsGetValue(context.Background(), key)
require.NoError(t, err)
require.Equal(t, `"bar"`, res.GetJsonData())

reset()
}

func TestGetValueNotFound(t *testing.T) {
Expand Down