From f8bba0735dfc69c14c7bfb94c59d164e7d5ecdee Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 9 Jan 2021 13:58:23 +0000
Subject: [PATCH] Use versioned import for github.com/cenkalti/backoff

---
 clientutil/balancer.go | 2 +-
 go.mod                 | 2 +-
 go.sum                 | 4 ++--
 ldap/pool.go           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/clientutil/balancer.go b/clientutil/balancer.go
index b70602c..ca926d0 100644
--- a/clientutil/balancer.go
+++ b/clientutil/balancer.go
@@ -16,7 +16,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cenkalti/backoff"
+	"github.com/cenkalti/backoff/v4"
 )
 
 // Our own narrow logger interface.
diff --git a/go.mod b/go.mod
index eefcf77..84b618d 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	contrib.go.opencensus.io/exporter/zipkin v0.1.1
 	github.com/amoghe/go-crypt v0.0.0-20191109212615-b2ff80594b7f
 	github.com/bbrks/wrap/v2 v2.5.0
-	github.com/cenkalti/backoff v2.2.1+incompatible
+	github.com/cenkalti/backoff/v4 v4.1.0
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594
 	github.com/gofrs/flock v0.8.0 // indirect
diff --git a/go.sum b/go.sum
index 04c04d7..72e71dd 100644
--- a/go.sum
+++ b/go.sum
@@ -16,8 +16,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 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/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
-github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/cenkalti/backoff/v4 v4.1.0 h1:c8LkOFQTzuO0WBM/ae5HdGQuZPfPxp7lqBRwQRm4fSc=
+github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
diff --git a/ldap/pool.go b/ldap/pool.go
index ce23e6f..3195115 100644
--- a/ldap/pool.go
+++ b/ldap/pool.go
@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/cenkalti/backoff"
+	"github.com/cenkalti/backoff/v4"
 	"github.com/prometheus/client_golang/prometheus"
 	"go.opencensus.io/trace"
 	"gopkg.in/ldap.v3"
-- 
GitLab