fix: Added a default prefix value to the DA (cos). NOTE: It is still supported to pass null (or __NULL__ if in projects / schematics) if you do not wan't to use any prefix (#812)

arya-girish-k · web-flow · commit 28767619d24a · 2025-01-20T18:14:34.000Z
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -251,6 +251,11 @@
                       },
                       {
                         "key":"instance_cbr_rules"
+                      },
+                      {
+                        "key":"prefix",
+                        "required":true,
+                        "description": "Prefix to add to all resources created by this solution. To not use any prefix value, you can enter the string `__NULL__`."
                       }
                     ]
 
diff --git a/solutions/instance/main.tf b/solutions/instance/main.tf
@@ -1,15 +1,15 @@
 module "resource_group" {
   source                       = "terraform-ibm-modules/resource-group/ibm"
   version                      = "1.1.6"
-  resource_group_name          = var.existing_resource_group == false ? (var.prefix != null ? "${var.prefix}-${var.resource_group_name}" : var.resource_group_name) : null
+  resource_group_name          = var.existing_resource_group == false ? ((var.prefix != null && var.prefix != "") ? "${var.prefix}-${var.resource_group_name}" : var.resource_group_name) : null
   existing_resource_group_name = var.existing_resource_group == true ? var.resource_group_name : null
 }
 
 module "cos" {
   source              = "../../modules/fscloud"
   resource_group_id   = module.resource_group.resource_group_id
   create_cos_instance = true
-  cos_instance_name   = var.prefix != null ? "${var.prefix}-${var.cos_instance_name}" : var.cos_instance_name
+  cos_instance_name   = (var.prefix != null && var.prefix != "") ? "${var.prefix}-${var.cos_instance_name}" : var.cos_instance_name
   resource_keys       = var.resource_keys
   cos_plan            = var.cos_plan
   cos_tags            = var.cos_tags
diff --git a/solutions/instance/variables.tf b/solutions/instance/variables.tf
@@ -6,8 +6,8 @@ variable "ibmcloud_api_key" {
 
 variable "prefix" {
   type        = string
-  description = "(Optional) Prefix to append to all resources created by this solution."
-  default     = null
+  description = "(Optional) Prefix to add to all resources created by this solution. To not use any prefix value, you can set this value to `null` or an empty string."
+  default     = "cos"
 }
 
 variable "existing_resource_group" {

Original file line number	Diff line number	Diff line change
`@@ -251,6 +251,11 @@`
`251`	`251`	`},`
`252`	`252`	`{`
`253`	`253`	`"key":"instance_cbr_rules"`
	`254`	`+ },`
	`255`	`+ {`
	`256`	`+ "key":"prefix",`
	`257`	`+ "required":true,`
	`258`	+ "description": "Prefix to add to all resources created by this solution. To not use any prefix value, you can enter the string `__NULL__`."
`254`	`259`	`}`
`255`	`260`	`]`
`256`	`261`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ variable "ibmcloud_api_key" {`
`6`	`6`
`7`	`7`	`variable "prefix" {`
`8`	`8`	`type = string`
`9`		`- description = "(Optional) Prefix to append to all resources created by this solution."`
`10`		`- default = null`
	`9`	+ description = "(Optional) Prefix to add to all resources created by this solution. To not use any prefix value, you can set this value to `null` or an empty string."
	`10`	`+ default = "cos"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`variable "existing_resource_group" {`