Upgrade BurntSushi/toml

go.mod

@@ -3,8 +3,8 @@ module github.com/bookingcom/nanotube
 go 1.21
 
 require (
+	github.com/BurntSushi/toml v1.4.0
 	github.com/RussellLuo/slidingwindow v0.0.0-20200528002341-535bb99d338b
-	github.com/burntsushi/toml v0.3.1
 	github.com/containerd/containerd v1.7.11
 	github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0
 	github.com/docker/docker v27.1.2+incompatible

go.sum

@@ -7,6 +7,8 @@ github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2/go.mod
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
+github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/Microsoft/hcsshim v0.12.4 h1:Ev7YUMHAHoWNm+aDSPzc5W9s6E2jyL1szpVDJeZ/Rr4=
@@ -20,8 +22,6 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-github.com/burntsushi/toml v0.3.1 h1:XebFhzi1T+XmBZG9aKnQnA50YOydJUYK7g5SM40w+ik=
-github.com/burntsushi/toml v0.3.1/go.mod h1:tCq67G3LEDB9hykA6+KWl2FPEy0nPcvE8TTBhtOtdGs=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=

pkg/conf/clusters.go

@@ -5,7 +5,7 @@
 	"fmt"
 	"io"
 
-	"github.com/burntsushi/toml"
+	"github.com/BurntSushi/toml"
 	"github.com/pkg/errors"
 )
 
@@ -59,7 +59,7 @@
 // ReadClustersConfig reads clusters set from a reader.
 func ReadClustersConfig(r io.Reader) (Clusters, error) {
 	var cls Clusters
-	_, err := toml.DecodeReader(r, &cls)
+	_, err := toml.NewDecoder(r).Decode(&cls)
 	if err != nil {
 		return cls, errors.Wrap(err, "error while decoding")
 	}

pkg/conf/conf.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"path/filepath"
 
-	"github.com/burntsushi/toml"
+	"github.com/BurntSushi/toml"
 	"github.com/pkg/errors"
 )
 
@@ -179,7 +179,7 @@ type Main struct {
 func ReadMain(r io.Reader) (Main, error) {
 	cfg := MakeDefault()
 
-	_, err := toml.DecodeReader(r, &cfg)
+	_, err := toml.NewDecoder(r).Decode(&cfg)
 	if err != nil {
 		return cfg, errors.Wrap(err, "parsing error")
 	}

pkg/conf/rewrites.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/burntsushi/toml"
+	"github.com/BurntSushi/toml"
 	"github.com/pkg/errors"
 )
 
@@ -24,7 +24,7 @@ type Rewrite struct {
 func ReadRewrites(r io.Reader) (Rewrites, error) {
 	var rewrites Rewrites
 
-	_, err := toml.DecodeReader(r, &rewrites)
+	_, err := toml.NewDecoder(r).Decode(&rewrites)
 	if err != nil {
 		return rewrites, errors.Wrap(err, "error parsing rewrites")
 	}

pkg/conf/rules.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/burntsushi/toml"
+	"github.com/BurntSushi/toml"
 	"github.com/pkg/errors"
 )
 
@@ -24,7 +24,7 @@ type Rule struct {
 // ReadRules reads rules from the reader. Errors when parsing fails.
 func ReadRules(r io.Reader) (Rules, error) {
 	var rs Rules
-	_, err := toml.DecodeReader(r, &rs)
+	_, err := toml.NewDecoder(r).Decode(&rs)
 	if err != nil {
 		return rs, errors.Wrap(err, "error parsing rules")
 	}