deps: use v2 of go-toml

v1 is no longer maintained.

control/config/BUILD.bazel

@@ -39,7 +39,7 @@ go_test(
         "//private/mgmtapi/mgmtapitest:go_default_library",
         "//private/storage:go_default_library",
         "//private/storage/test:go_default_library",
-        "@com_github_pelletier_go_toml//:go_default_library",
+        "@com_github_pelletier_go_toml_v2//:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
         "@com_github_stretchr_testify//require:go_default_library",
     ],

control/config/config_test.go

@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/scionproto/scion/pkg/log/logtest"
@@ -34,8 +34,8 @@ func TestConfigSample(t *testing.T) {
 	cfg.Sample(&sample, nil, nil)
 
 	InitTestConfig(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
-	assert.NoError(t, err)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
+	assert.NoError(t, err, "config: \n%s", sample.String())
 	CheckTestConfig(t, &cfg, idSample)
 }
 

control/config/drkey_test.go

@@ -20,7 +20,7 @@ import (
 	"os"
 	"testing"
 
-	toml "github.com/pelletier/go-toml"
+	toml "github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -39,8 +39,8 @@ func TestSample(t *testing.T) {
 	var sample bytes.Buffer
 	var cfg DRKeyConfig
 	cfg.Sample(&sample, nil, nil)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
-	require.NoError(t, err)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
+	require.NoError(t, err, "config:\n%s", sample.String())
 	err = cfg.Validate()
 	assert.NoError(t, err)
 }
@@ -94,14 +94,15 @@ func TestSecretValueHostListSyntax(t *testing.T) {
 	var cfg SecretValueHostList
 	var err error
 	sample1 := `scmp = ["1.1.1.1"]`
-	err = toml.NewDecoder(bytes.NewReader([]byte(sample1))).Strict(true).Decode(&cfg)
+	err = toml.NewDecoder(bytes.NewReader([]byte(sample1))).DisallowUnknownFields().Decode(&cfg)
 	require.NoError(t, err)
 	assert.NoError(t, cfg.Validate())
 
+	var cfg2 SecretValueHostList
 	sample2 := `scmp = ["not an address"]`
-	err = toml.NewDecoder(bytes.NewReader([]byte(sample2))).Strict(true).Decode(&cfg)
+	err = toml.NewDecoder(bytes.NewReader([]byte(sample2))).DisallowUnknownFields().Decode(&cfg2)
 	require.NoError(t, err)
-	assert.Error(t, cfg.Validate())
+	assert.Error(t, cfg2.Validate())
 }
 
 func TestToMapPerHost(t *testing.T) {
@@ -111,7 +112,7 @@ func TestToMapPerHost(t *testing.T) {
 	require.NoError(t, err)
 	ip2222, err := netip.ParseAddr("2.2.2.2")
 	require.NoError(t, err)
-	err = toml.NewDecoder(bytes.NewReader([]byte(sample))).Strict(true).Decode(&cfg)
+	err = toml.NewDecoder(bytes.NewReader([]byte(sample))).DisallowUnknownFields().Decode(&cfg)
 	require.NoError(t, err)
 	assert.NoError(t, cfg.Validate())
 	m := cfg.ToAllowedSet()

daemon/config/BUILD.bazel

@@ -31,7 +31,7 @@ go_test(
         "//private/env/envtest:go_default_library",
         "//private/mgmtapi/mgmtapitest:go_default_library",
         "//private/storage/test:go_default_library",
-        "@com_github_pelletier_go_toml//:go_default_library",
+        "@com_github_pelletier_go_toml_v2//:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
     ],
 )

daemon/config/config_test.go

@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/scionproto/scion/pkg/daemon"
@@ -34,7 +34,7 @@ func TestConfigSample(t *testing.T) {
 	cfg.Sample(&sample, nil, nil)
 
 	InitTestConfig(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
 	assert.NoError(t, err)
 	CheckTestConfig(t, &cfg, idSample)
 }

dispatcher/config/BUILD.bazel

@@ -30,7 +30,7 @@ go_test(
         "//private/env/envtest:go_default_library",
         "//private/mgmtapi/mgmtapitest:go_default_library",
         "//private/topology:go_default_library",
-        "@com_github_pelletier_go_toml//:go_default_library",
+        "@com_github_pelletier_go_toml_v2//:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
     ],
 )

dispatcher/config/config_test.go

@@ -19,7 +19,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/scionproto/scion/pkg/log/logtest"
@@ -35,7 +35,7 @@ func TestConfigSample(t *testing.T) {
 	cfg.Sample(&sample, nil, nil)
 
 	InitTestConfig(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
 	assert.NoError(t, err)
 	CheckTestConfig(t, &cfg, idSample)
 }

gateway/config/BUILD.bazel

@@ -25,7 +25,7 @@ go_test(
         "//pkg/log/logtest:go_default_library",
         "//private/env/envtest:go_default_library",
         "//private/mgmtapi/mgmtapitest:go_default_library",
-        "@com_github_pelletier_go_toml//:go_default_library",
+        "@com_github_pelletier_go_toml_v2//:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
     ],
 )

gateway/config/config_test.go

@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"testing"
 
-	toml "github.com/pelletier/go-toml"
+	toml "github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/scionproto/scion/gateway/config"
@@ -34,7 +34,7 @@ func TestConfigSample(t *testing.T) {
 	cfg.Sample(&sample, nil, nil)
 
 	InitConfig(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
 	assert.NoError(t, err)
 	CheckConfig(t, &cfg)
 }

go.mod

@@ -27,7 +27,7 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/patrickmn/go-cache v2.1.1-0.20180815053127-5633e0862627+incompatible
-	github.com/pelletier/go-toml v1.9.5
+	github.com/pelletier/go-toml/v2 v2.0.9
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.14.0
 	github.com/prometheus/procfs v0.12.0
@@ -94,7 +94,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.9 // indirect
 	github.com/perimeterx/marshmallow v1.1.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect

go.sum

@@ -338,8 +338,6 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/patrickmn/go-cache v2.1.1-0.20180815053127-5633e0862627+incompatible h1:MUIwjEiAMYk8zkXXUQeb5itrXF+HpS2pfxNsA2a7AiY=
 github.com/patrickmn/go-cache v2.1.1-0.20180815053127-5633e0862627+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-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.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0=
 github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/perimeterx/marshmallow v1.1.4 h1:pZLDH9RjlLGGorbXhcaQLhfuV0pFMNfPO55FuFkxqLw=

go_deps.bzl

@@ -1081,12 +1081,6 @@ def go_deps():
         sum = "h1:MUIwjEiAMYk8zkXXUQeb5itrXF+HpS2pfxNsA2a7AiY=",
         version = "v2.1.1-0.20180815053127-5633e0862627+incompatible",
     )
-    go_repository(
-        name = "com_github_pelletier_go_toml",
-        importpath = "github.com/pelletier/go-toml",
-        sum = "h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=",
-        version = "v1.9.5",
-    )
     go_repository(
         name = "com_github_pelletier_go_toml_v2",
         importpath = "github.com/pelletier/go-toml/v2",

pkg/log/BUILD.bazel

@@ -39,7 +39,7 @@ go_test(
         "//pkg/log/logtest:go_default_library",
         "//pkg/private/common:go_default_library",
         "//private/config:go_default_library",
-        "@com_github_pelletier_go_toml//:go_default_library",
+        "@com_github_pelletier_go_toml_v2//:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
         "@com_github_stretchr_testify//require:go_default_library",
         "@org_uber_go_zap//zapcore:go_default_library",

pkg/log/config_test.go

@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/scionproto/scion/pkg/log"
@@ -32,7 +32,7 @@ func TestLoggingSample(t *testing.T) {
 	var cfg log.Config
 	cfg.Sample(&sample, nil, map[string]string{config.ID: id})
 	logtest.InitTestLogging(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
 	assert.NoError(t, err)
 	logtest.CheckTestLogging(t, &cfg, id)
 }

private/config/BUILD.bazel

@@ -10,6 +10,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/private/serrors:go_default_library",
-        "@com_github_pelletier_go_toml//:go_default_library",
+        "@com_github_pelletier_go_toml_v2//:go_default_library",
     ],
 )

private/config/config.go

@@ -54,7 +54,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 
 	"github.com/scionproto/scion/pkg/private/serrors"
 )
@@ -162,7 +162,7 @@ func InitAll(defaulters ...Defaulter) {
 
 // Decode decodes a raw config.
 func Decode(raw []byte, cfg interface{}) error {
-	return toml.NewDecoder(bytes.NewReader(raw)).Strict(true).Decode(cfg)
+	return toml.NewDecoder(bytes.NewReader(raw)).DisallowUnknownFields().Decode(cfg)
 }
 
 // LoadFile loads the config from file.

private/env/envtest/BUILD.bazel

@@ -20,7 +20,7 @@ go_test(
     deps = [
         "//private/config:go_default_library",
         "//private/env:go_default_library",
-        "@com_github_pelletier_go_toml//:go_default_library",
+        "@com_github_pelletier_go_toml_v2//:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
     ],
 )

private/env/envtest/config_test.go

@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/scionproto/scion/private/config"
@@ -30,7 +30,7 @@ func TestGeneralSample(t *testing.T) {
 	var cfg env.General
 	cfg.Sample(&sample, nil, map[string]string{config.ID: "general"})
 	InitTestGeneral(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
 	assert.NoError(t, err)
 	CheckTestGeneral(t, &cfg, "general")
 }
@@ -40,7 +40,7 @@ func TestMetricsSample(t *testing.T) {
 	var cfg env.Metrics
 	cfg.Sample(&sample, nil, nil)
 	InitTestMetrics(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
 	assert.NoError(t, err)
 	CheckTestMetrics(t, &cfg)
 }
@@ -50,7 +50,7 @@ func TestTracingSample(t *testing.T) {
 	var cfg env.Tracing
 	cfg.Sample(&sample, nil, nil)
 	InitTestTracing(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
 	assert.NoError(t, err)
 	CheckTestTracing(t, &cfg)
 }
@@ -60,7 +60,7 @@ func TestSCIONDClientSample(t *testing.T) {
 	var cfg env.Daemon
 	cfg.Sample(&sample, nil, nil)
 	InitTestSCIOND(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
 	assert.NoError(t, err)
 	InitTestSCIOND(&cfg)
 }

private/mgmtapi/BUILD.bazel

@@ -20,7 +20,7 @@ go_test(
     deps = [
         ":go_default_library",
         "//private/mgmtapi/mgmtapitest:go_default_library",
-        "@com_github_pelletier_go_toml//:go_default_library",
+        "@com_github_pelletier_go_toml_v2//:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
     ],
 )

private/mgmtapi/config_test.go

@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/assert"
 
 	api "github.com/scionproto/scion/private/mgmtapi"
@@ -30,7 +30,7 @@ func TestConfigSample(t *testing.T) {
 	var cfg api.Config
 	cfg.Sample(&sample, nil, nil)
 	apitest.InitConfig(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
 	assert.NoError(t, err)
 	apitest.CheckConfig(t, &cfg)
 }

private/service/BUILD.bazel

@@ -10,7 +10,7 @@ go_library(
         "//pkg/private/serrors:go_default_library",
         "//private/env:go_default_library",
         "//private/topology:go_default_library",
-        "@com_github_pelletier_go_toml//:go_default_library",
+        "@com_github_pelletier_go_toml_v2//:go_default_library",
         "@com_github_prometheus_client_golang//prometheus/promhttp:go_default_library",
     ],
 )

private/service/statuspages.go

@@ -23,7 +23,7 @@ import (
 	"sort"
 	"strings"
 
-	toml "github.com/pelletier/go-toml"
+	toml "github.com/pelletier/go-toml/v2"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
 	"github.com/scionproto/scion/pkg/log"
@@ -128,7 +128,7 @@ func (s StatusPages) Register(serveMux *http.ServeMux, elemId string) error {
 func NewConfigStatusPage(config interface{}) StatusPage {
 	handler := func(w http.ResponseWriter, r *http.Request) {
 		var buf bytes.Buffer
-		err := toml.NewEncoder(&buf).Order(toml.OrderPreserve).Encode(config)
+		err := toml.NewEncoder(&buf).Encode(config)
 		if err != nil {
 			http.Error(w, "Error encoding toml config", http.StatusInternalServerError)
 			return

private/trust/config/config.go

@@ -70,7 +70,7 @@ func (cfg *Cache) Sample(dst io.Writer, path config.Path, _ config.CtxMap) {
 # Disable caching.
 disable = false
 
-# Maximum chache expiration.
+# Maximum cache expiration.
 expiration = "1m"
 `)
 }

router/config/BUILD.bazel

@@ -29,7 +29,7 @@ go_test(
         "//pkg/log/logtest:go_default_library",
         "//private/env/envtest:go_default_library",
         "//private/mgmtapi/mgmtapitest:go_default_library",
-        "@com_github_pelletier_go_toml//:go_default_library",
+        "@com_github_pelletier_go_toml_v2//:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
     ],
 )

router/config/config_test.go

@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/scionproto/scion/pkg/log/logtest"
@@ -33,7 +33,7 @@ func TestConfigSample(t *testing.T) {
 	cfg.Sample(&sample, nil, nil)
 
 	InitTestConfig(&cfg)
-	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).Strict(true).Decode(&cfg)
+	err := toml.NewDecoder(bytes.NewReader(sample.Bytes())).DisallowUnknownFields().Decode(&cfg)
 	assert.NoError(t, err)
 	CheckTestConfig(t, &cfg, config.IDSample)
 }