IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Include .tofu in tofu fmt (#1790)

Browse Source 
Signed-off-by: Christian Mesh <christianmesh1@gmail.com>
This commit is contained in:
Christian Mesh 2024-07-10 09:06:08 -04:00 committed by GitHub
parent 5f8497b86b
commit dcaa01e1ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/command/fmt.go
View File

@ -31,8 +31,10 @@ const (
var ( var (
fmtSupportedExts = []string{ fmtSupportedExts = []string{
".tf", ".tf",
".tofu",
".tfvars", ".tfvars",
".tftest.hcl", ".tftest.hcl",
".tofutest.hcl",
} }
) )

32
internal/command/fmt_test.go
View File

@ -10,6 +10,7 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"sort"
"strings" "strings"
"testing" "testing"
@ -297,11 +298,18 @@ func TestFmt_workingDirectory(t *testing.T) {
t.Fatalf("wrong exit code. errors: \n%s", ui.ErrorWriter.String()) t.Fatalf("wrong exit code. errors: \n%s", ui.ErrorWriter.String())
} }
expected := fmt.Sprintf("%s\n", fmtFixture.filename) output := strings.Split(strings.TrimSpace(ui.OutputWriter.String()), "\n")
if actual := ui.OutputWriter.String(); actual != expected {
// Consistent order
sort.Strings(output)
for i, expected := range []string{fmtFixture.filename, fmtFixture.altFilename} {
actual := output[i]
if actual != expected {
t.Fatalf("got: %q\nexpected: %q", actual, expected) t.Fatalf("got: %q\nexpected: %q", actual, expected)
} }
} }
}
func TestFmt_directoryArg(t *testing.T) { func TestFmt_directoryArg(t *testing.T) {
tempDir := fmtFixtureWriteDir(t) tempDir := fmtFixtureWriteDir(t)
@ -319,16 +327,23 @@ func TestFmt_directoryArg(t *testing.T) {
t.Fatalf("wrong exit code. errors: \n%s", ui.ErrorWriter.String()) t.Fatalf("wrong exit code. errors: \n%s", ui.ErrorWriter.String())
} }
got, err := filepath.Abs(strings.TrimSpace(ui.OutputWriter.String())) output := strings.Split(strings.TrimSpace(ui.OutputWriter.String()), "\n")
// Consistent order
sort.Strings(output)
for i, check := range []string{fmtFixture.filename, fmtFixture.altFilename} {
got, err := filepath.Abs(output[i])
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
want := filepath.Join(tempDir, fmtFixture.filename) want := filepath.Join(tempDir, check)
if got != want { if got != want {
t.Fatalf("wrong output\ngot: %s\nwant: %s", got, want) t.Fatalf("wrong output\ngot: %s\nwant: %s", got, want)
} }
} }
}
func TestFmt_fileArg(t *testing.T) { func TestFmt_fileArg(t *testing.T) {
tempDir := fmtFixtureWriteDir(t) tempDir := fmtFixtureWriteDir(t)
@ -464,9 +479,11 @@ func TestFmt_checkStdin(t *testing.T) {
var fmtFixture = struct { var fmtFixture = struct {
filename string filename string
altFilename string
input, golden []byte input, golden []byte
}{ }{
"main.tf", "main.tf",
"main.tofu",
[]byte(` foo = "bar" []byte(` foo = "bar"
`), `),
[]byte(`foo = "bar" []byte(`foo = "bar"
@ -476,7 +493,12 @@ var fmtFixture = struct {
func fmtFixtureWriteDir(t *testing.T) string { func fmtFixtureWriteDir(t *testing.T) string {
dir := testTempDir(t) dir := testTempDir(t)
err := os.WriteFile(filepath.Join(dir, fmtFixture.filename), fmtFixture.input, 0644) err := os.WriteFile(filepath.Join(dir, fmtFixture.filename), fmtFixture.input, 0600)
if err != nil {
t.Fatal(err)
}
err = os.WriteFile(filepath.Join(dir, fmtFixture.altFilename), fmtFixture.input, 0600)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }