mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-31 18:48:08 +00:00 
			
		
		
		
	DBPW - Enables AutoMTLS for DB plugins (#10220)
This also temporarily disables couchbase, elasticsearch, and mongodbatlas because the `Serve` function needs to change signatures and those plugins are vendored in from external repos, causing problems when building.
This commit is contained in:
		| @@ -9,7 +9,6 @@ import ( | ||||
|  | ||||
| 	stdmysql "github.com/go-sql-driver/mysql" | ||||
| 	"github.com/hashicorp/errwrap" | ||||
| 	"github.com/hashicorp/vault/api" | ||||
| 	dbplugin "github.com/hashicorp/vault/sdk/database/dbplugin/v5" | ||||
| 	"github.com/hashicorp/vault/sdk/database/helper/credsutil" | ||||
| 	"github.com/hashicorp/vault/sdk/database/helper/dbutil" | ||||
| @@ -63,29 +62,6 @@ func new(legacy bool) *MySQL { | ||||
| 	} | ||||
| } | ||||
|  | ||||
| // Run instantiates a MySQL object, and runs the RPC server for the plugin | ||||
| func Run(apiTLSConfig *api.TLSConfig) error { | ||||
| 	return runCommon(false, apiTLSConfig) | ||||
| } | ||||
|  | ||||
| // Run instantiates a MySQL object, and runs the RPC server for the plugin | ||||
| func RunLegacy(apiTLSConfig *api.TLSConfig) error { | ||||
| 	return runCommon(true, apiTLSConfig) | ||||
| } | ||||
|  | ||||
| func runCommon(legacy bool, apiTLSConfig *api.TLSConfig) error { | ||||
| 	var f func() (interface{}, error) | ||||
| 	f = New(legacy) | ||||
| 	dbType, err := f() | ||||
| 	if err != nil { | ||||
| 		return err | ||||
| 	} | ||||
|  | ||||
| 	dbplugin.Serve(dbType.(dbplugin.Database), api.VaultPluginTLSProvider(apiTLSConfig)) | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| func (m *MySQL) Type() (string, error) { | ||||
| 	return mySQLTypeName, nil | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Michael Golowka
					Michael Golowka