From ce52acb968eea1ccd760413b50bd4a1807259fda Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Wed, 14 Jul 2021 17:37:40 -0700 Subject: [PATCH] Update strutil import --- go.mod | 2 +- internal/api/genapi/parse.go | 2 +- internal/auth/authorized_actions.go | 2 +- internal/auth/oidc/repository_auth_method_update.go | 2 +- internal/auth/oidc/service_callback_test.go | 2 +- internal/cmd/base/servers.go | 2 +- internal/cmd/commands/accountscmd/accounts.gen.go | 2 +- internal/cmd/commands/accountscmd/funcs.go | 2 +- internal/cmd/commands/accountscmd/oidc_accounts.gen.go | 2 +- internal/cmd/commands/accountscmd/password_accounts.gen.go | 2 +- internal/cmd/commands/accountscmd/password_funcs.go | 2 +- internal/cmd/commands/authmethodscmd/authmethods.gen.go | 2 +- internal/cmd/commands/authmethodscmd/oidc_authmethods.gen.go | 2 +- .../cmd/commands/authmethodscmd/password_authmethods.gen.go | 2 +- internal/cmd/commands/authtokenscmd/authtokens.gen.go | 2 +- internal/cmd/commands/authtokenscmd/funcs.go | 2 +- .../credentiallibrariescmd/credentiallibraries.gen.go | 2 +- .../credentiallibrariescmd/vault_credentiallibraries.gen.go | 2 +- .../cmd/commands/credentialstorescmd/credentialstores.gen.go | 2 +- .../credentialstorescmd/vault_credentialstores.gen.go | 2 +- internal/cmd/commands/dev/dev.go | 2 +- internal/cmd/commands/groupscmd/groups.gen.go | 2 +- internal/cmd/commands/hostcatalogscmd/hostcatalogs.gen.go | 2 +- .../cmd/commands/hostcatalogscmd/static_hostcatalogs.gen.go | 2 +- internal/cmd/commands/hostscmd/hosts.gen.go | 2 +- internal/cmd/commands/hostscmd/static_hosts.gen.go | 2 +- internal/cmd/commands/hostsetscmd/hostsets.gen.go | 2 +- internal/cmd/commands/hostsetscmd/static_hostsets.gen.go | 2 +- internal/cmd/commands/managedgroupscmd/managedgroups.gen.go | 2 +- .../cmd/commands/managedgroupscmd/oidc_managedgroups.gen.go | 2 +- internal/cmd/commands/rolescmd/roles.gen.go | 2 +- internal/cmd/commands/scopescmd/scopes.gen.go | 2 +- internal/cmd/commands/sessionscmd/sessions.gen.go | 2 +- internal/cmd/commands/targetscmd/funcs.go | 2 +- internal/cmd/commands/targetscmd/targets.gen.go | 2 +- internal/cmd/commands/targetscmd/tcp_targets.gen.go | 2 +- internal/cmd/commands/userscmd/users.gen.go | 2 +- internal/cmd/config/config.go | 2 +- internal/cmd/gencli/templates.go | 4 ++-- internal/credential/vault/repository_credential_library.go | 2 +- internal/iam/repository_user_test.go | 2 +- internal/observability/event/event_observation.go | 2 +- internal/servers/controller/handler.go | 2 +- .../controller/handlers/authmethods/authmethod_service.go | 2 +- .../handlers/credentiallibraries/credentiallibrary_service.go | 2 +- internal/servers/controller/handlers/groups/group_service.go | 2 +- .../servers/controller/handlers/host_sets/host_set_service.go | 2 +- internal/servers/controller/handlers/roles/role_service.go | 2 +- .../servers/controller/handlers/targets/target_service.go | 2 +- internal/servers/controller/handlers/users/user_service.go | 2 +- internal/servers/controller/testing.go | 2 +- internal/session/repository_connection_test.go | 2 +- 52 files changed, 53 insertions(+), 53 deletions(-) diff --git a/go.mod b/go.mod index 11e9d3724..3fec56e1d 100644 --- a/go.mod +++ b/go.mod @@ -32,12 +32,12 @@ require ( github.com/hashicorp/go-rootcerts v1.0.2 github.com/hashicorp/go-secure-stdlib/base62 v0.1.1 github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 + github.com/hashicorp/go-secure-stdlib/strutil v0.1.1 github.com/hashicorp/go-uuid v1.0.2 github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/shared-secure-libs v0.0.7 github.com/hashicorp/shared-secure-libs/parseutil v0.1.0 github.com/hashicorp/shared-secure-libs/password v0.1.0 - github.com/hashicorp/shared-secure-libs/strutil v0.1.0 github.com/hashicorp/vault/api v1.1.1 github.com/iancoleman/strcase v0.1.3 github.com/jefferai/keyring v1.1.7-0.20210105022822-8749b3d9ce79 diff --git a/internal/api/genapi/parse.go b/internal/api/genapi/parse.go index c4d9f3754..ce1efa733 100644 --- a/internal/api/genapi/parse.go +++ b/internal/api/genapi/parse.go @@ -11,7 +11,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" "github.com/hashicorp/boundary/internal/gen/controller/protooptions" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/iancoleman/strcase" ) diff --git a/internal/auth/authorized_actions.go b/internal/auth/authorized_actions.go index 4a391c8bf..d7e935fb0 100644 --- a/internal/auth/authorized_actions.go +++ b/internal/auth/authorized_actions.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/internal/auth/oidc/repository_auth_method_update.go b/internal/auth/oidc/repository_auth_method_update.go index 80378f336..87c846d36 100644 --- a/internal/auth/oidc/repository_auth_method_update.go +++ b/internal/auth/oidc/repository_auth_method_update.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/oplog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" ) const ( diff --git a/internal/auth/oidc/service_callback_test.go b/internal/auth/oidc/service_callback_test.go index 8da27035a..1652be223 100644 --- a/internal/auth/oidc/service_callback_test.go +++ b/internal/auth/oidc/service_callback_test.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/boundary/internal/errors" "github.com/hashicorp/boundary/internal/iam" iamStore "github.com/hashicorp/boundary/internal/iam/store" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/oplog" diff --git a/internal/cmd/base/servers.go b/internal/cmd/base/servers.go index 84022326a..fec6ddf85 100644 --- a/internal/cmd/base/servers.go +++ b/internal/cmd/base/servers.go @@ -33,10 +33,10 @@ import ( wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-secure-stdlib/mlock" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/shared-secure-libs/configutil" "github.com/hashicorp/shared-secure-libs/gatedwriter" "github.com/hashicorp/shared-secure-libs/reloadutil" - "github.com/hashicorp/shared-secure-libs/strutil" "github.com/jinzhu/gorm" "github.com/mitchellh/cli" "google.golang.org/grpc/grpclog" diff --git a/internal/cmd/commands/accountscmd/accounts.gen.go b/internal/cmd/commands/accountscmd/accounts.gen.go index d0ed51ddf..3a476ab32 100644 --- a/internal/cmd/commands/accountscmd/accounts.gen.go +++ b/internal/cmd/commands/accountscmd/accounts.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/accounts" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/accountscmd/funcs.go b/internal/cmd/commands/accountscmd/funcs.go index c2b58bb7f..3258f5468 100644 --- a/internal/cmd/commands/accountscmd/funcs.go +++ b/internal/cmd/commands/accountscmd/funcs.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/accounts" "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/shared-secure-libs/password" - "github.com/hashicorp/shared-secure-libs/strutil" ) func init() { diff --git a/internal/cmd/commands/accountscmd/oidc_accounts.gen.go b/internal/cmd/commands/accountscmd/oidc_accounts.gen.go index 5f76b18e5..8ec585122 100644 --- a/internal/cmd/commands/accountscmd/oidc_accounts.gen.go +++ b/internal/cmd/commands/accountscmd/oidc_accounts.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/accounts" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/accountscmd/password_accounts.gen.go b/internal/cmd/commands/accountscmd/password_accounts.gen.go index 3c997da1e..d8a40761a 100644 --- a/internal/cmd/commands/accountscmd/password_accounts.gen.go +++ b/internal/cmd/commands/accountscmd/password_accounts.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/accounts" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/accountscmd/password_funcs.go b/internal/cmd/commands/accountscmd/password_funcs.go index 20251b729..e99a89243 100644 --- a/internal/cmd/commands/accountscmd/password_funcs.go +++ b/internal/cmd/commands/accountscmd/password_funcs.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/boundary/api/accounts" "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/shared-secure-libs/password" - "github.com/hashicorp/shared-secure-libs/strutil" ) func init() { diff --git a/internal/cmd/commands/authmethodscmd/authmethods.gen.go b/internal/cmd/commands/authmethodscmd/authmethods.gen.go index 02c06e432..c09b1f4bd 100644 --- a/internal/cmd/commands/authmethodscmd/authmethods.gen.go +++ b/internal/cmd/commands/authmethodscmd/authmethods.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/authmethods" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/authmethodscmd/oidc_authmethods.gen.go b/internal/cmd/commands/authmethodscmd/oidc_authmethods.gen.go index 1ca1d5df8..0c18c67b6 100644 --- a/internal/cmd/commands/authmethodscmd/oidc_authmethods.gen.go +++ b/internal/cmd/commands/authmethodscmd/oidc_authmethods.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/authmethods" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/authmethodscmd/password_authmethods.gen.go b/internal/cmd/commands/authmethodscmd/password_authmethods.gen.go index 353d094bc..dd72b86f8 100644 --- a/internal/cmd/commands/authmethodscmd/password_authmethods.gen.go +++ b/internal/cmd/commands/authmethodscmd/password_authmethods.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/authmethods" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/authtokenscmd/authtokens.gen.go b/internal/cmd/commands/authtokenscmd/authtokens.gen.go index 213c90554..cb71873db 100644 --- a/internal/cmd/commands/authtokenscmd/authtokens.gen.go +++ b/internal/cmd/commands/authtokenscmd/authtokens.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/authtokens" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/authtokenscmd/funcs.go b/internal/cmd/commands/authtokenscmd/funcs.go index 3cc5085d0..1777fd314 100644 --- a/internal/cmd/commands/authtokenscmd/funcs.go +++ b/internal/cmd/commands/authtokenscmd/funcs.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/authtokens" "github.com/hashicorp/boundary/internal/cmd/base" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" ) const selfFlag = "self" diff --git a/internal/cmd/commands/credentiallibrariescmd/credentiallibraries.gen.go b/internal/cmd/commands/credentiallibrariescmd/credentiallibraries.gen.go index f04ea8787..87803efc6 100644 --- a/internal/cmd/commands/credentiallibrariescmd/credentiallibraries.gen.go +++ b/internal/cmd/commands/credentiallibrariescmd/credentiallibraries.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/credentiallibraries" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/credentiallibrariescmd/vault_credentiallibraries.gen.go b/internal/cmd/commands/credentiallibrariescmd/vault_credentiallibraries.gen.go index 46effd803..395cb7fa7 100644 --- a/internal/cmd/commands/credentiallibrariescmd/vault_credentiallibraries.gen.go +++ b/internal/cmd/commands/credentiallibrariescmd/vault_credentiallibraries.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/credentiallibraries" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/credentialstorescmd/credentialstores.gen.go b/internal/cmd/commands/credentialstorescmd/credentialstores.gen.go index 0d60fc66b..a7da26513 100644 --- a/internal/cmd/commands/credentialstorescmd/credentialstores.gen.go +++ b/internal/cmd/commands/credentialstorescmd/credentialstores.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/credentialstores" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/credentialstorescmd/vault_credentialstores.gen.go b/internal/cmd/commands/credentialstorescmd/vault_credentialstores.gen.go index e55562469..a45714fe6 100644 --- a/internal/cmd/commands/credentialstorescmd/vault_credentialstores.gen.go +++ b/internal/cmd/commands/credentialstorescmd/vault_credentialstores.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/credentialstores" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/dev/dev.go b/internal/cmd/commands/dev/dev.go index eb73a0d02..f6dc56aa2 100644 --- a/internal/cmd/commands/dev/dev.go +++ b/internal/cmd/commands/dev/dev.go @@ -19,8 +19,8 @@ import ( "github.com/hashicorp/boundary/internal/servers/worker" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/types/scope" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/shared-secure-libs/configutil" - "github.com/hashicorp/shared-secure-libs/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/groupscmd/groups.gen.go b/internal/cmd/commands/groupscmd/groups.gen.go index 227997a31..e25f377f1 100644 --- a/internal/cmd/commands/groupscmd/groups.gen.go +++ b/internal/cmd/commands/groupscmd/groups.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/groups" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/hostcatalogscmd/hostcatalogs.gen.go b/internal/cmd/commands/hostcatalogscmd/hostcatalogs.gen.go index 72bf8681e..6ab66cd53 100644 --- a/internal/cmd/commands/hostcatalogscmd/hostcatalogs.gen.go +++ b/internal/cmd/commands/hostcatalogscmd/hostcatalogs.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/hostcatalogs" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/hostcatalogscmd/static_hostcatalogs.gen.go b/internal/cmd/commands/hostcatalogscmd/static_hostcatalogs.gen.go index 1f68f8bfc..84b8de177 100644 --- a/internal/cmd/commands/hostcatalogscmd/static_hostcatalogs.gen.go +++ b/internal/cmd/commands/hostcatalogscmd/static_hostcatalogs.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/hostcatalogs" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/hostscmd/hosts.gen.go b/internal/cmd/commands/hostscmd/hosts.gen.go index 52e3476c5..c5fd4799d 100644 --- a/internal/cmd/commands/hostscmd/hosts.gen.go +++ b/internal/cmd/commands/hostscmd/hosts.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/hosts" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/hostscmd/static_hosts.gen.go b/internal/cmd/commands/hostscmd/static_hosts.gen.go index 8f3c247b3..016126e66 100644 --- a/internal/cmd/commands/hostscmd/static_hosts.gen.go +++ b/internal/cmd/commands/hostscmd/static_hosts.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/hosts" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/hostsetscmd/hostsets.gen.go b/internal/cmd/commands/hostsetscmd/hostsets.gen.go index 82e3f456e..ea69e3c74 100644 --- a/internal/cmd/commands/hostsetscmd/hostsets.gen.go +++ b/internal/cmd/commands/hostsetscmd/hostsets.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/hostsets" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/hostsetscmd/static_hostsets.gen.go b/internal/cmd/commands/hostsetscmd/static_hostsets.gen.go index 157b9f5ef..25375154e 100644 --- a/internal/cmd/commands/hostsetscmd/static_hostsets.gen.go +++ b/internal/cmd/commands/hostsetscmd/static_hostsets.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/hostsets" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/managedgroupscmd/managedgroups.gen.go b/internal/cmd/commands/managedgroupscmd/managedgroups.gen.go index 588305693..27d642c37 100644 --- a/internal/cmd/commands/managedgroupscmd/managedgroups.gen.go +++ b/internal/cmd/commands/managedgroupscmd/managedgroups.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/managedgroups" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/managedgroupscmd/oidc_managedgroups.gen.go b/internal/cmd/commands/managedgroupscmd/oidc_managedgroups.gen.go index 332dc4508..8a09b0797 100644 --- a/internal/cmd/commands/managedgroupscmd/oidc_managedgroups.gen.go +++ b/internal/cmd/commands/managedgroupscmd/oidc_managedgroups.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/managedgroups" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/rolescmd/roles.gen.go b/internal/cmd/commands/rolescmd/roles.gen.go index 00a8a3515..fc6e749f8 100644 --- a/internal/cmd/commands/rolescmd/roles.gen.go +++ b/internal/cmd/commands/rolescmd/roles.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/roles" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/scopescmd/scopes.gen.go b/internal/cmd/commands/scopescmd/scopes.gen.go index e0a02c54d..65edfa060 100644 --- a/internal/cmd/commands/scopescmd/scopes.gen.go +++ b/internal/cmd/commands/scopescmd/scopes.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/scopes" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/sessionscmd/sessions.gen.go b/internal/cmd/commands/sessionscmd/sessions.gen.go index 9bcdb988b..3810eff56 100644 --- a/internal/cmd/commands/sessionscmd/sessions.gen.go +++ b/internal/cmd/commands/sessionscmd/sessions.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/sessions" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/targetscmd/funcs.go b/internal/cmd/commands/targetscmd/funcs.go index 353b06b4e..03b1c527e 100644 --- a/internal/cmd/commands/targetscmd/funcs.go +++ b/internal/cmd/commands/targetscmd/funcs.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/credential" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/go-wordwrap" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/targetscmd/targets.gen.go b/internal/cmd/commands/targetscmd/targets.gen.go index 2d1aae5cc..45b59f067 100644 --- a/internal/cmd/commands/targetscmd/targets.gen.go +++ b/internal/cmd/commands/targetscmd/targets.gen.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/boundary/api/targets" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/targetscmd/tcp_targets.gen.go b/internal/cmd/commands/targetscmd/tcp_targets.gen.go index b7f7939a3..2992ea4a8 100644 --- a/internal/cmd/commands/targetscmd/tcp_targets.gen.go +++ b/internal/cmd/commands/targetscmd/tcp_targets.gen.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/boundary/api/targets" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/userscmd/users.gen.go b/internal/cmd/commands/userscmd/users.gen.go index 1b921ba5f..f8d0e1b63 100644 --- a/internal/cmd/commands/userscmd/users.gen.go +++ b/internal/cmd/commands/userscmd/users.gen.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/api/users" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/config/config.go b/internal/cmd/config/config.go index 551cdb29d..fabb20986 100644 --- a/internal/cmd/config/config.go +++ b/internal/cmd/config/config.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/boundary/internal/observability/event" wrapping "github.com/hashicorp/go-kms-wrapping" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/hcl" "github.com/hashicorp/shared-secure-libs/configutil" "github.com/hashicorp/shared-secure-libs/parseutil" - "github.com/hashicorp/shared-secure-libs/strutil" "github.com/mitchellh/mapstructure" ) diff --git a/internal/cmd/gencli/templates.go b/internal/cmd/gencli/templates.go index bbb6cccc6..a6851506e 100644 --- a/internal/cmd/gencli/templates.go +++ b/internal/cmd/gencli/templates.go @@ -8,7 +8,7 @@ import ( "path/filepath" "text/template" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/iancoleman/strcase" ) @@ -90,7 +90,7 @@ import ( "github.com/hashicorp/boundary/api/{{ .Pkg }}" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/common" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/credential/vault/repository_credential_library.go b/internal/credential/vault/repository_credential_library.go index f15861cda..c084381ef 100644 --- a/internal/credential/vault/repository_credential_library.go +++ b/internal/credential/vault/repository_credential_library.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/boundary/internal/errors" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/oplog" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" ) // CreateCredentialLibrary inserts l into the repository and returns a new diff --git a/internal/iam/repository_user_test.go b/internal/iam/repository_user_test.go index 338cebc16..052610fc8 100644 --- a/internal/iam/repository_user_test.go +++ b/internal/iam/repository_user_test.go @@ -17,8 +17,8 @@ import ( "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/oplog" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/shared-secure-libs/strutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/internal/observability/event/event_observation.go b/internal/observability/event/event_observation.go index 1e38c7d0d..d0e7c7def 100644 --- a/internal/observability/event/event_observation.go +++ b/internal/observability/event/event_observation.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hashicorp/eventlogger" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" ) // observationVersion defines the version of observation events diff --git a/internal/servers/controller/handler.go b/internal/servers/controller/handler.go index e8a075706..3499492c2 100644 --- a/internal/servers/controller/handler.go +++ b/internal/servers/controller/handler.go @@ -28,8 +28,8 @@ import ( "github.com/hashicorp/boundary/internal/servers/controller/handlers/sessions" "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets" "github.com/hashicorp/go-cleanhttp" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/hashicorp/shared-secure-libs/configutil" - "github.com/hashicorp/shared-secure-libs/strutil" "google.golang.org/grpc/codes" "github.com/hashicorp/boundary/internal/servers/controller/handlers" diff --git a/internal/servers/controller/handlers/authmethods/authmethod_service.go b/internal/servers/controller/handlers/authmethods/authmethod_service.go index 0b68cfe10..855bd01d1 100644 --- a/internal/servers/controller/handlers/authmethods/authmethod_service.go +++ b/internal/servers/controller/handlers/authmethods/authmethod_service.go @@ -28,7 +28,7 @@ import ( "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/wrapperspb" diff --git a/internal/servers/controller/handlers/credentiallibraries/credentiallibrary_service.go b/internal/servers/controller/handlers/credentiallibraries/credentiallibrary_service.go index 4dffcbbd1..54e4defbc 100644 --- a/internal/servers/controller/handlers/credentiallibraries/credentiallibrary_service.go +++ b/internal/servers/controller/handlers/credentiallibraries/credentiallibrary_service.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/internal/servers/controller/handlers/groups/group_service.go b/internal/servers/controller/handlers/groups/group_service.go index 1dfff002a..7971ac2e3 100644 --- a/internal/servers/controller/handlers/groups/group_service.go +++ b/internal/servers/controller/handlers/groups/group_service.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/internal/servers/controller/handlers/host_sets/host_set_service.go b/internal/servers/controller/handlers/host_sets/host_set_service.go index fdc867bce..ab2a43066 100644 --- a/internal/servers/controller/handlers/host_sets/host_set_service.go +++ b/internal/servers/controller/handlers/host_sets/host_set_service.go @@ -18,7 +18,7 @@ import ( "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/internal/servers/controller/handlers/roles/role_service.go b/internal/servers/controller/handlers/roles/role_service.go index b495f8bfa..695b64f59 100644 --- a/internal/servers/controller/handlers/roles/role_service.go +++ b/internal/servers/controller/handlers/roles/role_service.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/internal/servers/controller/handlers/targets/target_service.go b/internal/servers/controller/handlers/targets/target_service.go index a355ac880..d0e7b14d7 100644 --- a/internal/servers/controller/handlers/targets/target_service.go +++ b/internal/servers/controller/handlers/targets/target_service.go @@ -35,7 +35,7 @@ import ( "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/go-bexpr" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/mitchellh/pointerstructure" "github.com/mr-tron/base58" "google.golang.org/grpc/codes" diff --git a/internal/servers/controller/handlers/users/user_service.go b/internal/servers/controller/handlers/users/user_service.go index d21ae5768..9379b87df 100644 --- a/internal/servers/controller/handlers/users/user_service.go +++ b/internal/servers/controller/handlers/users/user_service.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/internal/servers/controller/testing.go b/internal/servers/controller/testing.go index 9c33dfcf0..8c311cdda 100644 --- a/internal/servers/controller/testing.go +++ b/internal/servers/controller/testing.go @@ -24,7 +24,7 @@ import ( "github.com/hashicorp/go-hclog" wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/hashicorp/go-secure-stdlib/base62" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/jinzhu/gorm" ) diff --git a/internal/session/repository_connection_test.go b/internal/session/repository_connection_test.go index b0498d436..960e51584 100644 --- a/internal/session/repository_connection_test.go +++ b/internal/session/repository_connection_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/oplog" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/shared-secure-libs/strutil" + "github.com/hashicorp/go-secure-stdlib/strutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" )