wip

divnix · Jul 30, 2024 · 2b38372 · 2b38372
1 parent 63de519
commit 2b38372
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/src/std/fwlib/blockTypes/terra.nix b/src/std/fwlib/blockTypes/terra.nix
@@ -79,28 +79,21 @@ in
 
       wrap = cmd:
         setup
-        + (
-          (pkgs.lib.optionalString (cmd == "plan")) (
-            postDiffToGitHubSnippet cmd ''
-              terraform-backend-git git \
-                 --dir "$dir" \
-                 --repository ${git.repo} \
-                 --ref ${git.ref} \
-                 --state ${git.state} \
-                 terraform plan \
-                   -lock=false \
-                   -no-color
-            ''
-          )
-        )
         + ''
           terraform-backend-git git \
              --dir "$dir" \
              --repository ${git.repo} \
              --ref ${git.ref} \
              --state ${git.state} \
-             terraform ${cmd} "$@";
-        '';
+             terraform ${cmd} ${pkgs.lib.optionalString (cmd == "plan") "-out=$dir/plan"} "$@";
+        ''
+        + (
+          (pkgs.lib.optionalString (cmd == "plan")) (
+            postDiffToGitHubSnippet cmd ''
+              terraform show --no-color $dir/plan
+            ''
+          )
+        );
     in [
       (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") {})