From c825362304b7d36f6af85b88bde39e7ffb384fcc Mon Sep 17 00:00:00 2001 From: Brian Kassouf Date: Thu, 4 May 2017 10:41:59 -0700 Subject: [PATCH] PR comments --- builtin/logical/database/path_roles.go | 2 +- helper/builtinplugins/builtin.go | 4 ++-- logical/system_view.go | 2 +- website/source/docs/secrets/databases/mysql-maria.html.md | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/logical/database/path_roles.go b/builtin/logical/database/path_roles.go index c81261804641..8be33c0a1215 100644 --- a/builtin/logical/database/path_roles.go +++ b/builtin/logical/database/path_roles.go @@ -57,7 +57,7 @@ func pathRoles(b *databaseBackend) *framework.Path { }, "rollback_statements": { Type: framework.TypeString, - Description: `SQL statements to be executed to revoke a user. Must be a semicolon-separated + Description: `Statements to be executed to revoke a user. Must be a semicolon-separated string, a base64-encoded semicolon-separated string, a serialized JSON string array, or a base64-encoded serialized JSON string array. The '{{name}}' value will be substituted.`, diff --git a/helper/builtinplugins/builtin.go b/helper/builtinplugins/builtin.go index 8e6ed22ef674..a2100e931872 100644 --- a/helper/builtinplugins/builtin.go +++ b/helper/builtinplugins/builtin.go @@ -13,8 +13,8 @@ var plugins map[string]BuiltinFactory = map[string]BuiltinFactory{ // These four plugins all use the same mysql implementation but with // different username settings passed by the constructor. "mysql-database-plugin": mysql.New(mysql.DisplayNameLen, mysql.UsernameLen), - "aurora-database-plugin": mysql.New(mysql.LegacyDisplayNameLen, mysql.LegacyUsernameLen), - "rds-database-plugin": mysql.New(mysql.LegacyDisplayNameLen, mysql.LegacyUsernameLen), + "mysql-aurora-database-plugin": mysql.New(mysql.LegacyDisplayNameLen, mysql.LegacyUsernameLen), + "mysql-rds-database-plugin": mysql.New(mysql.LegacyDisplayNameLen, mysql.LegacyUsernameLen), "mysql-legacy-database-plugin": mysql.New(mysql.LegacyDisplayNameLen, mysql.LegacyUsernameLen), "postgresql-database-plugin": postgresql.New, diff --git a/logical/system_view.go b/logical/system_view.go index 175edc0f9a40..64fc51c7b477 100644 --- a/logical/system_view.go +++ b/logical/system_view.go @@ -49,7 +49,7 @@ type SystemView interface { // name. Returns a PluginRunner or an error if a plugin can not be found. LookupPlugin(string) (*pluginutil.PluginRunner, error) - // MlockEnabled returns the configuration setting for Enableing mlock on + // MlockEnabled returns the configuration setting for enabling mlock on // plugins. MlockEnabled() bool } diff --git a/website/source/docs/secrets/databases/mysql-maria.html.md b/website/source/docs/secrets/databases/mysql-maria.html.md index ae6c19eac284..f4cf3640ba92 100644 --- a/website/source/docs/secrets/databases/mysql-maria.html.md +++ b/website/source/docs/secrets/databases/mysql-maria.html.md @@ -8,7 +8,7 @@ description: |- # MySQL/MariaDB Database Plugin -Name: `mysql-database-plugin`, `aurora-database-plugin`, `rds-database-plugin`, +Name: `mysql-database-plugin`, `mysql-aurora-database-plugin`, `mysql-rds-database-plugin`, `mysql-legacy-database-plugin` The MySQL Database Plugin is one of the supported plugins for the Database @@ -24,8 +24,8 @@ the length of usernames generated by the plugin as different versions of mysql accept different lengths. The availible plugins are: - mysql-database-plugin - - aurora-database-plugin - - rds-database-plugin + - mysql-aurora-database-plugin + - mysql-rds-database-plugin - mysql-legacy-database-plugin ## Quick Start