refactor: run stricter formatter

gofumpt is a bit more strict than fmt I run this every year or so to standardize various formatting things.
pivotal-cf · Feb 22, 2024 · 817a610 · 817a610
1 parent aa6aaf4
commit 817a610
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/internal/acceptance/workflows/scenario/step_funcs_exec.go b/internal/acceptance/workflows/scenario/step_funcs_exec.go
@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/cucumber/godog"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
+
+	"github.com/cucumber/godog"
 )
 
 func outputContainsSubstring(ctx context.Context, outputName, substring string) error {
@@ -76,5 +77,5 @@ func iWriteFileWith(ctx context.Context, fileName string, lines *godog.Table) er
 	}
 
 	fileName = filepath.Join(tileDir, fileName)
-	return os.WriteFile(fileName, out.Bytes(), 0644)
+	return os.WriteFile(fileName, out.Bytes(), 0o644)
 }
diff --git a/internal/acceptance/workflows/scenario/step_funcs_tile_source_code.go b/internal/acceptance/workflows/scenario/step_funcs_tile_source_code.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/cucumber/godog"
 	"io"
 	"io/fs"
 	"os"
@@ -13,6 +12,8 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/cucumber/godog"
+
 	"github.com/pivotal-cf/kiln/pkg/cargo"
 )
 

diff --git a/pkg/notes/notes_data.go b/pkg/notes/notes_data.go
@@ -629,7 +629,6 @@ func (t *TrainstatClient) FetchTrainstatNotes(ctx context.Context, milestone str
 func (t *TrainstatClient) FetchTrainstatWinfsVersionInfo(ctx context.Context, milestone string, version string) (bumped bool, winfsVersion string, err error) {
 	baseURL := fmt.Sprintf("%s/%s", t.host, "api/v1/get_winfs_version_bump")
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, baseURL, nil)
-
 	if err != nil {
 		return false, "", err
 	}

diff --git a/pkg/source/bake_record.go b/pkg/source/bake_record.go
@@ -3,14 +3,15 @@ package source
 import (
 	"encoding/json"
 	"fmt"
-	"gopkg.in/yaml.v3"
 	"io/fs"
 	"os"
 	"path"
 	"path/filepath"
 	"slices"
 	"strings"
 
+	"gopkg.in/yaml.v3"
+
 	"github.com/pivotal-cf/kiln/internal/builder"
 
 	"github.com/Masterminds/semver/v3"
@@ -90,7 +91,7 @@ func (b BakeRecord) WriteFile(tileSourceDirectory string) error {
 	if b.IsDevBuild() {
 		return fmt.Errorf("will not write development builds to %s directory", BakeRecordsDirectory)
 	}
-	if err := os.MkdirAll(filepath.Join(tileSourceDirectory, BakeRecordsDirectory), 0766); err != nil {
+	if err := os.MkdirAll(filepath.Join(tileSourceDirectory, BakeRecordsDirectory), 0o766); err != nil {
 		return err
 	}
 	buf, err := json.MarshalIndent(b, "", "  ")
@@ -105,7 +106,7 @@ func (b BakeRecord) WriteFile(tileSourceDirectory string) error {
 	if _, err := os.Stat(outputFilepath); err == nil {
 		return fmt.Errorf("tile bake record already exists for %s", b.Name())
 	}
-	return os.WriteFile(outputFilepath, buf, 0644)
+	return os.WriteFile(outputFilepath, buf, 0o644)
 }
 
 func ReadBakeRecords(dir fs.FS) ([]BakeRecord, error) {

diff --git a/pkg/source/bake_record_test.go b/pkg/source/bake_record_test.go
@@ -1,18 +1,18 @@
 package source_test
 
 import (
-	"github.com/pivotal-cf/kiln/internal/builder"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"github.com/pivotal-cf/kiln/internal/builder"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/pivotal-cf/kiln/pkg/source"
 )
 
 func TestBuild(t *testing.T) {
-
 	t.Run("when creating a bake record from a product template", func(t *testing.T) {
 		// language=yaml
 		b, err := source.NewBakeRecord([]byte(`