Use gopkg.in/ldap.v3 3.1.0 (#6567)

This commit is contained in:
Daniel Nelson 2019-11-07 11:07:45 -08:00 committed by GitHub
parent 80e93af25b
commit 23c43fc310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 13 deletions

10
Gopkg.lock generated
View File

@ -1629,12 +1629,12 @@
version = "v1.1.0" version = "v1.1.0"
[[projects]] [[projects]]
digest = "1:367baf06b7dbd0ef0bbdd785f6a79f929c96b0c18e9d3b29c0eed1ac3f5db133" digest = "1:cff622452aa789a1b2212d401f6b618ca1751a02229d26e002eb645ec22818f2"
name = "gopkg.in/ldap.v2" name = "gopkg.in/ldap.v3"
packages = ["."] packages = ["."]
pruneopts = "" pruneopts = ""
revision = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9" revision = "caa044a2bfa324b735baee1722e8e2e372f76864"
version = "v2.5.1" version = "v3.1.0"
[[projects]] [[projects]]
branch = "v2" branch = "v2"
@ -1826,7 +1826,7 @@
"google.golang.org/grpc/peer", "google.golang.org/grpc/peer",
"google.golang.org/grpc/status", "google.golang.org/grpc/status",
"gopkg.in/gorethink/gorethink.v3", "gopkg.in/gorethink/gorethink.v3",
"gopkg.in/ldap.v2", "gopkg.in/ldap.v3",
"gopkg.in/mgo.v2", "gopkg.in/mgo.v2",
"gopkg.in/mgo.v2/bson", "gopkg.in/mgo.v2/bson",
"gopkg.in/olivere/elastic.v5", "gopkg.in/olivere/elastic.v5",

View File

@ -201,10 +201,6 @@
name = "gopkg.in/gorethink/gorethink.v3" name = "gopkg.in/gorethink/gorethink.v3"
version = "3.0.5" version = "3.0.5"
[[constraint]]
name = "gopkg.in/ldap.v2"
version = "2.5.1"
[[constraint]] [[constraint]]
name = "gopkg.in/mgo.v2" name = "gopkg.in/mgo.v2"
branch = "v2" branch = "v2"
@ -301,3 +297,7 @@
[[constraint]] [[constraint]]
branch = "master" branch = "master"
name = "github.com/cisco-ie/nx-telemetry-proto" name = "github.com/cisco-ie/nx-telemetry-proto"
[[constraint]]
name = "gopkg.in/ldap.v3"
version = "3.1.0"

View File

@ -5,11 +5,10 @@ import (
"strconv" "strconv"
"strings" "strings"
"gopkg.in/ldap.v2"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal/tls" "github.com/influxdata/telegraf/internal/tls"
"github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/inputs"
"gopkg.in/ldap.v3"
) )
type Openldap struct { type Openldap struct {

View File

@ -4,11 +4,10 @@ import (
"strconv" "strconv"
"testing" "testing"
"gopkg.in/ldap.v2"
"github.com/influxdata/telegraf/testutil" "github.com/influxdata/telegraf/testutil"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gopkg.in/ldap.v3"
) )
func TestOpenldapMockResult(t *testing.T) { func TestOpenldapMockResult(t *testing.T) {