normalize code

.tf-control

@@ -0,0 +1,20 @@
+# .tf-control
+# allows for setting a specific command to be used for tf-* commands under this git repo
+# see tf-control.sh help for more info
+
+TFCONTROL_VERSION="1.0.5"
+
+TFCOMMAND="terraform_latest"
+# TF_CLI_CONFIG_FILE=PATH-TO-FILE/.tf-control.tfrc
+# TFARGS=""
+# TFNOLOG=""
+# TFNOCOLOR=""
+
+# use the following to force a specific version.  An upgrade of an existing 0.12.31 to 1.x
+# needs you to cycle through 0.13.17, 0.14.11, and then latest (0.15.5 not needed).  Other
+# steps in between.  See https://github.e.it.census.gov/terraform/support/tree/master/docs/how-to/terraform-upgrade for details
+#
+#TFCOMMAND="terraform_0.12.31"
+#TFCOMMAND="terraform_0.13.7"
+#TFCOMMAND="terraform_0.14.11"
+#TFCOMMAND="terraform_0.15.5"

.tf-control.tfrc

@@ -0,0 +1,24 @@
+TFCONTROL_VERSION="1.0.5"
+
+# https://www.terraform.io/docs/cli/config/config-file.html
+plugin_cache_dir   = "/data/terraform/terraform.d/plugin-cache"
+#disable_checkpoint = true
+
+provider_installation {
+#  filesystem_mirror {
+#    path    = "/apps/terraform/terraform.d/providers"
+#    include = [ "*/*/*" ]
+#  }
+  filesystem_mirror {
+    path    = "/data/terraform/terraform.d/providers"
+    include = [ "*/*/*" ]
+  }
+#  filesystem_mirror {
+#    path    = "/apps/terraform/terraform.d/providers"
+#    include = [ "external.terraform.census.gov/*/*" ]
+#  }
+  direct {
+    include = [ "*/*/*" ]
+  }
+}
+

cname/common.tf

@@ -0,0 +1 @@
+../common/common.tf

cname/entry.tf

@@ -0,0 +1 @@
+../common/entry.tf

cname/entry_heritage.tf

@@ -0,0 +1 @@
+../common/entry_heritage.tf

cname/heritage_tags.tf

@@ -0,0 +1 @@
+../common/heritage_tags.tf

cname/main.tf

@@ -1,56 +1,12 @@
-locals {
-  account_id          = var.account_id != "" ? var.account_id : data.aws_caller_identity.current.account_id
-  account_environment = data.aws_arn.current.partition == "aws-us-gov" ? "gov" : "ew"
-
-  base_tags = {
-    "boc:tf_module_version" = local._module_version
-    "boc:created_by"        = "terraform"
-  }
-}
-
-locals {
-  name_parts              = split(".", var.name)
-  host_name               = var.name_parts[0]
-  zone                    = trimprefix(var.name, format("%v.", local.host_name))
-  private_zone            = local.account_environment == "gov" ? true : var.private_zone
-  rr_type                 = uppercase(var.type)
-  default_enable_ptr      = lookup(local._defaults.enable_ptr, var.type, false)
-  default_heritage_prefix = lookup(local._defaults.heritage_prefix, var.type, "") != "" ? format("%v.", lookup(local._defaults.heritage_prefix, var.type)) : ""
-  is_cname                = var.type == "cname"
-  base_heritage_tags = [
-    format("heritage=%v", local._defaults.heritage_label),
-    format("%v/account_id=%v", local._defaults.heritage_label, data.aws_caller_identity.current.account_id),
-    format("%v/region=%v", local._defaults.heritage_label, local.region),
-    format("%v/create_time=%d", local._defaults.heritage_label, time_static.timestamp.unix)
-  ]
-  heritage_tags = [for k, v in var.heritage_tags : format("%v/%v", local._defaults.heritage_label, k)]
+local {
+# force to cname for this module
+  record_type = "cname"
 }
 
-
 # if the zone grab fails here, it either doesn't exist or it is not associated with this VPC
 data "aws_route53_zone" "zone" {
   name         = local.zone
   private_zone = local.private_zone
 }
 
 resource "time_static" "timestamp" {}
-
-resource "aws_route53_record" "entry" {
-  count   = local.is_cname ? 1 : 0
-  zone_id = data.aws_route53_zone.zone.zone_id
-  name    = var.name
-  type    = local.rr_type
-  ttl     = var.ttl
-  records = var.values
-}
-
-
-resource "aws_route53_record" "entry_heritage" {
-  count   = var.enable_heritage ? 1 : 0
-  zone_id = data.aws_route53_zone.zone.zone_id
-  name    = format("%v%v", aws_route53_record.entry.name)
-
-  type    = "TXT"
-  ttl     = var.ttl
-  records = [join(",", concat(local.base_heritage_tags, local.heritage_tags))]
-}

cname/x

@@ -0,0 +1,4 @@
+../common/entry_heritage.tf
+../common/entry.tf
+../common/heritage_tags.tf
+../common/zone_forward.tf

cname/zone_forward.tf

@@ -0,0 +1 @@
+../common/zone_forward.tf

common/common.tf

@@ -0,0 +1,23 @@
+locals {
+  account_id          = var.account_id != "" ? var.account_id : data.aws_caller_identity.current.account_id
+  account_environment = data.aws_arn.current.partition == "aws-us-gov" ? "gov" : "ew"
+  region = var.region
+
+  base_tags = {
+    "boc:tf_module_version" = local._module_version
+    "boc:created_by"        = "terraform"
+  }
+}
+
+locals {
+  name_parts              = split(".", var.name)
+  host_name               = var.name_parts[0]
+  zone                    = trimprefix(var.name, format("%v.", local.host_name))
+  private_zone            = local.account_environment == "gov" ? true : var.private_zone
+  rr_type                 = uppercase(local.record_type)
+  default_enable_ptr      = lookup(local._defaults.enable_ptr, local.record_type, false)
+  default_heritage_prefix = lookup(local._defaults.heritage_prefix, local.record_type, "") != "" ? format("%v.", lookup(local._defaults.heritage_prefix, local.record_type)) : ""
+  values                  = type(var.values) == "string" ? [var.values] : var.values
+}
+
+resource "time_static" "timestamp" {}

common/entry.tf

@@ -0,0 +1,7 @@
+resource "aws_route53_record" "entry" {
+  zone_id = data.aws_route53_zone.zone.zone_id
+  name    = var.name
+  type    = local.rr_type
+  ttl     = var.ttl
+  records = var.values
+}

common/entry_heritage.tf

@@ -0,0 +1,9 @@
+resource "aws_route53_record" "entry_heritage" {
+  count   = var.enable_heritage ? 1 : 0
+  zone_id = data.aws_route53_zone.zone.zone_id
+  name    = format("%v%v", aws_route53_record.entry[0].name)
+
+  type    = "TXT"
+  ttl     = var.ttl
+  records = [join(",", concat(local.base_heritage_tags, local.heritage_tags))]
+}

common/heritage_tags.tf

@@ -0,0 +1,9 @@
+locals {
+  base_heritage_tags = [
+    format("heritage=%v", local._defaults.heritage_label),
+    format("%v/account_id=%v", local._defaults.heritage_label, data.aws_caller_identity.current.account_id),
+    format("%v/region=%v", local._defaults.heritage_label, local.region),
+    format("%v/create_time=%d", local._defaults.heritage_label, time_static.timestamp.unix)
+  ]
+  heritage_tags = [for k, v in var.heritage_tags : format("%v/%v", local._defaults.heritage_label, k)]
+}

common/variables.tf

@@ -54,3 +54,8 @@ variable "ttl" {
   type        = number
   default     = 900
 }
+
+variable "values" {
+  description = "DNS value to set for the name.  May be a string or list of strings (like multiple IP addresses)"
+  type        = any
+}

common/versions.tf

@@ -5,5 +5,9 @@ terraform {
       source  = "hashicorp/aws"
       version = ">= 4"
     }
+    time = {
+      source  = "hashicorp/time"
+      version = ">= 0.9.1"
+    }
   }
 }

common/zone_forward.tf

@@ -0,0 +1,5 @@
+# if the zone grab fails here, it either doesn't exist or it is not associated with this VPC
+data "aws_route53_zone" "zone" {
+  name         = local.zone
+  private_zone = local.private_zone
+}