Use gopkg.in/ldap.v3 3.1.0

Include GitHub #136: Require explicit intention for empty password.
influxdata · Oct 23, 2019 · 7d6ea20 · 7d6ea20
1 parent 5a6fe14
commit 7d6ea20
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git 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
@@ -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
@@ -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) {