Skip to content

Commit f0b191e

Browse files
committed
Fix: validate script to include needed provider + syntax
1 parent 8192b3e commit f0b191e

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

hack/validate-terraform.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ environment=$1
77
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
88

99
terraform_dir="$(mktemp -d)"
10+
echo $terraform_dir
11+
1012
manifests_dir="${SCRIPT_DIR}/../manifests"
1113

1214
conf_dir="$terraform_dir/conf"
@@ -17,12 +19,18 @@ cp $manifests_dir/.workshop/terraform/base.tf $conf_dir/base.tf
1719

1820
find $manifests_dir/modules -type d -name "terraform" -print0 | while read -d $'\0' file
1921
do
20-
target=$(echo $file | md5sum | cut -f1 -d" ")
22+
md5=$(echo ${file#"$manifests_dir/modules/"} | md5sum | cut -f1 -d" " | cut -d'/' -f1 | rev) # In case of non-unique
23+
first_path=$(echo ${file#"$manifests_dir/modules/"} | cut -d'/' -f1,2 | tr '/' '_')
24+
target="${first_path}-$md5"
2125
cp -R $file $conf_dir/$target
2226

2327
cat << EOF > $conf_dir/$target.tf
2428
module "gen-$target" {
2529
source = "./$target"
30+
providers = {
31+
helm.auto_mode = helm.auto_mode
32+
kubernetes.auto_mode = kubernetes.auto_mode
33+
}
2634
2735
eks_cluster_id = local.eks_cluster_id
2836
eks_cluster_version = local.eks_cluster_version

manifests/modules/fastpaths/operators/eks-pod-identity/.workshop/terraform/preprovision/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ resource "kubernetes_manifest" "ui_ns" {
1818
manifest = {
1919
"apiVersion" = "v1"
2020
"kind" = "Namespace"
21-
"metadata" = {
22-
"name" = "ui"
23-
"labels" = {
21+
"metadata" = {
22+
"name" = "ui"
23+
"labels" = {
2424
"app.kubernetes.io/created-by" = "eks-workshop"
2525
}
2626
}

0 commit comments

Comments
 (0)