feat: Change terraform-format to support both Terraform and OpenTof…

…u packages (#419)
cachix · Jan 21, 2025 · 9364dc0 · 9364dc0
1 parent 15a87ce
commit 9364dc0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/modules/hooks.nix b/modules/hooks.nix
@@ -3688,9 +3688,9 @@ lib.escapeShellArgs (lib.concatMap (ext: [ "--ghc-opt" "-X${ext}" ]) hooks.ormol
       terraform-format =
         {
           name = "terraform-format";
-          description = "Format terraform (`.tf`) files.";
-          package = tools.terraform-fmt;
-          entry = "${hooks.terraform-format.package}/bin/terraform-fmt";
+          description = "Format Terraform (`.tf`) files.";
+          package = tools.opentofu;
+          entry = "${lib.getExe hooks.terraform-format.package} fmt -check -diff";
           files = "\\.tf$";
         };
       terraform-validate =

diff --git a/nix/terraform-fmt/default.nix b/nix/terraform-fmt/default.nix
diff --git a/nix/tools.nix b/nix/tools.nix
@@ -51,6 +51,7 @@
 , nodePackages
 , ocamlPackages
 , opam
+, opentofu
 , ormolu
 , pkgsBuildBuild
 , poetry
@@ -137,6 +138,7 @@ in
     mdsh
     nil
     nixpkgs-fmt
+    opentofu
     ormolu
     pre-commit-hook-ensure-sops
     poetry
@@ -185,7 +187,6 @@ in
   hpack-dir = callPackage ./hpack-dir { };
   hunspell = callPackage ./hunspell { };
   purty = callPackage ./purty { purty = nodePackages.purty; };
-  terraform-fmt = callPackage ./terraform-fmt { };
   terraform-validate = callPackage ./terraform-validate { };
   tflint = callPackage ./tflint { };
   dune-build-opam-files = callPackage ./dune-build-opam-files { dune = dune_3; inherit (pkgsBuildBuild) ocaml; };