feat: dynamically generate the OCIR url using the region name (#454)

Author: snafuz

main.tf

@@ -289,7 +289,6 @@ module "extensions" {
 
   # ocir parameters
   email_address    = var.email_address
-  ocir_urls        = var.ocir_urls
   secret_id        = var.secret_id
   secret_name      = var.secret_name
   secret_namespace = var.secret_namespace

modules/extensions/templates.tf

@@ -74,7 +74,7 @@ locals {
       region         = var.region
 
       email_address     = var.email_address
-      region_registry   = var.ocir_urls[var.region]
+      region_registry   = join("",[var.region,".ocir.io"])
       secret_id         = var.secret_id
       secret_name       = var.secret_name
       secret_namespace  = var.secret_namespace

modules/extensions/variables.tf

@@ -65,10 +65,6 @@ variable "kms_dynamic_group_id" {}
 # ocir
 variable "email_address" {}
 
-variable "ocir_urls" {
-  type = map(any)
-}
-
 variable "secret_id" {}
 
 variable "secret_name" {}

variables.tf

@@ -656,44 +656,6 @@ variable "email_address" {
   type        = string
 }
 
-variable "ocir_urls" {
-  # Region and region codes: https://docs.cloud.oracle.com/iaas/Content/General/Concepts/regions.htm#ServiceAvailabilityAcrossRegions
-  description = "The urls of ocir in the respective regions."
-  default = {
-    af-johannesburg-1 = "jnb.ocir.io"
-    ap-melbourne-1    = "mel.ocir.io"
-    ap-hyderabad-1    = "hyd.ocir.io"
-    ap-mumbai-1       = "bom.ocir.io"
-    ap-osaka-1        = "kix.ocir.io"
-    ap-singapore-1    = "sin.ocir.io"
-    ap-seoul-1        = "icn.ocir.io"
-    ap-chuncheon-1    = "yny.ocir.io"
-    ap-sydney-1       = "syd.ocir.io"
-    ap-tokyo-1        = "nrt.ocir.io"
-    ca-montreal-1     = "yul.ocir.io"
-    ca-toronto-1      = "yyz.ocir.io"
-    eu-amsterdam-1    = "ams.ocir.io"
-    eu-frankfurt-1    = "fra.ocir.io"
-    eu-marseille-1    = "mrs.ocir.io"
-    eu-milan-1        = "lin.ocir.io"
-    eu-stockholm-1    = "arn.ocir.io"
-    eu-zurich-1       = "zrh.ocir.io"
-    il-jerusalem-1    = "mtz.ocir.io"
-    me-abudhabi-1     = "auh.ocir.io"
-    me-dubai-1        = "dxb.ocir.io"
-    me-jeddah-1       = "jed.ocir.io"
-    sa-santiago-1     = "scl.ocir.io"
-    sa-saopaulo-1     = "gru.ocir.io"
-    sa-vinhedo-1      = "vcp.ocir.io"
-    uk-london-1       = "lhr.ocir.io"
-    uk-cardiff-1      = "cwl.ocir.io"
-    us-ashburn-1      = "iad.ocir.io"
-    us-phoenix-1      = "phx.ocir.io"
-    us-sanjose-1      = "sjc.ocir.io"
-  }
-  type = map(string)
-}
-
 variable "secret_id" {
   description = "The OCID of the Secret on OCI Vault which holds the authentication token."
   type        = string