Skip to content

Commit d82d9b6

Browse files
committed
feat: Create different hooks for Terraform and OpenTofu format
1 parent db656fc commit d82d9b6

File tree

4 files changed

+27
-4
lines changed

4 files changed

+27
-4
lines changed

modules/hooks.nix

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2479,6 +2479,14 @@ in
24792479
entry = "${hooks.opam-lint.package}/bin/opam lint";
24802480
files = "\\.opam$";
24812481
};
2482+
opentofu-format =
2483+
{
2484+
name = "opentofu-format";
2485+
description = "Format OpenTofu (`.tf`) files.";
2486+
package = tools.opentofu-fmt;
2487+
entry = "${hooks.opentofu-format.package}/bin/opentofu-fmt";
2488+
files = "\\.tf$";
2489+
};
24822490
ormolu =
24832491
{
24842492
name = "ormolu";
@@ -2848,7 +2856,7 @@ in
28482856
terraform-format =
28492857
{
28502858
name = "terraform-format";
2851-
description = "Format terraform (`.tf`) files.";
2859+
description = "Format Terraform (`.tf`) files.";
28522860
package = tools.terraform-fmt;
28532861
entry = "${hooks.terraform-format.package}/bin/terraform-fmt";
28542862
files = "\\.tf$";

nix/opentofu-fmt/default.nix

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{ writeScriptBin, opentofu }:
2+
3+
writeScriptBin "opentofu-fmt" ''
4+
#!/usr/bin/env bash
5+
for arg in "$@"; do
6+
dirname "$arg"
7+
done \
8+
| sort \
9+
| uniq \
10+
| while read dir; do
11+
${opentofu}/bin/tofu fmt "$dir"
12+
done
13+
''

nix/terraform-fmt/default.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
{ writeScriptBin, opentofu }:
1+
{ writeScriptBin, terraform }:
22

3-
writeScriptBin "terraform-fmt" ''#!/usr/bin/env bash
3+
writeScriptBin "terraform-fmt" ''
4+
#!/usr/bin/env bash
45
for arg in "$@"; do
56
dirname "$arg"
67
done \
78
| sort \
89
| uniq \
910
| while read dir; do
10-
${opentofu}/bin/tofu fmt "$dir"
11+
${terraform}/bin/terraform fmt "$dir"
1112
done
1213
''

nix/tools.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ in
176176
hunspell = callPackage ./hunspell { };
177177
purty = callPackage ./purty { purty = nodePackages.purty; };
178178
terraform-fmt = callPackage ./terraform-fmt { };
179+
opentofu-fmt = callPackage ./opentofu-fmt { };
179180
tflint = callPackage ./tflint { };
180181
dune-build-opam-files = callPackage ./dune-build-opam-files { dune = dune_3; inherit (pkgsBuildBuild) ocaml; };
181182
dune-fmt = callPackage ./dune-fmt { dune = dune_3; inherit (pkgsBuildBuild) ocaml; };

0 commit comments

Comments
 (0)