Fix deprecation and import path

bookingcom · Aug 20, 2024 · 7d330d9 · 7d330d9
1 parent 135540f
commit 7d330d9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/pkg/conf/clusters.go b/pkg/conf/clusters.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/burntsushi/toml"
+	"github.com/BurntSushi/toml"
 	"github.com/pkg/errors"
 )
 
@@ -59,7 +59,7 @@ type Host struct {
 // 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")
 	}

diff --git a/pkg/conf/conf.go b/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")
 	}

diff --git a/pkg/conf/rewrites.go b/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")
 	}

diff --git a/pkg/conf/rules.go b/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")
 	}