mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-05 20:36:26 +02:00
Code Issues Projects Releases Wiki Activity

Move ldaputil and tlsutil over to sdk

Browse Source
This commit is contained in:
Jeff Mitchell 2019-04-12 18:26:54 -04:00
parent 6388efd4f0
commit f95571a361
23 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/credential/ldap/backend.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
"strings"
"github.com/hashicorp/vault/helper/ldaputil"
"github.com/hashicorp/vault/sdk/helper/ldaputil"
"github.com/hashicorp/vault/helper/mfa"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"

2
builtin/credential/ldap/path_config.go
View File

@ -4,7 +4,7 @@ import (
"context"
"github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/helper/ldaputil"
"github.com/hashicorp/vault/sdk/helper/ldaputil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/sdk/framework"
)

2
builtin/logical/cassandra/path_config_connection.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/helper/tlsutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/sdk/framework"
)

2
builtin/logical/cassandra/util.go
View File

@ -9,7 +9,7 @@ import (
"github.com/gocql/gocql"
"github.com/hashicorp/errwrap"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/helper/tlsutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/sdk/logical"
)

2
helper/listenerutil/listener.go
View File

@ -13,7 +13,7 @@ import (
"github.com/hashicorp/errwrap"
"github.com/hashicorp/vault/sdk/helper/parseutil"
"github.com/hashicorp/vault/helper/reload"
"github.com/hashicorp/vault/helper/tlsutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/jefferai/isbadcipher"
"github.com/mitchellh/cli"
)

2
physical/consul/consul.go
View File

@ -30,7 +30,7 @@ import (
"github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/sdk/helper/parseutil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/helper/tlsutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/sdk/physical"
)

2
physical/zookeeper/zookeeper.go
View File

@ -19,7 +19,7 @@ import (
"github.com/hashicorp/vault/sdk/physical"
metrics "github.com/armon/go-metrics"
"github.com/hashicorp/vault/helper/tlsutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/samuel/go-zookeeper/zk"
)

2
plugins/database/cassandra/connection_producer.go
View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/errwrap"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/sdk/helper/parseutil"
"github.com/hashicorp/vault/helper/tlsutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/plugins/helper/database/connutil"
"github.com/hashicorp/vault/plugins/helper/database/dbutil"
)

2
plugins/database/influxdb/connection_producer.go
View File

@ -10,7 +10,7 @@ import (
"github.com/hashicorp/errwrap"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/sdk/helper/parseutil"
"github.com/hashicorp/vault/helper/tlsutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/plugins/helper/database/connutil"
influx "github.com/influxdata/influxdb/client/v2"
"github.com/mitchellh/mapstructure"

2
sdk/go.mod
View File

@ -5,6 +5,7 @@ go 1.12
require (
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310
github.com/fatih/structs v1.1.0
github.com/go-ldap/ldap v3.0.2+incompatible
github.com/go-test/deep v1.0.1
github.com/gogo/protobuf v1.2.1
github.com/golang/protobuf v1.3.1
@ -31,4 +32,5 @@ require (
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect
google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107 // indirect
google.golang.org/grpc v1.19.1
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
)

4
sdk/go.sum
View File

@ -12,6 +12,8 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
github.com/go-ldap/ldap v3.0.2+incompatible h1:kD5HQcAzlQ7yrhfn+h+MSABeAy/jAJhvIJ/QDllP44g=
github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg=
github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
@ -133,4 +135,6 @@ google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM=
google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

2
helper/ldaputil/client.go → sdk/helper/ldaputil/client.go
View File

@ -16,7 +16,7 @@ import (
"github.com/hashicorp/errwrap"
hclog "github.com/hashicorp/go-hclog"
multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/vault/helper/tlsutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
)
type Client struct {

0
helper/ldaputil/client_test.go → sdk/helper/ldaputil/client_test.go
View File

2
helper/ldaputil/config.go → sdk/helper/ldaputil/config.go
View File

@ -8,7 +8,7 @@ import (
"strings"
"text/template"
"github.com/hashicorp/vault/helper/tlsutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/errwrap"

0
helper/ldaputil/config_test.go → sdk/helper/ldaputil/config_test.go
View File

0
helper/ldaputil/connection.go → sdk/helper/ldaputil/connection.go
View File

0
helper/ldaputil/ldap.go → sdk/helper/ldaputil/ldap.go
View File

0
helper/tlsutil/tlsutil.go → sdk/helper/tlsutil/tlsutil.go
View File

0
helper/tlsutil/tlsutil_test.go → sdk/helper/tlsutil/tlsutil_test.go
View File

2
vault/core.go
View File

@ -34,7 +34,7 @@ import (
"github.com/hashicorp/vault/sdk/helper/mlock"
"github.com/hashicorp/vault/helper/namespace"
"github.com/hashicorp/vault/helper/reload"
"github.com/hashicorp/vault/helper/tlsutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/sdk/physical"
"github.com/hashicorp/vault/shamir"

2
vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/client/client.go generated vendored
View File

@ -9,7 +9,7 @@ import (
"github.com/go-errors/errors"
"github.com/go-ldap/ldap"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/vault/helper/ldaputil"
"github.com/hashicorp/vault/sdk/helper/ldaputil"
"golang.org/x/text/encoding/unicode"
)

2
vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/client/config.go generated vendored
View File

@ -3,7 +3,7 @@ package client
import (
"time"
"github.com/hashicorp/vault/helper/ldaputil"
"github.com/hashicorp/vault/sdk/helper/ldaputil"
)
type ADConf struct {

2
vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_config.go generated vendored
View File

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/vault-plugin-secrets-ad/plugin/client"
"github.com/hashicorp/vault-plugin-secrets-ad/plugin/util"
"github.com/hashicorp/vault/helper/ldaputil"
"github.com/hashicorp/vault/sdk/helper/ldaputil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/sdk/framework"
)