[pre-commit] use another yaml formatter and simplify go tests

Mathieu Grzybek · Mathieu Grzybek · commit aec09bccbca2 · 2021-08-05T16:41:05.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,14 +1,19 @@
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
-    hooks:
-    -   id: check-yaml
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.0.1
+  hooks:
+  - id: end-of-file-fixer
+  - id: trailing-whitespace
 
--   repo: https://github.com/tekwizely/pre-commit-golang
-    rev: v0.8.3
-    hooks:
+- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+  rev: v1.5.0
+  hooks:
+  - id: pretty-format-yaml
+    args: [--autofix, --indent, '2']
+
+- repo: https://github.com/tekwizely/pre-commit-golang
+  rev: v0.8.3
+  hooks:
     #
     # Go Build
     #
@@ -19,17 +24,17 @@ repos:
     #
     # Go Test
     #
-    -   id: go-test-mod
+  - id: go-test-mod
     #-   id: go-test-pkg
-    -   id: go-test-repo-mod
+  - id: go-test-repo-mod
     #-   id: go-test-repo-pkg
     #
     # Go Vet
     #
     #-   id: go-vet
-    -   id: go-vet-mod
+  - id: go-vet-mod
     #-   id: go-vet-pkg
-    -   id: go-vet-repo-mod
+  - id: go-vet-repo-mod
     #-   id: go-vet-repo-pkg
     #
     # Revive
@@ -47,13 +52,13 @@ repos:
     #
     # Formatters
     #
-    -   id: go-fmt
+  - id: go-fmt
     #-   id: go-imports # Replaces go-fmt
     #-   id: go-returns # Replaces go-imports & go-fmt
     #
     # Style Checkers
     #
-    -   id: go-lint
+  - id: go-lint
     #-   id: go-critic
     #
     # GolangCI-Lint

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,19 @@`
`1`	`1`	`repos:`
`2`		`-- repo: https://github.com/pre-commit/pre-commit-hooks`
`3`		`- rev: v4.0.1`
`4`		`- hooks:`
`5`		`- - id: check-yaml`
`6`		`- - id: end-of-file-fixer`
`7`		`- - id: trailing-whitespace`
	`2`	`+- repo: https://github.com/pre-commit/pre-commit-hooks`
	`3`	`+ rev: v4.0.1`
	`4`	`+ hooks:`
	`5`	`+ - id: end-of-file-fixer`
	`6`	`+ - id: trailing-whitespace`
`8`	`7`
`9`		`-- repo: https://github.com/tekwizely/pre-commit-golang`
`10`		`- rev: v0.8.3`
`11`		`- hooks:`
	`8`	`+- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks`
	`9`	`+ rev: v1.5.0`
	`10`	`+ hooks:`
	`11`	`+ - id: pretty-format-yaml`
	`12`	`+ args: [--autofix, --indent, '2']`
	`13`	`+`
	`14`	`+- repo: https://github.com/tekwizely/pre-commit-golang`
	`15`	`+ rev: v0.8.3`
	`16`	`+ hooks:`
`12`	`17`	`#`
`13`	`18`	`# Go Build`
`14`	`19`	`#`
`@@ -19,17 +24,17 @@ repos:`
`19`	`24`	`#`
`20`	`25`	`# Go Test`
`21`	`26`	`#`
`22`		`- - id: go-test-mod`
	`27`	`+ - id: go-test-mod`
`23`	`28`	`#- id: go-test-pkg`
`24`		`- - id: go-test-repo-mod`
	`29`	`+ - id: go-test-repo-mod`
`25`	`30`	`#- id: go-test-repo-pkg`
`26`	`31`	`#`
`27`	`32`	`# Go Vet`
`28`	`33`	`#`
`29`	`34`	`#- id: go-vet`
`30`		`- - id: go-vet-mod`
	`35`	`+ - id: go-vet-mod`
`31`	`36`	`#- id: go-vet-pkg`
`32`		`- - id: go-vet-repo-mod`
	`37`	`+ - id: go-vet-repo-mod`
`33`	`38`	`#- id: go-vet-repo-pkg`
`34`	`39`	`#`
`35`	`40`	`# Revive`
`@@ -47,13 +52,13 @@ repos:`
`47`	`52`	`#`
`48`	`53`	`# Formatters`
`49`	`54`	`#`
`50`		`- - id: go-fmt`
	`55`	`+ - id: go-fmt`
`51`	`56`	`#- id: go-imports # Replaces go-fmt`
`52`	`57`	`#- id: go-returns # Replaces go-imports & go-fmt`
`53`	`58`	`#`
`54`	`59`	`# Style Checkers`
`55`	`60`	`#`
`56`		`- - id: go-lint`
	`61`	`+ - id: go-lint`
`57`	`62`	`#- id: go-critic`
`58`	`63`	`#`
`59`	`64`	`# GolangCI-Lint`