diff --git a/cmd/couchbase-database-plugin/main.go b/cmd/couchbase-database-plugin/main.go index 3e648de..e1652e6 100644 --- a/cmd/couchbase-database-plugin/main.go +++ b/cmd/couchbase-database-plugin/main.go @@ -4,17 +4,12 @@ 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 := couchbase.Run(apiClientMeta.GetTLSConfig()) + err := Run() if err != nil { logger := hclog.New(&hclog.LoggerOptions{}) @@ -22,3 +17,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 c139051..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), api.VaultPluginTLSProvider(apiTLSConfig)) - - 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 { diff --git a/go.mod b/go.mod index cfdd41c..5f60e7e 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,7 @@ 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.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..17ff279 100644 --- a/go.sum +++ b/go.sum @@ -164,8 +164,8 @@ 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= 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=