diff options
| author | Toon Claes <toon@gitlab.com> | 2022-08-16 14:47:26 +0300 |
|---|---|---|
| committer | Will Chandler <wchandler@gitlab.com> | 2022-08-20 06:49:38 +0300 |
| commit | 72e1c78e920a917ae96a25271173740e6557888e (patch) | |
| tree | a637cef25392bedd1651349b64fb8ec922fbc412 /internal | |
| parent | cb0e4c4d751ebbe3a18bddc69aa2e7792b9415aa (diff) | |
go: Update module github.com/pelletier/go-toml to v2
With this change we upgrade go-toml to v2. This includes changing the
import paths to include v2.
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/blackbox/config.go | 2 | ||||
| -rw-r--r-- | internal/gitaly/config/config.go | 2 | ||||
| -rw-r--r-- | internal/praefect/config/config.go | 2 | ||||
| -rw-r--r-- | internal/praefect/config/config_test.go | 4 | ||||
| -rw-r--r-- | internal/testhelper/testserver/praefect.go | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/internal/blackbox/config.go b/internal/blackbox/config.go index c9e5966ed..9ea3c33a9 100644 --- a/internal/blackbox/config.go +++ b/internal/blackbox/config.go @@ -5,7 +5,7 @@ import ( "net/url" "time" - "github.com/pelletier/go-toml" + "github.com/pelletier/go-toml/v2" logconfig "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config/log" "gitlab.com/gitlab-org/gitaly/v15/internal/helper/duration" ) diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go index 8378933a6..43fae6f40 100644 --- a/internal/gitaly/config/config.go +++ b/internal/gitaly/config/config.go @@ -13,7 +13,7 @@ import ( "syscall" "time" - "github.com/pelletier/go-toml" + "github.com/pelletier/go-toml/v2" log "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config/auth" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config/cgroups" diff --git a/internal/praefect/config/config.go b/internal/praefect/config/config.go index 6a053f0ec..5af6eccdb 100644 --- a/internal/praefect/config/config.go +++ b/internal/praefect/config/config.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/pelletier/go-toml" + "github.com/pelletier/go-toml/v2" promclient "github.com/prometheus/client_golang/prometheus" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config/auth" diff --git a/internal/praefect/config/config_test.go b/internal/praefect/config/config_test.go index 503430dda..b0e1879f6 100644 --- a/internal/praefect/config/config_test.go +++ b/internal/praefect/config/config_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/pelletier/go-toml" + "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config/log" @@ -522,6 +522,6 @@ func TestSerialization(t *testing.T) { t.Run("partially set", func(t *testing.T) { out.Reset() require.NoError(t, encoder.Encode(Config{ListenAddr: "localhost:5640"})) - require.Equal(t, "listen_addr = \"localhost:5640\"\n", out.String()) + require.Equal(t, "listen_addr = 'localhost:5640'\n", out.String()) }) } diff --git a/internal/testhelper/testserver/praefect.go b/internal/testhelper/testserver/praefect.go index ec930ffd8..8f4fc5040 100644 --- a/internal/testhelper/testserver/praefect.go +++ b/internal/testhelper/testserver/praefect.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/pelletier/go-toml" + "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/require" gitalycfg "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config" "gitlab.com/gitlab-org/gitaly/v15/internal/praefect/config" |