Skip to content

Commit 9364dc0

Browse files
authored
feat: Change terraform-format to support both Terraform and OpenTofu packages (#419)
1 parent 15a87ce commit 9364dc0

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

modules/hooks.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3688,9 +3688,9 @@ lib.escapeShellArgs (lib.concatMap (ext: [ "--ghc-opt" "-X${ext}" ]) hooks.ormol
36883688
terraform-format =
36893689
{
36903690
name = "terraform-format";
3691-
description = "Format terraform (`.tf`) files.";
3692-
package = tools.terraform-fmt;
3693-
entry = "${hooks.terraform-format.package}/bin/terraform-fmt";
3691+
description = "Format Terraform (`.tf`) files.";
3692+
package = tools.opentofu;
3693+
entry = "${lib.getExe hooks.terraform-format.package} fmt -check -diff";
36943694
files = "\\.tf$";
36953695
};
36963696
terraform-validate =

nix/terraform-fmt/default.nix

Lines changed: 0 additions & 12 deletions
This file was deleted.

nix/tools.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
, nodePackages
5252
, ocamlPackages
5353
, opam
54+
, opentofu
5455
, ormolu
5556
, pkgsBuildBuild
5657
, poetry
@@ -137,6 +138,7 @@ in
137138
mdsh
138139
nil
139140
nixpkgs-fmt
141+
opentofu
140142
ormolu
141143
pre-commit-hook-ensure-sops
142144
poetry
@@ -185,7 +187,6 @@ in
185187
hpack-dir = callPackage ./hpack-dir { };
186188
hunspell = callPackage ./hunspell { };
187189
purty = callPackage ./purty { purty = nodePackages.purty; };
188-
terraform-fmt = callPackage ./terraform-fmt { };
189190
terraform-validate = callPackage ./terraform-validate { };
190191
tflint = callPackage ./tflint { };
191192
dune-build-opam-files = callPackage ./dune-build-opam-files { dune = dune_3; inherit (pkgsBuildBuild) ocaml; };

0 commit comments

Comments
 (0)