diff --git a/infrastructure/terraform/modules/vauco-platform/main.tf b/infrastructure/terraform/modules/vauco-platform/main.tf index 6bc14d5..ac83566 100644 --- a/infrastructure/terraform/modules/vauco-platform/main.tf +++ b/infrastructure/terraform/modules/vauco-platform/main.tf @@ -2,6 +2,10 @@ # vauco-platform — Vauco sin egen plattforminfrastruktur # Scope: propane-will-491900-m5 / europe-west1 # Håndterer: Cloud Run domain mappings, salgsmodul-subdomener +# +# MERK: domain mappings bruker Cloud Run v1 API internt (google_cloud_run_domain_mapping +# er et v1-ressurs). Vi bruker derfor service-navnet direkte som string istedenfor +# data source, for å unngå v1/v2 API-konflikt. # ============================================================================== locals { @@ -12,15 +16,6 @@ locals { } } -# ------------------------------------------------------------------------------ -# Eksisterende Cloud Run-service (data source — ikke opprettet av Terraform) -# ------------------------------------------------------------------------------ -data "google_cloud_run_service" "platform" { - name = var.cloud_run_service_name - location = var.region - project = var.project_id -} - # ------------------------------------------------------------------------------ # Domain mapping — opax.vauco.no (primær) # ------------------------------------------------------------------------------ @@ -35,13 +30,12 @@ resource "google_cloud_run_domain_mapping" "opax" { } spec { - route_name = data.google_cloud_run_service.platform.name + route_name = var.cloud_run_service_name certificate_mode = "AUTOMATIC" force_override = false } lifecycle { - # Ikke slett mappingen ved rename — Cloud Run domain mappings er sårbare prevent_destroy = true } } @@ -60,16 +54,15 @@ resource "google_cloud_run_domain_mapping" "costguard_oss" { } spec { - route_name = data.google_cloud_run_service.platform.name + route_name = var.cloud_run_service_name certificate_mode = "AUTOMATIC" force_override = false } } # ------------------------------------------------------------------------------ -# Domain mapping — dynamisk per salgsmodul -# Brukes når nye moduler legges til i var.salesmodule_domains -# Eks: ["threadstone.oss.vauco.no", "invoicepilot.oss.vauco.no"] +# Domain mapping — dynamisk per salgsmodul (for_each) +# Legg til i var.salesmodule_domains i platform.tf # ------------------------------------------------------------------------------ resource "google_cloud_run_domain_mapping" "salesmodules" { for_each = toset(var.salesmodule_domains) @@ -84,7 +77,7 @@ resource "google_cloud_run_domain_mapping" "salesmodules" { } spec { - route_name = data.google_cloud_run_service.platform.name + route_name = var.cloud_run_service_name certificate_mode = "AUTOMATIC" force_override = false }