From d3446522bb56954a120a973ed355a4c302d1132e Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 3 Feb 2025 21:21:03 -0500 Subject: [PATCH] no mocks on the provider gens, otherwise okay --- .../eks-cert-manager/terragrunt.hcl | 30 +++++++++--------- .../eks-config/terragrunt.hcl | 3 -- .../eks-dns/terragrunt.hcl | 31 ++++++++++--------- .../eks-istio/terragrunt.hcl | 30 +++++++++--------- .../eks-karpenter/terragrunt.hcl | 31 ++++++++++--------- 5 files changed, 62 insertions(+), 63 deletions(-) diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl index e2ff68f..0c899ed 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-cert-manager/terragrunt.hcl @@ -8,7 +8,7 @@ terraform { dependency "eks" { config_path = "../eks" - # mock_outputs_allowed_terraform_commands = ["plan", "validate"] + mock_outputs_allowed_terraform_commands = ["plan", "validate"] mock_outputs = { cluster_name = "a-cluster-name" oidc_provider_arn = "arn:aws-us-gov:iam::111111111111:oidc-provider/oidc.eks.us-gov-east-1.amazonaws.com/id/0000000000000000AAAAAAAAAAAAAAAA" @@ -19,22 +19,22 @@ dependencies { paths = ["../eks-config"] } -# locals { -# helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) -# kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) -# } +locals { + helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) + kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) +} -# generate "helm" { -# path = local.helm.generate.helm_provider.path -# if_exists = local.helm.generate.helm_provider.if_exists -# contents = local.helm.generate.helm_provider.contents -# } +generate "helm" { + path = local.helm.generate.helm_provider.path + if_exists = local.helm.generate.helm_provider.if_exists + contents = local.helm.generate.helm_provider.contents +} -# generate "kube" { -# path = local.kube.generate.kube_provider.path -# if_exists = local.kube.generate.kube_provider.if_exists -# contents = local.kube.generate.kube_provider.contents -# } +generate "kube" { + path = local.kube.generate.kube_provider.path + if_exists = local.kube.generate.kube_provider.if_exists + contents = local.kube.generate.kube_provider.contents +} inputs = { cert_manager_cainjector_tag = dependency.eks.inputs.cert_manager_cainjector_tag diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl index d0dceb9..fc6cead 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-config/terragrunt.hcl @@ -27,9 +27,6 @@ dependency "eks" { locals { helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) - # Debug output - helm_debug = local.helm - kube_debug = local.kube } generate "helm" { diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl index 38d5cb3..21be985 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-dns/terragrunt.hcl @@ -9,8 +9,9 @@ terraform { dependency "eks" { config_path = "../eks" + mock_outputs_allowed_terraform_commands = ["plan", "validate"] mock_outputs = { - subnets = ["subnet-abcdefgh", "subnet-12345678", "subnet-ab12cd34"] + subnets = ["subnet-00000000000000001", "subnet-00000000000000002", "subnet-00000000000000003"] } } @@ -24,22 +25,22 @@ dependency "istio" { } } -# locals { -# helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) -# kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) -# } +locals { + helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) + kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) +} -# generate "helm" { -# path = local.helm.generate.helm_provider.path -# if_exists = local.helm.generate.helm_provider.if_exists -# contents = local.helm.generate.helm_provider.contents -# } +generate "helm" { + path = local.helm.generate.helm_provider.path + if_exists = local.helm.generate.helm_provider.if_exists + contents = local.helm.generate.helm_provider.contents +} -# generate "kube" { -# path = local.kube.generate.kube_provider.path -# if_exists = local.kube.generate.kube_provider.if_exists -# contents = local.kube.generate.kube_provider.contents -# } +generate "kube" { + path = local.kube.generate.kube_provider.path + if_exists = local.kube.generate.kube_provider.if_exists + contents = local.kube.generate.kube_provider.contents +} inputs = { cluster_name = dependency.eks.inputs.cluster_name diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl index a92da4a..6d4b5a0 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-istio/terragrunt.hcl @@ -8,7 +8,7 @@ terraform { dependency "eks" { config_path = "${get_original_terragrunt_dir()}/../eks" - # mock_outputs_allowed_terraform_commands = ["plan", "validate"] + mock_outputs_allowed_terraform_commands = ["plan", "validate"] mock_outputs = { cluster_name = "a-cluster-name" } @@ -18,22 +18,22 @@ dependencies { paths = ["../eks-karpenter"] } -# locals { -# helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) -# kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) -# } +locals { + helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) + kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) +} -# generate "helm" { -# path = local.helm.generate.helm_provider.path -# if_exists = local.helm.generate.helm_provider.if_exists -# contents = local.helm.generate.helm_provider.contents -# } +generate "helm" { + path = local.helm.generate.helm_provider.path + if_exists = local.helm.generate.helm_provider.if_exists + contents = local.helm.generate.helm_provider.contents +} -# generate "kube" { -# path = local.kube.generate.kube_provider.path -# if_exists = local.kube.generate.kube_provider.if_exists -# contents = local.kube.generate.kube_provider.contents -# } +generate "kube" { + path = local.kube.generate.kube_provider.path + if_exists = local.kube.generate.kube_provider.if_exists + contents = local.kube.generate.kube_provider.contents +} inputs = { cluster_name = dependency.eks.outputs.cluster_name diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl index 4e5069c..2627422 100644 --- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl +++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-mcm/eks-karpenter/terragrunt.hcl @@ -9,7 +9,7 @@ terraform { dependency "eks" { config_path = "../eks" - # mock_outputs_allowed_terraform_commands = ["plan", "validate"] + mock_outputs_allowed_terraform_commands = ["plan", "validate"] mock_outputs = { cluster_endpoint = "https://0000000000000000AAAAAAAAAAAAAAAA.sk1.us-gov-east-1.eks.amazonaws.com" cluster_name = "a-cluster-name" @@ -22,22 +22,23 @@ dependency "eks" { dependencies { paths = ["../eks-config"] } -# locals { -# helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) -# kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) -# } -# generate "helm" { -# path = local.helm.generate.helm_provider.path -# if_exists = local.helm.generate.helm_provider.if_exists -# contents = local.helm.generate.helm_provider.contents -# } +locals { + helm = read_terragrunt_config(find_in_parent_folders("./_envcommon/helm-provider.hcl")) + kube = read_terragrunt_config(find_in_parent_folders("./_envcommon/kube-provider.hcl")) +} + +generate "helm" { + path = local.helm.generate.helm_provider.path + if_exists = local.helm.generate.helm_provider.if_exists + contents = local.helm.generate.helm_provider.contents +} -# generate "kube" { -# path = local.kube.generate.kube_provider.path -# if_exists = local.kube.generate.kube_provider.if_exists -# contents = local.kube.generate.kube_provider.contents -# } +generate "kube" { + path = local.kube.generate.kube_provider.path + if_exists = local.kube.generate.kube_provider.if_exists + contents = local.kube.generate.kube_provider.contents +} inputs = { cluster_endpoint = dependency.eks.outputs.cluster_endpoint