chore(deps): Adding gofumpt as a formatting tool

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Oct 31, 2021 · a6adffc · a6adffc
1 parent 8f5a3d9
commit a6adffc
Show file tree

Hide file tree

Showing 30 changed files with 105 additions and 122 deletions.
diff --git a/Makefile b/Makefile
@@ -50,18 +50,19 @@ dev: format style test build
 .PHONY: init
 init:
 	@curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "git_hooks" "coverage" "release"
-	go install github.com/kisielk/errcheck@latest
-	go install golang.org/x/lint/golint@latest
-	go install golang.org/x/tools/cmd/goimports@latest
-	go install github.com/golang/mock/[email protected]
+	go install "github.com/golang/mock/[email protected]"
+	go install "github.com/kisielk/errcheck@latest"
+	go install "golang.org/x/lint/golint@latest"
+	go install "golang.org/x/tools/cmd/goimports@latest"
+	go install "mvdan.cc/gofumpt@latest"
 	$(MAKE) mocks
 	go mod tidy -compat=1.17
 
 ## format: Format code. e.g Prettier (js), format (golang)
 .PHONY: format
 format:
 	goimports -w $(shell find . -name "*.go")
-	gofmt -s -w $(shell find . -name "*.go")
+	gofumpt -s -w $(shell find . -name "*.go")
 
 ## style: Check lint, code styling rules. e.g. pylint, phpcs, eslint, style (java) etc ...
 .PHONY: style

diff --git a/pkg/ketchup/ketchup.go b/pkg/ketchup/ketchup.go
@@ -18,21 +18,19 @@ const (
 	appPath      = "/app"
 )
 
-var (
-	// FuncMap for template rendering
-	FuncMap = template.FuncMap{
-		"frequencyImage": func(frequency model.KetchupFrequency) string {
-			switch frequency {
-			case model.None:
-				return "bell-slash"
-			case model.Weekly:
-				return "calendar"
-			default:
-				return "clock"
-			}
-		},
-	}
-)
+// FuncMap for template rendering
+var FuncMap = template.FuncMap{
+	"frequencyImage": func(frequency model.KetchupFrequency) string {
+		switch frequency {
+		case model.None:
+			return "bell-slash"
+		case model.Weekly:
+			return "calendar"
+		default:
+			return "clock"
+		}
+	},
+}
 
 // App of package
 type App struct {

diff --git a/pkg/ketchup/renderer_test.go b/pkg/ketchup/renderer_test.go
@@ -8,7 +8,7 @@ func TestMin(t *testing.T) {
 		b uint64
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      uint64

diff --git a/pkg/ketchup/security.go b/pkg/ketchup/security.go
@@ -23,21 +23,19 @@ type securityPayload struct {
 	Question string `json:"question"`
 }
 
-var (
-	colors = map[int64]securityQuestion{
-		0:  {"❄️ and 🧻 are both?", "white"},
-		1:  {"☀️ and 🍋 are both?", "yellow"},
-		2:  {"🥦 and 🥝 are both?", "green"},
-		3:  {"👖 and 💧 are both?", "blue"},
-		4:  {"🍅 and 🩸 are both?", "red"},
-		5:  {"🍆 and ☂️ are both?", "purple"},
-		6:  {"🦓 and 🕳 are both?", "black"},
-		7:  {"🍊 and 🥕 are both?", "orange"},
-		8:  {"🟥 mixed with 🟦 give?", "purple"},
-		9:  {"🟨 mixed with 🟥 give?", "orange"},
-		10: {"🟦 mixed with 🟨 give?", "green"},
-	}
-)
+var colors = map[int64]securityQuestion{
+	0:  {"❄️ and 🧻 are both?", "white"},
+	1:  {"☀️ and 🍋 are both?", "yellow"},
+	2:  {"🥦 and 🥝 are both?", "green"},
+	3:  {"👖 and 💧 are both?", "blue"},
+	4:  {"🍅 and 🩸 are both?", "red"},
+	5:  {"🍆 and ☂️ are both?", "purple"},
+	6:  {"🦓 and 🕳 are both?", "black"},
+	7:  {"🍊 and 🥕 are both?", "orange"},
+	8:  {"🟥 mixed with 🟦 give?", "purple"},
+	9:  {"🟨 mixed with 🟥 give?", "orange"},
+	10: {"🟦 mixed with 🟨 give?", "green"},
+}
 
 func (a App) generateToken(ctx context.Context) (securityPayload, error) {
 	questionID, err := rand.Int(rand.Reader, big.NewInt(int64(len(colors))))

diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestMiddleware(t *testing.T) {
-	var cases = []struct {
+	cases := []struct {
 		intention  string
 		next       http.Handler
 		request    *http.Request

diff --git a/pkg/model/ketchup.go b/pkg/model/ketchup.go
@@ -20,10 +20,8 @@ const (
 	Weekly
 )
 
-var (
-	// KetchupFrequencyValues string values
-	KetchupFrequencyValues = []string{"None", "Daily", "Weekly"}
-)
+// KetchupFrequencyValues string values
+var KetchupFrequencyValues = []string{"None", "Daily", "Weekly"}
 
 // ParseKetchupFrequency parse raw string into a KetchupFrequency
 func ParseKetchupFrequency(value string) (KetchupFrequency, error) {

diff --git a/pkg/model/ketchup_test.go b/pkg/model/ketchup_test.go
@@ -15,7 +15,7 @@ func TestParseKetchupFrequency(t *testing.T) {
 		value string
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      KetchupFrequency
@@ -75,7 +75,7 @@ func TestKetchupByRepositoryID(t *testing.T) {
 		array []Ketchup
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      []Ketchup
@@ -112,7 +112,7 @@ func TestKetchupByPriority(t *testing.T) {
 		array []Ketchup
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      []Ketchup
@@ -193,7 +193,7 @@ func TestReleaseByRepositoryID(t *testing.T) {
 		array []Release
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      []Release
@@ -230,7 +230,7 @@ func TestReleaseByKindAndName(t *testing.T) {
 		array []Release
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      []Release

diff --git a/pkg/model/repository.go b/pkg/model/repository.go
@@ -30,10 +30,8 @@ const (
 	Pypi
 )
 
-var (
-	// RepositoryKindValues string values
-	RepositoryKindValues = []string{"github", "helm", "docker", "npm", "pypi"}
-)
+// RepositoryKindValues string values
+var RepositoryKindValues = []string{"github", "helm", "docker", "npm", "pypi"}
 
 // ParseRepositoryKind parse raw string into a RepositoryKind
 func ParseRepositoryKind(value string) (RepositoryKind, error) {

diff --git a/pkg/model/repository_test.go b/pkg/model/repository_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestString(t *testing.T) {
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		instance  RepositoryKind
 		want      string
@@ -38,7 +38,7 @@ func TestURL(t *testing.T) {
 		pattern string
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		instance  Repository
 		args      args
@@ -85,7 +85,7 @@ func TestCompareURL(t *testing.T) {
 		pattern string
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		instance  Repository
 		args      args
@@ -122,7 +122,7 @@ func TestParseRepositoryKind(t *testing.T) {
 		value string
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      RepositoryKind

diff --git a/pkg/model/semver_test.go b/pkg/model/semver_test.go
@@ -31,7 +31,7 @@ func TestCheckPatternsMatching(t *testing.T) {
 		version          semver.Version
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      map[string]semver.Version

diff --git a/pkg/model/user_test.go b/pkg/model/user_test.go
@@ -10,7 +10,7 @@ func TestReadUser(t *testing.T) {
 		ctx context.Context
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      User

diff --git a/pkg/notifier/notifier.go b/pkg/notifier/notifier.go
@@ -19,9 +19,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/push"
 )
 
-var (
-	pageSize = uint(20)
-)
+var pageSize = uint(20)
 
 // App of package
 type App struct {

diff --git a/pkg/notifier/notifier_test.go b/pkg/notifier/notifier_test.go
@@ -33,7 +33,7 @@ func safeParse(version string) semver.Version {
 }
 
 func TestFlags(t *testing.T) {
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		want      string
 	}{
@@ -66,7 +66,7 @@ func TestGetNewRepositoryReleases(t *testing.T) {
 		repo model.Repository
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		instance  App
 		args      args
@@ -159,7 +159,7 @@ func TestGetKetchupToNotify(t *testing.T) {
 		releases []model.Release
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      map[model.User][]model.Release
@@ -326,7 +326,7 @@ func TestSendNotification(t *testing.T) {
 		ketchupToNotify map[model.User][]model.Release
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		instance  App
 		args      args

diff --git a/pkg/notifier/releases_test.go b/pkg/notifier/releases_test.go
@@ -19,7 +19,7 @@ func TestGetNewStandardReleases(t *testing.T) {
 		ctx context.Context
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		instance  App
 		args      args
@@ -82,7 +82,8 @@ func TestGetNewStandardReleases(t *testing.T) {
 				mockRepositoryService.EXPECT().ListByKinds(gomock.Any(), gomock.Any(), gomock.Any(), model.Github, model.Docker, model.NPM, model.Pypi).Return(nil, uint64(0), errors.New("failed"))
 			case "github error":
 				mockRepositoryService.EXPECT().ListByKinds(gomock.Any(), gomock.Any(), gomock.Any(), model.Github, model.Docker, model.NPM, model.Pypi).Return([]model.Repository{
-					model.NewGithubRepository(1, repositoryName).AddVersion(model.DefaultPattern, repositoryVersion)}, uint64(1), nil)
+					model.NewGithubRepository(1, repositoryName).AddVersion(model.DefaultPattern, repositoryVersion),
+				}, uint64(1), nil)
 				mockRepositoryService.EXPECT().LatestVersions(gomock.Any()).Return(nil, errors.New("failed"))
 			case "same version":
 				mockRepositoryService.EXPECT().ListByKinds(gomock.Any(), gomock.Any(), gomock.Any(), model.Github, model.Docker, model.NPM, model.Pypi).Return([]model.Repository{
@@ -135,7 +136,7 @@ func TestGetNewHelmReleases(t *testing.T) {
 		content string
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		instance  App
 		args      args

diff --git a/pkg/provider/docker/docker_test.go b/pkg/provider/docker/docker_test.go
@@ -18,7 +18,7 @@ func TestGetNextURL(t *testing.T) {
 	lowerCaseHeader.Add("link", `rel="prev"; /v2/prev`)
 	lowerCaseHeader.Add("link", `rel="next"; /v2/next`)
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		args      args
 		want      string

diff --git a/pkg/provider/github/github_test.go b/pkg/provider/github/github_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestFlags(t *testing.T) {
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		want      string
 	}{

diff --git a/pkg/provider/helm/helm.go b/pkg/provider/helm/helm.go
@@ -25,8 +25,7 @@ type chart struct {
 }
 
 // App of package
-type App struct {
-}
+type App struct{}
 
 // New creates new App from Config
 func New() App {

diff --git a/pkg/provider/npm/npm.go b/pkg/provider/npm/npm.go
@@ -23,8 +23,7 @@ type versionResp struct {
 }
 
 // App of package
-type App struct {
-}
+type App struct{}
 
 // New creates new App from Config
 func New() App {

diff --git a/pkg/provider/pypi/pypi.go b/pkg/provider/pypi/pypi.go
@@ -19,8 +19,7 @@ type packageResp struct {
 }
 
 // App of package
-type App struct {
-}
+type App struct{}
 
 // New creates new App
 func New() App {

diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestFlags(t *testing.T) {
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		want      string
 	}{

diff --git a/pkg/semver/pattern_test.go b/pkg/semver/pattern_test.go
@@ -15,7 +15,7 @@ func TestCheck(t *testing.T) {
 		version Version
 	}
 
-	var cases = []struct {
+	cases := []struct {
 		intention string
 		instance  Pattern
 		args      args