From d5c00a2712f6a17c689eecaf4efc8b722b7c0e28 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 3 Feb 2025 16:27:43 -0500 Subject: [PATCH] use dependency blocks again --- lab/_envcommon/helm-provider.hcl | 9 +++++---- lab/_envcommon/kube-provider.hcl | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lab/_envcommon/helm-provider.hcl b/lab/_envcommon/helm-provider.hcl index 90e27cf..72a7a33 100644 --- a/lab/_envcommon/helm-provider.hcl +++ b/lab/_envcommon/helm-provider.hcl @@ -1,5 +1,8 @@ -dependencies { - paths = ["${get_original_terragrunt_dir()}/../eks"] +dependency "eks" { + config_path = "${get_original_terragrunt_dir()}/../eks" + mock_outputs = { + cluster_name = "a-cluster-name" + } } inputs = { @@ -11,7 +14,6 @@ generate "helm_provider" { path = "helm-provider.tf" if_exists = "overwrite_terragrunt" contents = <<-EOF -%{if "${dependency.eks.outputs.cluster_name}" != "a-cluster-name" ~} data "aws_eks_cluster" "helm" { name = "${dependency.eks.outputs.cluster_name}" } @@ -25,6 +27,5 @@ generate "helm_provider" { token = data.aws_eks_cluster_auth.helm.token } } -%{ endif ~} EOF } diff --git a/lab/_envcommon/kube-provider.hcl b/lab/_envcommon/kube-provider.hcl index c4ed4cd..3733680 100644 --- a/lab/_envcommon/kube-provider.hcl +++ b/lab/_envcommon/kube-provider.hcl @@ -1,5 +1,8 @@ -dependencies { - paths = ["${get_original_terragrunt_dir()}/../eks"] +dependency "eks" { + config_path = "${get_original_terragrunt_dir()}/../eks" + mock_outputs = { + cluster_name = "a-cluster-name" + } } inputs = { @@ -11,7 +14,6 @@ generate "kube_provider" { path = "kube-provider.tf" if_exists = "overwrite_terragrunt" contents = <<-EOF -%{if "${dependency.eks.outputs.cluster_name}" != "a-cluster-name" ~} data "aws_eks_cluster" "kube" { name = "${dependency.eks.outputs.cluster_name}" } @@ -23,6 +25,5 @@ generate "kube_provider" { cluster_ca_certificate = base64decode(data.aws_eks_cluster.kube.certificate_authority[0].data) token = data.aws_eks_cluster_auth.kube.token } -%{ endif ~} EOF }