remove the Initialize wrap and call close explicitly (#3769)

builtin/logical/database/backend.go

@@ -106,6 +106,7 @@ func (b *databaseBackend) createDBObj(ctx context.Context, s logical.Storage, na
 
 	err = db.Initialize(ctx, config.ConnectionDetails, true)
 	if err != nil {
+		db.Close()
 		return nil, err
 	}
 

builtin/logical/database/dbplugin/client.go

@@ -1,7 +1,6 @@
 package dbplugin
 
 import (
-	"context"
 	"errors"
 	"sync"
 
@@ -28,16 +27,6 @@ func (dc *DatabasePluginClient) Close() error {
 	return err
 }
 
-// This wraps the Initialize call and ensures we close the plugin on error.
-func (dc *DatabasePluginClient) Initialize(ctx context.Context, config map[string]interface{}, verifyConnection bool) error {
-	err := dc.Database.Initialize(ctx, config, verifyConnection)
-	if err != nil {
-		dc.Close()
-	}
-
-	return err
-}
-
 // newPluginClient returns a databaseRPCClient with a connection to a running
 // plugin. The client is wrapped in a DatabasePluginClient object to ensure the
 // plugin is killed on call of Close().

builtin/logical/database/path_config_connection.go

@@ -233,6 +233,7 @@ func (b *databaseBackend) connectionWriteHandler() framework.OperationFunc {
 
 		err = db.Initialize(ctx, config.ConnectionDetails, verifyConnection)
 		if err != nil {
+			db.Close()
 			return logical.ErrorResponse(fmt.Sprintf("error creating database object: %s", err)), nil
 		}