feat: remove Account Config DA from customize DA flow, add default value for prefix using random string generator and update logic that handles default resource group lookup (#573)

daniel-butler-irl · web-flow · commit c1de37a8d1ed · 2025-10-17T10:52:07.000+01:00
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -72,11 +72,14 @@
             },
             {
               "key": "prefix",
-              "required": true,
+              "default_value": "dev",
+              "random_string": {
+                "length": 4
+              },
               "value_constraints": [
                 {
                   "type": "regex",
-                  "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters.",
+                  "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters",
                   "value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$"
                 }
               ]
@@ -152,9 +155,7 @@
                 "config_constraints": {
                   "identifier": "rg_name"
                 }
-              },
-              "default_value": "Default",
-              "description": "The name of an existing resource group to provision the resources."
+              }
             },
             {
               "key": "existing_monitoring_crn",
@@ -361,11 +362,14 @@
             },
             {
               "key": "prefix",
-              "required": true,
+              "default_value": "dev",
+              "random_string": {
+                "length": 4
+              },
               "value_constraints": [
                 {
                   "type": "regex",
-                  "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters.",
+                  "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters",
                   "value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$"
                 }
               ]
@@ -448,9 +452,7 @@
                 "config_constraints": {
                   "identifier": "rg_name"
                 }
-              },
-              "default_value": "Default",
-              "description": "The name of an existing resource group to provision the resources."
+              }
             },
             {
               "key": "existing_monitoring_crn",
@@ -679,20 +681,6 @@
               "service_name": "Resource group only",
               "notes": "Required to create an instance of Event Notifications."
             },
-            {
-              "role_crns": [
-                "crn:v1:bluemix:public:iam::::role:Administrator"
-              ],
-              "service_name": "All Account Management services",
-              "notes": "[Optional] Required to deploy Cloud automation for account configuration, which creates foundational IBM Cloud account resources, like IAM settings, trusted profiles, access groups, and resource groups."
-            },
-            {
-              "role_crns": [
-                "crn:v1:bluemix:public:iam::::role:Administrator"
-              ],
-              "service_name": "All Identity and Access enabled services",
-              "notes": "[Optional] Required to deploy Cloud automation for account configuration, which creates foundational IBM Cloud account resources, like IAM settings, trusted profiles, access groups, and resource groups."
-            },
             {
               "role_crns": [
                 "crn:v1:bluemix:public:iam::::serviceRole:Manager",
@@ -762,31 +750,6 @@
             ]
           },
           "dependencies": [
-            {
-              "name": "deploy-arch-ibm-account-infra-base",
-              "description": "Organize your IBM Cloud account with preconfigured resource groups. If not selected, the default resource group is used. Optionally, expand to apply recommended security controls via \"with Account Settings\" variation.",
-              "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
-              "flavors": [
-                "resource-group-only",
-                "resource-groups-with-account-settings"
-              ],
-              "default_flavor": "resource-group-only",
-              "id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global",
-              "input_mapping": [
-                {
-                  "dependency_input": "prefix",
-                  "version_input": "prefix",
-                  "reference_version": true
-                },
-                {
-                  "dependency_output": "observability_resource_group_name",
-                  "version_input": "existing_resource_group_name"
-                }
-              ],
-              "optional": true,
-              "on_by_default": false,
-              "version": "v3.0.23"
-            },
             {
               "name": "deploy-arch-ibm-cloud-monitoring",
               "description": "Set up a Cloud Monitoring instance to collect platform metrics.",
@@ -800,6 +763,11 @@
                   "dependency_output": "cloud_monitoring_crn",
                   "version_input": "existing_monitoring_crn"
                 },
+                {
+                  "dependency_input": "existing_resource_group_name",
+                  "version_input": "existing_resource_group_name",
+                  "reference_version": true
+                },
                 {
                   "dependency_input": "prefix",
                   "version_input": "prefix",
@@ -818,7 +786,7 @@
               ],
               "optional": true,
               "on_by_default": true,
-              "version": "v1.7.2"
+              "version": "v1.9.0"
             },
             {
               "name": "deploy-arch-ibm-kms",
@@ -833,6 +801,11 @@
                   "dependency_output": "kms_instance_crn",
                   "version_input": "existing_kms_instance_crn"
                 },
+                {
+                  "dependency_input": "existing_resource_group_name",
+                  "version_input": "existing_resource_group_name",
+                  "reference_version": true
+                },
                 {
                   "dependency_output": "kms_private_endpoint",
                   "version_input": "kms_endpoint_url"
@@ -854,7 +827,7 @@
               ],
               "optional": true,
               "on_by_default": true,
-              "version": "v5.1.27"
+              "version": "v5.4.0"
             },
             {
               "name": "deploy-arch-ibm-cos",
@@ -875,7 +848,7 @@
                   "reference_version": true
                 },
                 {
-                  "dependency_input": "resource_group_name",
+                  "dependency_input": "existing_resource_group_name",
                   "version_input": "existing_resource_group_name",
                   "reference_version": true
                 },
@@ -886,7 +859,7 @@
               ],
               "optional": true,
               "on_by_default": true,
-              "version": "v10.2.21"
+              "version": "v10.5.0"
             }
           ],
           "dependency_version_2": true,
diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf
@@ -4,7 +4,7 @@
 
 module "resource_group" {
   source                       = "terraform-ibm-modules/resource-group/ibm"
-  version                      = "1.3.0"
+  version                      = "1.4.0"
   existing_resource_group_name = var.existing_resource_group_name
 }
 
diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf
@@ -4,8 +4,8 @@
 
 variable "existing_resource_group_name" {
   type        = string
-  description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used."
-  default     = null
+  description = "The name of an existing resource group to provision the resources."
+  default     = "Default"
 }
 
 variable "ibmcloud_api_key" {
diff --git a/solutions/security-enforced/variables.tf b/solutions/security-enforced/variables.tf
@@ -4,8 +4,8 @@
 
 variable "existing_resource_group_name" {
   type        = string
-  description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used."
-  default     = null
+  description = "The name of an existing resource group to provision the resources."
+  default     = "Default"
 }
 
 variable "ibmcloud_api_key" {
diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -207,8 +207,8 @@ func TestAddonDefaultConfiguration(t *testing.T) {
 		"deploy-arch-ibm-event-notifications",
 		"fully-configurable",
 		map[string]interface{}{
-			"prefix": options.Prefix,
-			"region": validRegions[rand.Intn(len(validRegions))],
+			"region":                  validRegions[rand.Intn(len(validRegions))],
+			"existing_resource_group": resourceGroup,
 		},
 	)
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`module "resource_group" {`
`6`	`6`	`source = "terraform-ibm-modules/resource-group/ibm"`
`7`		`- version = "1.3.0"`
	`7`	`+ version = "1.4.0"`
`8`	`8`	`existing_resource_group_name = var.existing_resource_group_name`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`variable "existing_resource_group_name" {`
`6`	`6`	`type = string`
`7`		`- description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used."`
`8`		`- default = null`
	`7`	`+ description = "The name of an existing resource group to provision the resources."`
	`8`	`+ default = "Default"`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`variable "ibmcloud_api_key" {`