Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonebruzzechesse
simonebruzzechesse committed May 17, 2024
1 parent 329cd5b commit 39fa907
Show file tree
Hide file tree
Showing 8 changed files with 134 additions and 89 deletions.
88 changes: 46 additions & 42 deletions modules/alloydb/README.md
View file

Large diffs are not rendered by default.

79 changes: 44 additions & 35 deletions modules/alloydb/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
locals {
prefix = var.prefix == null ? "" : "${var.prefix}-"
# has_replicas = try(length(var.replicas) > 0, false)
is_regional = var.availability_type == "REGIONAL" ? true : false
is_regional = var.availability_type == "REGIONAL"
# secondary instance type is aligned with cluster type unless apply is targeting a promotion, in that
# case cluster will be 'primary' while instance still 'secondary'.
primary_cluster_name = "${local.prefix}${var.cluster_name}"
primary_instance_name = "${local.prefix}${var.name}"
secondary_cluster_name = coalesce(var.secondary_cluster_name, "${var.cluster_name}-sec")
secondary_instance_name = coalesce(var.secondary_name, "${var.name}-sec")
secondary_instance_type = try(var.cross_region_replication.promote_secondary && google_alloydb_cluster.secondary[0].cluster_type == "SECONDARY" ? "SECONDARY" : google_alloydb_cluster.secondary[0].cluster_type, null)
Expand All @@ -36,9 +38,12 @@ locals {

resource "google_alloydb_cluster" "primary" {
project = var.project_id
cluster_id = "${local.prefix}${var.cluster_name}"
annotations = var.annotations
cluster_id = local.primary_cluster_name
cluster_type = "PRIMARY"
database_version = var.database_version
deletion_policy = var.deletion_policy
display_name = coalesce(var.cluster_display_name, local.primary_cluster_name)
labels = var.labels
location = var.location

Expand All @@ -48,15 +53,15 @@ resource "google_alloydb_cluster" "primary" {
}

dynamic "automated_backup_policy" {
for_each = var.automated_backup_configuration.enabled ? { 1 = 1 } : {}
for_each = var.automated_backup_configuration.enabled ? [""] : []
content {
enabled = true
location = try(var.automated_backup_configuration.location, var.location)
backup_window = var.automated_backup_configuration.backup_window
labels = var.labels

dynamic "encryption_config" {
for_each = var.encryption_config != null ? { 1 = 1 } : {}
for_each = var.encryption_config != null ? [""] : []
content {
kms_key_name = var.encryption_config.primary_kms_key_name
}
Expand All @@ -73,14 +78,14 @@ resource "google_alloydb_cluster" "primary" {
}

dynamic "quantity_based_retention" {
for_each = var.automated_backup_configuration.retention_count != null ? { 1 = 1 } : {}
for_each = var.automated_backup_configuration.retention_count != null ? [""] : []
content {
count = var.automated_backup_configuration.retention_count
}
}

dynamic "time_based_retention" {
for_each = var.automated_backup_configuration.retention_period != null ? { 1 = 1 } : {}
for_each = var.automated_backup_configuration.retention_period != null ? [""] : []
content {
retention_period = var.automated_backup_configuration.retention_period
}
Expand All @@ -89,12 +94,12 @@ resource "google_alloydb_cluster" "primary" {
}

dynamic "continuous_backup_config" {
for_each = var.continuous_backup_configuration.enabled ? { 1 = 1 } : {}
for_each = var.continuous_backup_configuration.enabled ? [""] : []
content {
enabled = true
recovery_window_days = var.continuous_backup_configuration.recovery_window_days
dynamic "encryption_config" {
for_each = var.encryption_config != null ? { 1 = 1 } : {}
for_each = var.encryption_config != null ? [""] : []
content {
kms_key_name = var.encryption_config.primary_kms_key_name
}
Expand All @@ -103,22 +108,22 @@ resource "google_alloydb_cluster" "primary" {
}

dynamic "encryption_config" {
for_each = var.encryption_config != null ? { 1 = 1 } : {}
for_each = var.encryption_config != null ? [""] : []
content {
kms_key_name = var.encryption_config.primary_kms_key_name
}
}

dynamic "initial_user" {
for_each = var.initial_user != null ? { 1 = 1 } : {}
for_each = var.initial_user != null ? [""] : []
content {
user = var.initial_user.user
password = var.initial_user.password
}
}

dynamic "maintenance_update_policy" {
for_each = var.maintenance_config.enabled ? { 1 = 1 } : {}
for_each = var.maintenance_config.enabled ? [""] : []
content {
maintenance_windows {
day = var.maintenance_config.day
Expand All @@ -134,21 +139,22 @@ resource "google_alloydb_cluster" "primary" {
}

resource "google_alloydb_instance" "primary" {
cluster = google_alloydb_cluster.primary.id
annotations = var.annotations
availability_type = var.availability_type
cluster = google_alloydb_cluster.primary.id
database_flags = var.flags
display_name = "${local.prefix}${var.name}"
instance_id = "${local.prefix}${var.name}"
display_name = coalesce(var.display_name, local.primary_instance_name)
instance_id = local.primary_instance_name
instance_type = "PRIMARY"
gce_zone = local.is_regional ? null : var.gce_zone
labels = var.labels

dynamic "client_connection_config" {
for_each = var.client_connection_config != null ? { 1 = 1 } : {}
for_each = var.client_connection_config != null ? [""] : []
content {
require_connectors = var.client_connection_config.require_connectors
dynamic "ssl_config" {
for_each = var.client_connection_config.ssl_config != null ? { 1 = 1 } : {}
for_each = var.client_connection_config.ssl_config != null ? [""] : []
content {
ssl_mode = var.client_connection_config.ssl_config.ssl_mode
}
Expand All @@ -157,14 +163,14 @@ resource "google_alloydb_instance" "primary" {
}

dynamic "machine_config" {
for_each = var.machine_config != null ? { 1 = 1 } : {}
for_each = var.machine_config != null ? [""] : []
content {
cpu_count = var.machine_config.cpu_count
}
}

dynamic "network_config" {
for_each = var.network_config != null ? { 1 = 1 } : {}
for_each = var.network_config != null ? [""] : []
content {
dynamic "authorized_external_networks" {
for_each = coalesce(var.network_config.authorized_external_networks, [])
Expand All @@ -177,7 +183,7 @@ resource "google_alloydb_instance" "primary" {
}

dynamic "query_insights_config" {
for_each = var.query_insights_config != null ? { 1 = 1 } : {}
for_each = var.query_insights_config != null ? [""] : []
content {
query_string_length = var.query_insights_config.query_string_length
record_application_tags = var.query_insights_config.record_application_tags
Expand All @@ -190,10 +196,12 @@ resource "google_alloydb_instance" "primary" {
resource "google_alloydb_cluster" "secondary" {
count = var.cross_region_replication.enabled ? 1 : 0
project = var.project_id
annotations = var.annotations
cluster_id = local.secondary_cluster_name
cluster_type = var.cross_region_replication.promote_secondary ? "PRIMARY" : "SECONDARY"
database_version = var.database_version
deletion_policy = "FORCE"
display_name = coalesce(var.secondary_cluster_display_name, local.secondary_cluster_name)
labels = var.labels
location = var.cross_region_replication.region

Expand All @@ -203,15 +211,15 @@ resource "google_alloydb_cluster" "secondary" {
}

dynamic "automated_backup_policy" {
for_each = var.automated_backup_configuration.enabled ? { 1 = 1 } : {}
for_each = var.automated_backup_configuration.enabled ? [""] : []
content {
enabled = true
location = var.cross_region_replication.region
backup_window = var.automated_backup_configuration.backup_window
labels = var.labels

dynamic "encryption_config" {
for_each = var.encryption_config != null ? { 1 = 1 } : {}
for_each = var.encryption_config != null ? [""] : []
content {
kms_key_name = var.encryption_config.secondary_kms_key_name
}
Expand All @@ -228,14 +236,14 @@ resource "google_alloydb_cluster" "secondary" {
}

dynamic "quantity_based_retention" {
for_each = var.automated_backup_configuration.retention_count != null ? { 1 = 1 } : {}
for_each = var.automated_backup_configuration.retention_count != null ? [""] : []
content {
count = var.automated_backup_configuration.retention_count
}
}

dynamic "time_based_retention" {
for_each = var.automated_backup_configuration.retention_period != null ? { 1 = 1 } : {}
for_each = var.automated_backup_configuration.retention_period != null ? [""] : []
content {
retention_period = var.automated_backup_configuration.retention_period
}
Expand All @@ -244,12 +252,12 @@ resource "google_alloydb_cluster" "secondary" {
}

dynamic "continuous_backup_config" {
for_each = var.continuous_backup_configuration.enabled ? { 1 = 1 } : {}
for_each = var.continuous_backup_configuration.enabled ? [""] : []
content {
enabled = true
recovery_window_days = var.continuous_backup_configuration.recovery_window_days
dynamic "encryption_config" {
for_each = var.encryption_config != null ? { 1 = 1 } : {}
for_each = var.encryption_config != null ? [""] : []
content {
kms_key_name = var.encryption_config.secondary_kms_key_name
}
Expand All @@ -258,22 +266,22 @@ resource "google_alloydb_cluster" "secondary" {
}

dynamic "encryption_config" {
for_each = var.encryption_config != null ? { 1 = 1 } : {}
for_each = var.encryption_config != null ? [""] : []
content {
kms_key_name = var.encryption_config.secondary_kms_key_name
}
}

dynamic "initial_user" {
for_each = var.initial_user != null ? { 1 = 1 } : {}
for_each = var.initial_user != null ? [""] : []
content {
user = var.initial_user.user
password = var.initial_user.password
}
}

dynamic "maintenance_update_policy" {
for_each = var.maintenance_config.enabled ? { 1 = 1 } : {}
for_each = var.maintenance_config.enabled ? [""] : []
content {
maintenance_windows {
day = var.maintenance_config.day
Expand All @@ -288,7 +296,7 @@ resource "google_alloydb_cluster" "secondary" {
}

dynamic "secondary_config" {
for_each = var.cross_region_replication.promote_secondary ? {} : { 1 = 1 }
for_each = var.cross_region_replication.promote_secondary ? [""] : []
content {
primary_cluster_name = google_alloydb_cluster.primary.id
}
Expand All @@ -299,21 +307,22 @@ resource "google_alloydb_cluster" "secondary" {

resource "google_alloydb_instance" "secondary" {
count = var.cross_region_replication.enabled ? 1 : 0
annotations = var.annotations
availability_type = var.availability_type
cluster = google_alloydb_cluster.secondary[0].id
database_flags = var.cross_region_replication.promote_secondary ? var.flags : null
display_name = local.secondary_instance_name
display_name = coalesce(var.secondary_display_name, local.secondary_instance_name)
gce_zone = local.is_regional ? null : var.gce_zone
instance_id = local.secondary_instance_name
instance_type = local.secondary_instance_type
labels = var.labels

dynamic "client_connection_config" {
for_each = var.client_connection_config != null ? { 1 = 1 } : {}
for_each = var.client_connection_config != null ? [""] : []
content {
require_connectors = var.client_connection_config.require_connectors
dynamic "ssl_config" {
for_each = var.client_connection_config.ssl_config != null ? { 1 = 1 } : {}
for_each = var.client_connection_config.ssl_config != null ? [""] : []
content {
ssl_mode = var.client_connection_config.ssl_config.ssl_mode
}
Expand All @@ -322,14 +331,14 @@ resource "google_alloydb_instance" "secondary" {
}

dynamic "machine_config" {
for_each = var.machine_config != null ? { 1 = 1 } : {}
for_each = var.machine_config != null ? [""] : []
content {
cpu_count = var.machine_config.cpu_count
}
}

dynamic "network_config" {
for_each = var.network_config != null ? { 1 = 1 } : {}
for_each = var.network_config != null ? [""] : []
content {
dynamic "authorized_external_networks" {
for_each = coalesce(var.network_config.authorized_external_networks, [])
Expand All @@ -342,7 +351,7 @@ resource "google_alloydb_instance" "secondary" {
}

dynamic "query_insights_config" {
for_each = var.query_insights_config != null ? { 1 = 1 } : {}
for_each = var.query_insights_config != null ? [""] : []
content {
query_string_length = var.query_insights_config.query_string_length
record_application_tags = var.query_insights_config.record_application_tags
Expand Down
11 changes: 7 additions & 4 deletions modules/alloydb/outputs.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ locals {
# { primary = google_alloydb_instance.primary },
# google_alloydb_instance.replicas
# )
_all_instances = merge({ primary = google_alloydb_instance.primary }, var.cross_region_replication.enabled ? { secondary = google_alloydb_instance.secondary[0] } : {})
_all_instances = {
primary = google_alloydb_instance.primary
secondary = one(google_alloydb_instance.secondary)
}
}

output "id" {
Expand All @@ -31,7 +34,7 @@ output "ids" {
description = "Fully qualified ids of all instances."
value = {
for id, instance in local._all_instances :
id => instance.id
id => try(instance.id, null)
}
}

Expand All @@ -49,7 +52,7 @@ output "ip" {
output "ips" {
description = "IP addresses of all instances."
value = {
for id, instance in local._all_instances : id => instance.ip_address
for id, instance in local._all_instances : id => try(instance.ip_address, null)
}
}

Expand All @@ -62,7 +65,7 @@ output "names" {
description = "Names of all instances."
value = {
for id, instance in local._all_instances :
id => instance.name
id => try(instance.name, null)
}
}

Expand Down
Loading

0 comments on commit 39fa907

Please sign in to comment.