From 23c43fc310c6d2150a22e153a0ae2862ebfa953a Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Thu, 7 Nov 2019 11:07:45 -0800
Subject: [PATCH] Use gopkg.in/ldap.v3 3.1.0 (#6567)

---
 Gopkg.lock                               | 10 +++++-----
 Gopkg.toml                               |  8 ++++----
 plugins/inputs/openldap/openldap.go      |  3 +--
 plugins/inputs/openldap/openldap_test.go |  3 +--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 78842d940..35f25649f 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1629,12 +1629,12 @@
   version = "v1.1.0"
 
 [[projects]]
-  digest = "1:367baf06b7dbd0ef0bbdd785f6a79f929c96b0c18e9d3b29c0eed1ac3f5db133"
-  name = "gopkg.in/ldap.v2"
+  digest = "1:cff622452aa789a1b2212d401f6b618ca1751a02229d26e002eb645ec22818f2"
+  name = "gopkg.in/ldap.v3"
   packages = ["."]
   pruneopts = ""
-  revision = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9"
-  version = "v2.5.1"
+  revision = "caa044a2bfa324b735baee1722e8e2e372f76864"
+  version = "v3.1.0"
 
 [[projects]]
   branch = "v2"
@@ -1826,7 +1826,7 @@
     "google.golang.org/grpc/peer",
     "google.golang.org/grpc/status",
     "gopkg.in/gorethink/gorethink.v3",
-    "gopkg.in/ldap.v2",
+    "gopkg.in/ldap.v3",
     "gopkg.in/mgo.v2",
     "gopkg.in/mgo.v2/bson",
     "gopkg.in/olivere/elastic.v5",
diff --git a/Gopkg.toml b/Gopkg.toml
index 1bbeb962f..cc3498ab3 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -201,10 +201,6 @@
   name = "gopkg.in/gorethink/gorethink.v3"
   version = "3.0.5"
 
-[[constraint]]
-  name = "gopkg.in/ldap.v2"
-  version = "2.5.1"
-
 [[constraint]]
   name = "gopkg.in/mgo.v2"
   branch = "v2"
@@ -301,3 +297,7 @@
 [[constraint]]
   branch = "master"
   name = "github.com/cisco-ie/nx-telemetry-proto"
+
+[[constraint]]
+  name = "gopkg.in/ldap.v3"
+  version = "3.1.0"
diff --git a/plugins/inputs/openldap/openldap.go b/plugins/inputs/openldap/openldap.go
index 9e69c8a21..a92a37371 100644
--- a/plugins/inputs/openldap/openldap.go
+++ b/plugins/inputs/openldap/openldap.go
@@ -5,11 +5,10 @@ import (
 	"strconv"
 	"strings"
 
-	"gopkg.in/ldap.v2"
-
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/tls"
 	"github.com/influxdata/telegraf/plugins/inputs"
+	"gopkg.in/ldap.v3"
 )
 
 type Openldap struct {
diff --git a/plugins/inputs/openldap/openldap_test.go b/plugins/inputs/openldap/openldap_test.go
index 10835896f..76d9cc3a9 100644
--- a/plugins/inputs/openldap/openldap_test.go
+++ b/plugins/inputs/openldap/openldap_test.go
@@ -4,11 +4,10 @@ import (
 	"strconv"
 	"testing"
 
-	"gopkg.in/ldap.v2"
-
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/ldap.v3"
 )
 
 func TestOpenldapMockResult(t *testing.T) {