diff --git a/go.mod b/go.mod index f2483ec75a..11e9d3724b 100644 --- a/go.mod +++ b/go.mod @@ -31,10 +31,10 @@ require ( github.com/hashicorp/go-retryablehttp v0.7.0 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-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/mlock v0.1.0 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 diff --git a/go.sum b/go.sum index d8411459ab..73c026cacc 100644 --- a/go.sum +++ b/go.sum @@ -502,6 +502,8 @@ github.com/hashicorp/go-secure-stdlib/configutil v0.1.1 h1:GeZcTbpivJpNPx5L9ciCH github.com/hashicorp/go-secure-stdlib/configutil v0.1.1/go.mod h1:5CQ5+MqV+qf46nta8piifri5TdcZ0sE/PCz9vgzeh0U= github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.1 h1:HlTofNQN49DTzPCMVDppp+AVxMNVWaHUElpUYC0TRRE= github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.1/go.mod h1:irE9ILwhE8VooWdhHhBy0qXzOMRlHKoWoMlr31mAFCE= +github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 h1:cCRo8gK7oq6A2L6LICkUZ+/a5rLiRXFMf1Qd4xSwxTc= +github.com/hashicorp/go-secure-stdlib/mlock v0.1.1/go.mod h1:zq93CJChV6L9QTfGKtfBxKqD7BqqXx5O04A/ns2p5+I= github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1 h1:78ki3QBevHwYrVxnyVeaEz+7WtifHhauYF23es/0KlI= github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8= github.com/hashicorp/go-secure-stdlib/reloadutil v0.1.1 h1:SMGUnbpAcat8rIKHkBPjfv81yC46a8eCNZ2hsR2l1EI= @@ -535,8 +537,6 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/shared-secure-libs v0.0.7 h1:vdoIg+ahLPlwTELM7eA4OWws54Hf0en2QaFKsY8NqeM= github.com/hashicorp/shared-secure-libs v0.0.7/go.mod h1:PH51kNtHA6kYV5Z8E3TOJM634iyp7IIxAMfLh0Dp35o= -github.com/hashicorp/shared-secure-libs/mlock v0.1.0 h1:7xw1ZVNW41PGRiRysdA8SBaRN2bNE+Bf+Uce/+JWsu4= -github.com/hashicorp/shared-secure-libs/mlock v0.1.0/go.mod h1:lOpv9YZPgTDtfSdhetd25YVO3uxRrD8KD0erct1PdP0= github.com/hashicorp/shared-secure-libs/parseutil v0.1.0 h1:R5IyN4zkqbxkPLhR7WSvF7Jhoc7AtlvlVK8QZKs8N9c= github.com/hashicorp/shared-secure-libs/parseutil v0.1.0/go.mod h1:VeS21zHAo7PicmcAptMd/ZdckVlHtdI4xA0GOOpssVI= github.com/hashicorp/shared-secure-libs/password v0.1.0 h1:Q8SHs8TKPsBwgyoPz72TeND0DCXe6bxnj2T5lYN3Fvs= diff --git a/internal/cmd/base/servers.go b/internal/cmd/base/servers.go index 42fbcf4a64..84022326a8 100644 --- a/internal/cmd/base/servers.go +++ b/internal/cmd/base/servers.go @@ -32,9 +32,9 @@ import ( "github.com/hashicorp/go-hclog" wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/hashicorp/go-multierror" + "github.com/hashicorp/go-secure-stdlib/mlock" "github.com/hashicorp/shared-secure-libs/configutil" "github.com/hashicorp/shared-secure-libs/gatedwriter" - "github.com/hashicorp/shared-secure-libs/mlock" "github.com/hashicorp/shared-secure-libs/reloadutil" "github.com/hashicorp/shared-secure-libs/strutil" "github.com/jinzhu/gorm" diff --git a/internal/cmd/commands/database/init.go b/internal/cmd/commands/database/init.go index 02cc9f7d44..52b32faff2 100644 --- a/internal/cmd/commands/database/init.go +++ b/internal/cmd/commands/database/init.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/boundary/sdk/wrapper" wrapping "github.com/hashicorp/go-kms-wrapping" + "github.com/hashicorp/go-secure-stdlib/mlock" "github.com/hashicorp/shared-secure-libs/configutil" - "github.com/hashicorp/shared-secure-libs/mlock" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/database/migrate.go b/internal/cmd/commands/database/migrate.go index ab28b131f0..ce50a91301 100644 --- a/internal/cmd/commands/database/migrate.go +++ b/internal/cmd/commands/database/migrate.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/boundary/internal/errors" "github.com/hashicorp/boundary/sdk/wrapper" wrapping "github.com/hashicorp/go-kms-wrapping" + "github.com/hashicorp/go-secure-stdlib/mlock" "github.com/hashicorp/shared-secure-libs/configutil" - "github.com/hashicorp/shared-secure-libs/mlock" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/internal/cmd/commands/server/server.go b/internal/cmd/commands/server/server.go index f420f3b64d..b4ca916598 100644 --- a/internal/cmd/commands/server/server.go +++ b/internal/cmd/commands/server/server.go @@ -22,8 +22,8 @@ import ( "github.com/hashicorp/go-hclog" wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/hashicorp/go-multierror" + "github.com/hashicorp/go-secure-stdlib/mlock" "github.com/hashicorp/shared-secure-libs/configutil" - "github.com/hashicorp/shared-secure-libs/mlock" "github.com/mitchellh/cli" "github.com/posener/complete" "go.uber.org/atomic" diff --git a/internal/servers/controller/controller.go b/internal/servers/controller/controller.go index 7cc23abacc..5dc51e53d3 100644 --- a/internal/servers/controller/controller.go +++ b/internal/servers/controller/controller.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-secure-stdlib/base62" - "github.com/hashicorp/shared-secure-libs/mlock" + "github.com/hashicorp/go-secure-stdlib/mlock" "github.com/patrickmn/go-cache" ua "go.uber.org/atomic" ) diff --git a/internal/servers/worker/worker.go b/internal/servers/worker/worker.go index 60510f85ce..57a39ea096 100644 --- a/internal/servers/worker/worker.go +++ b/internal/servers/worker/worker.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/boundary/internal/servers" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-secure-stdlib/base62" - "github.com/hashicorp/shared-secure-libs/mlock" + "github.com/hashicorp/go-secure-stdlib/mlock" ua "go.uber.org/atomic" "google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver/manual"