1. Refactoring EditorConfig & golangci config

2. Updated dependency versions

Author: BorzdeG

.editorconfig

@@ -7,28 +7,15 @@ indent_size = tab
 indent_style = tab
 insert_final_newline = true
 tab_width = 4
+max_line_length = 150
+# https://www.jetbrains.com/help/idea/editorconfig.html
 ij_smart_tabs = true
 ij_continuation_indent_size = 4
-max_line_length = 150
 ij_visual_guides = 80, 120
 ij_formatter_tags_enabled = true
 ij_formatter_on_tag = @formatter:on
 ij_formatter_off_tag = @formatter:off
 
-[*.json]
-ij_json_keep_indents_on_empty_lines = false
-ij_json_keep_line_breaks = false
-ij_json_wrap_long_lines = false
-
-[{.env,.env.*}]
-ij_wrap_on_typing = false
-
-[*.proto]
-ij_protobuf_blank_lines_after_imports = 1
-ij_protobuf_blank_lines_after_package = 1
-ij_protobuf_keep_indents_on_empty_lines = false
-ij_protobuf_spaces_around_assignment_operators = true
-
 [*.go]
 ij_go_add_leading_space_to_comments = true
 
@@ -44,12 +31,21 @@ ij_go_run_go_fmt_on_reformat = true
 ij_go_call_parameters_wrap = on_every_item
 
 [*.yml]
+indent_size = 2
+indent_style = space
 tab_width = 2
 ij_wrap_on_typing = false
 ij_yaml_keep_indents_on_empty_lines = false
 
 [.idea/**.xml]
+indent_size = 2
+indent_style = space
+tab_width = 2
+ij_xml_space_inside_empty_tag = true
 insert_final_newline = false
 
 [Makefile]
 ij_wrap_on_typing = false
+
+[{LICENSE,*.adoc}]
+max_line_length = off

.github/workflows/dependency-review.yml

@@ -1,9 +1,3 @@
-# Dependency Review Action
-#
-# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
-#
-# Source repository: https://github.com/actions/dependency-review-action
-# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
 name: 'Dependency Review'
 on: [pull_request]
 

.github/workflows/lint.yml

@@ -0,0 +1,36 @@
+name: lint & diff
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test-gomod:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
+      - run: go mod tidy && git diff --exit-code go.mod go.sum
+
+  test-generate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
+          check-latest: true
+
+      - run: make go-dependencies
+
+      - run: make go-generate && git diff --exit-code
+
+  editorconfig:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: editorconfig-checker/action-editorconfig-checker@main
+      - run: editorconfig-checker

.github/workflows/test.yml

@@ -27,7 +27,6 @@ jobs:
           check-latest: true
 
       - run: make go-dependencies
-      - run: make go-generate && git diff --exit-code
       - run: make go-all-tests
 
       - name: Test Summary

.golangci.yml

@@ -7,57 +7,56 @@ run:
 linters:
   disable-all: true
   enable:
-    - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - unused
     - asasalint
     - bodyclose
     - containedctx
     - contextcheck
     - cyclop
     - dogsled
+    - err113
+    - errcheck
     - errname
     - errorlint
     - exhaustive
     - exportloopref
     - forbidigo
     - funlen
+    - ginkgolinter
     - gocritic
     - gocyclo
-    - err113
     - goimports
-    - mnd
     - gomoddirectives
     - gosec
+    - gosimple
     - govet
     - grouper
+    - ineffassign
+    - interfacebloat
     - misspell
+    - mnd
     - nilerr
+    - nilnil
     - nlreturn
     - noctx
     - prealloc
     - predeclared
     - promlinter
     - revive
-    - wastedassign
+    - sloglint
+    - staticcheck
     - tagliatelle
     - tenv
     - testpackage
     - typecheck
     - unconvert
     - unparam
+    - unused
     - usestdlibvars
     - varnamelen
+    - wastedassign
     - whitespace
     - wrapcheck
     - wsl
-    - ginkgolinter
-    - interfacebloat
-    - sloglint
-    - nilnil
 
 linters-settings:
   varnamelen:

Makefile

@@ -5,6 +5,8 @@ go-dependencies:
 	$(eval GOBIN=$(shell go env GOPATH 2>/dev/null)/bin)
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) latest
 	#
+	go install github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@latest
+	#
 	go install github.com/onsi/ginkgo/v2/ginkgo@latest
 
 go-update: go-dependencies
@@ -15,6 +17,7 @@ go-generate:
 	$(MAKE) go-update
 
 go-lint:
+	editorconfig-checker
 	golangci-lint run
 
 go-unit-tests:

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
+	github.com/google/pprof v0.0.0-20240829160300-da1f7e9f2b25 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/pgx/v5 v5.6.0 // indirect

go.sum

@@ -12,8 +12,8 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
-github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/pprof v0.0.0-20240829160300-da1f7e9f2b25 h1:sEDPKUw6iPjczdu33njxFjO6tYa9bfc0z/QyB/zSsBw=
+github.com/google/pprof v0.0.0-20240829160300-da1f7e9f2b25/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@@ -31,8 +31,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo=
-github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI=
+github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
+github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
 github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
 github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
 github.com/orandin/slog-gorm v1.4.0 h1:FgA8hJufF9/jeNSYoEXmHPPBwET2gwlF3B85JdpsTUU=