db/mongodb: migrate to secrets API for v2db/mongodb/v2.0.0

3 files changed, 32 insertions, 30 deletions

diff --git a/db/mongodb/client.go b/db/mongodb/client.go
index 1f3815d..f06f5ec 100644
--- a/db/mongodb/client.go
+++ b/db/mongodb/client.go
@@ -7,12 +7,11 @@ import (
         "net/url"
         "strings"
 
+        "code.crute.us/mcrute/golib/secrets"
         "go.mongodb.org/mongo-driver/bson"
         "go.mongodb.org/mongo-driver/mongo"
         "go.mongodb.org/mongo-driver/mongo/options"
         "go.mongodb.org/mongo-driver/x/mongo/driver/connstring"
-
-        "code.crute.us/mcrute/golib/vault"
 )
 
 // AnyInTopLevelArray is just a convenience method so apps don't have to repeat
@@ -26,12 +25,12 @@ type Mongo struct {
         db     *mongo.Database
 }
 
-func Connect(ctx context.Context, uri string, vc vault.VaultClient) (*Mongo, error) {
+func Connect(ctx context.Context, uri string, sc secrets.Client) (*Mongo, error) {
         db := &Mongo{}
 
         // Prefix uri with mongodb:// unless it already includes one of the
         // standard prefixes (only these two are valid). Otherwise if scheme is
-        // omitted then url parsing will fail to capture the username for Vault
+        // omitted then url parsing will fail to capture the username for secret
         // lookup.
         if !strings.HasPrefix(uri, "mongodb://") && !strings.HasPrefix(uri, "mongodb+srv://") {
                 uri = "mongodb://" + uri
@@ -43,11 +42,11 @@ func Connect(ctx context.Context, uri string, vc vault.VaultClient) (*Mongo, err
         }
 
         // The username provided by the user (there should be no
-        // password) will be a reference to a vault material with the
+        // password) will be a reference to a secret material with the
         // prefix database/creds/. This needs to be replaced with the real
-        // username/password pair fetched from Vault before attempting to
+        // username/password pair fetched from secret before attempting to
         // connect.
-        cred, err := vc.DbCredential(ctx, u.User.Username())
+        cred, _, err := sc.DatabaseCredential(ctx, u.User.Username())
         if err != nil {
                 return nil, err
         }
diff --git a/db/mongodb/go.mod b/db/mongodb/go.mod
index 06df033..6d5ba3b 100644
--- a/db/mongodb/go.mod
+++ b/db/mongodb/go.mod
@@ -1,13 +1,14 @@
-module code.crute.us/mcrute/golib/db/mongodb
+module code.crute.us/mcrute/golib/db/mongodb/v2
 
 go 1.17
 
 require (
-        code.crute.us/mcrute/golib/vault v0.2.0
+        code.crute.us/mcrute/golib/secrets v0.1.0
         go.mongodb.org/mongo-driver v1.7.4
 )
 
 require (
+        code.crute.us/mcrute/golib v0.4.0 // indirect
         github.com/armon/go-metrics v0.3.9 // indirect
         github.com/armon/go-radix v1.0.0 // indirect
         github.com/cenkalti/backoff/v3 v3.0.0 // indirect
@@ -24,16 +25,16 @@ require (
         github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
         github.com/hashicorp/go-rootcerts v1.0.2 // indirect
         github.com/hashicorp/go-secure-stdlib/mlock v0.1.1 // indirect
-        github.com/hashicorp/go-secure-stdlib/parseutil v0.1.1 // indirect
-        github.com/hashicorp/go-secure-stdlib/strutil v0.1.1 // indirect
+        github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
+        github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
         github.com/hashicorp/go-sockaddr v1.0.2 // indirect
         github.com/hashicorp/go-uuid v1.0.2 // indirect
         github.com/hashicorp/go-version v1.2.0 // indirect
         github.com/hashicorp/golang-lru v0.5.4 // indirect
         github.com/hashicorp/hcl v1.0.0 // indirect
-        github.com/hashicorp/vault/api v1.5.0 // indirect
-        github.com/hashicorp/vault/api/auth/approle v0.1.1 // indirect
-        github.com/hashicorp/vault/sdk v0.4.1 // indirect
+        github.com/hashicorp/vault/api v1.8.0 // indirect
+        github.com/hashicorp/vault/api/auth/approle v0.3.0 // indirect
+        github.com/hashicorp/vault/sdk v0.6.0 // indirect
         github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
         github.com/klauspost/compress v1.13.6 // indirect
         github.com/mattn/go-colorable v0.1.6 // indirect
@@ -41,7 +42,7 @@ require (
         github.com/mitchellh/copystructure v1.0.0 // indirect
         github.com/mitchellh/go-homedir v1.1.0 // indirect
         github.com/mitchellh/go-testing-interface v1.0.0 // indirect
-        github.com/mitchellh/mapstructure v1.4.2 // indirect
+        github.com/mitchellh/mapstructure v1.5.0 // indirect
         github.com/mitchellh/reflectwalk v1.0.0 // indirect
         github.com/oklog/run v1.0.0 // indirect
         github.com/pierrec/lz4 v2.5.2+incompatible // indirect
diff --git a/db/mongodb/go.sum b/db/mongodb/go.sum
index 51dd0bf..e677ffc 100644
--- a/db/mongodb/go.sum
+++ b/db/mongodb/go.sum
@@ -1,7 +1,9 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-code.crute.us/mcrute/golib/vault v0.2.0 h1:8n1DRZIo9WA9uPWAw0BPk9DfRs3kz8B58p6n1RF7Zk8=
-code.crute.us/mcrute/golib/vault v0.2.0/go.mod h1:23C5g8O0zaeFfo7v6sCO0RKgnHIiHM9ku+ASOWHJD9k=
+code.crute.us/mcrute/golib v0.4.0 h1:VWxb7v4gGkqL700zxDwgROweBsfx5RbiB35VW0O0oi0=
+code.crute.us/mcrute/golib v0.4.0/go.mod h1:dukLPhs1H8dxtkhXtpJZYo/bMzefLRbdRj9Tj67wdaQ=
+code.crute.us/mcrute/golib/secrets v0.1.0 h1:22W0rLhE5jvIQlsUDQt1soGBEoBn4rl4a883f1yBybI=
+code.crute.us/mcrute/golib/secrets v0.1.0/go.mod h1:O1ypm8JirXI4SekwNCHwQbfsieDQJxeRNwZYoot6fvw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -128,7 +130,7 @@ github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc=
 github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod h1:d1g9WGtAunDNpek8jUIEJnBlbgKS1N2Q61QkHiZyR1g=
+github.com/hashicorp/go-kms-wrapping/entropy/v2 v2.0.0/go.mod h1:xvb32K2keAc+R8DSFG2IwDcydK9DBQE+fGA5fsw6hSk=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
@@ -142,11 +144,13 @@ github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR3
 github.com/hashicorp/go-secure-stdlib/base62 v0.1.1/go.mod h1:EdWO6czbmthiwZ3/PUsDV+UD1D5IRU4ActiaWGwt0Yw=
 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/parseutil v0.1.6 h1:om4Al8Oy7kCm/B86rLCLah4Dt5Aa0Fr5rYBG60OzwHQ=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/password v0.1.1/go.mod h1:9hH302QllNwu1o2TGYtSk8I8kTAN0ca1EHpwhm5Mmzo=
-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/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
+github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
 github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.1/go.mod h1:l8slYwnJA26yBz+ErHpp2IRCLr0vuOMGBORIz4rRiAs=
 github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
@@ -160,14 +164,12 @@ github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+l
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/vault/api v1.3.0/go.mod h1:EabNQLI0VWbWoGlA+oBLC8PXmR9D60aUVgQGvangFWQ=
-github.com/hashicorp/vault/api v1.5.0 h1:Bp6yc2bn7CWkOrVIzFT/Qurzx528bdavF3nz590eu28=
-github.com/hashicorp/vault/api v1.5.0/go.mod h1:LkMdrZnWNrFaQyYYazWVn7KshilfDidgVBq6YiTq/bM=
-github.com/hashicorp/vault/api/auth/approle v0.1.1 h1:R5yA+xcNvw1ix6bDuWOaLOq2L4L77zDCVsethNw97xQ=
-github.com/hashicorp/vault/api/auth/approle v0.1.1/go.mod h1:mHOLgh//xDx4dpqXoq6tS8Ob0FoCFWLU2ibJ26Lfmag=
-github.com/hashicorp/vault/sdk v0.3.0/go.mod h1:aZ3fNuL5VNydQk8GcLJ2TV8YCRVvyaakYkhZRoVuhj0=
-github.com/hashicorp/vault/sdk v0.4.1 h1:3SaHOJY687jY1fnB61PtL0cOkKItphrbLmux7T92HBo=
-github.com/hashicorp/vault/sdk v0.4.1/go.mod h1:aZ3fNuL5VNydQk8GcLJ2TV8YCRVvyaakYkhZRoVuhj0=
+github.com/hashicorp/vault/api v1.8.0 h1:7765sW1XBt+qf4XKIYE4ebY9qc/yi9V2/egzGSUNMZU=
+github.com/hashicorp/vault/api v1.8.0/go.mod h1:uJrw6D3y9Rv7hhmS17JQC50jbPDAZdjZoTtrCCxxs7E=
+github.com/hashicorp/vault/api/auth/approle v0.3.0 h1:Ib0oCNXsCq/QZhPYtXPzJEbGS5WR/KoZf8c84QoFdkU=
+github.com/hashicorp/vault/api/auth/approle v0.3.0/go.mod h1:hm51TbjzUkPO0Y17wkrpwOpvyyMRpXJNueTHiG04t3k=
+github.com/hashicorp/vault/sdk v0.6.0 h1:6Z+In5DXHiUfZvIZdMx7e2loL1PPyDjA4bVh9ZTIAhs=
+github.com/hashicorp/vault/sdk v0.6.0/go.mod h1:+DRpzoXIdMvKc88R4qxr+edwy/RvH5QK8itmxLiDHLc=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@@ -215,8 +217,8 @@ github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdI
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo=
-github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=