update dependencies

Author: lukasmalkmus

.github/workflows/pr.yaml

@@ -24,8 +24,8 @@ jobs:
         with:
           go-version-file: go.mod
           cache: false
-      - run: echo "GOLANGCI_LINT_VERSION=$(go list -m -f '{{.Version}}' github.com/golangci/golangci-lint)" >> $GITHUB_ENV
-      - uses: golangci/golangci-lint-action@v6
+      - run: echo "GOLANGCI_LINT_VERSION=$(go list -m -f '{{.Version}}' github.com/golangci/golangci-lint/v2)" >> $GITHUB_ENV
+      - uses: golangci/golangci-lint-action@v7
         with:
           version: ${{ env.GOLANGCI_LINT_VERSION }}
           only-new-issues: true

.github/workflows/push.yaml

@@ -21,8 +21,8 @@ jobs:
         with:
           go-version-file: go.mod
           cache: false
-      - run: echo "GOLANGCI_LINT_VERSION=$(go list -m -f '{{.Version}}' github.com/golangci/golangci-lint)" >> $GITHUB_ENV
-      - uses: golangci/golangci-lint-action@v6
+      - run: echo "GOLANGCI_LINT_VERSION=$(go list -m -f '{{.Version}}' github.com/golangci/golangci-lint/v2)" >> $GITHUB_ENV
+      - uses: golangci/golangci-lint-action@v7
         with:
           version: ${{ env.GOLANGCI_LINT_VERSION }}
 

.golangci.yaml

@@ -1,50 +1,64 @@
+version: "2"
+
 run:
   modules-download-mode: readonly
 
-linters-settings:
-  gofmt:
-    simplify: true
-  goimports:
-    local-prefixes: github.com/axiomhq/axiom-syslog-proxy
-  govet:
-    enable:
-      - shadow
-  nolintlint:
-    allow-unused: false
-    require-explanation: true
-    require-specific: true
-
 linters:
-  disable-all: true
+  default: none
   enable:
     - bodyclose
     - dogsled
     - dupl
     - errcheck
     - exhaustive
-    - exportloopref
     - goconst
-    - gofmt
-    - goimports
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - misspell
     - nolintlint
     - prealloc
     - revive
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - unused
     - whitespace
+  settings:
+    govet:
+      enable:
+        - shadow
+    nolintlint:
+      require-explanation: true
+      require-specific: true
+      allow-unused: false
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - .git
+      - .github
+      - .vscode
+      - dist
 
-issues:
-  exclude-dirs:
-    - .git
-    - .github
-    - .vscode
-    - dist
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      simplify: true
+    goimports:
+      local-prefixes:
+        - github.com/axiomhq/axiom-syslog-proxy
+  exclusions:
+    generated: lax
+    paths:
+      - .git
+      - .github
+      - .vscode
+      - dist

.goreleaser.yaml

@@ -1,3 +1,5 @@
+version: 2
+
 project_name: axiom-syslog-proxy
 
 builds:
@@ -77,21 +79,23 @@ archives:
   - <<: &archive_defaults
       name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     id: nix
-    builds:
+    ids:
       - darwin
       - linux
       - linux-no-pie
     wrap_in_directory: true
-    format: tar.gz
+    formats:
+      - tar.gz
     files:
       - LICENSE
       - README.md
   - <<: *archive_defaults
     id: windows
-    builds:
+    ids:
       - windows
     wrap_in_directory: false
-    format: zip
+    formats:
+      - zip
     files:
       - LICENSE
       - README.md
@@ -100,7 +104,7 @@ checksum:
   name_template: checksums.txt
 
 snapshot:
-  name_template: "{{ .Tag }}-next"
+  version_template: "{{ .Tag }}-next"
 
 changelog:
   use: github-native

Makefile

@@ -1,7 +1,6 @@
 # TOOLCHAIN
 GO	  := CGO_ENABLED=0 go
 CGO	  := CGO_ENABLED=1 go
-GOFMT := $(GO)fmt
 
 # ENVIRONMENT
 VERBOSE	=
@@ -13,9 +12,6 @@ REVISION	:= $(shell git rev-parse --short HEAD)
 RELEASE		:= $(shell git describe --tags 2>/dev/null || git rev-parse --short HEAD)-dev
 USER		:= $(shell whoami)
 
-# GO TOOLS
-GOTOOLS := $(shell cat tools.go | grep "_ \"" | awk '{ print $$2 }' | tr -d '"')
-
 # MISC
 COVERPROFILE	:= coverage.out
 DIST_DIR		:= dist
@@ -45,8 +41,6 @@ ifdef VERBOSE
 endif
 
 # FUNCTIONS
-# func go-run-tool(name)
-go-run-tool = $(CGO) run $(shell echo $(GOTOOLS) | tr ' ' '\n' | grep -w $1)
 # func go-list-pkg-sources(package)
 go-list-pkg-sources = $(GO) list -f '{{range .GoFiles}}{{$$.Dir}}/{{.}} {{end}}' $(1)
 # func go-pkg-sourcefiles(package)
@@ -58,7 +52,7 @@ all: dep fmt lint test build ## Run dep, fmt, lint, test and build
 .PHONY: build
 build: dep.stamp $(call go-pkg-sourcefiles, ./...) ## Build the binaries
 	@echo ">> building binaries"
-	@$(call go-run-tool, goreleaser) build $(GORELEASER_FLAGS)
+	@$(GO) tool goreleaser build $(GORELEASER_FLAGS)
 
 .PHONY: clean
 clean: ## Remove build and test artifacts
@@ -78,13 +72,7 @@ dep-clean: ## Remove obsolete dependencies
 .PHONY: dep-upgrade
 dep-upgrade: ## Upgrade all direct dependencies to their latest version
 	@echo ">> upgrading dependencies"
-	@$(GO) get -d $(shell $(GO) list -f '{{if not (or .Main .Indirect)}}{{.Path}}{{end}}' -m all)
-	@make dep
-
-.PHONY: dep-upgrade-tools
-dep-upgrade-tools: ## Upgrade all tool dependencies to their latest version
-	@echo ">> upgrading tool dependencies"
-	@$(GO) get -d $(GOTOOLS)
+	@$(GO) get $(shell $(GO) list -f '{{if not (or .Main .Indirect)}}{{.Path}}{{end}}' -m all)
 	@make dep
 
 .PHONY: dep
@@ -97,22 +85,22 @@ dep.stamp: $(GOMODDEPS)
 	@touch $@
 
 .PHONY: fmt
-fmt: ## Format and simplify the source code using `gofmt`
+fmt: ## Format and simplify the source code using `golangci-lint fmt`
 	@echo ">> formatting code"
-	@! $(GOFMT) -s -w $(shell find . -path -prune -o -name '*.go' -print) | grep '^'
+	@$(GO) tool golangci-lint fmt
 
 .PHONY: install
 install: $(GOPATH)/bin/axiom-syslog-proxy ## Install the binary into the $GOPATH/bin directory
 
 .PHONY: lint
 lint: ## Lint the source code
 	@echo ">> linting code"
-	@$(call go-run-tool, golangci-lint) run
+	@$(GO) tool golangci-lint run
 
 .PHONY: test
 test: ## Run all tests. Run with VERBOSE=1 to get verbose test output ('-v' flag).
 	@echo ">> running tests"
-	@$(call go-run-tool, gotestsum) $(GOTESTSUM_FLAGS) -- $(GO_TEST_FLAGS) ./...
+	@$(CGO) tool gotestsum $(GOTESTSUM_FLAGS) -- $(GO_TEST_FLAGS) ./...
 
 .PHONY: help
 help: