gofumpt

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

.golangci.yml

@@ -10,7 +10,7 @@ linters:
     - errorlint
     - gocritic
     - gocyclo
-    - gofmt
+    - gofumpt
     - goimports
     - gomodguard
     - revive

interpolation/interpolation_test.go

@@ -98,7 +98,7 @@ func TestInterpolateWithDefaults(t *testing.T) {
 }
 
 func TestValidUnexistentInterpolation(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		test     string
 		expected string
 		errMsg   string
@@ -154,7 +154,7 @@ func TestValidUnexistentInterpolation(t *testing.T) {
 }
 
 func TestValidExistentInterpolation(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		test     string
 		expected string
 	}{
@@ -215,7 +215,7 @@ func TestInterpolateWithCast(t *testing.T) {
 }
 
 func TestPathMatches(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		doc      string
 		path     tree.Path
 		pattern  tree.Path

loader/loader.go

@@ -414,7 +414,8 @@ func loadYamlFile(ctx context.Context,
 	environment types.Mapping,
 	ct *cycleTracker,
 	dict map[string]interface{},
-	included []string) (map[string]interface{}, PostProcessor, error) {
+	included []string,
+) (map[string]interface{}, PostProcessor, error) {
 	ctx = context.WithValue(ctx, consts.ComposeFileKey{}, file.Filename)
 	if file.Content == nil && file.Config == nil {
 		content, err := os.ReadFile(file.Filename)

loader/loader_test.go

@@ -1839,7 +1839,7 @@ func TestLoadInit(t *testing.T) {
 	booleanTrue := true
 	booleanFalse := false
 
-	var testcases = []struct {
+	testcases := []struct {
 		doc  string
 		yaml string
 		init *bool

loader/loader_windows_test.go

@@ -24,7 +24,7 @@ import (
 )
 
 func TestConvertWindowsVolumePath(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		windowsPath           string
 		expectedConvertedPath string
 	}{

loader/loader_yaml_test.go

@@ -45,7 +45,8 @@ services:
     image: bar
     command: echo world
     init: false
-`)},
+`),
+			},
 		},
 	}, &Options{}, &cycleTracker{}, nil)
 	assert.NilError(t, err)
@@ -85,7 +86,8 @@ configs:
   credentials:
     content: |
       dummy value
-`)},
+`),
+			},
 		},
 	}, &Options{}, &cycleTracker{}, nil)
 	assert.NilError(t, err)

tree/path_test.go

@@ -24,7 +24,7 @@ import (
 )
 
 func TestPathMatches(t *testing.T) {
-	var testcases = []struct {
+	testcases := []struct {
 		doc      string
 		path     Path
 		pattern  Path

types/config.go

@@ -24,10 +24,8 @@ import (
 	"github.com/go-viper/mapstructure/v2"
 )
 
-var (
-	// isCaseInsensitiveEnvVars is true on platforms where environment variable names are treated case-insensitively.
-	isCaseInsensitiveEnvVars = (runtime.GOOS == "windows")
-)
+// isCaseInsensitiveEnvVars is true on platforms where environment variable names are treated case-insensitively.
+var isCaseInsensitiveEnvVars = (runtime.GOOS == "windows")
 
 // ConfigDetails are the details about a group of ConfigFiles
 type ConfigDetails struct {

types/project.go

@@ -746,7 +746,6 @@ func (p *Project) deepCopy() *Project {
 	n := &Project{}
 	deriveDeepCopyProject(n, p)
 	return n
-
 }
 
 // WithServicesTransform applies a transformation to project services and return a new project with transformation results

types/project_test.go

@@ -42,7 +42,6 @@ func Test_ApplyProfiles(t *testing.T) {
 
 	assert.DeepEqual(t, p.ServiceNames(), []string{"service_1", "service_2", "service_4", "service_5", "service_6"})
 	assert.DeepEqual(t, p.DisabledServiceNames(), []string{"service_3"})
-
 }
 
 func Test_WithoutUnnecessaryResources(t *testing.T) {