Commit 74a99aa

authored

Allow empty configuration merging (#2432)

* Enable empty configuration merging * Test that a default configuration is correctly deleted * Reset config after every merge test

1 parent bd02844 commit 74a99aaCopy full SHA for 74a99aa

File tree

+14

-1

lines changed

+14

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

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,13 @@ func TestMerge(t *testing.T) {`
`81`	`81`	`require.Equal(t, "", configuration.Settings.GetString("foo"))`
`82`	`82`	`require.Equal(t, false, configuration.Settings.GetBool("sketch.always_export_binaries"))`
`83`	`83`
	`84`	+ bulkSettings = `{"network": {}}`
	`85`	`+ res, err = svc.SettingsMerge(context.Background(), &rpc.SettingsMergeRequest{JsonData: bulkSettings})`
	`86`	`+ require.NotNil(t, res)`
	`87`	`+ require.NoError(t, err)`
	`88`	`+`
	`89`	`+ require.Equal(t, "", configuration.Settings.GetString("proxy"))`
	`90`	`+`
`84`	`91`	`reset()`
`85`	`92`	`}`
`86`	`93`
`@@ -113,6 +120,8 @@ func TestGetMergedValue(t *testing.T) {`
`113`	`120`	`res, err = svc.SettingsGetValue(context.Background(), key)`
`114`	`121`	`require.NoError(t, err)`
`115`	`122`	require.Equal(t, `"bar"`, res.GetJsonData())
	`123`	`+`
	`124`	`+ reset()`
`116`	`125`	`}`
`117`	`126`
`118`	`127`	`func TestGetValueNotFound(t *testing.T) {`

Comments

(0)