From 4b12adc3542dcb89e61bd73e170ecc29d76ff6dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2026 10:33:57 +0000 Subject: [PATCH 1/5] Bump github.com/sirupsen/logrus from 1.9.4 to 1.10.2 Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.9.4 to 1.10.2. - [Release notes](https://github.com/sirupsen/logrus/releases) - [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md) - [Commits](https://github.com/sirupsen/logrus/compare/v1.9.4...v1.10.2) --- updated-dependencies: - dependency-name: github.com/sirupsen/logrus dependency-version: 1.10.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 9777772..2fec446 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hellofresh/goengine/v2 -go 1.19 +go 1.23 require ( github.com/DATA-DOG/go-sqlmock v1.5.2 @@ -10,7 +10,7 @@ require ( github.com/mailru/easyjson v0.9.2 github.com/prometheus/client_golang v1.13.0 github.com/rabbitmq/amqp091-go v1.13.0 - github.com/sirupsen/logrus v1.9.4 + github.com/sirupsen/logrus v1.10.2 github.com/stretchr/testify v1.12.1 go.uber.org/zap v1.28.0 ) diff --git a/go.sum b/go.sum index 0379809..5e91f8a 100644 --- a/go.sum +++ b/go.sum @@ -114,6 +114,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -199,8 +200,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w= -github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g= +github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo= +github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -218,6 +219,7 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= From 62e55a5c8416a9a1bb323a1543b7d11ba61c2af1 Mon Sep 17 00:00:00 2001 From: Richard Palm Date: Thu, 24 Sep 2026 09:11:53 +0200 Subject: [PATCH 2/5] Update Go Minimal version to 1.25 The intention would be to support the latest 3 versions officially --- .github/workflows/testing.yml | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 40ae150..4fcd96f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: - go: [ '1.19', '1.20', '1.21' ] + go: [ '1.25', '1.26', '1.27' ] services: postgres: diff --git a/go.mod b/go.mod index 2fec446..91b55ee 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hellofresh/goengine/v2 -go 1.23 +go 1.25 require ( github.com/DATA-DOG/go-sqlmock v1.5.2 From b150c7e7180eedcbd61b572ad721282f907cc2b3 Mon Sep 17 00:00:00 2001 From: Richard Palm Date: Thu, 24 Sep 2026 09:14:56 +0200 Subject: [PATCH 3/5] Update actions --- .github/workflows/testing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 4fcd96f..645ea37 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -13,9 +13,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v7 - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v9 with: only-new-issues: ${{ github.event_name == 'pull_request' }} From 96694909b55bd8de5120687a9548d4ba88dba701 Mon Sep 17 00:00:00 2001 From: Richard Palm Date: Thu, 24 Sep 2026 09:16:15 +0200 Subject: [PATCH 4/5] Update dependabot config --- .github/dependabot.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9e43af3..c548ec3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,4 +4,24 @@ updates: directory: "/" rebase-strategy: "disabled" schedule: - interval: "daily" \ No newline at end of file + interval: "monthly" + groups: + stable-updates: + update-types: + - "major" + - "minor" + - "patch" + + - directory: "/" + package-ecosystem: "github-actions" + schedule: + interval: "monthly" + timezone: "Europe/Berlin" + time: "05:00" + rebase-strategy: "disabled" + groups: + stable-updates: + update-types: + - "major" + - "minor" + - "patch" From 2868dca90ceb6d3bb4ea642c2afe2af9ee80c061 Mon Sep 17 00:00:00 2001 From: Richard Palm Date: Thu, 24 Sep 2026 11:13:29 +0200 Subject: [PATCH 5/5] Migrate lint config go version 2 --- .golangci.yml | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 6344a9a..7980ed3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,39 +1,39 @@ +version: "2" run: build-tags: - unit - integration - skip-files: - - driver/inmemory/matcher_gen.go - linters: enable: - - govet - - errcheck - - gosec - goconst - gocyclo - - gofmt - - goimports + - gosec - revive - - ineffassign - - staticcheck - unconvert - - vet - - vetshadow - -issues: - exclude-use-default: false - exclude-rules: - - path: _test\.go - linters: - - errcheck - - # Ignore the streamEvents.Close errcheck warning since we do not want to introduce a logger for repositories just yet - - path: aggregate/repository.go - text: "Error return value of \\`streamEvents.Close\\` is not checked" - linters: - - errcheck - - - linters: - - revive - text: "package-comments:" + exclusions: + generated: lax + rules: + - linters: + - errcheck + path: _test\.go + - linters: + - errcheck + path: aggregate/repository.go + text: Error return value of \`streamEvents.Close\` is not checked + - linters: + - revive + text: 'package-comments:' + paths: + - third_party$ + - builtin$ + - examples$ +formatters: + enable: + - gofmt + - goimports + exclusions: + generated: lax + paths: + - third_party$ + - builtin$ + - examples$