From a62941f099c0d6b43ea2fe40610095172e1bd83c Mon Sep 17 00:00:00 2001 From: Lauren Voswinkel Date: Thu, 22 Oct 2020 14:26:48 -0700 Subject: [PATCH 1/5] Removing tls argument from Serve call --- couchbase.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchbase.go b/couchbase.go index c139051..c0baea2 100644 --- a/couchbase.go +++ b/couchbase.go @@ -66,7 +66,7 @@ func Run(apiTLSConfig *api.TLSConfig) error { return err } - dbplugin.Serve(db.(dbplugin.Database), api.VaultPluginTLSProvider(apiTLSConfig)) + dbplugin.Serve(db.(dbplugin.Database)) return nil } From fccad073dea597a2f1a144f03c955f1615651a24 Mon Sep 17 00:00:00 2001 From: Lauren Voswinkel Date: Thu, 22 Oct 2020 14:42:49 -0700 Subject: [PATCH 2/5] Move Run into main package --- cmd/couchbase-database-plugin/main.go | 15 ++++++++++++++- couchbase.go | 13 ------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/couchbase-database-plugin/main.go b/cmd/couchbase-database-plugin/main.go index 3e648de..c49b80a 100644 --- a/cmd/couchbase-database-plugin/main.go +++ b/cmd/couchbase-database-plugin/main.go @@ -5,6 +5,7 @@ import ( hclog "github.com/hashicorp/go-hclog" + dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5" couchbase "github.com/hashicorp/vault-plugin-database-couchbase" "github.com/hashicorp/vault/api" ) @@ -14,7 +15,7 @@ func main() { flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) - err := couchbase.Run(apiClientMeta.GetTLSConfig()) + err := Run() if err != nil { logger := hclog.New(&hclog.LoggerOptions{}) @@ -22,3 +23,15 @@ func main() { os.Exit(1) } } + +// Run instantiates a CouchbaseDB object, and runs the RPC server for the plugin +func Run() error { + db, err := couchbase.New() + if err != nil { + return err + } + + dbplugin.Serve(db.(dbplugin.Database)) + + return nil +} diff --git a/couchbase.go b/couchbase.go index c0baea2..5f2d83c 100644 --- a/couchbase.go +++ b/couchbase.go @@ -10,7 +10,6 @@ import ( "github.com/couchbase/gocb/v2" "github.com/hashicorp/errwrap" hclog "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/api" dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5" "github.com/hashicorp/vault/sdk/database/helper/credsutil" ) @@ -59,18 +58,6 @@ func new() *CouchbaseDB { return db } -// Run instantiates a CouchbaseDB object, and runs the RPC server for the plugin -func Run(apiTLSConfig *api.TLSConfig) error { - db, err := New() - if err != nil { - return err - } - - dbplugin.Serve(db.(dbplugin.Database)) - - return nil -} - func (c *CouchbaseDB) Initialize(ctx context.Context, req dbplugin.InitializeRequest) (dbplugin.InitializeResponse, error) { err := c.couchbaseDBConnectionProducer.Initialize(ctx, req.Config, req.VerifyConnection) if err != nil { From 683d07be21f1d015af08a322df14a1e5f45f02fe Mon Sep 17 00:00:00 2001 From: Lauren Voswinkel Date: Thu, 22 Oct 2020 14:48:12 -0700 Subject: [PATCH 3/5] Update vault/sdk version --- cmd/couchbase-database-plugin/main.go | 2 +- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/couchbase-database-plugin/main.go b/cmd/couchbase-database-plugin/main.go index c49b80a..fede4ab 100644 --- a/cmd/couchbase-database-plugin/main.go +++ b/cmd/couchbase-database-plugin/main.go @@ -5,9 +5,9 @@ import ( hclog "github.com/hashicorp/go-hclog" - dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5" couchbase "github.com/hashicorp/vault-plugin-database-couchbase" "github.com/hashicorp/vault/api" + dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5" ) func main() { diff --git a/go.mod b/go.mod index cfdd41c..bbfd96e 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/hashicorp/go-hclog v0.14.1 github.com/hashicorp/go-version v1.2.1 github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f - github.com/hashicorp/vault/sdk v0.1.14-0.20201015192012-a69ee0f65a28 + github.com/hashicorp/vault/sdk v0.1.14-0.20201022214319-d87657199d4b github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect github.com/lib/pq v1.8.0 // indirect github.com/mitchellh/mapstructure v1.3.3 diff --git a/go.sum b/go.sum index ba4aca0..0f88b18 100644 --- a/go.sum +++ b/go.sum @@ -166,6 +166,8 @@ github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f/go.mod h1:eu 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.20201015192012-a69ee0f65a28 h1:OqvajJPvZ05G65Z8IAmPvEeJg6jE8CTi5LDOtNacnpk= github.com/hashicorp/vault/sdk v0.1.14-0.20201015192012-a69ee0f65a28/go.mod h1:cAGI4nVnEfAyMeqt9oB+Mase8DNn3qA/LDNHURiwssY= +github.com/hashicorp/vault/sdk v0.1.14-0.20201022214319-d87657199d4b h1:kT0HPwthAisVgxAkm/kNGI2IHm0rAco28dOs3geL90E= +github.com/hashicorp/vault/sdk v0.1.14-0.20201022214319-d87657199d4b/go.mod h1:cAGI4nVnEfAyMeqt9oB+Mase8DNn3qA/LDNHURiwssY= 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= From e8296cdc4ad6c0c5d6eb738ee50071555a868dda Mon Sep 17 00:00:00 2001 From: Lauren Voswinkel Date: Thu, 22 Oct 2020 15:05:54 -0700 Subject: [PATCH 4/5] Remove references to api package that is not being used. --- cmd/couchbase-database-plugin/main.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cmd/couchbase-database-plugin/main.go b/cmd/couchbase-database-plugin/main.go index fede4ab..e1652e6 100644 --- a/cmd/couchbase-database-plugin/main.go +++ b/cmd/couchbase-database-plugin/main.go @@ -4,17 +4,11 @@ import ( "os" hclog "github.com/hashicorp/go-hclog" - couchbase "github.com/hashicorp/vault-plugin-database-couchbase" - "github.com/hashicorp/vault/api" dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5" ) func main() { - apiClientMeta := &api.PluginAPIClientMeta{} - flags := apiClientMeta.FlagSet() - flags.Parse(os.Args[1:]) - err := Run() if err != nil { logger := hclog.New(&hclog.LoggerOptions{}) From 2a1a7a13bbb2e19a8c18527c137c229175180f15 Mon Sep 17 00:00:00 2001 From: Lauren Voswinkel Date: Thu, 22 Oct 2020 15:17:49 -0700 Subject: [PATCH 5/5] Tidy go.mod --- go.mod | 1 - go.sum | 2 -- 2 files changed, 3 deletions(-) diff --git a/go.mod b/go.mod index bbfd96e..5f60e7e 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ require ( github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/go-hclog v0.14.1 github.com/hashicorp/go-version v1.2.1 - github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f github.com/hashicorp/vault/sdk v0.1.14-0.20201022214319-d87657199d4b github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect github.com/lib/pq v1.8.0 // indirect diff --git a/go.sum b/go.sum index 0f88b18..17ff279 100644 --- a/go.sum +++ b/go.sum @@ -164,8 +164,6 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f h1:PYtnlUZzFSZxPcq7mYp5oC9N+BcJ8IKYf6/EG0GHM2Y= github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f/go.mod h1:euTFbi2YJgwcju3imEt919lhJKF68nN1cQPq3aA+kBE= 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.20201015192012-a69ee0f65a28 h1:OqvajJPvZ05G65Z8IAmPvEeJg6jE8CTi5LDOtNacnpk= -github.com/hashicorp/vault/sdk v0.1.14-0.20201015192012-a69ee0f65a28/go.mod h1:cAGI4nVnEfAyMeqt9oB+Mase8DNn3qA/LDNHURiwssY= github.com/hashicorp/vault/sdk v0.1.14-0.20201022214319-d87657199d4b h1:kT0HPwthAisVgxAkm/kNGI2IHm0rAco28dOs3geL90E= github.com/hashicorp/vault/sdk v0.1.14-0.20201022214319-d87657199d4b/go.mod h1:cAGI4nVnEfAyMeqt9oB+Mase8DNn3qA/LDNHURiwssY= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=