From c21797c12db532e2dc9e4a0e014530979993fa72 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 15:25:54 +0000 Subject: [PATCH 1/3] Update dependency golangci/golangci-lint to v2.5.0 | datasource | package | from | to | | ----------- | ---------------------- | ------ | ------ | | github-tags | golangci/golangci-lint | v2.4.0 | v2.5.0 | Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/lint.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b753570c..6b7916b6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -35,7 +35,7 @@ jobs: - name: Lint Go uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0 with: - version: v2.4.0 # renovate: datasource=github-tags depName=golangci/golangci-lint + version: v2.5.0 # renovate: datasource=github-tags depName=golangci/golangci-lint actionlint: name: Actionlint diff --git a/Makefile b/Makefile index 39415af4..ae4f7742 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # renovate: datasource=github-tags depName=golangci/golangci-lint -GOLANGCI_LINT_VERSION = v2.4.0 +GOLANGCI_LINT_VERSION = v2.5.0 test: unit-test test-integration test-integration-no-stream-block clean From 250cd3977ecdd945de4012b31070df726d4be3b9 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Thu, 9 Oct 2025 11:37:27 +0100 Subject: [PATCH 2/3] Address linter issue --- client/nginx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/nginx.go b/client/nginx.go index e6c9c0ad..c28536ae 100644 --- a/client/nginx.go +++ b/client/nginx.go @@ -1002,7 +1002,7 @@ func determineUpdates(updatedServers []UpstreamServer, nginxServers []UpstreamSe } } - return + return toAdd, toRemove, toUpdate } func (client *NginxClient) getIDOfHTTPServer(ctx context.Context, upstream string, name string) (int, error) { From adf5f1d8187c4ce8c75171c422c735c690c552a1 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Thu, 9 Oct 2025 11:42:41 +0100 Subject: [PATCH 3/3] Return values --- client/nginx.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/nginx.go b/client/nginx.go index c28536ae..a84f3a53 100644 --- a/client/nginx.go +++ b/client/nginx.go @@ -1376,7 +1376,7 @@ func determineStreamUpdates(updatedServers []StreamUpstreamServer, nginxServers } } - return + return toAdd, toRemove, toUpdate } // GetStats gets process, slab, connection, request, ssl, zone, stream zone, upstream and stream upstream related stats from the NGINX Plus API.