NAP-275/domain mapping

experimental/terraform/outputs.tf

@@ -2,6 +2,18 @@ output "event_handler_endpoint" {
   value = google_cloud_run_service.event_handler.status[0]["url"]
 }
 
+output "event_handler_dns_data" {
+  value = try(google_cloud_run_domain_mapping.event_handler[0].status[0]["resource_records"][0].rrdata, null)
+}
+
+output "event_handler_dns_name" {
+  value = try(google_cloud_run_domain_mapping.event_handler[0].status[0]["resource_records"][0].name, null)
+}
+
+output "event_handler_dns_type" {
+  value = try(google_cloud_run_domain_mapping.event_handler[0].status[0]["resource_records"][0].type, null)
+}
+
 output "event_handler_name_servers" {
   value = try(module.event_hander_dns[0].name_servers, null)
 }

experimental/terraform/resource_event_handler.tf

@@ -46,7 +46,7 @@ resource "google_cloud_run_domain_mapping" "event_handler" {
   # conditionally use this module
   count    = length(var.mapped_domain) > 0 ? 1 : 0
   location = var.google_domain_mapping_region
-  name     = "dora.${var.mapped_domain}"
+  name     = "${var.subdomain}.${var.mapped_domain}"
 
   metadata {
     namespace = var.google_project_id
@@ -59,7 +59,7 @@ resource "google_cloud_run_domain_mapping" "event_handler" {
 
 module "event_hander_dns" {
   source  = "./cloud-dns"
-  count   = length(var.mapped_domain) > 0 ? 1 : 0
+  count   = length(var.mapped_domain) > 0 && var.google_dns ? 1 : 0
 
   project_id = var.google_project_id
   name       = replace(replace(lower(trimspace(var.mapped_domain)), ".", "-"), "/[^a-z0-9\\-]/", "")
@@ -69,7 +69,7 @@ module "event_hander_dns" {
 
   recordsets = [
     {
-      name    = "dora"
+      name    = "${var.subdomain}"
       type    = "CNAME"
       ttl     = 3600
       records = [

experimental/terraform/variables.tf

@@ -23,6 +23,12 @@ variable "google_region" {
   default = "us-central1"
 }
 
+variable "google_dns" {
+  description = "To create a Google Cloud DNS zone and records for event handler"
+  default     = false
+  type        = bool
+}
+
 variable "google_domain_mapping_region" {
   type        = string
   description = "Domain mapping region"
@@ -65,6 +71,15 @@ variable "mapped_domain" {
   default     = ""
 }
 
+/*  The default for normal usage is true, because VCS webhooks need to call the endpoint over the
+    public internet (with auth provided by the security token). But some deployments (including CI
+    E2E tests on Google infra) will require this to be false. */
+variable "make_event_handler_public" {
+  description = "If true, the event handler endpoint will be accessible by unauthenticated users."
+  type        = bool
+  default     = true
+}
+
 variable "owner" {
   type        = string
   description = "The owner of code repository"
@@ -80,11 +95,8 @@ variable "repository" {
   description = "The name of the git repository"
 }
 
-/*  The default for normal usage is true, because VCS webhooks need to call the endpoint over the
-    public internet (with auth provided by the security token). But some deployments (including CI
-    E2E tests on Google infra) will require this to be false. */
-variable "make_event_handler_public" {
-  description = "If true, the event handler endpoint will be accessible by unauthenticated users."
-  type        = bool
-  default     = true
+variable "subdomain" {
+  description = "The prefix added to the `mapped_domain`, of event handler, use to create a record within Google Cloud DNS."
+  default     = "dora"
+  type        = string
 }