fix: PR fixes

Author: vbontempi

ibm_catalog.json

@@ -82,9 +82,8 @@
                   "reference_version": true
                 },
                 {
-                  "dependency_input": "region",
-                  "version_input": "region",
-                  "reference_version": true
+                  "value": "us-south",
+                  "dependency_input": "region"
                 }
               ],
               "optional": true,
@@ -110,11 +109,6 @@
                 {
                   "dependency_output": "workload_resource_group_name",
                   "version_input": "existing_resource_group_name"
-                },
-                {
-                  "dependency_input": "provider_visibility",
-                  "version_input": "provider_visibility",
-                  "reference_version": true
                 }
               ],
               "optional": true,
@@ -148,7 +142,7 @@
             },
             {
               "key": "existing_resource_group_name",
-              "display_name": "Resource group",
+              "display_name": "resource_group",
               "required": true,
               "custom_config": {
                 "type": "resource_group",
@@ -277,7 +271,14 @@
               "key": "enable_high_availability"
             },
             {
-              "key": "resource_tags"
+              "key": "resource_tags",
+              "custom_config": {
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "type": "string"
+                }
+              }
             },
             {
               "key": "enable_oracle_compatibility"

solutions/fully-configurable/README.md

@@ -45,7 +45,7 @@ This solution supports provisioning and configuring the following infrastructure
 | <a name="input_node_type"></a> [node\_type](#input\_node\_type) | The node type of the DB2 instance, valid values are `bx2.1x4`, `bx2.4x16`, `bx2.8x32`, `bx2.16x64`, `bx2.32x128`, `bx2.48x192`, `mx2.4x32`, `mx2.16x128`, `mx2.128x1024` | `string` | `"bx2.4x16"` | no |
 | <a name="input_prefix"></a> [prefix](#input\_prefix) | 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. | `string` | n/a | yes |
 | <a name="input_provider_visibility"></a> [provider\_visibility](#input\_provider\_visibility) | Set the visibility value for the IBM terraform provider. Supported values are `public`, `private`, `public-and-private`. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/guides/custom-service-endpoints). | `string` | `"private"` | no |
-| <a name="input_region"></a> [region](#input\_region) | Region to provision all resources created by this example | `string` | `"us-east"` | no |
+| <a name="input_region"></a> [region](#input\_region) | The region to provision all resources in. [Learn more](https://terraform-ibm-modules.github.io/documentation/#/region) about how to select different regions for different services. | `string` | `"us-east"` | no |
 | <a name="input_resource_tags"></a> [resource\_tags](#input\_resource\_tags) | Optional list of tags to be added to created resources | `list(string)` | `[]` | no |
 | <a name="input_service_endpoints"></a> [service\_endpoints](#input\_service\_endpoints) | Service endpoints for the DB2 instance, valid values are `public`, `private`, or `public-and-private` | `string` | `"private"` | no |
 | <a name="input_subscription_id"></a> [subscription\_id](#input\_subscription\_id) | Value of the subscription ID to use with the subscription plan of DB2 | `string` | `null` | no |

solutions/fully-configurable/main.tf

@@ -26,7 +26,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
+  prefix          = var.prefix != null ? trimspace(var.prefix) != "" ? "${var.prefix}-" : "" : ""
 }
 
 ########################################################################################################################
@@ -36,7 +36,7 @@ locals {
 module "db2_instance" {
   source                      = "../.."
   region                      = var.region
-  db2_instance_name           = try("${local.prefix}-${var.db2_instance_name}", var.db2_instance_name)
+  db2_instance_name           = "${local.prefix}${var.db2_instance_name}"
   subscription_id             = local.subscription_id
   resource_group_id           = module.resource_group.resource_group_id
   service_endpoints           = var.service_endpoints

solutions/fully-configurable/variables.tf

@@ -21,7 +21,7 @@ variable "provider_visibility" {
 
 variable "region" {
   type        = string
-  description = "Region to provision all resources created by this example"
+  description = "The region to provision all resources in. [Learn more](https://terraform-ibm-modules.github.io/documentation/#/region) about how to select different regions for different services."
   default     = "us-east"
 
   validation {