chore: some updates on catalog json for DAs guidance

Author: vbontempi

ibm_catalog.json

@@ -121,59 +121,60 @@
             },
             {
               "name": "deploy-arch-ibm-observability",
-              "id": "a3137d28-79e0-479d-8a24-758ebd5a0eab-global",
+              "description": "Enable to provisions and configures IBM Cloud Monitoring, Activity Tracker, and Log Analysis services for analysing events generated from the Events Notification instance.",
               "flavors": [
                 "instances"
               ],
+              "id": "a3137d28-79e0-479d-8a24-758ebd5a0eab-global",
               "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
-              "optional": true,
-              "version": "^v3.0.3",
-              "on_by_default": true,
-              "default_flavor": "instances",
               "input_mapping": [
                 {
-                  "value": "us-south",
-                  "dependency_input": "region"
+                  "dependency_input": "prefix",
+                  "version_input": "prefix",
+                  "reference_version": true
                 },
                 {
-                  "reference_version": true,
-                  "dependency_input": "prefix",
-                  "version_input": "prefix"
+                  "value": "us-south",
+                  "dependency_input": "region"
                 }
               ],
-              "ignore_auto_referencing": [
-                "*"
-              ]
+              "optional": true,
+              "on_by_default": true,
+              "version": "v3.0.3"
             },
-            {
+              {
               "name": "deploy-arch-ibm-account-infra-base",
-              "id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global",
+              "description": "Cloud automation for account configuration organizes your IBM Cloud account with a ready-made set of resource groups by default. When you enable the “with account settings” option, it also applies baseline security and governance settings.",
               "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
-              "optional": true,
-              "on_by_default": true,
+              "flavors": [
+                "resource-group-only",
+                "resource-groups-with-account-settings"
+              ],
               "default_flavor": "resource-group-only",
-              "version": "^v3.0.7",
+              "id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global",
               "input_mapping": [
                 {
-                  "reference_version": true,
                   "dependency_input": "prefix",
-                  "version_input": "prefix"
-                },
-                {
-                  "dependency_input": "provision_trusted_profile_projects",
-                  "value": false
+                  "version_input": "prefix",
+                  "reference_version": true
                 },
                 {
                   "dependency_output": "workload_resource_group_name",
                   "version_input": "existing_resource_group_name"
+                },
+                {
+                  "dependency_input": "provider_visibility",
+                  "version_input": "provider_visibility",
+                  "reference_version": true
                 }
               ],
-              "ignore_auto_referencing": [
-                "*"
-              ]
+              "optional": true,
+              "on_by_default": false,
+              "version": "v3.0.7"
             },
             {
               "name": "testing-deploy-arch-ibm-db2-cloud",
+              "description": "Enable to provision and configure IBM DB2 on Cloud instance and to automatically configure the authorisation policy with Enterprise Application Service instance.",
               "label": "[Add-ons Beta] Cloud automation for DB2 on Cloud",
               "version": "^v1.0.0",
               "id": "fa1560c6-f626-4605-b2e7-6299686fac40-global",
@@ -202,6 +203,11 @@
                 {
                   "value": true,
                   "dependency_input": "db2_s2s_policy_enable"
+                },
+                {
+                  "dependency_input": "provider_visibility",
+                  "version_input": "provider_visibility",
+                  "reference_version": true
                 }
               ],
               "ignore_auto_referencing": [
@@ -210,6 +216,7 @@
             },
             {
               "name": "testing-deploy-arch-ibm-mq-cloud",
+              "description": "Enable to provision and configure IBM MQ on Cloud instance and to automatically configure the authorisation policy with Enterprise Application Service instance.",
               "version": "^v0.4.2",
               "label": "[Add-ons Beta] Cloud automation for MQ on Cloud",
               "id": "272fbeb0-7a85-47b1-bb8a-e5478e3112f2-global",
@@ -239,6 +246,11 @@
                 {
                   "value": true,
                   "dependency_input": "mq_s2s_policy_enable"
+                },
+                {
+                  "dependency_input": "provider_visibility",
+                  "version_input": "provider_visibility",
+                  "reference_version": true
                 }
               ],
               "ignore_auto_referencing": [
@@ -252,6 +264,24 @@
               "key": "ibmcloud_api_key",
               "required": true
             },
+            {
+              "key": "provider_visibility",
+              "hidden": true,
+              "options": [
+                {
+                  "displayname": "private",
+                  "value": "private"
+                },
+                {
+                  "displayname": "public",
+                  "value": "public"
+                },
+                {
+                  "displayname": "public-and-private",
+                  "value": "public-and-private"
+                }
+              ]
+            },
             {
               "key": "instance_name"
             },
@@ -290,6 +320,7 @@
             },
             {
               "key": "existing_resource_group_name",
+              "display_name": "Resource group",
               "required": true,
               "custom_config": {
                 "type": "resource_group",

solutions/fully-configurable/provider.tf

@@ -4,11 +4,13 @@
 
 provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
+  visibility       = var.provider_visibility
   region           = var.region
 }
 
 provider "ibm" {
   ibmcloud_api_key = var.ibmcloud_api_key
+  visibility       = var.provider_visibility
   region           = local.sm_region
   alias            = "ibm-sm"
 }

solutions/fully-configurable/variables.tf

@@ -8,6 +8,17 @@ variable "ibmcloud_api_key" {
   sensitive   = true
 }
 
+variable "provider_visibility" {
+  description = "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)."
+  type        = string
+  default     = "private"
+
+  validation {
+    condition     = contains(["public", "private", "public-and-private"], var.provider_visibility)
+    error_message = "Invalid visibility option. Allowed values are 'public', 'private', or 'public-and-private'."
+  }
+}
+
 variable "resource_tags" {
   type        = list(string)
   description = "Optional list of tags to be added to created resources"