From 4162c520a86de01958b49e2773ff89175faedb5e Mon Sep 17 00:00:00 2001
From: "Matthew C. Morgan" <matthew.c.morgan@census.gov>
Date: Sat, 20 Jul 2024 00:22:54 -0400
Subject: [PATCH] wip

---
 .../eks-cert-manager/terragrunt.hcl           |  1 +
 .../vpc/_mcmCluster/eks-config/terragrunt.hcl |  2 +-
 .../vpc/_mcmCluster/eks-istio/terragrunt.hcl  | 30 ----------------
 .../vpc/_mcmCluster/eks-loki/terragrunt.hcl   | 30 ----------------
 .../vpc/_mcmCluster/eks/terragrunt.hcl        | 36 +++++++++++++++++--
 .../vpc/_mcmCluster/terragrunt.hcl            |  3 +-
 6 files changed, 37 insertions(+), 65 deletions(-)

diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl
index c7ad6f4..49e4006 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-cert-manager/terragrunt.hcl
@@ -5,6 +5,7 @@ include "root" {
 
 terraform {
   source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-cert-mgr.git"
+  depends_on = [dependency.eks.outputs.oidc_provider_arn]
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
index 9ac8592..1767061 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-config/terragrunt.hcl
@@ -1,6 +1,5 @@
 include "root" {
   path = find_in_parent_folders()
-  expose = true
 }
 
 locals {
@@ -40,6 +39,7 @@ inputs = {
   region                                          = local.region
 }
 
+
 generate "provider-eks" {
   path      = "provider.tf"
   if_exists = "overwrite_terragrunt"
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
index 64862bb..8b80764 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-istio/terragrunt.hcl
@@ -26,33 +26,3 @@ inputs = {
   istio_chart_version = "1.22.1"
   istio_version       = "1.22.1"
 }
-
-generate "provider-eks" {
-  path      = "provider.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-data "aws_eks_cluster" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-data "aws_eks_cluster_auth" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-provider "kubernetes" {
-  host = data.aws_eks_cluster.cluster.endpoint
-
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-  token                  = data.aws_eks_cluster_auth.cluster.token
-}
-
-provider "helm" {
-  kubernetes {
-    host = data.aws_eks_cluster.cluster.endpoint
-
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-    token                  = data.aws_eks_cluster_auth.cluster.token
-  }
-}
-EOF
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
index 9911815..4cd3a71 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks-loki/terragrunt.hcl
@@ -29,33 +29,3 @@ inputs = {
   oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
   region            = dependency.eks.inputs.region
 }
-
-generate "provider-eks" {
-  path      = "provider.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<EOF
-data "aws_eks_cluster" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-data "aws_eks_cluster_auth" "cluster" {
-  name = "${dependency.eks.inputs.cluster_name}"
-}
-
-provider "kubernetes" {
-  host = data.aws_eks_cluster.cluster.endpoint
-
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-  token                  = data.aws_eks_cluster_auth.cluster.token
-}
-
-provider "helm" {
-  kubernetes {
-    host = data.aws_eks_cluster.cluster.endpoint
-
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
-    token                  = data.aws_eks_cluster_auth.cluster.token
-  }
-}
-EOF
-}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl
index 7bc77b4..93a0eea 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/eks/terragrunt.hcl
@@ -52,7 +52,7 @@ locals {
 }
 
 terraform {
-  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git"
+  source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-eks.git?ref=mcmCluster"
   extra_arguments "retry_lock" {
     commands  = get_terraform_commands_that_need_locking()
     arguments = ["-lock-timeout=20m"]
@@ -66,7 +66,7 @@ inputs = {
   cluster_version        = local.cluster_version
   eks_instance_disk_size = local.eks_instance_disk_size
   eks_vpc_name           = local.eks_vpc_name
-  #eks_instance_types     = local.eks_instance_types
+  # eks_instance_types     = local.eks_instance_types
   eks_ng_desired_size                      = local.eks_ng_desired_size
   eks_ng_max_size                          = local.eks_ng_max_size
   eks_ng_min_size                          = local.eks_ng_min_size
@@ -79,3 +79,35 @@ inputs = {
   region                                   = local.region
   creator                                  = local.cluster_mailing_list
 }
+
+generate "provider-eks" {
+  path      = "provider.tf"
+  if_exists = "overwrite_terragrunt"
+  contents  = <<EOF
+data "aws_eks_cluster" "cluster" {
+  depends_on = [module.cluster.oidc_provider]
+  name = "${local.cluster_name}"
+}
+
+data "aws_eks_cluster_auth" "cluster" {
+  depends_on = [module.cluster.oidc_provider]
+  name = "${local.cluster_name}"
+}
+
+provider "kubernetes" {
+  host = data.aws_eks_cluster.cluster.endpoint
+
+  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
+  token                  = data.aws_eks_cluster_auth.cluster.token
+}
+
+provider "helm" {
+  kubernetes {
+    host = data.aws_eks_cluster.cluster.endpoint
+
+    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
+    token                  = data.aws_eks_cluster_auth.cluster.token
+  }
+}
+EOF
+}
diff --git a/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl b/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl
index d0811e3..0b454f5 100644
--- a/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl
+++ b/lab/us-gov-east-1/vpc/_mcmCluster/terragrunt.hcl
@@ -59,7 +59,7 @@ remote_state {
   }
   config = {
     bucket         = "tg-infrastructure-tf-state-lab-dev-ew-us-gov-east-1"
-    key            = "${local.project_number}/${local.project_name}/${local.project_role}/terraform.tfstate"
+    key            = "${local.project_number}/${local.project_name}/${local.project_role}/${path_relative_to_include()}/terraform.tfstate"
     region         = local.region_vars.locals.aws_region
     encrypt        = true
     dynamodb_table = "tf_remote_state"
@@ -70,4 +70,3 @@ inputs = merge(
   local.account_vars.locals,
   local.region_vars.locals,
 )
-