[RFC,12/31] terraform/OCI: Add a Region selector

Commit Message

Chuck Lever April 1, 2025, 12:59 a.m. UTC

From: Chuck Lever <[e-mail]>

Replace the free-form string region setting with a selector that
chooses among already-validated settings. Some popular regions in
the "commercial" realm are added. It should be easy to add more.

Signed-off-by: Chuck Lever <[e-mail]>
---
 scripts/terraform.Makefile              |  1 -
 terraform/oci/kconfigs/Kconfig.location | 53 ++++++++++++++++++++++---
 2 files changed, 48 insertions(+), 6 deletions(-)

Patch

diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile
index 75ba9b97b518..ea5309d5da2e 100644
--- a/scripts/terraform.Makefile
+++ b/scripts/terraform.Makefile
@@ -95,7 +95,6 @@  TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_
 endif
 
 ifeq (y,$(CONFIG_TERRAFORM_OCI))
-TERRAFORM_EXTRA_VARS += terraform_oci_region=$(subst ",,$(CONFIG_TERRAFORM_OCI_REGION))
 TERRAFORM_EXTRA_VARS += terraform_oci_availablity_domain=$(subst ",,$(CONFIG_TERRAFORM_OCI_AVAILABLITY_DOMAIN))
 TERRAFORM_EXTRA_VARS += terraform_oci_compartment_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_COMPARTMENT_OCID))
 TERRAFORM_EXTRA_VARS += terraform_oci_shape=$(subst ",,$(CONFIG_TERRAFORM_OCI_SHAPE))
diff --git a/terraform/oci/kconfigs/Kconfig.location b/terraform/oci/kconfigs/Kconfig.location
index 9e06aa9332f8..9ef81cedd235 100644
--- a/terraform/oci/kconfigs/Kconfig.location
+++ b/terraform/oci/kconfigs/Kconfig.location
@@ -1,9 +1,52 @@ 
-config TERRAFORM_OCI_REGION
-	string "OCI Region"
+choice
+	prompt "OCI Region"
+	default TERRAFORM_OCI_REGION_ORD
 	help
-	  This option will set the OCI resource location.
-	  Read this:
-	  https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm
+	  A region is a collection of geographically co-located data
+	  centers that share data and hardware resources. Using this
+	  menu, select the region in which you wish to deploy your
+	  kdevops resources. Your tenancy must be subscribed to the
+	  selected region. For more information:
+
+	  https://docs.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm
+
+config TERRAFORM_OCI_REGION_HYD
+	bool "India South (Hyderabad)"
+
+config TERRAFORM_OCI_REGION_BOM
+	bool "India West (Mumbai)"
+
+config TERRAFORM_OCI_REGION_YUL
+	bool "Canada Southeast (Montreal)"
+
+config TERRAFORM_OCI_REGION_YYZ
+	bool "Canada Southeast (Toronto)"
+
+config TERRAFORM_OCI_REGION_IAD
+	bool "US East (Ashburn)"
+
+config TERRAFORM_OCI_REGION_ORD
+	bool "US Midwest (Chicago)"
+
+config TERRAFORM_OCI_REGION_PHX
+	bool "US West (Phoenix)"
+
+config TERRAFORM_OCI_REGION_SJC
+	bool "US West (San Jose)"
+
+endchoice
+
+config TERRAFORM_OCI_REGION
+	string
+	output yaml
+	default "ap-hyderabad-1" if TERRAFORM_OCI_REGION_HYD
+	default "ap-mumbai-1" if TERRAFORM_OCI_REGION_BOM
+	default "ca-montreal-1" if TERRAFORM_OCI_REGION_YUL
+	default "ca-toronto-1" if TERRAFORM_OCI_REGION_YYZ
+	default "us-ashburn-1" if TERRAFORM_OCI_REGION_IAD
+	default "us-chicago-1" if TERRAFORM_OCI_REGION_ORD
+	default "us-phoenix-1" if TERRAFORM_OCI_REGION_PHX
+	default "us-sanjose-1" if TERRAFORM_OCI_REGION_SJC
 
 config TERRAFORM_OCI_AVAILABLITY_DOMAIN
 	string "OCI availablity domain"