From 981173777b30972d47ee7b1a22d8bea62e72526f Mon Sep 17 00:00:00 2001
From: dantefromhell <90508808+dantefromhell@users.noreply.github.com>
Date: Tue, 28 Nov 2023 15:05:26 +0000
Subject: [PATCH] fix: Improve readability of terraform errors

When terraform errors output the affected line-of-code the output is highly unreadable as `config.tf.json' is a one-line JSON file.

Since there seems to be no nix expression for pretty printing JSON, this PR uses `jq` on the command line instead.

The result is that terraform syntax errors output the single affected line-of-code.
---
 src/std/fwlib/blockTypes/terra.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/std/fwlib/blockTypes/terra.nix b/src/std/fwlib/blockTypes/terra.nix
index 60ef17e0..707f5db9 100644
--- a/src/std/fwlib/blockTypes/terra.nix
+++ b/src/std/fwlib/blockTypes/terra.nix
@@ -74,7 +74,7 @@ in
         MESSAGE
 
         if [[ -e "$dir/config.tf.json" ]]; then rm -f "$dir/config.tf.json"; fi
-        cp ${terraformConfiguration} "$dir/config.tf.json"
+        jq '.' ${terraformConfiguration} > "$dir/config.tf.json"
       '';
 
       wrap = cmd: ''
@@ -87,11 +87,11 @@ in
            terraform ${cmd} "$@";
       '';
     in [
-      (mkCommand currentSystem "init" "tf init" [pkgs.terraform pkgs.terraform-backend-git] (wrap "init") {})
-      (mkCommand currentSystem "plan" "tf plan" [pkgs.terraform pkgs.terraform-backend-git] (wrap "plan") {})
-      (mkCommand currentSystem "apply" "tf apply" [pkgs.terraform pkgs.terraform-backend-git] (wrap "apply") {})
-      (mkCommand currentSystem "state" "tf state" [pkgs.terraform pkgs.terraform-backend-git] (wrap "state") {})
-      (mkCommand currentSystem "refresh" "tf refresh" [pkgs.terraform pkgs.terraform-backend-git] (wrap "refresh") {})
-      (mkCommand currentSystem "destroy" "tf destroy" [pkgs.terraform pkgs.terraform-backend-git] (wrap "destroy") {})
+      (mkCommand currentSystem "init" "tf init" [pkgs.jq pkgs.terraform pkgs.terraform-backend-git] (wrap "init") {})
+      (mkCommand currentSystem "plan" "tf plan" [pkgs.jq pkgs.terraform pkgs.terraform-backend-git] (wrap "plan") {})
+      (mkCommand currentSystem "apply" "tf apply" [pkgs.jq pkgs.terraform pkgs.terraform-backend-git] (wrap "apply") {})
+      (mkCommand currentSystem "state" "tf state" [pkgs.jq pkgs.terraform pkgs.terraform-backend-git] (wrap "state") {})
+      (mkCommand currentSystem "refresh" "tf refresh" [pkgs.jq pkgs.terraform pkgs.terraform-backend-git] (wrap "refresh") {})
+      (mkCommand currentSystem "destroy" "tf destroy" [pkgs.jq pkgs.terraform pkgs.terraform-backend-git] (wrap "destroy") {})
     ];
   }