feat: added support for "au-syd" and"ca-tor" regions (#188)

Author: zikra-iqbal

ibm_catalog.json

@@ -217,6 +217,14 @@
                 {
                   "displayname": "Tokyo (jp-tok)",
                   "value": "jp-tok"
+                },
+                {
+                  "displayname": "Sydney (au-syd)",
+                  "value": "au-syd"
+                },
+                {
+                  "displayname": "Toronto (ca-tor)",
+                  "value": "ca-tor"
                 }
               ]
             },

modules/configure_project/main.tf

@@ -77,7 +77,9 @@ locals {
     "us-south" = "//api.dataplatform.cloud.ibm.com",
     "eu-gb"    = "//api.eu-gb.dataplatform.cloud.ibm.com",
     "eu-de"    = "//api.eu-de.dataplatform.cloud.ibm.com",
-    "jp-tok"   = "//api.jp-tok.dataplatform.cloud.ibm.com"
+    "jp-tok"   = "//api.jp-tok.dataplatform.cloud.ibm.com",
+    "au-syd"   = "//api.au-syd.dai.cloud.ibm.com",
+    "ca-tor"   = "//api.ca-tor.dai.cloud.ibm.com"
   }
   dataplatform_api          = local.dataplatform_api_mapping[var.region]
   watsonx_project_id_object = restapi_object.configure_project.id
@@ -87,7 +89,9 @@ locals {
     "us-south" = "https://dataplatform.cloud.ibm.com",
     "eu-gb"    = "https://eu-gb.dataplatform.cloud.ibm.com",
     "eu-de"    = "https://eu-de.dataplatform.cloud.ibm.com",
-    "jp-tok"   = "https://jp-tok.dataplatform.cloud.ibm.com"
+    "jp-tok"   = "https://jp-tok.dataplatform.cloud.ibm.com",
+    "au-syd"   = "https://au-syd.dai.cloud.ibm.com",
+    "ca-tor"   = "https://ca-tor.dai.cloud.ibm.com"
   }
   dataplatform_ui = local.dataplatform_ui_mapping[var.region]
 

modules/configure_project/scripts/add_collaborators_to_project.sh

@@ -14,6 +14,10 @@ elif [ "$region" == "eu-de" ]; then
     dataplatform_api="https://api.eu-de.dataplatform.cloud.ibm.com"
 elif [ "$region" == "jp-tok" ]; then
     dataplatform_api="https://api.jp-tok.dataplatform.cloud.ibm.com"
+elif [ "$location" == "au-syd" ]; then
+    dataplatform_api="https://api.au-syd.dai.cloud.ibm.com"
+elif [ "$location" == "ca-tor" ]; then
+    dataplatform_api="https://api.ca-tor.dai.cloud.ibm.com"
 else
     echo "Unknown region" && exit 1
 fi

modules/configure_user/scripts/add_user.sh

@@ -25,6 +25,10 @@ elif [ "$region" == "eu-de" ]; then
     dataplatform_api="https://api.eu-de.dataplatform.cloud.ibm.com"
 elif [ "$region" == "jp-tok" ]; then
     dataplatform_api="https://api.jp-tok.dataplatform.cloud.ibm.com"
+elif [ "$region" == "au-syd" ]; then
+    dataplatform_api="https://api.au-syd.dai.cloud.ibm.com"
+elif [ "$region" == "ca-tor" ]; then
+    dataplatform_api="https://api.ca-tor.dai.cloud.ibm.com"
 else
     echo "Unknown region" && exit 1
 fi

modules/configure_user/scripts/enforce_account_restriction.sh

@@ -22,6 +22,10 @@ elif [ "$region" == "eu-de" ]; then
     dataplatform_api="https://api.eu-de.dataplatform.cloud.ibm.com"
 elif [ "$region" == "jp-tok" ]; then
     dataplatform_api="https://api.jp-tok.dataplatform.cloud.ibm.com"
+elif [ "$region" == "au-syd" ]; then
+    dataplatform_api="https://api.au-syd.dai.cloud.ibm.com"
+elif [ "$region" == "ca-tor" ]; then
+    dataplatform_api="https://api.ca-tor.dai.cloud.ibm.com"
 else
     echo "Unknown region" && exit 1
 fi

modules/storage_delegation/main.tf

@@ -10,7 +10,9 @@ locals {
     "us-south" = "dataplatform.cloud.ibm.com",
     "eu-gb"    = "eu-gb.dataplatform.cloud.ibm.com",
     "eu-de"    = "eu-de.dataplatform.cloud.ibm.com",
-    "jp-tok"   = "jp-tok.dataplatform.cloud.ibm.com"
+    "jp-tok"   = "jp-tok.dataplatform.cloud.ibm.com",
+    "au-syd"   = "au-syd.dai.cloud.ibm.com",
+    "ca-tor"   = "ca-tor.dai.cloud.ibm.com"
   }
   dataplatform_ui = local.dataplatform_ui_mapping[local.region]
 

tests/pr_test.go

@@ -37,6 +37,8 @@ var validRegions = []string{
 	"eu-de",
 	"eu-gb",
 	"jp-tok",
+	"au-syd",
+	"ca-tor",
 }
 
 var permanentResources map[string]interface{}

variables.tf

@@ -23,8 +23,8 @@ variable "region" {
   type        = string
 
   validation {
-    condition     = contains(["eu-de", "us-south", "eu-gb", "jp-tok"], var.region)
-    error_message = "Value is not valid. You must specify `eu-de`, `eu-gb`, `jp-tok`, or `us-south` as the IBM Cloud region."
+    condition     = contains(["eu-de", "us-south", "eu-gb", "jp-tok", "au-syd", "ca-tor"], var.region)
+    error_message = "Value is not valid. You must specify `eu-de`, `eu-gb`, `jp-tok`, `au-syd`, `ca-tor` or `us-south` as the IBM Cloud region."
   }
 
   validation {