From 5bdab587ff513f22ce414ba8a976ad9b26b6cfab Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 10 Feb 2025 16:22:27 +0100 Subject: [PATCH 1/2] pkg/e2e: fix contains: use assert.Contains (testifylint) pkg/e2e/ps_test.go:50:5: contains: use assert.Contains (testifylint) assert.True(t, strings.Contains(line, "127.0.0.1:8001->8000/tcp")) ^ pkg/e2e/ps_test.go:54:5: contains: use assert.Contains (testifylint) assert.True(t, strings.Contains(line, "80/tcp, 443/tcp, 8080/tcp")) ^ Signed-off-by: Sebastiaan van Stijn --- pkg/e2e/ps_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/e2e/ps_test.go b/pkg/e2e/ps_test.go index 702c273f193..f6910129e41 100644 --- a/pkg/e2e/ps_test.go +++ b/pkg/e2e/ps_test.go @@ -47,11 +47,11 @@ func TestPs(t *testing.T) { count := 0 for _, line := range lines[1:3] { if strings.Contains(line, "e2e-ps-busybox-1") { - assert.True(t, strings.Contains(line, "127.0.0.1:8001->8000/tcp")) + assert.Contains(t, line, "127.0.0.1:8001->8000/tcp") count++ } if strings.Contains(line, "e2e-ps-nginx-1") { - assert.True(t, strings.Contains(line, "80/tcp, 443/tcp, 8080/tcp")) + assert.Contains(t, line, "80/tcp, 443/tcp, 8080/tcp") count++ } } From 5dc69a3ce97a5cb34d9726c6e780415621443c28 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 10 Feb 2025 16:02:42 +0100 Subject: [PATCH 2/2] Dockerfile: update golangci-lint to v1.63.4 make sure it's compatible with go1.23 full diff: https://github.com/golangci/golangci-lint/compare/v1.60.2...v1.63.4 Changelog: https://golangci-lint.run/product/changelog/#v1634 Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0090461aaaa..d22f807790c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG GO_VERSION=1.22.10 ARG XX_VERSION=1.6.1 -ARG GOLANGCI_LINT_VERSION=v1.60.2 +ARG GOLANGCI_LINT_VERSION=v1.63.4 ARG ADDLICENSE_VERSION=v1.0.0 ARG BUILD_TAGS="e2e"