diff --git a/builtin/credential/app-id/path_login.go b/builtin/credential/app-id/path_login.go index f5f0816f44..e516026d7e 100644 --- a/builtin/credential/app-id/path_login.go +++ b/builtin/credential/app-id/path_login.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/approle/path_role.go b/builtin/credential/approle/path_role.go index 55a0717087..0eeca92bb5 100644 --- a/builtin/credential/approle/path_role.go +++ b/builtin/credential/approle/path_role.go @@ -12,7 +12,7 @@ import ( "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/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" diff --git a/builtin/credential/approle/path_role_test.go b/builtin/credential/approle/path_role_test.go index a1b1188a67..cb3000fe9f 100644 --- a/builtin/credential/approle/path_role_test.go +++ b/builtin/credential/approle/path_role_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/credential/aws/backend_test.go b/builtin/credential/aws/backend_test.go index 3713d151b9..65e64f6ad9 100644 --- a/builtin/credential/aws/backend_test.go +++ b/builtin/credential/aws/backend_test.go @@ -14,7 +14,7 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sts" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" diff --git a/builtin/credential/aws/path_role.go b/builtin/credential/aws/path_role.go index 6efc493865..9aaf8155f2 100644 --- a/builtin/credential/aws/path_role.go +++ b/builtin/credential/aws/path_role.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/sdk/helper/consts" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/aws/path_role_tag.go b/builtin/credential/aws/path_role_tag.go index 914c2dc4a8..2aaae95e2b 100644 --- a/builtin/credential/aws/path_role_tag.go +++ b/builtin/credential/aws/path_role_tag.go @@ -12,7 +12,7 @@ import ( "time" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" diff --git a/builtin/credential/aws/path_role_test.go b/builtin/credential/aws/path_role_test.go index 91a36bc49a..150f323169 100644 --- a/builtin/credential/aws/path_role_test.go +++ b/builtin/credential/aws/path_role_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/go-test/deep" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/logical" ) diff --git a/builtin/credential/cert/path_certs.go b/builtin/credential/cert/path_certs.go index 3762067228..6ac85f1927 100644 --- a/builtin/credential/cert/path_certs.go +++ b/builtin/credential/cert/path_certs.go @@ -9,7 +9,7 @@ import ( sockaddr "github.com/hashicorp/go-sockaddr" "github.com/hashicorp/vault/sdk/helper/parseutil" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/cert/path_login.go b/builtin/credential/cert/path_login.go index b1df3183fb..7f31347024 100644 --- a/builtin/credential/cert/path_login.go +++ b/builtin/credential/cert/path_login.go @@ -13,7 +13,7 @@ import ( "strings" "github.com/hashicorp/vault/sdk/helper/certutil" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" diff --git a/builtin/credential/github/path_login.go b/builtin/credential/github/path_login.go index cc3e43cef4..32391c1b5d 100644 --- a/builtin/credential/github/path_login.go +++ b/builtin/credential/github/path_login.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-github/github" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/ldap/backend_test.go b/builtin/credential/ldap/backend_test.go index 49c1eb7856..dfa61ee428 100644 --- a/builtin/credential/ldap/backend_test.go +++ b/builtin/credential/ldap/backend_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" diff --git a/builtin/credential/ldap/path_groups.go b/builtin/credential/ldap/path_groups.go index d0ef2d15da..bc12a9fabf 100644 --- a/builtin/credential/ldap/path_groups.go +++ b/builtin/credential/ldap/path_groups.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/ldap/path_login.go b/builtin/credential/ldap/path_login.go index 4b09af81de..a6d1cd27f5 100644 --- a/builtin/credential/ldap/path_login.go +++ b/builtin/credential/ldap/path_login.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/ldap/path_users.go b/builtin/credential/ldap/path_users.go index fbfeb3169f..45baaf229d 100644 --- a/builtin/credential/ldap/path_users.go +++ b/builtin/credential/ldap/path_users.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" diff --git a/builtin/credential/okta/backend_test.go b/builtin/credential/okta/backend_test.go index 662ce80e3b..d9bffa7647 100644 --- a/builtin/credential/okta/backend_test.go +++ b/builtin/credential/okta/backend_test.go @@ -9,7 +9,7 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/sdk/helper/logging" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "time" diff --git a/builtin/credential/okta/path_groups.go b/builtin/credential/okta/path_groups.go index 91a099cfb5..8abc382f27 100644 --- a/builtin/credential/okta/path_groups.go +++ b/builtin/credential/okta/path_groups.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/okta/path_login.go b/builtin/credential/okta/path_login.go index 230c9f68ad..aaf5cab7f0 100644 --- a/builtin/credential/okta/path_login.go +++ b/builtin/credential/okta/path_login.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/go-errors/errors" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/radius/path_login.go b/builtin/credential/radius/path_login.go index 3c800e9906..2c70bced72 100644 --- a/builtin/credential/radius/path_login.go +++ b/builtin/credential/radius/path_login.go @@ -11,7 +11,7 @@ import ( "layeh.com/radius" . "layeh.com/radius/rfc2865" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/radius/path_users.go b/builtin/credential/radius/path_users.go index 3075c502e6..ead8bc2d6d 100644 --- a/builtin/credential/radius/path_users.go +++ b/builtin/credential/radius/path_users.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/userpass/backend_test.go b/builtin/credential/userpass/backend_test.go index 489b10cda4..a98c530b64 100644 --- a/builtin/credential/userpass/backend_test.go +++ b/builtin/credential/userpass/backend_test.go @@ -9,7 +9,7 @@ import ( "crypto/tls" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" diff --git a/builtin/credential/userpass/path_login.go b/builtin/credential/userpass/path_login.go index 61ece91237..31089d1185 100644 --- a/builtin/credential/userpass/path_login.go +++ b/builtin/credential/userpass/path_login.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/hashicorp/vault/sdk/helper/cidrutil" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" "golang.org/x/crypto/bcrypt" diff --git a/builtin/credential/userpass/path_user_policies.go b/builtin/credential/userpass/path_user_policies.go index c3a0dc686e..c5a4270a2d 100644 --- a/builtin/credential/userpass/path_user_policies.go +++ b/builtin/credential/userpass/path_user_policies.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/builtin/credential/userpass/path_users.go b/builtin/credential/userpass/path_users.go index da8dff9324..e719fa5384 100644 --- a/builtin/credential/userpass/path_users.go +++ b/builtin/credential/userpass/path_users.go @@ -8,7 +8,7 @@ import ( sockaddr "github.com/hashicorp/go-sockaddr" "github.com/hashicorp/vault/sdk/helper/parseutil" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/helper/policyutil/policyutil.go b/sdk/helper/policyutil/policyutil.go similarity index 100% rename from helper/policyutil/policyutil.go rename to sdk/helper/policyutil/policyutil.go diff --git a/helper/policyutil/policyutil_test.go b/sdk/helper/policyutil/policyutil_test.go similarity index 100% rename from helper/policyutil/policyutil_test.go rename to sdk/helper/policyutil/policyutil_test.go diff --git a/vault/request_handling.go b/vault/request_handling.go index 67134da547..cb03db2a9f 100644 --- a/vault/request_handling.go +++ b/vault/request_handling.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/helper/wrapping" "github.com/hashicorp/vault/sdk/logical" diff --git a/vault/token_store.go b/vault/token_store.go index f6bb7ecba9..0e0d4d1c16 100644 --- a/vault/token_store.go +++ b/vault/token_store.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/vault/sdk/helper/locksutil" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/sdk/helper/parseutil" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/helper/salt" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/logical" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-azure/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-auth-azure/Gopkg.lock index ba7a931f9f..34fb6aea15 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-azure/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-azure/Gopkg.lock @@ -479,7 +479,7 @@ "github.com/hashicorp/go-cleanhttp", "github.com/hashicorp/go-hclog", "github.com/hashicorp/vault/sdk/helper/pluginutil", - "github.com/hashicorp/vault/helper/policyutil", + "github.com/hashicorp/vault/sdk/helper/policyutil", "github.com/hashicorp/vault/sdk/logical", "github.com/hashicorp/vault/sdk/framework", "github.com/hashicorp/vault/sdk/logical/plugin", diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_role.go b/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_role.go index 174ff3eb72..4c01044034 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_role.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_role.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/Gopkg.lock index 6af4d6c0d8..959d14ecf3 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/Gopkg.lock @@ -396,7 +396,7 @@ "github.com/hashicorp/vault/api", "github.com/hashicorp/vault/helper/password", "github.com/hashicorp/vault/sdk/helper/pluginutil", - "github.com/hashicorp/vault/helper/policyutil", + "github.com/hashicorp/vault/sdk/helper/policyutil", "github.com/hashicorp/vault/sdk/logical", "github.com/hashicorp/vault/sdk/framework", "github.com/hashicorp/vault/sdk/logical/plugin", diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_config.go b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_config.go index 4856bf7193..d0b370a558 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_config.go @@ -5,7 +5,7 @@ import ( "fmt" "net/url" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_login.go b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_login.go index 8aea7013f0..bb1de349bf 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_login.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_login.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/go-gcp-common/gcputil" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_role.go b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_role.go index 824a3f08f7..72bed0b50a 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_role.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_role.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/go-gcp-common/gcputil" vaultconsts "github.com/hashicorp/vault/sdk/helper/consts" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/Gopkg.lock index 30e86af803..115fc9e1fe 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/Gopkg.lock @@ -468,7 +468,7 @@ "github.com/hashicorp/vault/sdk/helper/logging", "github.com/hashicorp/vault/sdk/helper/parseutil", "github.com/hashicorp/vault/sdk/helper/pluginutil", - "github.com/hashicorp/vault/helper/policyutil", + "github.com/hashicorp/vault/sdk/helper/policyutil", "github.com/hashicorp/vault/sdk/helper/strutil", "github.com/hashicorp/vault/sdk/logical", "github.com/hashicorp/vault/sdk/framework", diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_role.go b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_role.go index 4e15c212ca..21448d638e 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_role.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_role.go @@ -9,7 +9,7 @@ import ( sockaddr "github.com/hashicorp/go-sockaddr" "github.com/hashicorp/vault/sdk/helper/parseutil" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/Gopkg.lock index ae088fee8a..eeac72ccc9 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/Gopkg.lock @@ -475,7 +475,7 @@ "github.com/hashicorp/vault/sdk/helper/logging", "github.com/hashicorp/vault/sdk/helper/parseutil", "github.com/hashicorp/vault/sdk/helper/pluginutil", - "github.com/hashicorp/vault/helper/policyutil", + "github.com/hashicorp/vault/sdk/helper/policyutil", "github.com/hashicorp/vault/sdk/helper/strutil", "github.com/hashicorp/vault/sdk/logical", "github.com/hashicorp/vault/sdk/framework", diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_role.go b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_role.go index f784eb33b1..0cb023ac8c 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_role.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_role.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/go-sockaddr" "github.com/hashicorp/vault/sdk/helper/parseutil" - "github.com/hashicorp/vault/helper/policyutil" + "github.com/hashicorp/vault/sdk/helper/policyutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework"