libpod/config: use built-in TOML instead of manually merging

Instead of manually merging the configs, use the built-in features of
TOMP to merge/extend the fields of a data type when encoding a file.
This erases the need for the merge code in libpod/config and also
addresses issues when merging booleans.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/libpod/config/config_test.go b/libpod/config/config_test.go
index 47c092440..24620ce0e 100644
--- a/libpod/config/config_test.go
+++ b/libpod/config/config_test.go
@@ -11,14 +11,14 @@ import (
 
 func TestEmptyConfig(t *testing.T) {
 	// Make sure that we can read empty configs
-	config, err := readConfigFromFile("testdata/empty.conf")
+	config, err := readConfigFromFile("testdata/empty.conf", &Config{})
 	assert.NotNil(t, config)
 	assert.Nil(t, err)
 }
 
 func TestDefaultLibpodConf(t *testing.T) {
 	// Make sure that we can read the default libpod.conf
-	config, err := readConfigFromFile("testdata/libpod.conf")
+	config, err := readConfigFromFile("testdata/libpod.conf", &Config{})
 	assert.NotNil(t, config)
 	assert.Nil(t, err)
 }
@@ -32,13 +32,10 @@ func TestMergeEmptyAndDefaultMemoryConfig(t *testing.T) {
 	defaultConfig.StateType = define.InvalidStateStore
 	defaultConfig.StorageConfig = storage.StoreOptions{}
 
-	emptyConfig, err := readConfigFromFile("testdata/empty.conf")
+	emptyConfig, err := readConfigFromFile("testdata/empty.conf", defaultConfig)
 	assert.NotNil(t, emptyConfig)
 	assert.Nil(t, err)
 
-	err = emptyConfig.mergeConfig(defaultConfig)
-	assert.Nil(t, err)
-
 	equal := reflect.DeepEqual(emptyConfig, defaultConfig)
 	assert.True(t, equal)
 }
@@ -46,19 +43,16 @@ func TestMergeEmptyAndDefaultMemoryConfig(t *testing.T) {
 func TestMergeEmptyAndLibpodConfig(t *testing.T) {
 	// Make sure that when we merge the default config into an empty one that we
 	// effectively get the default config.
-	libpodConfig, err := readConfigFromFile("testdata/libpod.conf")
+	libpodConfig, err := readConfigFromFile("testdata/libpod.conf", &Config{})
 	assert.NotNil(t, libpodConfig)
 	assert.Nil(t, err)
 	libpodConfig.StateType = define.InvalidStateStore
 	libpodConfig.StorageConfig = storage.StoreOptions{}
 
-	emptyConfig, err := readConfigFromFile("testdata/empty.conf")
+	emptyConfig, err := readConfigFromFile("testdata/empty.conf", libpodConfig)
 	assert.NotNil(t, emptyConfig)
 	assert.Nil(t, err)
 
-	err = emptyConfig.mergeConfig(libpodConfig)
-	assert.Nil(t, err)
-
 	equal := reflect.DeepEqual(emptyConfig, libpodConfig)
 	assert.True(t, equal)
 }