Use Zone ID for DNS Aliases (#2)

* Pass parent zone id

* Drop alias module

* Add atlantis URL

* Update desc

Author: osterman

README.md

@@ -190,7 +190,6 @@ Available targets:
 | default_backend_image | ECS default (bootstrap) image | string | `cloudposse/default-backend:0.1.2` | no |
 | delimiter | Delimiter to be used between `namespace`, `stage`, `name` and `attributes` | string | `-` | no |
 | desired_count | Atlantis desired number of tasks | string | `1` | no |
-| domain_name | A domain name for which the certificate should be issued | string | - | yes |
 | ecs_cluster_arn | ARN of the ECS cluster to deploy Atlantis | string | - | yes |
 | ecs_cluster_name | Name of the ECS cluster to deploy Atlantis | string | - | yes |
 | enabled | Whether to create the resources. Set to `false` to prevent the module from creating any resources | string | `false` | no |
@@ -202,6 +201,7 @@ Available targets:
 | name | Application or solution name (e.g. `app`) | string | `ecs` | no |
 | namespace | Namespace (e.g. `eg` or `cp`) | string | - | yes |
 | overwrite_ssm_parameter | Whether to overwrite an existing SSM parameter | string | `true` | no |
+| parent_zone_id | The zone ID where the DNS record for the `short_name` will be written | string | `` | no |
 | policy_arn | Permission to grant to atlantis server | string | `arn:aws:iam::aws:policy/AdministratorAccess` | no |
 | private_subnet_ids | The private subnet IDs | list | `<list>` | no |
 | region | AWS Region for Atlantis deployment | string | `us-west-2` | no |
@@ -222,7 +222,8 @@ Available targets:
 | Name | Description |
 |------|-------------|
 | atlantis_ssh_public_key | Atlantis SSH Public Key |
-| badge_url | the url of the build badge when badge_enabled is enabled |
+| atlantis_url | The URL endpoint for the atlantis server |
+| badge_url | The URL of the build badge when `badge_enabled` is enabled |
 
 
 

docs/terraform.md

@@ -33,7 +33,6 @@
 | default_backend_image | ECS default (bootstrap) image | string | `cloudposse/default-backend:0.1.2` | no |
 | delimiter | Delimiter to be used between `namespace`, `stage`, `name` and `attributes` | string | `-` | no |
 | desired_count | Atlantis desired number of tasks | string | `1` | no |
-| domain_name | A domain name for which the certificate should be issued | string | - | yes |
 | ecs_cluster_arn | ARN of the ECS cluster to deploy Atlantis | string | - | yes |
 | ecs_cluster_name | Name of the ECS cluster to deploy Atlantis | string | - | yes |
 | enabled | Whether to create the resources. Set to `false` to prevent the module from creating any resources | string | `false` | no |
@@ -45,6 +44,7 @@
 | name | Application or solution name (e.g. `app`) | string | `ecs` | no |
 | namespace | Namespace (e.g. `eg` or `cp`) | string | - | yes |
 | overwrite_ssm_parameter | Whether to overwrite an existing SSM parameter | string | `true` | no |
+| parent_zone_id | The zone ID where the DNS record for the `short_name` will be written | string | `` | no |
 | policy_arn | Permission to grant to atlantis server | string | `arn:aws:iam::aws:policy/AdministratorAccess` | no |
 | private_subnet_ids | The private subnet IDs | list | `<list>` | no |
 | region | AWS Region for Atlantis deployment | string | `us-west-2` | no |
@@ -65,5 +65,6 @@
 | Name | Description |
 |------|-------------|
 | atlantis_ssh_public_key | Atlantis SSH Public Key |
-| badge_url | the url of the build badge when badge_enabled is enabled |
+| atlantis_url | The URL endpoint for the atlantis server |
+| badge_url | The URL of the build badge when `badge_enabled` is enabled |
 

main.tf

@@ -23,7 +23,7 @@ locals {
   atlantis_gh_webhook_secret  = "${length(var.atlantis_gh_webhook_secret) > 0 ? var.atlantis_gh_webhook_secret : join("", random_string.atlantis_gh_webhook_secret.*.result)}"
   atlantis_url                = "${format(var.atlantis_webhook_format, local.hostname)}"
   attributes                  = "${concat(list(var.short_name), var.attributes)}"
-  default_hostname            = "${var.short_name}.${var.domain_name}"
+  default_hostname            = "${join("", aws_route53_record.default.*.fqdn)}"
   github_oauth_token          = "${length(join("", data.aws_ssm_parameter.atlantis_gh_token.*.value)) > 0 ? join("", data.aws_ssm_parameter.atlantis_gh_token.*.value) : var.github_oauth_token}"
   github_oauth_token_ssm_name = "${length(var.github_oauth_token_ssm_name) > 0 ? var.github_oauth_token_ssm_name : format(var.chamber_format, var.chamber_service, "atlantis_gh_token")}"
   hostname                    = "${length(var.hostname) > 0 ? var.hostname : local.default_hostname}"
@@ -44,15 +44,6 @@ module "ssh_key_pair" {
   ssm_path_prefix      = "${var.chamber_service}"
 }
 
-module "hostname" {
-  source           = "git::https://github.com/cloudposse/terraform-aws-route53-alias.git?ref=tags/0.2.7"
-  enabled          = "${local.enabled}"
-  aliases          = ["${local.hostname}"]
-  parent_zone_name = "${var.domain_name}"
-  target_dns_name  = "${var.alb_dns_name}"
-  target_zone_id   = "${var.alb_zone_id}"
-}
-
 module "webhooks" {
   source              = "git::https://github.com/cloudposse/terraform-github-repository-webhooks.git?ref=tags/0.1.1"
   github_token        = "${local.github_oauth_token}"
@@ -146,6 +137,20 @@ module "web_app" {
 
 # Resources
 #--------------------------------------------------------------
+
+resource "aws_route53_record" "default" {
+  count   = "${local.enabled ? 1 : 0}"
+  zone_id = "${var.parent_zone_id}"
+  name    = "${var.short_name}"
+  type    = "A"
+
+  alias {
+    name                   = "${var.alb_dns_name}"
+    zone_id                = "${var.alb_zone_id}"
+    evaluate_target_health = "false"
+  }
+}
+
 resource "random_string" "atlantis_gh_webhook_secret" {
   count   = "${local.enabled ? 1 : 0}"
   length  = "${var.webhook_secret_length}"

outputs.tf

@@ -4,6 +4,11 @@ output "atlantis_ssh_public_key" {
 }
 
 output "badge_url" {
-  description = "the url of the build badge when badge_enabled is enabled"
+  description = "The URL of the build badge when `badge_enabled` is enabled"
   value       = "${module.web_app.badge_url}"
 }
+
+output "atlantis_url" {
+  description = "The URL endpoint for the atlantis server"
+  value       = "${local.atlantis_url}"
+}

variables.tf

@@ -317,9 +317,10 @@ variable "region" {
   default     = "us-west-2"
 }
 
-variable "domain_name" {
+variable "parent_zone_id" {
   type        = "string"
-  description = "A domain name for which the certificate should be issued"
+  description = "The zone ID where the DNS record for the `short_name` will be written"
+  default     = ""
 }
 
 variable "overwrite_ssm_parameter" {