diff --git a/builtin/credential/approle/path_login.go b/builtin/credential/approle/path_login.go index 87527f7744..4c68a452a7 100644 --- a/builtin/credential/approle/path_login.go +++ b/builtin/credential/approle/path_login.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/cidrutil" + "github.com/hashicorp/vault/sdk/helper/cidrutil" "github.com/hashicorp/vault/sdk/helper/parseutil" "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 7853d83f75..55a0717087 100644 --- a/builtin/credential/approle/path_role.go +++ b/builtin/credential/approle/path_role.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/cidrutil" + "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" diff --git a/builtin/credential/approle/validation.go b/builtin/credential/approle/validation.go index 16b0cb5977..96357d62fd 100644 --- a/builtin/credential/approle/validation.go +++ b/builtin/credential/approle/validation.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/cidrutil" + "github.com/hashicorp/vault/sdk/helper/cidrutil" "github.com/hashicorp/vault/sdk/helper/locksutil" "github.com/hashicorp/vault/sdk/logical" ) diff --git a/builtin/credential/cert/path_login.go b/builtin/credential/cert/path_login.go index 54156eb562..b1df3183fb 100644 --- a/builtin/credential/cert/path_login.go +++ b/builtin/credential/cert/path_login.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" - "github.com/hashicorp/vault/helper/cidrutil" + "github.com/hashicorp/vault/sdk/helper/cidrutil" glob "github.com/ryanuber/go-glob" ) diff --git a/builtin/credential/userpass/path_login.go b/builtin/credential/userpass/path_login.go index c661b4f053..61ece91237 100644 --- a/builtin/credential/userpass/path_login.go +++ b/builtin/credential/userpass/path_login.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/vault/helper/cidrutil" + "github.com/hashicorp/vault/sdk/helper/cidrutil" "github.com/hashicorp/vault/helper/policyutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" diff --git a/builtin/logical/ssh/path_roles.go b/builtin/logical/ssh/path_roles.go index c87b04f1b6..9c85822d50 100644 --- a/builtin/logical/ssh/path_roles.go +++ b/builtin/logical/ssh/path_roles.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/cidrutil" + "github.com/hashicorp/vault/sdk/helper/cidrutil" "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" diff --git a/helper/cidrutil/cidr.go b/sdk/helper/cidrutil/cidr.go similarity index 100% rename from helper/cidrutil/cidr.go rename to sdk/helper/cidrutil/cidr.go diff --git a/helper/cidrutil/cidr_test.go b/sdk/helper/cidrutil/cidr_test.go similarity index 100% rename from helper/cidrutil/cidr_test.go rename to sdk/helper/cidrutil/cidr_test.go diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/Gopkg.lock index d8b819ae5a..ab956f4393 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/Gopkg.lock @@ -447,7 +447,7 @@ "github.com/hashicorp/go-sockaddr", "github.com/hashicorp/go-uuid", "github.com/hashicorp/vault/api", - "github.com/hashicorp/vault/helper/cidrutil", + "github.com/hashicorp/vault/sdk/helper/cidrutil", "github.com/hashicorp/vault/sdk/helper/parseutil", "github.com/hashicorp/vault/sdk/helper/pluginutil", "github.com/hashicorp/vault/sdk/logical", diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_login.go b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_login.go index e8df5940a6..3968831766 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_login.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_login.go @@ -13,7 +13,7 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints" "github.com/aliyun/alibaba-cloud-sdk-go/services/sts" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/cidrutil" + "github.com/hashicorp/vault/sdk/helper/cidrutil" "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 c26076c8e9..30e86af803 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/Gopkg.lock @@ -464,7 +464,7 @@ "github.com/hashicorp/go-uuid", "github.com/hashicorp/vault/api", "github.com/hashicorp/vault/sdk/helper/certutil", - "github.com/hashicorp/vault/helper/cidrutil", + "github.com/hashicorp/vault/sdk/helper/cidrutil", "github.com/hashicorp/vault/sdk/helper/logging", "github.com/hashicorp/vault/sdk/helper/parseutil", "github.com/hashicorp/vault/sdk/helper/pluginutil", diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_login.go b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_login.go index 5708c462cc..114d2b2f2e 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_login.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_login.go @@ -8,7 +8,7 @@ import ( "github.com/coreos/go-oidc" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/cidrutil" + "github.com/hashicorp/vault/sdk/helper/cidrutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework" "gopkg.in/square/go-jose.v2/jwt" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_oidc.go b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_oidc.go index 3c34dcbf07..5e0f42ff11 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_oidc.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_oidc.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/hashicorp/vault/helper/cidrutil" + "github.com/hashicorp/vault/sdk/helper/cidrutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/coreos/go-oidc" 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 dd78d07192..ae088fee8a 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/Gopkg.lock @@ -471,7 +471,7 @@ "github.com/hashicorp/go-hclog", "github.com/hashicorp/go-multierror", "github.com/hashicorp/go-sockaddr", - "github.com/hashicorp/vault/helper/cidrutil", + "github.com/hashicorp/vault/sdk/helper/cidrutil", "github.com/hashicorp/vault/sdk/helper/logging", "github.com/hashicorp/vault/sdk/helper/parseutil", "github.com/hashicorp/vault/sdk/helper/pluginutil", diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_login.go b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_login.go index 3b3d934025..24884caea5 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_login.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_login.go @@ -12,7 +12,7 @@ import ( "github.com/briankassouf/jose/jwt" "github.com/hashicorp/errwrap" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/helper/cidrutil" + "github.com/hashicorp/vault/sdk/helper/cidrutil" "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/sdk/framework"