From c9423a5e9cd6717f2a43a99a82dc426d31021d53 Mon Sep 17 00:00:00 2001
From: Aashiq-J <122446118+Aashiq-J@users.noreply.github.com>
Date: Mon, 21 Oct 2024 23:10:23 +0530
Subject: [PATCH] fix: updated the region selector to include all IBM Cloud
 regions (#197)

---
 ibm_catalog.json                 | 85 +++++++++++---------------------
 solutions/instances/variables.tf |  5 --
 tests/pr_test.go                 |  3 +-
 3 files changed, 30 insertions(+), 63 deletions(-)

diff --git a/ibm_catalog.json b/ibm_catalog.json
index b862d59f..87dfe559 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -44,7 +44,6 @@
           "description": "Configures the IBM Cloud Monitoring instance and logging agents."
         },
         {
-
           "title": "Configures IBM Cloud Activity Tracker Event Routing",
           "description": "Configures an IBM Cloud Activity Tracker route with a Cloud Object Storage, Log Analysis and Cloud Logs target."
         }
@@ -130,42 +129,18 @@
               "key": "resource_group_name"
             },
             {
-              "key": "region",
-              "required": true,
-              "options": [
-                {
-                  "displayname": "Dallas (us-south)",
-                  "value": "us-south"
-                },
-                {
-                  "displayname": "Frankfurt (eu-de)",
-                  "value": "eu-de"
-                },
-                {
-                  "displayname": "London (eu-gb)",
-                  "value": "eu-gb"
-                },
-                {
-                  "displayname": "Madrid (eu-es)",
-                  "value": "eu-es"
-                },
-                {
-                  "displayname": "Osaka (jp-osa)",
-                  "value": "jp-osa"
-                },
-                {
-                  "displayname": "Sydney (au-syd)",
-                  "value": "au-syd"
-                },
-                {
-                  "displayname": "Tokyo (jp-tok)",
-                  "value": "jp-tok"
-                },
-                {
-                  "displayname": "Washington (us-east)",
-                  "value": "us-east"
+              "custom_config": {
+                "type": "region",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "showKinds": [
+                    "region"
+                  ]
                 }
-              ]
+              },
+              "key": "region",
+              "required": true
             },
             {
               "key": "cloud_logs_provision"
@@ -533,9 +508,7 @@
             }
           ],
           "architecture": {
-
             "descriptions": "This architecture supports the deployment of IBM Log Analysis, IBM Cloud Monitoring and IBM Cloud Logs instances on IBM Cloud. It also supports the deployment of IBM Cloud Activity Tracker Event Routing to an Object Storage bucket, Log Analysis and Cloud Logs target.",
-
             "features": [
               {
                 "title": "Creates a Cloud Logs instance",
@@ -565,9 +538,7 @@
                   "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-observability-da/main/reference-architecture/deployable-architecture-observability-instances.svg",
                   "type": "image/svg+xml"
                 },
-
                 "description": "This architecture supports creating and configuring IBM Cloud Observability instances and IBM Cloud Activity Tracker Event Routing to an Object Storage bucket, Log Analysis and Cloud Logs instance."
-
               }
             ]
           }
@@ -623,18 +594,18 @@
             },
             {
               "key": "cluster_config_endpoint_type",
-              "options":[
+              "options": [
                 {
-                  "displayname" : "default",
-                  "value" : "default"
+                  "displayname": "default",
+                  "value": "default"
                 },
                 {
-                  "displayname" : "private",
-                  "value" : "private"
+                  "displayname": "private",
+                  "value": "private"
                 },
                 {
-                  "displayname" : "vpe",
-                  "value" : "vpe"
+                  "displayname": "vpe",
+                  "value": "vpe"
                 },
                 {
                   "displayname": "link",
@@ -671,14 +642,14 @@
             },
             {
               "key": "log_analysis_endpoint_type",
-              "options":[
+              "options": [
                 {
-                  "displayname" : "private",
-                  "value" : "private"
+                  "displayname": "private",
+                  "value": "private"
                 },
                 {
-                  "displayname" : "public",
-                  "value" : "public"
+                  "displayname": "public",
+                  "value": "public"
                 }
               ]
             },
@@ -712,14 +683,14 @@
             },
             {
               "key": "cloud_monitoring_endpoint_type",
-              "options":[
+              "options": [
                 {
-                  "displayname" : "private",
-                  "value" : "private"
+                  "displayname": "private",
+                  "value": "private"
                 },
                 {
-                  "displayname" : "public",
-                  "value" : "public"
+                  "displayname": "public",
+                  "value": "public"
                 }
               ]
             },
diff --git a/solutions/instances/variables.tf b/solutions/instances/variables.tf
index 7dd8cb96..2db3b887 100644
--- a/solutions/instances/variables.tf
+++ b/solutions/instances/variables.tf
@@ -43,11 +43,6 @@ variable "region" {
   description = "The region where observability resources are created."
   type        = string
   default     = "us-south"
-
-  validation {
-    condition     = contains(["us-south", "us-east", "jp-osa", "jp-tok", "eu-de", "eu-es", "eu-gb", "au-syd"], var.region)
-    error_message = "The specified region is not valid. Specify a valid region to create observability resources in."
-  }
 }
 
 variable "prefix" {
diff --git a/tests/pr_test.go b/tests/pr_test.go
index 56f5d6f3..23273573 100644
--- a/tests/pr_test.go
+++ b/tests/pr_test.go
@@ -38,6 +38,8 @@ var validRegions = []string{
 	"jp-tok",
 	"us-south",
 	"us-east",
+	"ca-tor",
+	"br-sao",
 }
 
 var sharedInfoSvc *cloudinfo.CloudInfoService
@@ -113,7 +115,6 @@ func TestRunUpgradeSolutionInstances(t *testing.T) {
 		"existing_kms_instance_crn":           permanentResources["hpcs_south_crn"],
 		"kms_endpoint_type":                   "public",
 		"management_endpoint_type_for_bucket": "public",
-		"log_analysis_service_endpoints":      "public-and-private",
 		"enable_platform_logs":                "false",
 		"enable_platform_metrics":             "false",
 	}