diff --git a/go.mod b/go.mod index c27f738040..f2483ec75a 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/google/go-cmp v0.5.6 github.com/grpc-ecosystem/grpc-gateway/v2 v2.3.0 github.com/hashicorp/boundary/api v0.0.13 - github.com/hashicorp/boundary/sdk v0.0.5 + github.com/hashicorp/boundary/sdk v0.0.6 github.com/hashicorp/cap v0.1.1 github.com/hashicorp/dawdle v0.4.0 github.com/hashicorp/dbassert v0.0.0-20200930125617-6218396928df @@ -26,20 +26,19 @@ require ( github.com/hashicorp/go-bexpr v0.1.8 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-hclog v0.16.2 - github.com/hashicorp/go-kms-wrapping v0.6.2 + github.com/hashicorp/go-kms-wrapping v0.6.3 github.com/hashicorp/go-multierror v1.1.1 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-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/base62 v0.1.0 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 - github.com/hashicorp/vault/api v1.1.0 - github.com/hashicorp/vault/sdk v0.2.0 // indirect + 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 github.com/jinzhu/gorm v1.9.16 @@ -71,7 +70,7 @@ require ( google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6 google.golang.org/grpc v1.38.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 - google.golang.org/protobuf v1.26.0 + google.golang.org/protobuf v1.27.1 gopkg.in/yaml.v2 v2.4.0 // indirect mvdan.cc/gofumpt v0.1.1 nhooyr.io/websocket v1.8.7 diff --git a/go.sum b/go.sum index 52196c6a5c..d8411459ab 100644 --- a/go.sum +++ b/go.sum @@ -160,6 +160,7 @@ github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod h1:S/7n9cop github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c= github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= github.com/cenkalti/backoff/v4 v4.1.0 h1:c8LkOFQTzuO0WBM/ae5HdGQuZPfPxp7lqBRwQRm4fSc= @@ -475,9 +476,8 @@ github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjh github.com/hashicorp/go-immutable-radix v1.1.0 h1:vN9wG1D6KG6YHRTWr8512cxGOVgTMEfgEdSj/hr8MPc= github.com/hashicorp/go-immutable-radix v1.1.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-kms-wrapping v0.5.12/go.mod h1:yVIWtGOTh/cdGc++/NOlXLus0hJ19Lz4iFrpF6WsZh4= -github.com/hashicorp/go-kms-wrapping v0.6.1/go.mod h1:lxD7e9q7ZyCtDEP+tnMevsEvw3M0gmZnneAgv8BaO1Q= -github.com/hashicorp/go-kms-wrapping v0.6.2 h1:ryj5jVvecszFG4yL4/0jQxGK6g1LCNVLWRH8ZXjrYbY= -github.com/hashicorp/go-kms-wrapping v0.6.2/go.mod h1:aUzqzg9WEm5mEcQcNI431QLmxKzGL80cvwGQyVSP15Y= +github.com/hashicorp/go-kms-wrapping v0.6.3 h1:N5an2PAZNBp3MpFv6Rca8ol9qNZyO9v9sAkXgPYN8UU= +github.com/hashicorp/go-kms-wrapping v0.6.3/go.mod h1:1DTKimjuT1g8KaS8rwYxF0kkjaFMXKtJif9KXxsrr+s= github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod h1:d1g9WGtAunDNpek8jUIEJnBlbgKS1N2Q61QkHiZyR1g= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= @@ -496,6 +496,20 @@ github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-secure-stdlib/base62 v0.1.1 h1:6KMBnfEv0/kLAz0O76sliN5mXbCDcLfs2kP7ssP7+DQ= +github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw= +github.com/hashicorp/go-secure-stdlib/configutil v0.1.1 h1:GeZcTbpivJpNPx5L9ciCH6M3Jw4i8uiiMAOYfxmyRQA= +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/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= +github.com/hashicorp/go-secure-stdlib/reloadutil v0.1.1/go.mod h1:Ch/bf00Qnx77MZd49JRgHYqHQjtEmTgGU2faufpVZb0= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.1 h1:nd0HIW15E6FG1MsnArYaHfuw9C2zgzM8LxkG5Ty/788= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U= +github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1 h1:Yc026VyMyIpq1UWRnakHRG01U8fJm+nEfEmjoAb00n8= +github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= @@ -519,11 +533,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/shared-secure-libs v0.0.4/go.mod h1:xhtA0FH6AYYFOy0sir7u0O0zzdLi7ofU6oWxy+gjnuc= 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/base62 v0.1.0 h1:MZpHgL9yms0DVhYJ+cVpQ5tp8IbyoVufyMvCi6stJnU= -github.com/hashicorp/shared-secure-libs/base62 v0.1.0/go.mod h1:yQ1EUBxJZ654Ivhjmr1pq2wt6YCoeTCuZgX2Ysc4IMg= 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= @@ -534,18 +545,15 @@ github.com/hashicorp/shared-secure-libs/strutil v0.1.0 h1:mzQjO/tqNZAmdcZ5gecvzs github.com/hashicorp/shared-secure-libs/strutil v0.1.0/go.mod h1:YsAf1vJYtE4AhRdGD+X/96cFK7j8oosgnYLilKGzSTw= github.com/hashicorp/vault/api v1.0.5-0.20200514164214-89b1987e38c2/go.mod h1:P8A7gn1a6j/7qQ4zOaWI6FC/Q9jQWEBRTOwZH33tC9o= github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f/go.mod h1:euTFbi2YJgwcju3imEt919lhJKF68nN1cQPq3aA+kBE= -github.com/hashicorp/vault/api v1.0.5-0.20200805123347-1ef507638af6/go.mod h1:R3Umvhlxi2TN7Ex2hzOowyeNb+SfbVWI973N+ctaFMk= -github.com/hashicorp/vault/api v1.1.0 h1:QcxC7FuqEl0sZaIjcXB/kNEeBa0DH5z57qbWBvZwLC4= -github.com/hashicorp/vault/api v1.1.0/go.mod h1:R3Umvhlxi2TN7Ex2hzOowyeNb+SfbVWI973N+ctaFMk= +github.com/hashicorp/vault/api v1.1.1 h1:907ld+Z9cALyvbZK2qUX9cLwvSaEQsMVQB3x2KE8+AI= +github.com/hashicorp/vault/api v1.1.1/go.mod h1:29UXcn/1cLOPHQNMWA7bCz2By4PSd0VKPAydKXS5yN0= github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= github.com/hashicorp/vault/sdk v0.1.14-0.20200514144402-4bfac290c352/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= github.com/hashicorp/vault/sdk v0.1.14-0.20200514164214-89b1987e38c2/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= github.com/hashicorp/vault/sdk v0.1.14-0.20200519221530-14615acda45f/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= -github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10= github.com/hashicorp/vault/sdk v0.1.14-0.20200805123347-1ef507638af6/go.mod h1:+S2qzS1Tex9JgbHxb/Jv7CdZyKydxqg09G/qVvyVmUc= -github.com/hashicorp/vault/sdk v0.1.14-0.20200916184745-5576096032f8/go.mod h1:7GBJyKruotYxJlye8yHyGICV7kN7dQCNsCMTrb+v5J0= -github.com/hashicorp/vault/sdk v0.2.0 h1:hvVswvMA9LvXwLBFDJLIoDBXi8hj90Q+gSS7vRYmLvQ= -github.com/hashicorp/vault/sdk v0.2.0/go.mod h1:cAGI4nVnEfAyMeqt9oB+Mase8DNn3qA/LDNHURiwssY= +github.com/hashicorp/vault/sdk v0.2.1 h1:S4O6Iv/dyKlE9AUTXGa7VOvZmsCvg36toPKgV4f2P4M= +github.com/hashicorp/vault/sdk v0.2.1/go.mod h1:WfUiO1vYzfBkz1TmoE4ZGU7HD0T0Cl/rZwaxjBkgN4U= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= @@ -1420,8 +1428,9 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.25.1-0.20201208041424-160c7477e0e8/go.mod h1:hFxJC2f0epmp1elRCiEGJTKAWbwxZ2nvqZdHl3FQXCY= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= diff --git a/internal/authtoken/authtoken.go b/internal/authtoken/authtoken.go index a104534be5..ae2627fac6 100644 --- a/internal/authtoken/authtoken.go +++ b/internal/authtoken/authtoken.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/boundary/internal/kms" wrapping "github.com/hashicorp/go-kms-wrapping" "github.com/hashicorp/go-kms-wrapping/structwrapping" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" "github.com/mr-tron/base58" "google.golang.org/protobuf/proto" ) diff --git a/internal/cmd/base/initial_resources.go b/internal/cmd/base/initial_resources.go index 85fc646d10..65d98f15d0 100644 --- a/internal/cmd/base/initial_resources.go +++ b/internal/cmd/base/initial_resources.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/types/scope" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" ) func (b *Server) CreateInitialLoginRole(ctx context.Context) (*iam.Role, error) { diff --git a/internal/cmd/commands/connect/connect.go b/internal/cmd/commands/connect/connect.go index 8422f5515c..149c5d92bb 100644 --- a/internal/cmd/commands/connect/connect.go +++ b/internal/cmd/commands/connect/connect.go @@ -26,7 +26,7 @@ import ( targetspb "github.com/hashicorp/boundary/internal/gen/controller/api/resources/targets" "github.com/hashicorp/boundary/internal/proxy" "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" "github.com/mitchellh/cli" "github.com/mr-tron/base58" "github.com/posener/complete" diff --git a/internal/db/common/update_test.go b/internal/db/common/update_test.go index d4536578ea..41d41b3c7d 100644 --- a/internal/db/common/update_test.go +++ b/internal/db/common/update_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/hashicorp/boundary/internal/db/db_test" + "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/shared-secure-libs/base62" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" ) diff --git a/internal/db/db_test/db.go b/internal/db/db_test/db.go index 48d56d6229..0d641b2a1e 100644 --- a/internal/db/db_test/db.go +++ b/internal/db/db_test/db.go @@ -2,7 +2,7 @@ package db_test import ( - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" "google.golang.org/protobuf/proto" ) diff --git a/internal/db/id.go b/internal/db/id.go index 6029327a7a..8847f812da 100644 --- a/internal/db/id.go +++ b/internal/db/id.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/boundary/internal/errors" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" "golang.org/x/crypto/blake2b" ) diff --git a/internal/db/read_writer_test.go b/internal/db/read_writer_test.go index f822f326ee..545c6d1652 100644 --- a/internal/db/read_writer_test.go +++ b/internal/db/read_writer_test.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/boundary/internal/oplog" "github.com/hashicorp/boundary/internal/oplog/store" wrapping "github.com/hashicorp/go-kms-wrapping" + "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/shared-secure-libs/base62" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/db/schema/migrations/postgres/0/01_domain_types.up.sql b/internal/db/schema/migrations/postgres/0/01_domain_types.up.sql index e204f6680d..c7a4a66d1a 100644 --- a/internal/db/schema/migrations/postgres/0/01_domain_types.up.sql +++ b/internal/db/schema/migrations/postgres/0/01_domain_types.up.sql @@ -5,7 +5,7 @@ check( length(trim(value)) > 10 ); comment on domain wt_public_id is -'Random ID generated with github.com/hashicorp/shared-secure-libs/base62'; +'Random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create domain wt_private_id as text not null @@ -13,14 +13,14 @@ check( length(trim(value)) > 10 ); comment on domain wt_private_id is -'Random ID generated with github.com/hashicorp/shared-secure-libs/base62'; +'Random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create domain wt_scope_id as text check( length(trim(value)) > 10 or value = 'global' ); comment on domain wt_scope_id is -'"global" or random ID generated with github.com/hashicorp/shared-secure-libs/base62'; +'"global" or random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create domain wt_user_id as text not null @@ -28,7 +28,7 @@ check( length(trim(value)) > 10 or value = 'u_anon' or value = 'u_auth' or value = 'u_recovery' ); comment on domain wt_scope_id is -'"u_anon", "u_auth", or random ID generated with github.com/hashicorp/shared-secure-libs/base62'; +'"u_anon", "u_auth", or random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create domain wt_role_id as text not null @@ -36,7 +36,7 @@ check( length(trim(value)) > 10 ); comment on domain wt_scope_id is -'Random ID generated with github.com/hashicorp/shared-secure-libs/base62'; +'Random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create domain wt_timestamp as timestamp with time zone diff --git a/internal/db/schema/migrations/postgres/7/02_plugin.up.sql b/internal/db/schema/migrations/postgres/7/02_plugin.up.sql index f460f119e1..e9fec581b8 100644 --- a/internal/db/schema/migrations/postgres/7/02_plugin.up.sql +++ b/internal/db/schema/migrations/postgres/7/02_plugin.up.sql @@ -6,7 +6,7 @@ begin; length(trim(value)) > 10 or value = 'pi_system' ); comment on domain wt_plugin_id is - '"pi_system", or random ID generated with github.com/hashicorp/shared-secure-libs/base62'; + '"pi_system", or random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create table plugin ( public_id wt_plugin_id primary key diff --git a/internal/db/schema/postgres_migration.gen.go b/internal/db/schema/postgres_migration.gen.go index 8b501a12c5..b838438c88 100644 --- a/internal/db/schema/postgres_migration.gen.go +++ b/internal/db/schema/postgres_migration.gen.go @@ -12,7 +12,7 @@ check( length(trim(value)) > 10 ); comment on domain wt_public_id is -'Random ID generated with github.com/hashicorp/shared-secure-libs/base62'; +'Random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create domain wt_private_id as text not null @@ -20,14 +20,14 @@ check( length(trim(value)) > 10 ); comment on domain wt_private_id is -'Random ID generated with github.com/hashicorp/shared-secure-libs/base62'; +'Random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create domain wt_scope_id as text check( length(trim(value)) > 10 or value = 'global' ); comment on domain wt_scope_id is -'"global" or random ID generated with github.com/hashicorp/shared-secure-libs/base62'; +'"global" or random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create domain wt_user_id as text not null @@ -35,7 +35,7 @@ check( length(trim(value)) > 10 or value = 'u_anon' or value = 'u_auth' or value = 'u_recovery' ); comment on domain wt_scope_id is -'"u_anon", "u_auth", or random ID generated with github.com/hashicorp/shared-secure-libs/base62'; +'"u_anon", "u_auth", or random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create domain wt_role_id as text not null @@ -43,7 +43,7 @@ check( length(trim(value)) > 10 ); comment on domain wt_scope_id is -'Random ID generated with github.com/hashicorp/shared-secure-libs/base62'; +'Random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create domain wt_timestamp as timestamp with time zone @@ -7342,7 +7342,7 @@ create domain wt_plugin_id as text length(trim(value)) > 10 or value = 'pi_system' ); comment on domain wt_plugin_id is - '"pi_system", or random ID generated with github.com/hashicorp/shared-secure-libs/base62'; + '"pi_system", or random ID generated with github.com/hashicorp/go-secure-stdlib/base62'; create table plugin ( public_id wt_plugin_id primary key diff --git a/internal/observability/event/id.go b/internal/observability/event/id.go index abb0150a1a..fc4b706676 100644 --- a/internal/observability/event/id.go +++ b/internal/observability/event/id.go @@ -3,7 +3,7 @@ package event import ( "fmt" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" ) // This modified newId has been done to stop a circular diff --git a/internal/servers/common/handler.go b/internal/servers/common/handler.go index 4313cae020..cdaba93e56 100644 --- a/internal/servers/common/handler.go +++ b/internal/servers/common/handler.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" ) // generatedTraceId returns a boundary generated TraceId or "" if an error occurs when generating diff --git a/internal/servers/controller/controller.go b/internal/servers/controller/controller.go index a9029547b4..7cc23abacc 100644 --- a/internal/servers/controller/controller.go +++ b/internal/servers/controller/controller.go @@ -22,7 +22,7 @@ import ( "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/shared-secure-libs/mlock" "github.com/patrickmn/go-cache" ua "go.uber.org/atomic" diff --git a/internal/servers/controller/testing.go b/internal/servers/controller/testing.go index 67be160392..9c33dfcf0c 100644 --- a/internal/servers/controller/testing.go +++ b/internal/servers/controller/testing.go @@ -23,7 +23,7 @@ import ( "github.com/hashicorp/boundary/internal/servers" "github.com/hashicorp/go-hclog" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/shared-secure-libs/strutil" "github.com/jinzhu/gorm" ) diff --git a/internal/servers/worker/controller_connection.go b/internal/servers/worker/controller_connection.go index df70ac5d4e..4fd50940fa 100644 --- a/internal/servers/worker/controller_connection.go +++ b/internal/servers/worker/controller_connection.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/boundary/internal/cmd/base" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" "google.golang.org/grpc" "google.golang.org/grpc/resolver" "google.golang.org/protobuf/proto" diff --git a/internal/servers/worker/testing.go b/internal/servers/worker/testing.go index fedaa0f397..1e185f1b7c 100644 --- a/internal/servers/worker/testing.go +++ b/internal/servers/worker/testing.go @@ -12,7 +12,7 @@ import ( pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/go-hclog" wrapping "github.com/hashicorp/go-kms-wrapping" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" ) // TestWorker wraps a base.Server and Worker to provide a diff --git a/internal/servers/worker/worker.go b/internal/servers/worker/worker.go index 944b243421..60510f85ce 100644 --- a/internal/servers/worker/worker.go +++ b/internal/servers/worker/worker.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/servers" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/shared-secure-libs/mlock" ua "go.uber.org/atomic" "google.golang.org/grpc/resolver" diff --git a/internal/session/testing.go b/internal/session/testing.go index 0656d1aad7..6a71b8ee48 100644 --- a/internal/session/testing.go +++ b/internal/session/testing.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/boundary/internal/servers" "github.com/hashicorp/boundary/internal/target" wrapping "github.com/hashicorp/go-kms-wrapping" + "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/shared-secure-libs/base62" "github.com/jinzhu/gorm" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/tests/cluster/session_cleanup_test.go b/internal/tests/cluster/session_cleanup_test.go index 54140d93a1..aa6dbfa85f 100644 --- a/internal/tests/cluster/session_cleanup_test.go +++ b/internal/tests/cluster/session_cleanup_test.go @@ -27,7 +27,7 @@ import ( "github.com/hashicorp/dawdle" "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/shared-secure-libs/base62" + "github.com/hashicorp/go-secure-stdlib/base62" "github.com/mr-tron/base58" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"