feature: Set sensitive variables

Author: filippolmt

cloudsql_dumps_bucket.tf

@@ -35,7 +35,7 @@ resource "google_storage_bucket" "cloudsql_dumps" {
 
   lifecycle_rule {
     action {
-      type = "SetStorageClass"
+      type          = "SetStorageClass"
       storage_class = "COLDLINE"
     }
     condition {

examples/test.tfvars

@@ -15,7 +15,7 @@ my_drupal_projects_list = [
     bucket_name                     = "test-project-bucket-name"
     bucket_append_random_suffix     = false
     bucket_enable_disaster_recovery = false
-    bucket_labels                   = {
+    bucket_labels = {
       "project" = "test-project"
       "env"     = "stage"
     }

secrets.tf

@@ -2,12 +2,32 @@ locals {
   map_of_drupal_buckets = var.create_buckets == true ? {
     for o in local.drupal_buckets_list : o.name => o
   } : {}
-  map_of_drupal_databases = trimspace(var.cloudsql_instance_name) != "" && trimspace(var.cloudsql_privileged_user_name) != "" && trimspace(var.cloudsql_privileged_user_password) != "" && var.create_databases_and_users == true ? {
+
+  map_of_drupal_databases = (
+    trimspace(var.cloudsql_instance_name) != "" &&
+    trimspace(var.cloudsql_privileged_user_name) != "" &&
+    trimspace(var.cloudsql_privileged_user_password) != "" &&
+    var.create_databases_and_users == true
+    ) ? {
     for o in local.drupal_database_and_user_list : o.database => o
   } : {}
-  map_of_output_drupal_databases = trimspace(var.cloudsql_instance_name) != "" && trimspace(var.cloudsql_privileged_user_name) != "" && trimspace(var.cloudsql_privileged_user_password) != "" && var.create_databases_and_users == true ? {
+
+  map_of_output_drupal_databases = (
+    trimspace(var.cloudsql_instance_name) != "" &&
+    trimspace(var.cloudsql_privileged_user_name) != "" &&
+    trimspace(var.cloudsql_privileged_user_password) != "" &&
+    var.create_databases_and_users == true
+    ) ? {
     for o in module.drupal_databases_and_users[0].sql_users_creds : o.database => o
   } : {}
+
+  drupal_databases_keys = (
+    var.create_databases_and_users == true ?
+    [
+      for o in local.drupal_database_and_user_list : o.database
+      if trimspace(o.namespace) != ""
+    ] : []
+  )
 }
 
 resource "kubernetes_secret" "bucket_secret_name" {
@@ -17,13 +37,10 @@ resource "kubernetes_secret" "bucket_secret_name" {
   }
 
   metadata {
-    # If not specified, we suppose that the Helm release name is defined with
-    # the following convention (the default of sparkfabrik/pkg_drupal):
-    # PKG_DRUPAL_HELM_RELEASE_NAME: drupal-${CI_COMMIT_REF_SLUG}-${CI_PROJECT_ID}
     name        = each.value.helm_release_name == null ? "drupal-${each.value.release_branch_name}-${each.value.project_id}-bucket" : "${each.value.helm_release_name}-bucket"
     namespace   = var.use_existing_kubernetes_namespaces ? each.value.namespace : kubernetes_namespace.namespace[each.value.namespace].metadata[0].name
     annotations = {}
-    labels = var.default_k8s_labels
+    labels      = var.default_k8s_labels
   }
   data = {
     "endpoint"         = each.value.host
@@ -35,22 +52,17 @@ resource "kubernetes_secret" "bucket_secret_name" {
 }
 
 resource "kubernetes_secret" "database_secret_name" {
-  for_each = {
-    for o in local.map_of_drupal_databases : o.database => o
-    if trimspace(o.namespace) != "" && var.create_databases_and_users == true
-  }
+  for_each = toset(local.drupal_databases_keys)
+
   metadata {
-    # If not specified, we suppose that the Helm release name is defined with
-    # the following convention (the default of sparkfabrik/pkg_drupal):
-    # PKG_DRUPAL_HELM_RELEASE_NAME: drupal-${CI_COMMIT_REF_SLUG}-${CI_PROJECT_ID}
-    name        = each.value.helm_release_name == null ? "drupal-${each.value.release_branch_name}-${each.value.project_id}-db-user" : "${each.value.helm_release_name}-db-user"
-    namespace   = var.use_existing_kubernetes_namespaces ? each.value.namespace : kubernetes_namespace.namespace[each.value.namespace].metadata[0].name
+    name        = local.map_of_drupal_databases[each.key].helm_release_name == null ? "drupal-${local.map_of_drupal_databases[each.key].release_branch_name}-${local.map_of_drupal_databases[each.key].project_id}-db-user" : "${local.map_of_drupal_databases[each.key].helm_release_name}-db-user"
+    namespace   = var.use_existing_kubernetes_namespaces ? local.map_of_drupal_databases[each.key].namespace : kubernetes_namespace.namespace[local.map_of_drupal_databases[each.key].namespace].metadata[0].name
     annotations = {}
-    labels = var.default_k8s_labels
+    labels      = var.default_k8s_labels
   }
   data = {
-    "endpoint" = each.value.host != null ? each.value.host : ""
-    "port"     = each.value.port
+    "endpoint" = local.map_of_drupal_databases[each.key].host != null ? local.map_of_drupal_databases[each.key].host : ""
+    "port"     = local.map_of_drupal_databases[each.key].port
     "database" = local.map_of_output_drupal_databases[each.key].database
     "username" = local.map_of_output_drupal_databases[each.key].user
     "password" = local.map_of_output_drupal_databases[each.key].password

variables.tf

@@ -23,6 +23,7 @@ variable "cloudsql_privileged_user_name" {
 variable "cloudsql_privileged_user_password" {
   type        = string
   description = "The password of the privileged user of the Cloud SQL instance"
+  sensitive   = true
   default     = ""
 }