From 4d74d5324678752871f35570771d52cb7dc056f8 Mon Sep 17 00:00:00 2001 From: whoffler Date: Thu, 31 Jul 2025 12:19:04 +0100 Subject: [PATCH 1/4] lookup default resource group --- solutions/fully-configurable/main.tf | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index de6f3066..3ba40239 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -6,10 +6,23 @@ locals { # Resource Group ############################################################################## +# Use a local variable to determine if the default resource group should be used +locals { + # Name of default resource group change circa 2019 from default to Default so attempt to return the actual default resource group in this scenario + use_default_resource_group = var.existing_resource_group_name == null ? true : lower(var.existing_resource_group_name) == "default" + + # Use the local variable to decide which resource group name to use + existing_resource_group_name = local.use_default_resource_group ? data.ibm_resource_group.default.name : var.existing_resource_group_name +} + +data "ibm_resource_group" "default" { + is_default = "true" +} + module "resource_group" { source = "terraform-ibm-modules/resource-group/ibm" version = "1.2.1" - existing_resource_group_name = var.existing_resource_group_name + existing_resource_group_name = local.existing_resource_group_name } ############################################################################# From e4f8d64fd32be93e56a83d287aa2ba4c4337bdde Mon Sep 17 00:00:00 2001 From: whoffler Date: Thu, 31 Jul 2025 13:42:31 +0100 Subject: [PATCH 2/4] update --- solutions/fully-configurable/main.tf | 8 ++------ solutions/fully-configurable/variables.tf | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index 3ba40239..883dcf83 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -6,16 +6,12 @@ locals { # Resource Group ############################################################################## -# Use a local variable to determine if the default resource group should be used locals { - # Name of default resource group change circa 2019 from default to Default so attempt to return the actual default resource group in this scenario - use_default_resource_group = var.existing_resource_group_name == null ? true : lower(var.existing_resource_group_name) == "default" - - # Use the local variable to decide which resource group name to use - existing_resource_group_name = local.use_default_resource_group ? data.ibm_resource_group.default.name : var.existing_resource_group_name + existing_resource_group_name = var.existing_resource_group_name == null ? data.ibm_resource_group.default[0].name : var.existing_resource_group_name } data "ibm_resource_group" "default" { + count = var.existing_resource_group_name == null ? 1 : 0 is_default = "true" } diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 5d677f47..2824886f 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -22,7 +22,7 @@ variable "provider_visibility" { variable "existing_resource_group_name" { type = string description = "The name of an existing resource group to provision the resources." - default = "Default" + default = null } variable "prefix" { From 511bef1ccf565eb477480f1a0bef1ec034d89cbc Mon Sep 17 00:00:00 2001 From: whoffler Date: Thu, 31 Jul 2025 15:21:55 +0100 Subject: [PATCH 3/4] resource group null by default --- solutions/fully-configurable/main.tf | 11 +---------- solutions/fully-configurable/variables.tf | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index 883dcf83..de6f3066 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -6,19 +6,10 @@ locals { # Resource Group ############################################################################## -locals { - existing_resource_group_name = var.existing_resource_group_name == null ? data.ibm_resource_group.default[0].name : var.existing_resource_group_name -} - -data "ibm_resource_group" "default" { - count = var.existing_resource_group_name == null ? 1 : 0 - is_default = "true" -} - module "resource_group" { source = "terraform-ibm-modules/resource-group/ibm" version = "1.2.1" - existing_resource_group_name = local.existing_resource_group_name + existing_resource_group_name = var.existing_resource_group_name } ############################################################################# diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index 2824886f..bfdc4e2f 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -21,7 +21,7 @@ variable "provider_visibility" { variable "existing_resource_group_name" { type = string - description = "The name of an existing resource group to provision the resources." + description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used." default = null } From bb60f7f9d8147a11ed5ea24c6436e1c1c7b316b8 Mon Sep 17 00:00:00 2001 From: whoffler Date: Fri, 1 Aug 2025 08:50:07 +0100 Subject: [PATCH 4/4] update resource group version --- solutions/fully-configurable/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf index de6f3066..03a33db8 100644 --- a/solutions/fully-configurable/main.tf +++ b/solutions/fully-configurable/main.tf @@ -8,7 +8,7 @@ locals { module "resource_group" { source = "terraform-ibm-modules/resource-group/ibm" - version = "1.2.1" + version = "1.3.0" existing_resource_group_name = var.existing_resource_group_name }