From 3f4f8e8891c249525db5d6761210f5de5e3f330f Mon Sep 17 00:00:00 2001
From: arnol377 <david.j.arnold.jr@census.gov>
Date: Thu, 17 Oct 2024 14:47:16 -0400
Subject: [PATCH] updating

---
 default.auto.tfvars              | 23 +++++++++++++++++++++++
 main.tf                          |  6 +++---
 varfiles/automation-repos.tfvars | 24 ------------------------
 varfiles/edtsb.tfvars            |  3 +++
 4 files changed, 29 insertions(+), 27 deletions(-)
 create mode 100644 default.auto.tfvars
 create mode 100644 varfiles/edtsb.tfvars

diff --git a/default.auto.tfvars b/default.auto.tfvars
new file mode 100644
index 0000000..a8fe886
--- /dev/null
+++ b/default.auto.tfvars
@@ -0,0 +1,23 @@
+# The name of the ECS cluster
+image_name          = "github-runner"
+image_version       = "1.61.0"
+server_url          = "https://github.e.it.census.gov"
+create_vpc_endpoint = true
+create_ecs_cluster  = true
+
+ecs_cluster_name = "ecs-ghe-runners"
+vpc_id           = "vpc-00576a396ec570b94"
+
+subnets = [
+  "subnet-04b80d7ce5199f82b"
+]
+
+security_groups = [
+  # "sg-0d828d223df9834a6"
+  "sg-0641c697588b9aa6b"
+]
+
+certs = {
+  bucket = "image-pipeline-assets"
+  key    = "katello-server-ca.pem"
+}
diff --git a/main.tf b/main.tf
index 13b8f47..2eb6a76 100644
--- a/main.tf
+++ b/main.tf
@@ -95,11 +95,11 @@ module "github-runner" {
   # for_each     = toset([for repo in local.all_repos : repo])
   source      = "HappyPathway/github-runner/ecs"
   ecs_cluster = local.ecs_cluster
-  hostname    = "CSVD"
+  hostname    = var.repo_org
   image       = "229685449397.dkr.ecr.us-gov-west-1.amazonaws.com/github-runners/${var.image_name}:${var.image_version}"
   repo_org    = var.repo_org
   # repo_name    = each.value
-  namespace = "csvd-${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}"
+  namespace = "${lower(var.repo_org)}-${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}"
   log_group = aws_cloudwatch_log_group.function_log_group.name
   runner_group = {
     create                     = true
@@ -114,7 +114,7 @@ module "github-runner" {
 
   server_url = var.server_url
   runner_labels = [
-    "csvd",
+    var.repo_org,
     "${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}",
     data.aws_caller_identity.current.account_id,
     data.aws_region.current.name,
diff --git a/varfiles/automation-repos.tfvars b/varfiles/automation-repos.tfvars
index fbed4f4..5de4d25 100644
--- a/varfiles/automation-repos.tfvars
+++ b/varfiles/automation-repos.tfvars
@@ -1,26 +1,2 @@
-# The name of the ECS cluster
-image_name          = "github-runner"
-image_version       = "1.61.0"
-server_url          = "https://github.e.it.census.gov"
-create_vpc_endpoint = true
-create_ecs_cluster  = true
-
-ecs_cluster_name = "ecs-ghe-runners"
-vpc_id           = "vpc-00576a396ec570b94"
-
 namespace = "csvd-ghe-runner"
 repo_org  = "CSVD"
-
-subnets = [
-  "subnet-04b80d7ce5199f82b"
-]
-
-security_groups = [
-  # "sg-0d828d223df9834a6"
-  "sg-0641c697588b9aa6b"
-]
-
-certs = {
-  bucket = "image-pipeline-assets"
-  key    = "katello-server-ca.pem"
-}
diff --git a/varfiles/edtsb.tfvars b/varfiles/edtsb.tfvars
new file mode 100644
index 0000000..598c67a
--- /dev/null
+++ b/varfiles/edtsb.tfvars
@@ -0,0 +1,3 @@
+# The name of the ECS cluster
+namespace = "edtsb-ghe-runner"
+repo_org  = "EDTSB"