github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5278 from mxpv/toml

Browse Source 
Migrate TOML to github.com/pelletier/go-toml
This commit is contained in:
Derek McGowan
2021-04-01 21:24:52 -07:00
committed by GitHub
parent 251e3d15de 5ada2f74a7
commit 261c107ffc
59 changed files with 5433 additions and 3610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cri/server/helpers.go
View File

@@ -23,7 +23,6 @@ import (
"strconv"
"strings"
"github.com/BurntSushi/toml"
runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
"github.com/containerd/containerd"
"github.com/containerd/containerd/containers"
@@ -310,7 +309,7 @@ func generateRuntimeOptions(r criconfig.Runtime, c criconfig.Config) (interface{
}, nil
}
options := getRuntimeOptionsType(r.Type)
if err := toml.PrimitiveDecode(*r.Options, options); err != nil {
if err := r.Options.Unmarshal(options); err != nil {
return nil, err
}
return options, nil

11
pkg/cri/server/helpers_test.go
View File

@@ -21,7 +21,6 @@ import (
"io/ioutil"
"testing"
"github.com/BurntSushi/toml"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/reference/docker"
@@ -29,6 +28,7 @@ import (
runcoptions "github.com/containerd/containerd/runtime/v2/runc/options"
imagedigest "github.com/opencontainers/go-digest"
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pelletier/go-toml"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -223,11 +223,16 @@ systemd_cgroup = true
NoNewKeyring = true
`
var nilOptsConfig, nonNilOptsConfig criconfig.Config
_, err := toml.Decode(nilOpts, &nilOptsConfig)
tree, err := toml.Load(nilOpts)
require.NoError(t, err)
_, err = toml.Decode(nonNilOpts, &nonNilOptsConfig)
err = tree.Unmarshal(&nilOptsConfig)
require.NoError(t, err)
require.Len(t, nilOptsConfig.Runtimes, 3)
tree, err = toml.Load(nonNilOpts)
require.NoError(t, err)
err = tree.Unmarshal(&nonNilOptsConfig)
require.NoError(t, err)
require.Len(t, nonNilOptsConfig.Runtimes, 3)
for desc, test := range map[string]struct {