feat: Add optional hosted_zone_id input. (WRSAT-238) (#45)

Author: cram-cfa

README.md

@@ -88,7 +88,7 @@ this module offers three ways to define the current image version:
 > now to avoid unexpected changes in the future.
 
 | Name                           | Description                                                                                                                               | Type           | Default     | Required    |
-| ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- | -------------- | ----------- | ----------- |
+|--------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------|----------------|-------------|-------------|
 | logging_key_id                 | KMS key to use for log encryption.                                                                                                        | `string`       | n/a         | yes         |
 | private_subnets                | List of private subnet CIDR blocks.                                                                                                       | `list`         | n/a         | yes         |
 | project                        | Name of the project.                                                                                                                      | `string`       | n/a         | yes         |
@@ -115,6 +115,7 @@ this module offers three ways to define the current image version:
 | force_new_deployment           | Force a new task deployment of the service.                                                                                               | `bool`         | `false`     | no          |
 | health_check_grace_period      | Time, in seconds, after a container comes into service before health checks must pass.                                                    | `number`       | `300`       | no          |
 | health_check_path              | Application path to use for health checks.                                                                                                | `string`       | `"/health"` | no          |
+| hosted_zone_id                 | ID of the hosted zone for the domain, leave empty to have this module look it up.                                                         | `string`       | `null`      | no          |
 | image_tag                      | Tag of the container image to be deployed.                                                                                                | `string`       | `"latest"`  | no          |
 | image_tags_mutable             | Whether the container repository allows tags to be mutated.                                                                               | `bool`         | `false`     | no          |
 | ingress_cidrs                  | List of additional CIDR blocks to allow traffic from.                                                                                     | `list`         | `[]`        | no          |

alb.tf

@@ -89,7 +89,7 @@ resource "aws_route53_record" "endpoint" {
 
   name    = local.fqdn
   type    = "A"
-  zone_id = data.aws_route53_zone.domain["this"].zone_id
+  zone_id = local.hosted_zone_id
 
   alias {
     name                   = module.alb["this"].dns_name
@@ -112,7 +112,7 @@ resource "aws_route53_record" "endpoint_validation" {
   records         = [each.value.record]
   ttl             = 60
   type            = each.value.type
-  zone_id         = data.aws_route53_zone.domain["this"].zone_id
+  zone_id         = local.hosted_zone_id
 }
 
 resource "aws_acm_certificate_validation" "endpoint" {

data.tf

@@ -5,7 +5,7 @@ data "aws_partition" "current" {}
 data "aws_region" "current" {}
 
 data "aws_route53_zone" "domain" {
-  for_each = var.create_endpoint ? toset(["this"]) : toset([])
+  for_each = var.create_endpoint && var.hosted_zone_id == null ? toset(["this"]) : toset([])
 
   name = var.domain
 }

local.tf

@@ -1,5 +1,9 @@
 locals {
   fqdn              = var.subdomain != "" ? "${var.subdomain}.${var.domain}" : var.domain
+  hosted_zone_id    = (!var.create_endpoint
+    ? null
+    : (var.hosted_zone_id == null ? data.aws_route53_zone.domain["this"].zone_id : var.hosted_zone_id)
+  )
   image_url         = var.create_repository ? module.ecr["this"].repository_url : var.image_url
   prefix            = join("-", compact([var.project, var.environment, var.service]))
   prefix_short      = join("-", compact([var.project_short, var.environment, var.service_short]))

variables.tf

@@ -100,6 +100,12 @@ variable "health_check_path" {
   default     = "/health"
 }
 
+variable "hosted_zone_id" {
+  type        = string
+  description = "ID of the hosted zone for the domain, leave empty to have this module look it up."
+  default     = null
+}
+
 variable "image_tag" {
   type        = string
   description = "Tag for the image to be deployed."