Merge pull request #11 from particuleio/feat/add-managed-dbs-support

feat/add managed dbs support

Author: tbobm

README.md

@@ -5,9 +5,10 @@
 Terraform module to create Databases using Scaleway's [Managed Databases][scw-db].
 
 Create and configure the following:
-- Database Instance
+- Managed RDB Instances
 - Database Users
 - Database ACLs
+- Managed Databases
 
 [scw-db]: https://www.scaleway.com/en/database/
 
@@ -41,6 +42,7 @@ Multiple examples are available in the [`./examples`](./examples) directory.
 - A [simple database setup](./examples/simple/)
 - [Multiple database creation with users](./examples/users/)
 - [Database creation with ACL support](./examples/acls/)
+- [RDB instance with multiple databases](./examples/databases/)
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements

dbs.tf

@@ -0,0 +1,7 @@
+resource "scaleway_rdb_database" "this" {
+  for_each = local.dbs_by_database
+
+  instance_id = scaleway_rdb_instance.this[each.value.database].id
+  name        = each.value.db
+}
+

examples/databases/README.md

@@ -0,0 +1,52 @@
+# Databases Example
+
+Managed Database creation with database support.
+
+```hcl
+module "rdb" {
+  source = "../../"
+
+  databases = {
+    main = {
+      name      = "database-with-multiple-dbs"
+      node_type = "DB-DEV-S"
+      engine    = "PostgreSQL-11"
+      dbs = [
+        "default",
+        "admin",
+        "internal",
+      ]
+    }
+  }
+}
+```
+
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Requirements
+
+No requirements.
+
+## Providers
+
+No providers.
+
+## Modules
+
+| Name | Source | Version |
+|------|--------|---------|
+| <a name="module_rdb"></a> [rdb](#module\_rdb) | ../../ | n/a |
+
+## Resources
+
+No resources.
+
+## Inputs
+
+No inputs.
+
+## Outputs
+
+| Name | Description |
+|------|-------------|
+| <a name="output_rdb"></a> [rdb](#output\_rdb) | n/a |
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/databases/main.tf

@@ -0,0 +1,21 @@
+module "rdb" {
+  source = "../../"
+
+  databases = {
+    main = {
+      name      = "database-with-multiple-dbs"
+      node_type = "DB-DEV-S"
+      engine    = "PostgreSQL-11"
+      dbs = [
+        "default",
+        "admin",
+        "internal",
+      ]
+    }
+  }
+}
+
+output "rdb" {
+  value     = module.rdb.this
+  sensitive = true
+}

locals.tf

@@ -7,6 +7,14 @@ locals {
       }
     ]
   ])
+  db_configs = flatten([
+    for database, config in local.databases : [
+      for db in config.dbs : {
+        database = database
+        db       = db
+      }
+    ]
+  ])
   acl_configs = flatten([
     for database, config in local.databases : [
       for acl in config.acls : {
@@ -23,12 +31,17 @@ locals {
     for config in local.user_configs :
     "${config.database}_${config.user.username}" => config
   }
+  dbs_by_database = {
+    for config in local.db_configs :
+    "${config.database}_${config.db}" => config
+  }
   default_database = {
     name      = "default"
     node_type = "DB-DEV-S"
     users     = []
     settings  = {}
     acls      = []
+    dbs       = []
   }
   databases = {
     for database_name, config in var.databases :

main.tf

@@ -1,9 +1,3 @@
-resource "scaleway_rdb_database" "this" {
-  for_each    = local.databases
-  instance_id = scaleway_rdb_instance.this[each.key].id
-  name        = each.key
-}
-
 resource "scaleway_rdb_instance" "this" {
   for_each = local.databases
 

outputs.tf

@@ -2,7 +2,6 @@ output "this" {
   value = {
     for name in keys(var.databases) : name => {
       "instance" = scaleway_rdb_instance.this[name],
-      "database" = scaleway_rdb_database.this[name],
       "acls"     = lookup(scaleway_rdb_acl.this, name, []),
       "users" = [
         for identifier, config in local.user_by_database : {
@@ -12,6 +11,11 @@ output "this" {
           "identifier" : identifier
         } if config.database == name
       ],
+      "dbs" = [
+        for identifier, config in local.dbs_by_database :
+        scaleway_rdb_database.this[identifier]
+        if config.database == name
+      ]
     }
   }
   description = "A map of the scaleway_rdb_database (including their users) and scaleway_rdb_instance resources grouped by databases definitions"