From 0356b682600a9777f444a20198bc747bb9538e12 Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Tue, 15 Apr 2025 21:41:22 -0400
Subject: [PATCH] back to functional

---
 .github/platform-tg-infra.code-workspace             | 12 ++++--------
 lab/_envcommon/default-versions.hcl                  |  2 +-
 .../csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl | 11 -----------
 .../eks-keycloak/terragrunt.hcl                      |  9 +++++----
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/.github/platform-tg-infra.code-workspace b/.github/platform-tg-infra.code-workspace
index a4c0bf1..cefac38 100644
--- a/.github/platform-tg-infra.code-workspace
+++ b/.github/platform-tg-infra.code-workspace
@@ -24,6 +24,10 @@
 			"name": "tfmod-eks-dns",
 			"path": "../../tfmod-eks-dns"
 		},
+		{
+			"name": "tfmod-ersi-arcgis",
+			"path": "../../tfmod-ersi-arcgis"
+		},
 		{
 			"name": "tfmod-gogatekeeper",
 			"path": "../../tfmod-gogatekeeper"
@@ -79,14 +83,6 @@
 		{
 			"name": "tfmod-tempo",
 			"path": "../../tfmod-tempo"
-		},
-		{
-			"name": "terraform-aws-eks",
-			"path": "../../terraform-aws-eks"
-		},
-		{
-			"name": "terragrunt",
-			"path": "../../terragrunt"
 		}
 	]
 }
diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index c098315..1116c31 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -129,7 +129,7 @@ locals {
   # Metrics Server
   ################
   metrics_server_helm_chart = "3.12.2"
-  metrics_server_tag        = "0.7.2"
+  metrics_server_tag        = "v0.7.2"
 
   ################
   # PostgreSQL
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl
index 811bc8b..5d458d0 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-grafana/terragrunt.hcl
@@ -51,17 +51,6 @@ dependency "eks_prometheus" {
   }
 }
 
-dependency "eks_prometheus" {
-  config_path                             = "../eks-prometheus"
-  mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
-  mock_outputs = {
-    rwo_storage_class = "gp3-mocked"
-    prometheus_server_internal_endpoint = {
-      url = "mock.prometheus.enpoint.example.com"
-    }
-  }
-}
-
 dependency "eks_tempo" {
   config_path                             = "../eks-tempo"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
diff --git a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl
index 3b6ccdd..cf52252 100644
--- a/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/csvd-platform-lab-mcm/eks-keycloak/terragrunt.hcl
@@ -50,10 +50,11 @@ inputs = {
   cluster_domain = dependency.eks_dns.outputs.cluster_domain
   cluster_name   = dependency.eks.outputs.cluster_name
 
-  namespace      = include.root.inputs.namespaces["keycloak"]
-  account_id     = include.root.inputs.account_id
-  profile        = include.root.inputs.aws_profile
-  region         = include.root.inputs.aws_region
+  namespace = include.root.inputs.namespaces["keycloak"]
+  # AWS Configuration
+  account_id = include.root.inputs.aws_account_id
+  profile    = include.root.inputs.aws_profile
+  region     = include.root.inputs.aws_region
 
   # keycloak config
   default_storage_class  = dependency.eks_config.outputs.rwo_storage_class