Merge pull request #6507 from thaJeztah/toml_v2

migrate to github.com/pelletier/go-toml/v2

Author: tonistiigi

cmd/buildkitd/config/load.go

@@ -4,19 +4,14 @@ import (
 	"io"
 	"os"
 
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 	"github.com/pkg/errors"
 )
 
 // Load loads buildkitd config
 func Load(r io.Reader) (Config, error) {
 	var c Config
-	t, err := toml.LoadReader(r)
-	if err != nil {
-		return c, errors.Wrap(err, "failed to parse config")
-	}
-	err = t.Unmarshal(&c)
-	if err != nil {
+	if err := toml.NewDecoder(r).Decode(&c); err != nil {
 		return c, errors.Wrap(err, "failed to parse config")
 	}
 	return c, nil

cmd/buildkitd/main_containerd_worker.go

@@ -20,7 +20,7 @@ import (
 	"github.com/moby/buildkit/worker/base"
 	"github.com/moby/buildkit/worker/containerd"
 	"github.com/moby/sys/userns"
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 	"golang.org/x/sync/semaphore"
@@ -321,11 +321,11 @@ func containerdWorkerInitializer(c *cli.Context, common workerInitializerOpt) ([
 	if cfg.Runtime.Name != "" {
 		opts := getRuntimeOptionsType(cfg.Runtime.Name)
 
-		t, err := toml.TreeFromMap(cfg.Runtime.Options)
+		b, err := toml.Marshal(cfg.Runtime.Options)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to parse runtime options config")
 		}
-		err = t.Unmarshal(opts)
+		err = toml.Unmarshal(b, opts)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to parse runtime options config")
 		}

cmd/buildkitd/main_oci_worker.go

@@ -41,7 +41,7 @@ import (
 	"github.com/moby/buildkit/worker/base"
 	"github.com/moby/buildkit/worker/runc"
 	"github.com/moby/sys/userns"
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
@@ -422,11 +422,11 @@ func snapshotterFactory(commonRoot string, cfg config.OCIConfig, sm *session.Man
 			// the main BuildKit config, the main config Unmarshalls it into a
 			// generic map[string]interface{}. Here we convert it back into TOML
 			// tree, and unmarshal it to the actual type.
-			t, err := toml.TreeFromMap(cfg.StargzSnapshotterConfig)
+			b, err := toml.Marshal(cfg.StargzSnapshotterConfig)
 			if err != nil {
 				return snFactory, errors.Wrapf(err, "failed to parse stargz config")
 			}
-			err = t.Unmarshal(&sgzCfg)
+			err = toml.Unmarshal(b, &sgzCfg)
 			if err != nil {
 				return snFactory, errors.Wrapf(err, "failed to parse stargz config")
 			}

go.mod

@@ -65,7 +65,7 @@ require (
 	github.com/opencontainers/runtime-spec v1.3.0
 	github.com/opencontainers/selinux v1.13.1
 	github.com/package-url/packageurl-go v0.1.1
-	github.com/pelletier/go-toml v1.9.5
+	github.com/pelletier/go-toml/v2 v2.2.4
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/profile v1.7.0
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10

go.sum

@@ -488,8 +488,8 @@ github.com/opencontainers/selinux v1.13.1 h1:A8nNeceYngH9Ow++M+VVEwJVpdFmrlxsN22
 github.com/opencontainers/selinux v1.13.1/go.mod h1:S10WXZ/osk2kWOYKy1x2f/eXF5ZHJoUs8UU/2caNRbg=
 github.com/package-url/packageurl-go v0.1.1 h1:KTRE0bK3sKbFKAk3yy63DpeskU7Cvs/x/Da5l+RtzyU=
 github.com/package-url/packageurl-go v0.1.1/go.mod h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
 github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 h1:Dx7Ovyv/SFnMFw3fD4oEoeorXc6saIiQ23LrGLth0Gw=
 github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=