Merge pull request #37 from NandosUK/NAP-275/domain-mapping

NAP-275 domain mapping

experimental/terraform/outputs.tf

@@ -3,7 +3,7 @@ output "event_handler_endpoint" {
 }
 
 output "event_handler_dns" {
- value = try(google_cloud_run_domain_mapping.event_handler[0].status[0]["resource_records"], null)
+ value = try(google_cloud_run_domain_mapping.event_handler[0].status[0]["resource_records"][0], null)
 }
 
 output "event_handler_secret" {

experimental/terraform/resource_event_handler.tf

@@ -48,32 +48,27 @@ resource "google_cloud_run_domain_mapping" "event_handler" {
  namespace = var.google_project_id
  }
 
- depends_on = [
- google_cloud_run_service.event_handler
- ]
-
  spec {
  route_name = google_cloud_run_service.event_handler.name
  }
 }
 
 resource "google_cloud_run_service_iam_binding" "noauth" {
  count = var.make_event_handler_public ? 1 : 0
- location = var.google_region
+ location = length(var.mapped_domain) > 0 ? var.google_domain_mapping_region : var.google_region
  project = var.google_project_id
- service = "event-handler"
+ service = google_cloud_run_service.event_handler.name
 
  role = "roles/run.invoker"
  members = ["allUsers"]
- depends_on = [google_cloud_run_service.event_handler]
 }
 
 resource "google_secret_manager_secret" "event_handler" {
  secret_id = "event-handler"
  replication {
  user_managed {
  replicas {
- location = var.google_region
+ location = length(var.mapped_domain) > 0 ? var.google_domain_mapping_region : var.google_region
  }
  }
  }