Fix toml plugin decoding

mxpv · mxpv · commit bca0857530d1 · 2019-08-22T17:22:25.000-07:00
Do not rely on toml metadata when decoding plugin's configs as it's not possible to merge toml.MetaData structs during import.

Signed-off-by: Maksym Pavlenko &lt;makpav@amazon.com&gt;
diff --git a/services/server/config/config.go b/services/server/config/config.go
@@ -64,8 +64,6 @@ type Config struct {
 	Imports []string `toml:"imports"`
 
 	StreamProcessors []StreamProcessor `toml:"stream_processors"`
-
-	md toml.MetaData
 }
 
 // StreamProcessor provides configuration for diff content processors
@@ -203,7 +201,7 @@ func (c *Config) Decode(p *plugin.Registration) (interface{}, error) {
 	if !ok {
 		return p.Config, nil
 	}
-	if err := c.md.PrimitiveDecode(data, p.Config); err != nil {
+	if err := toml.PrimitiveDecode(data, p.Config); err != nil {
 		return nil, err
 	}
 	return p.Config, nil
@@ -258,11 +256,10 @@ func LoadConfig(path string, out *Config) error {
 // loadConfigFile decodes a TOML file at the given path
 func loadConfigFile(path string) (*Config, error) {
 	config := &Config{}
-	md, err := toml.DecodeFile(path, &config)
+	_, err := toml.DecodeFile(path, &config)
 	if err != nil {
 		return nil, err
 	}
-	config.md = md
 	return config, nil
 }
 
diff --git a/services/server/config/config_test.go b/services/server/config/config_test.go
@@ -23,6 +23,8 @@ import (
 	"testing"
 
 	"gotest.tools/assert"
+
+	"github.com/containerd/containerd/plugin"
 )
 
 func TestMergeConfigs(t *testing.T) {
@@ -161,3 +163,28 @@ imports = ["data1.toml", "data2.toml"]
 		filepath.Join(tempDir, "data2.toml"),
 	}, out.Imports)
 }
+
+func TestDecodePlugin(t *testing.T) {
+	data := `
+version = 1
+[plugins.linux]
+  shim_debug = true
+`
+
+	tempDir, err := ioutil.TempDir("", "containerd_")
+	assert.NilError(t, err)
+	defer os.RemoveAll(tempDir)
+
+	path := filepath.Join(tempDir, "config.toml")
+	err = ioutil.WriteFile(path, []byte(data), 0600)
+	assert.NilError(t, err)
+
+	var out Config
+	err = LoadConfig(path, &out)
+	assert.NilError(t, err)
+
+	pluginConfig := map[string]interface{}{}
+	_, err = out.Decode(&plugin.Registration{ID: "linux", Config: &pluginConfig})
+	assert.NilError(t, err)
+	assert.Equal(t, true, pluginConfig["shim_debug"])
+}

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,6 @@ type Config struct {`
`64`	`64`	Imports []string `toml:"imports"`
`65`	`65`
`66`	`66`	StreamProcessors []StreamProcessor `toml:"stream_processors"`
`67`		`-`
`68`		`- md toml.MetaData`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`// StreamProcessor provides configuration for diff content processors`
`@@ -203,7 +201,7 @@ func (c Config) Decode(p plugin.Registration) (interface{}, error) {`
`203`	`201`	`if !ok {`
`204`	`202`	`return p.Config, nil`
`205`	`203`	`}`
`206`		`- if err := c.md.PrimitiveDecode(data, p.Config); err != nil {`
	`204`	`+ if err := toml.PrimitiveDecode(data, p.Config); err != nil {`
`207`	`205`	`return nil, err`
`208`	`206`	`}`
`209`	`207`	`return p.Config, nil`
`@@ -258,11 +256,10 @@ func LoadConfig(path string, out *Config) error {`
`258`	`256`	`// loadConfigFile decodes a TOML file at the given path`
`259`	`257`	`func loadConfigFile(path string) (*Config, error) {`
`260`	`258`	`config := &Config{}`
`261`		`- md, err := toml.DecodeFile(path, &config)`
	`259`	`+ _, err := toml.DecodeFile(path, &config)`
`262`	`260`	`if err != nil {`
`263`	`261`	`return nil, err`
`264`	`262`	`}`
`265`		`- config.md = md`
`266`	`263`	`return config, nil`
`267`	`264`	`}`
`268`	`265`