db/mongodb: use new Vault client for credsdb/mongodb/v0.4.0

3 files changed, 17 insertions, 11 deletions

diff --git a/db/mongodb/client.go b/db/mongodb/client.go
index 705b151..c423d99 100644
--- a/db/mongodb/client.go
+++ b/db/mongodb/client.go
@@ -24,10 +24,10 @@ type Mongo struct {
         db     *mongo.Database
 }
 
-func Connect(ctx context.Context, uri, materialSet string) (*Mongo, error) {
+func Connect(ctx context.Context, uri, materialSet string, vc vault.VaultClient) (*Mongo, error) {
         db := &Mongo{}
 
-        cred, err := vault.GetVaultDatabase(materialSet)
+        cred, err := vc.DbCredential(ctx, materialSet)
         if err != nil {
                 return nil, err
         }
diff --git a/db/mongodb/go.mod b/db/mongodb/go.mod
index a83c655..06df033 100644
--- a/db/mongodb/go.mod
+++ b/db/mongodb/go.mod
@@ -2,10 +2,8 @@ module code.crute.us/mcrute/golib/db/mongodb
 
 go 1.17
 
-replace code.crute.us/mcrute/golib/vault => ../../vault
-
 require (
-        code.crute.us/mcrute/golib/vault v0.1.1
+        code.crute.us/mcrute/golib/vault v0.2.0
         go.mongodb.org/mongo-driver v1.7.4
 )
 
@@ -18,7 +16,7 @@ require (
         github.com/golang/protobuf v1.5.2 // indirect
         github.com/golang/snappy v0.0.4 // indirect
         github.com/hashicorp/errwrap v1.1.0 // indirect
-        github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+        github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
         github.com/hashicorp/go-hclog v0.16.2 // indirect
         github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
         github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -33,8 +31,9 @@ require (
         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.3.0 // indirect
-        github.com/hashicorp/vault/sdk v0.3.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/yamux v0.0.0-20180604194846-3520598351bb // indirect
         github.com/klauspost/compress v1.13.6 // indirect
         github.com/mattn/go-colorable v0.1.6 // indirect
diff --git a/db/mongodb/go.sum b/db/mongodb/go.sum
index 40f35bf..51dd0bf 100644
--- a/db/mongodb/go.sum
+++ b/db/mongodb/go.sum
@@ -1,5 +1,7 @@
 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=
 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=
@@ -116,8 +118,9 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
@@ -157,10 +160,14 @@ 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 h1:uDy39PLSvy6gtKyjOCRPizy2QdFiIYSWBR2pxCEzYL8=
 github.com/hashicorp/vault/api v1.3.0/go.mod h1:EabNQLI0VWbWoGlA+oBLC8PXmR9D60aUVgQGvangFWQ=
-github.com/hashicorp/vault/sdk v0.3.0 h1:kR3dpxNkhh/wr6ycaJYqp6AFT/i2xaftbfnwZduTKEY=
+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/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=