From 4a298bde8121f110243038bbdfd2a53f6f6461a2 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Fri, 17 Oct 2025 07:47:29 +1100
Subject: [PATCH] chore: upgrade terragrunt/tofu

- fix makefile to work with opentofu and terragrunt 0.90.0
- cleanup comments
- rename template/base/terragrunt.hcl
---
 Makefile                                               | 10 +++++-----
 config/globals/profiles.yaml                           |  1 -
 templates/base/{terragrunt.hcl => terragrunt.hcl.tmpl} |  0
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename templates/base/{terragrunt.hcl => terragrunt.hcl.tmpl} (100%)

diff --git a/Makefile b/Makefile
index 30df1d7..e42187b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ define vault_env
 	export PUPPET_CERT_CA=$$(vault kv get -field=public_key kv/service/puppet/certificates/ca) && \
 	export PUPPET_CERT_PUB=$$(vault kv get -field=public_key kv/service/puppet/certificates/terraform) && \
 	export PUPPET_CERT_PRIV=$$(vault kv get -field=private_key kv/service/puppet/certificates/terraform) && \
-	export TERRAGRUNT_EXCLUDE_DIR="templates/base" \
+	export TG_QUEUE_EXCLUDE_DIR="templates/base" && \
 	export $$(vault read -format=json kv/data/service/terraform/incus | jq -r '.data.data | to_entries[] | "\(.key)=\(.value)"')
 endef
 
@@ -23,20 +23,20 @@ clean:
 
 init:
 	@$(call vault_env) && \
-	terragrunt run-all --terragrunt-non-interactive init --upgrade
+	terragrunt run --all --non-interactive init -- -upgrade
 
 plan: init
 	@$(call vault_env) && \
-	terragrunt run-all --terragrunt-parallelism 8 --terragrunt-non-interactive plan
+	terragrunt run --all --parallelism 8 --non-interactive plan
 
 apply:
 	@$(call vault_env) && \
-	terragrunt run-all --terragrunt-parallelism 5 --terragrunt-non-interactive apply
+	terragrunt run --all --parallelism 5 --non-interactive apply
 
 output:
 	@$(call vault_env) && \
 	rm -f tf_outputs.json && \
-	terragrunt run-all --terragrunt-parallelism 10 --terragrunt-non-interactive output -json >> tf_outputs.json
+	terragrunt run --all --parallelism 10 --non-interactive output -json >> tf_outputs.json
 
 hiera:
 	@echo "Setting up virtual environment with uv..."
diff --git a/config/globals/profiles.yaml b/config/globals/profiles.yaml
index 698a016..1ae6cec 100644
--- a/config/globals/profiles.yaml
+++ b/config/globals/profiles.yaml
@@ -1,4 +1,3 @@
-# special devices
 gpu:
   description: "Pass-through Intel GPU"
   project: null
diff --git a/templates/base/terragrunt.hcl b/templates/base/terragrunt.hcl.tmpl
similarity index 100%
rename from templates/base/terragrunt.hcl
rename to templates/base/terragrunt.hcl.tmpl