fix: updated the default value of the prefix input to be "dev" in the DA.<br>- Marked the input as required in catalog so it will now show in the required tab of the projects UI.<br>-It is still possible omit the prefix by passing a value of null or empty string ("") when working directly with the terraform code, or by passing the string value of __NULL__ when deploying in projects or schematics. (#22)

Author: Aayush-Abhyarthi

ibm_catalog.json

@@ -82,7 +82,9 @@
                 "default_value": "us-east"
               },
               {
-                "key": "prefix"
+                "key": "prefix",
+                "required": true,
+                "description": "The prefix to add to all resources that this solution creates. To not use any prefix value, you can enter the string `__NULL__`."
               },
               {
                 "key": "db2_instance_name",

solutions/standard/main.tf

@@ -5,7 +5,7 @@
 module "resource_group" {
   source                       = "terraform-ibm-modules/resource-group/ibm"
   version                      = "1.1.6"
-  resource_group_name          = var.use_existing_resource_group == false ? (var.prefix != null ? "${var.prefix}-${var.resource_group_name}" : var.resource_group_name) : null
+  resource_group_name          = var.use_existing_resource_group == false ? (try("${local.prefix}-${var.resource_group_name}", var.resource_group_name)) : null
   existing_resource_group_name = var.use_existing_resource_group == true ? var.resource_group_name : null
 }
 
@@ -27,6 +27,7 @@ data "ibm_sm_arbitrary_secret" "sm_subscription_id" {
 locals {
   sm_region       = var.subscription_id_secret_crn != null ? module.crn_parser_subid[0].region : ""
   subscription_id = var.subscription_id_secret_crn != null ? data.ibm_sm_arbitrary_secret.sm_subscription_id[0].payload : (var.subscription_id != null ? var.subscription_id : null)
+  prefix          = var.prefix != null ? (var.prefix != "" ? var.prefix : null) : null
 }
 
 ########################################################################################################################
@@ -36,7 +37,7 @@ locals {
 module "db2_instance" {
   source                      = "../.."
   region                      = var.region
-  db2_instance_name           = try("${var.prefix}-${var.db2_instance_name}", var.db2_instance_name)
+  db2_instance_name           = try("${local.prefix}-${var.db2_instance_name}", var.db2_instance_name)
   subscription_id             = local.subscription_id
   resource_group_id           = module.resource_group.resource_group_id
   service_endpoints           = "private"

solutions/standard/variables.tf

@@ -27,8 +27,8 @@ variable "region" {
 
 variable "prefix" {
   type        = string
-  description = "Prefix to append to all resources created by this example"
-  default     = null
+  description = "The prefix to add to all resources that this solution creates. To not use any prefix value, you can set this value to `null` or an empty string."
+  default     = "dev"
 }
 
 variable "use_existing_resource_group" {