Skip to content

Commit 70b27f7

Browse files
committed
update
1 parent 5ce40cc commit 70b27f7

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

solutions/fully-configurable/main.tf

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@ locals {
66
# Resource Group
77
##############################################################################
88

9-
# Use a local variable to determine if the default resource group should be used
109
locals {
11-
# Name of default resource group change circa 2019 from default to Default so attempt to return the actual default resource group in this scenario
12-
use_default_resource_group = var.existing_resource_group_name == null ? true : lower(var.existing_resource_group_name) == "default"
13-
14-
# Use the local variable to decide which resource group name to use
15-
existing_resource_group_name = local.use_default_resource_group ? data.ibm_resource_group.default.name : var.existing_resource_group_name
10+
existing_resource_group_name = var.existing_resource_group_name == null ? data.ibm_resource_group.default[0].name : var.existing_resource_group_name
1611
}
1712

1813
data "ibm_resource_group" "default" {
14+
count = var.existing_resource_group_name == null ? 1 : 0
1915
is_default = "true"
2016
}
2117

solutions/fully-configurable/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ variable "provider_visibility" {
2222
variable "existing_resource_group_name" {
2323
type = string
2424
description = "The name of an existing resource group to provision the resources."
25-
default = "Default"
25+
default = null
2626
}
2727

2828
variable "prefix" {

0 commit comments

Comments
 (0)