From 9cce60826e9042e6a83da88dc28795961a562dc2 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 16 Mar 2026 18:50:04 -0400 Subject: [PATCH] rename to match --- locals.tf | 11 ----------- main.tf | 14 +++++++++++++- ...n-variables.hcl => common-variables.hcl.tf.tpl} | 2 ++ ...lt-versions.hcl => default-versions.hcl.tf.tpl} | 0 4 files changed, 15 insertions(+), 12 deletions(-) rename templates/{common-variables.hcl => common-variables.hcl.tf.tpl} (96%) rename templates/{default-versions.hcl => default-versions.hcl.tf.tpl} (100%) diff --git a/locals.tf b/locals.tf index 3d789da..9c5b274 100644 --- a/locals.tf +++ b/locals.tf @@ -108,15 +108,4 @@ locals { tempo_chart_version = var.versions.tempo.chart_version tempo_tag = var.versions.tempo.tag } - managed_extra_files = concat([ - { - path = "_envcommon/default-versions.hcl" - content = templatefile("${path.module}/templates/default-versions.hcl", local.default_versions) - }, - { - path = "_envcommon/common-variables.hcl" - content = templatefile("${path.module}/templates/common-variables.hcl", local.common_vars) - } - ], - var.github_actions_workflows) } \ No newline at end of file diff --git a/main.tf b/main.tf index 09368c7..f791f1c 100644 --- a/main.tf +++ b/main.tf @@ -1,4 +1,15 @@ locals { + managed_extra_files = concat([ + { + path = "_envcommon/default-versions.hcl" + content = templatefile("${path.module}/templates/default-versions.hcl.tf.tpl", local.default_versions) + }, + { + path = "_envcommon/common-variables.hcl" + content = templatefile("${path.module}/templates/common-variables.hcl.tf.tpl", local.common_vars) + }], + var.github_actions_workflows) + rendered_files = { "config.json" : jsonencode({ environment = var.environment @@ -111,7 +122,8 @@ module "github_repo" { path = path content = content }], - local.managed_extra_files) + local.managed_extra_files, + var.github_actions_workflows) archive_on_destroy = false github_org_teams = [ diff --git a/templates/common-variables.hcl b/templates/common-variables.hcl.tf.tpl similarity index 96% rename from templates/common-variables.hcl rename to templates/common-variables.hcl.tf.tpl index 1fdf031..8f4ba55 100644 --- a/templates/common-variables.hcl +++ b/templates/common-variables.hcl.tf.tpl @@ -32,6 +32,7 @@ locals { "us-gov-east-1" = "vpc-070595c5b133243dd" "us-gov-west-1" = "vpc-08b7b4db6a5ddf9c1" } + dev = local.route53_info["prod"] prod = { "account_id" = "057405694017" "alias" = "ent-ew-network-prod" @@ -53,6 +54,7 @@ locals { "profile" = "269222635945-lab-gov-shared-nonprod" "region" = "us-gov-east-1" } + dev = local.enterprise_ecr_account["prod"] prod = { "account_id" = "067074201825" "alias" = "ent-gov-shared-prod" diff --git a/templates/default-versions.hcl b/templates/default-versions.hcl.tf.tpl similarity index 100% rename from templates/default-versions.hcl rename to templates/default-versions.hcl.tf.tpl