Skip to content
This repository was archived by the owner on Jun 17, 2025. It is now read-only.

feat: add workaround for groups #293

Merged
merged 5 commits into from
Nov 29, 2024
Merged

feat: add workaround for groups #293

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
edbf3f0
feat: add workaround for groups
Nov 21, 2024
cc4412c
feat: add workaround for groups
Nov 21, 2024
8254931
Merge branch 'main' into group-fix
jor2 Nov 25, 2024
1e2ee35
fix: if condition
Nov 25, 2024
8236aa1
Update main.tf
jor2 Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ locals {
# Determine if host_flavor is used
host_flavor_set = var.member_host_flavor != null ? true : false

# Determine if restore, from backup or point in time recovery
recovery_mode = var.backup_crn != null || var.pitr_id != null

# Determine what KMS service is being used for database encryption
kms_service = var.kms_key_crn != null ? (
can(regex(".*kms.*", var.kms_key_crn)) ? "kms" : (
Expand Down Expand Up @@ -84,11 +87,15 @@ resource "ibm_database" "enterprise_db" {
}
}

# Workaround for https://github.ibm.com/GoldenEye/issues/issues/11359
# means that no `group` block is added when restoring from backup
# or point in time recovery

## This for_each block is NOT a loop to attach to multiple group blocks.
## This is used to conditionally add one, OR, the other group block depending on var.local.host_flavor_set
## This block is for if host_flavor IS set to specific pre-defined host sizes and not set to "multitenant"
dynamic "group" {
for_each = local.host_flavor_set ? [1] : []
for_each = local.host_flavor_set && var.member_host_flavor != "multitenant" && !local.recovery_mode ? [1] : []
Copy link
Contributor

@shemau shemau Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no plan type that supports multi tenant (for EDB, it is enterprise and isolated only). So the structure here is a bit different, remove && var.member_host_flavor != "multitenant"

content {
group_id = "member" # Only member type is allowed for IBM Cloud Databases
host_flavor {
Expand All @@ -112,15 +119,18 @@ resource "ibm_database" "enterprise_db" {

## This block is for if host_flavor IS NOT set
dynamic "group" {
for_each = local.host_flavor_set ? [] : [1]
for_each = local.host_flavor_set && var.member_host_flavor == "multitenant" && !local.recovery_mode ? [1] : []
Copy link
Contributor

@shemau shemau Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no plan type that supports multi tenant (for EDB, it is enterprise and isolated only). So the structure here is a bit different, remove && var.member_host_flavor == "multitenant"

content {
group_id = "member" # Only member type is allowed for IBM Cloud Databases
memory {
allocation_mb = var.member_memory_mb
host_flavor {
id = var.member_host_flavor
Copy link
Contributor

@shemau shemau Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The structure here should not be changing. This was the block that supported the old style, no host_flavor.

}
disk {
allocation_mb = var.member_disk_mb
}
memory {
allocation_mb = var.member_memory_mb
}
cpu {
allocation_count = var.member_cpu_count
}
Expand Down Expand Up @@ -172,6 +182,8 @@ resource "ibm_database" "enterprise_db" {

timeouts {
create = "120m" # Extending provisioning time to 120 minutes
update = "120m"
delete = "15m"
}
}

Expand Down