From e9b4270fd118381afd9ec023fccf3200936fcd34 Mon Sep 17 00:00:00 2001 From: Jan Baraniewski Date: Wed, 14 Aug 2024 13:24:24 +0200 Subject: [PATCH 1/2] Bump golangci-lint-action v3 -> v6 and version to 1.60.1 --- .github/workflows/golangci-lint.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml index ccee8b194..f02735368 100644 --- a/.github/workflows/golangci-lint.yaml +++ b/.github/workflows/golangci-lint.yaml @@ -28,7 +28,7 @@ jobs: go-version: "1.21.8" - uses: actions/checkout@v3 - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: latest - args: --modules-download-mode vendor --timeout 15m + version: v1.60.1 + args: --timeout 30m From db1223be74423e460ee308d2de574d3e28771114 Mon Sep 17 00:00:00 2001 From: Jan Baraniewski Date: Wed, 14 Aug 2024 13:31:10 +0200 Subject: [PATCH 2/2] Fix lint issues after golangci-lint upgrade --- cmd/pro/provider/list/projects.go | 2 +- pkg/ide/ideparse/parse.go | 2 +- pkg/options/resolver/parse.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/pro/provider/list/projects.go b/cmd/pro/provider/list/projects.go index cd20974d7..20d57bc3b 100644 --- a/cmd/pro/provider/list/projects.go +++ b/cmd/pro/provider/list/projects.go @@ -68,7 +68,7 @@ func (cmd *ProjectsCmd) Run(ctx context.Context) error { enum := []types.OptionEnum{} for _, project := range projectList.Items { // Filter out projects that don't have allowed runners - if project.Spec.AllowedRunners == nil || len(project.Spec.AllowedRunners) == 0 { + if len(project.Spec.AllowedRunners) == 0 { continue } enum = append(enum, types.OptionEnum{ diff --git a/pkg/ide/ideparse/parse.go b/pkg/ide/ideparse/parse.go index 579973859..a8148e5ef 100644 --- a/pkg/ide/ideparse/parse.go +++ b/pkg/ide/ideparse/parse.go @@ -245,7 +245,7 @@ func ParseOptions(options []string, ideOptions ide.Options) (map[string]config.O if !matcher.MatchString(value) { if ideOption.ValidationMessage != "" { - return nil, fmt.Errorf(ideOption.ValidationMessage) + return nil, fmt.Errorf("%s", ideOption.ValidationMessage) } return nil, fmt.Errorf("invalid value '%s' for option '%s', has to match the following regEx: %s", value, key, ideOption.ValidationPattern) diff --git a/pkg/options/resolver/parse.go b/pkg/options/resolver/parse.go index 323597b67..a4e38e027 100644 --- a/pkg/options/resolver/parse.go +++ b/pkg/options/resolver/parse.go @@ -33,7 +33,7 @@ func validateUserValue(optionName, userValue string, option *types.Option) error if !matcher.MatchString(userValue) { if option.ValidationMessage != "" { - return fmt.Errorf(option.ValidationMessage) + return fmt.Errorf("%s", option.ValidationMessage) } return fmt.Errorf("invalid value '%s' for option '%s', has to match the following regEx: %s", userValue, optionName, option.ValidationPattern)