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 (#117)

daniel-butler-irl · web-flow · commit fc9e2bf12650 · 2025-10-17T16:12:41.000+01:00
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-04-17T11:02:06Z",
+  "generated_at": "2025-10-17T12:05:48Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -88,7 +88,7 @@
       }
     ]
   },
-  "version": "0.13.1+ibm.62.dss",
+  "version": "0.13.1+ibm.64.dss",
   "word_list": {
     "file": null,
     "hash": null
diff --git a/common-dev-assets b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 84e744a27f774dac276e9381db01b6fe378c0af3
+Subproject commit 3c754bf732e99f95e77014077d2d7ed4b29c55b0
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -108,7 +108,10 @@
             },
             {
               "key": "prefix",
-              "required": true,
+              "default_value": "dev",
+              "random_string": {
+                "length": 4
+              },
               "value_constraints": [
                 {
                   "type": "regex",
@@ -169,6 +172,21 @@
                 }
               ]
             },
+            {
+              "key": "existing_resource_group_name",
+              "display_name": "resource_group",
+              "custom_config": {
+                "type": "resource_group",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "identifier": "rg_name"
+                }
+              },
+              "default_value": "Default",
+              "description": "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group.",
+              "virtual": true
+            },
             {
               "key": "enable_activity_tracker_event_routing_to_cloud_logs"
             },
@@ -350,7 +368,7 @@
               "name": "deploy-arch-ibm-cos",
               "description": "Enable this to create an IBM Cloud Object Storage(COS) instance. The buckets to store events will be created by the Activity Tracker Event Routing deployable architecture.",
               "id": "68921490-2778-4930-ac6d-bae7be6cd958-global",
-              "version": "v10.2.21",
+              "version": "v10.5.0",
               "flavors": [
                 "instance"
               ],
@@ -362,6 +380,11 @@
                   "dependency_output": "cos_instance_crn",
                   "version_input": "existing_cos_instance_crn"
                 },
+                {
+                  "dependency_input": "existing_resource_group_name",
+                  "version_input": "existing_resource_group_name",
+                  "reference_version": true
+                },
                 {
                   "dependency_input": "prefix",
                   "version_input": "prefix",
@@ -377,7 +400,7 @@
               "name": "deploy-arch-ibm-kms",
               "description": "Enable when you want to create your own managed keys to encrypt the buckets. Select only if existing KMS instance or Key is not provided. ",
               "id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
-              "version": "v5.1.27",
+              "version": "v5.4.0",
               "flavors": [
                 "fully-configurable"
               ],
@@ -402,6 +425,11 @@
                   "dependency_input": "region",
                   "version_input": "region",
                   "reference_version": true
+                },
+                {
+                  "dependency_input": "existing_resource_group_name",
+                  "version_input": "existing_resource_group_name",
+                  "reference_version": true
                 }
               ]
             },
@@ -413,7 +441,7 @@
                 "fully-configurable"
               ],
               "id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
-              "version": "v1.6.28",
+              "version": "v1.9.0",
               "optional": true,
               "on_by_default": true,
               "input_mapping": [
@@ -429,14 +457,19 @@
                 {
                   "version_input": "enable_activity_tracker_event_routing_to_cloud_logs",
                   "value": true
+                },
+                {
+                  "dependency_input": "existing_resource_group_name",
+                  "version_input": "existing_resource_group_name",
+                  "reference_version": true
                 }
               ]
             },
             {
               "name": "deploy-arch-ibm-cloud-monitoring",
               "description": "Configure IBM Cloud Monitoring to collect the platform metrics.",
               "id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
-              "version": "v1.7.2",
+              "version": "v1.9.0",
               "flavors": [
                 "fully-configurable"
               ],
@@ -457,6 +490,11 @@
                   "dependency_input": "region",
                   "version_input": "region",
                   "reference_version": true
+                },
+                {
+                  "dependency_input": "existing_resource_group_name",
+                  "version_input": "existing_resource_group_name",
+                  "reference_version": true
                 }
               ]
             }
diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -273,8 +273,8 @@ func TestActivityTrackerDefaultConfiguration(t *testing.T) {
 		"deploy-arch-ibm-activity-tracker",
 		"fully-configurable",
 		map[string]interface{}{
-			"prefix": options.Prefix,
-			"region": validRegions[rand.Intn(len(validRegions))],
+			"region":                  validRegions[rand.Intn(len(validRegions))],
+			"existing_resource_group": resourceGroup,
 		},
 	)
 
diff --git a/variables.tf b/variables.tf
@@ -42,7 +42,7 @@ variable "eventstreams_targets" {
 
   validation {
     condition     = alltrue([for es_target in var.eventstreams_targets : (es_target.service_to_service_enabled == true && es_target.api_key == null) || (es_target.service_to_service_enabled == false && es_target.api_key != null)])
-    error_message = "The value of `api_key` should not be provided if 'service_to_service_enabled' is set to tru for event stream targets. If you want to use 'api_key', set 'service_to_service_enabled' to false."
+    error_message = "The value of `api_key` should not be provided if 'service_to_service_enabled' is set to true for event stream targets. If you want to use 'api_key', set 'service_to_service_enabled' to false."
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"files": "go.sum\|^.secrets.baseline$",`
`4`	`4`	`"lines": null`
`5`	`5`	`},`
`6`		`- "generated_at": "2025-04-17T11:02:06Z",`
	`6`	`+ "generated_at": "2025-10-17T12:05:48Z",`
`7`	`7`	`"plugins_used": [`
`8`	`8`	`{`
`9`	`9`	`"name": "AWSKeyDetector"`
`@@ -88,7 +88,7 @@`
`88`	`88`	`}`
`89`	`89`	`]`
`90`	`90`	`},`
`91`		`- "version": "0.13.1+ibm.62.dss",`
	`91`	`+ "version": "0.13.1+ibm.64.dss",`
`92`	`92`	`"word_list": {`
`93`	`93`	`"file": null,`
`94`	`94`	`"hash": null`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ variable "eventstreams_targets" {`
`42`	`42`
`43`	`43`	`validation {`
`44`	`44`	`condition = alltrue([for es_target in var.eventstreams_targets : (es_target.service_to_service_enabled == true && es_target.api_key == null) \|\| (es_target.service_to_service_enabled == false && es_target.api_key != null)])`
`45`		- error_message = "The value of `api_key` should not be provided if 'service_to_service_enabled' is set to tru for event stream targets. If you want to use 'api_key', set 'service_to_service_enabled' to false."
	`45`	+ error_message = "The value of `api_key` should not be provided if 'service_to_service_enabled' is set to true for event stream targets. If you want to use 'api_key', set 'service_to_service_enabled' to false."
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`