Skip to content

Commit

Permalink
Migrate to sdk/internalshared libs in go-secure-stdlib (#12090)
Browse files Browse the repository at this point in the history 
* Swap sdk/helper libs to go-secure-stdlib

* Migrate to go-secure-stdlib reloadutil

* Migrate to go-secure-stdlib kv-builder

* Migrate to go-secure-stdlib gatedwriter
  • Loading branch information
@jefferai
jefferai committed Jul 16, 2021
1 parent 8ddf155 commit 861454e
Show file tree
Hide file tree
Showing 163 changed files with 207 additions and 705 deletions.
2 changes: 1 addition & 1 deletion api/client.go
View file
Expand Up @@ -19,8 +19,8 @@ import (
cleanhttp "github.com/hashicorp/go-cleanhttp"
retryablehttp "github.com/hashicorp/go-retryablehttp"
rootcerts "github.com/hashicorp/go-rootcerts"
"github.com/hashicorp/go-secure-stdlib/parseutil"
"github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/sdk/helper/parseutil"
"golang.org/x/net/http2"
"golang.org/x/time/rate"
)
Expand Down
1 change: 1 addition & 0 deletions api/go.mod
View file
Expand Up @@ -14,6 +14,7 @@ require (
github.com/hashicorp/go-multierror v1.1.0
github.com/hashicorp/go-retryablehttp v0.6.6
github.com/hashicorp/go-rootcerts v1.0.2
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1
github.com/hashicorp/hcl v1.0.0
github.com/hashicorp/vault/sdk v0.2.1
github.com/mitchellh/mapstructure v1.4.1
Expand Down
2 changes: 1 addition & 1 deletion api/secret.go
View file
Expand Up @@ -7,8 +7,8 @@ import (
"time"

"github.com/hashicorp/errwrap"
"github.com/hashicorp/go-secure-stdlib/parseutil"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
"github.com/hashicorp/vault/sdk/helper/parseutil"
)

// Secret is the structure returned for every secret within Vault.
Expand Down
2 changes: 1 addition & 1 deletion api/sys_raft.go
View file
Expand Up @@ -9,7 +9,7 @@ import (
"net/http"
"time"

"github.com/hashicorp/vault/sdk/helper/parseutil"
"github.com/hashicorp/go-secure-stdlib/parseutil"

"github.com/mitchellh/mapstructure"

Expand Down
2 changes: 1 addition & 1 deletion audit/hashstructure.go
View file
Expand Up @@ -6,8 +6,8 @@ import (
"reflect"
"time"

"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/sdk/helper/salt"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/helper/wrapping"
"github.com/hashicorp/vault/sdk/logical"
"github.com/mitchellh/copystructure"
Expand Down
2 changes: 1 addition & 1 deletion builtin/audit/socket/backend.go
View file
Expand Up @@ -10,8 +10,8 @@ import (
"time"

multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/go-secure-stdlib/parseutil"
"github.com/hashicorp/vault/audit"
"github.com/hashicorp/vault/sdk/helper/parseutil"
"github.com/hashicorp/vault/sdk/helper/salt"
"github.com/hashicorp/vault/sdk/logical"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/approle/path_login.go
View file
Expand Up @@ -6,9 +6,9 @@ import (
"strings"
"time"

"github.com/hashicorp/go-secure-stdlib/parseutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/cidrutil"
"github.com/hashicorp/vault/sdk/helper/parseutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
4 changes: 2 additions & 2 deletions builtin/credential/approle/path_role.go
View file
Expand Up @@ -7,14 +7,14 @@ import (
"strings"
"time"

"github.com/hashicorp/go-secure-stdlib/parseutil"
"github.com/hashicorp/go-secure-stdlib/strutil"
uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/cidrutil"
"github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/sdk/helper/locksutil"
"github.com/hashicorp/vault/sdk/helper/parseutil"
"github.com/hashicorp/vault/sdk/helper/policyutil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/helper/tokenutil"
"github.com/hashicorp/vault/sdk/logical"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/aws/path_config_client.go
View file
Expand Up @@ -8,8 +8,8 @@ import (
"strings"

"github.com/aws/aws-sdk-go/aws"
"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/aws/path_config_identity.go
View file
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"fmt"

"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/authmetadata"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/aws/path_login.go
View file
Expand Up @@ -24,12 +24,12 @@ import (
"github.com/hashicorp/errwrap"
cleanhttp "github.com/hashicorp/go-cleanhttp"
"github.com/hashicorp/go-retryablehttp"
"github.com/hashicorp/go-secure-stdlib/strutil"
uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/awsutil"
"github.com/hashicorp/vault/sdk/helper/cidrutil"
"github.com/hashicorp/vault/sdk/helper/jsonutil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/aws/path_role_tag.go
View file
Expand Up @@ -11,10 +11,10 @@ import (
"strings"
"time"

"github.com/hashicorp/go-secure-stdlib/strutil"
uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/policyutil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/aws/path_role_test.go
View file
Expand Up @@ -9,11 +9,11 @@ import (

"github.com/go-test/deep"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-secure-stdlib/strutil"
vlttesting "github.com/hashicorp/vault/helper/testhelpers/logical"
"github.com/hashicorp/vault/sdk/helper/awsutil"
"github.com/hashicorp/vault/sdk/helper/logging"
"github.com/hashicorp/vault/sdk/helper/policyutil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/github/cli.go
View file
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"strings"

"github.com/hashicorp/go-secure-stdlib/password"
"github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/sdk/helper/password"
)

type CLIHandler struct {
Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/ldap/backend.go
View file
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"strings"

"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/helper/mfa"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/ldaputil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/ldap/cli.go
View file
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"strings"

pwd "github.com/hashicorp/go-secure-stdlib/password"
"github.com/hashicorp/vault/api"
pwd "github.com/hashicorp/vault/sdk/helper/password"
)

type CLIHandler struct{}
Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/ldap/path_users.go
View file
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"strings"

"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/policyutil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/okta/cli.go
View file
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"strings"

pwd "github.com/hashicorp/go-secure-stdlib/password"
"github.com/hashicorp/vault/api"
pwd "github.com/hashicorp/vault/sdk/helper/password"
)

// CLIHandler struct
Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/token/cli.go
View file
Expand Up @@ -7,8 +7,8 @@ import (
"strconv"
"strings"

"github.com/hashicorp/go-secure-stdlib/password"
"github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/sdk/helper/password"
)

type CLIHandler struct {
Expand Down
2 changes: 1 addition & 1 deletion builtin/credential/userpass/cli.go
View file
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"strings"

pwd "github.com/hashicorp/go-secure-stdlib/password"
"github.com/hashicorp/vault/api"
pwd "github.com/hashicorp/vault/sdk/helper/password"
"github.com/mitchellh/mapstructure"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/aws/path_roles.go
View file
Expand Up @@ -12,9 +12,9 @@ import (

"github.com/aws/aws-sdk-go/aws/arn"
"github.com/hashicorp/go-multierror"
"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/aws/path_user.go
View file
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/iam"
"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/mitchellh/mapstructure"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/cassandra/path_config_connection.go
View file
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"fmt"

"github.com/hashicorp/go-secure-stdlib/tlsutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/cassandra/path_creds_create.go
View file
Expand Up @@ -7,9 +7,9 @@ import (
"time"

"github.com/gocql/gocql"
"github.com/hashicorp/go-secure-stdlib/strutil"
uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/cassandra/util.go
View file
Expand Up @@ -7,8 +7,8 @@ import (
"time"

"github.com/gocql/gocql"
"github.com/hashicorp/go-secure-stdlib/tlsutil"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/sdk/helper/tlsutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/database/backend.go
View file
Expand Up @@ -9,13 +9,13 @@ import (
"time"

log "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/go-uuid"
v4 "github.com/hashicorp/vault/sdk/database/dbplugin"
v5 "github.com/hashicorp/vault/sdk/database/dbplugin/v5"
"github.com/hashicorp/vault/sdk/database/helper/dbutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/locksutil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/sdk/queue"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/database/path_creds_create.go
View file
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"time"

"github.com/hashicorp/go-secure-stdlib/strutil"
v5 "github.com/hashicorp/vault/sdk/database/dbplugin/v5"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/database/path_roles.go
View file
Expand Up @@ -6,10 +6,10 @@ import (
"strings"
"time"

"github.com/hashicorp/go-secure-stdlib/strutil"
v4 "github.com/hashicorp/vault/sdk/database/dbplugin"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/locksutil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/sdk/queue"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/database/rotation.go
View file
Expand Up @@ -8,12 +8,12 @@ import (
"time"

"github.com/hashicorp/go-multierror"
"github.com/hashicorp/go-secure-stdlib/strutil"
v4 "github.com/hashicorp/vault/sdk/database/dbplugin"
v5 "github.com/hashicorp/vault/sdk/database/dbplugin/v5"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/sdk/helper/locksutil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/sdk/queue"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/mssql/path_creds_create.go
View file
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"strings"

"github.com/hashicorp/go-secure-stdlib/strutil"
uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/dbtxn"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/mssql/path_roles.go
View file
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"strings"

"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/mysql/path_role_create.go
View file
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"strings"

"github.com/hashicorp/go-secure-stdlib/strutil"
uuid "github.com/hashicorp/go-uuid"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/dbtxn"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
_ "github.com/lib/pq"
)
Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/mysql/path_roles.go
View file
Expand Up @@ -6,8 +6,8 @@ import (
"strings"

_ "github.com/go-sql-driver/mysql"
"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/mysql/secret_creds.go
View file
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"strings"

"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
)

Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/pki/backend_test.go
View file
Expand Up @@ -30,12 +30,12 @@ import (

"github.com/fatih/structs"
"github.com/go-test/deep"
"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/builtin/credential/userpass"
logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
vaulthttp "github.com/hashicorp/vault/http"
"github.com/hashicorp/vault/sdk/helper/certutil"
"github.com/hashicorp/vault/sdk/helper/strutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/vault"
"github.com/mitchellh/mapstructure"
Expand Down

0 comments on commit 861454e

Please sign in to comment.