Merge pull request hashicorp#37 from terraform-providers/paddy_databa…

…se_secret_backend_connection Add database secret backend connection resource.
dandandy · Feb 22, 2018 · cba7121 · cba7121
2 parents 3e92672 + c3749b1
commit cba7121
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/website/docs/r/database_secret_backend_connection.md b/website/docs/r/database_secret_backend_connection.md
@@ -26,7 +26,7 @@ resource "vault_mount" "db" {
   type = "database"
 }
 
-resource "vault_database_secret_backend" "postgres" {
+resource "vault_database_secret_backend_connection" "postgres" {
   backend       = "${vault_mount.db.path}"
   name          = "postgres"
   allowed_roles = ["dev", "prod"]
@@ -51,19 +51,21 @@ The following arguments are supported:
 * `allowed_roles` - (Optional) A list of roles that are allowed to use this
   connection.
 
-* `cassandra` - (Optional) Configuration options for Cassandra connections.
+* `cassandra` - (Optional) A nested block containing configuration options for Cassandra connections.
 
-* `mongodb` - (Optional) Configuration options for MongoDB connections.
+* `mongodb` - (Optional) A nested block containing configuration options for MongoDB connections.
 
-* `hana` - (Optional) Configuration options for SAP HanaDB connections.
+* `hana` - (Optional) A nested block containing configuration options for SAP HanaDB connections.
 
-* `mssql` - (Optional) Configuration options for MSSQL connections.
+* `mssql` - (Optional) A nested block containing configuration options for MSSQL connections.
 
-* `mysql` - (Optional) Configuration options for MySQL connections.
+* `mysql` - (Optional) A nested block containing configuration options for MySQL connections.
 
-* `postgresql` - (Optional) Configuration options for PostgreSQL connections.
+* `postgresql` - (Optional) A nested block containing configuration options for PostgreSQL connections.
 
-* `oracle` - (Optional) Configuration options for Oracle connections.
+* `oracle` - (Optional) A nested block containing configuration options for Oracle connections.
+
+Exactly one of the nested blocks of configuration options must be supplied.
 
 ### Cassandra Configuration Options
 

diff --git a/website/vault.erb b/website/vault.erb
@@ -91,6 +91,10 @@
                             <a href="/docs/providers/vault/r/database_secret_backend_role.html">vault_database_secret_backend_role</a>
                         </li>
 
+                        <li<%= sidebar_current("docs-vault-resource-generic-secret") %>>
+                            <a href="/docs/providers/vault/r/generic_secret.html">vault_generic_secret</a>
+                        </li>
+
                         <li<%= sidebar_current("docs-vault-resource-okta-auth-backend") %>>
                             <a href="/docs/providers/vault/r/okta_auth_backend.html">vault_okta_auth_backend</a>
                         </li>
@@ -103,10 +107,6 @@
                             <a href="/docs/providers/vault/r/okta_auth_backend_group.html">vault_okta_auth_backend_group</a>
                         </li>
 
-                        <li<%= sidebar_current("docs-vault-resource-generic-secret") %>>
-                            <a href="/docs/providers/vault/r/generic_secret.html">vault_generic_secret</a>
-                        </li>
-
                         <li<%= sidebar_current("docs-vault-resource-mount") %>>
                             <a href="/docs/providers/vault/r/mount.html">vault_mount</a>
                         </li>