From 5bdaf852a489da7aab5e50d71b436ab599acf994 Mon Sep 17 00:00:00 2001 From: Michal Jura Date: Fri, 9 Feb 2024 10:58:56 +0100 Subject: [PATCH] Satisfy golangci-lint and fix tests (cherry picked from commit 7ce428587c9b2782f447215209a02c46074bd3fb) --- .github/workflows/lint.yaml | 1 + test/e2e/config/config.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index ef2c8f5b..0de809f8 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -19,4 +19,5 @@ jobs: - name: Analysis uses: golangci/golangci-lint-action@v3 with: + args: -v skip-pkg-cache: true diff --git a/test/e2e/config/config.go b/test/e2e/config/config.go index c41eaccb..03c9446a 100644 --- a/test/e2e/config/config.go +++ b/test/e2e/config/config.go @@ -140,7 +140,7 @@ func ReadE2EConfig(configPath string) (*E2EConfig, error) { //nolint:gocyclo } func substituteVersions(config *E2EConfig) error { - certManagerURL, err := envsubst.Eval(config.CertManagerChartURL, func(s string) string { + certManagerURL, err := envsubst.Eval(config.CertManagerChartURL, func(_ string) string { return config.CertManagerVersion }) if err != nil { @@ -148,7 +148,7 @@ func substituteVersions(config *E2EConfig) error { } config.CertManagerChartURL = certManagerURL - rancherURL, err := envsubst.Eval(config.RancherChartURL, func(s string) string { + rancherURL, err := envsubst.Eval(config.RancherChartURL, func(_ string) string { return config.RancherVersion }) if err != nil {