Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Upgrade golangci from 1.54 to 1.57 #3846

Merged
merged 2 commits into from
Apr 6, 2024
Merged

✨ Upgrade golangci from 1.54 to 1.57 #3846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76ceedc
Upgrade golangci from 1.54 to 1.57
camilamacedo86 Apr 5, 2024
2e8c0e1
Fix lint issues after upgrade
camilamacedo86 Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint-sample.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ jobs:
- name: Run linter
uses: golangci/golangci-lint-action@v4
with:
version: v1.54
version: v1.57
working-directory: testdata/project-v4-with-deploy-image
args: --config .golangci.yml ./...
skip-cache: true # first lint action will handle
- name: Run linter
uses: golangci/golangci-lint-action@v4
with:
version: v1.54
version: v1.57
working-directory: testdata/project-v4-multigroup-with-deploy-image
args: --config .golangci.yml ./...
skip-cache: true # first lint action will handle
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Run linter
uses: golangci/golangci-lint-action@v4
with:
version: v1.54
version: v1.57

yamllint:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
golangci-lint:
@[ -f $(GOLANGCI_LINT) ] || { \
set -e ;\
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.54.2 ;\
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.57.2 ;\
}

.PHONY: apidiff
Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/component-config-tutorial/testdata/project/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
KUSTOMIZE_VERSION ?= v5.3.0
CONTROLLER_TOOLS_VERSION ?= v0.14.0
ENVTEST_VERSION ?= release-0.17
GOLANGCI_LINT_VERSION ?= v1.54.2
GOLANGCI_LINT_VERSION ?= v1.57.2

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ import (
"fmt"
"testing"

// nolint:revive
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than having all of these nolint:revive lines, I think we are safe to assume dot imports will be used for intentional reasons. I think it would be cleaner to just remove the dot-imports rule from line 28 in .golangci.yml.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. One way maybe:

[rule.dot-imports]
  arguments = [{ allowedPackages = ["github.com/onsi/ginkgo/v2","github.com/onsi/gomega"] }]

Copy link
Member Author

@camilamacedo86 camilamacedo86 Apr 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should not use dot imports
Just the case of ginkgo and gomega which are an exception.
So, we still want the check

If a config like

[rule.dot-imports]
  arguments = [{ allowedPackages = ["github.com/onsi/ginkgo/v2","github.com/onsi/gomega"] }]

Works then, It is totally fine.
We can use it

. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"
)

Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import (
"os/exec"
"time"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

"tutorial.kubebuilder.io/project/test/utils"
Expand Down
1 change: 1 addition & 0 deletions docs/book/src/component-config-tutorial/testdata/project/test/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"os/exec"
"strings"

// nolint:revive
. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
)

Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/cronjob-tutorial/testdata/project/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
KUSTOMIZE_VERSION ?= v5.3.0
CONTROLLER_TOOLS_VERSION ?= v0.14.0
ENVTEST_VERSION ?= release-0.17
GOLANGCI_LINT_VERSION ?= v1.54.2
GOLANGCI_LINT_VERSION ?= v1.57.2

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
Expand Down
1 change: 1 addition & 0 deletions docs/book/src/cronjob-tutorial/testdata/project/api/v1/cronjob_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package v1

import (
// nolint:revive
. "github.com/onsi/ginkgo/v2"
)

Expand Down
4 changes: 3 additions & 1 deletion docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ import (
"testing"
"time"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

admissionv1 "k8s.io/api/admission/v1"

//+kubebuilder:scaffold:imports
apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/rest"
Expand Down
2 changes: 2 additions & 0 deletions ...book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ import (
"reflect"
"time"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"
batchv1 "k8s.io/api/batch/v1"
v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/cronjob-tutorial/testdata/project/internal/controller/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

"k8s.io/client-go/kubernetes/scheme"
Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ import (
"fmt"
"testing"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"
)

Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import (
"os/exec"
"time"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

"tutorial.kubebuilder.io/project/test/utils"
Expand Down
1 change: 1 addition & 0 deletions docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"os/exec"
"strings"

// nolint:revive
. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
)

Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/getting-started/testdata/project/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
KUSTOMIZE_VERSION ?= v5.3.0
CONTROLLER_TOOLS_VERSION ?= v0.14.0
ENVTEST_VERSION ?= release-0.17
GOLANGCI_LINT_VERSION ?= v1.54.2
GOLANGCI_LINT_VERSION ?= v1.57.2

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
Expand Down
2 changes: 2 additions & 0 deletions ...ook/src/getting-started/testdata/project/internal/controller/memcached_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ import (
"time"

//nolint:golint
// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/getting-started/testdata/project/internal/controller/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import (
"runtime"
"testing"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

"k8s.io/client-go/kubernetes/scheme"
Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/getting-started/testdata/project/test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ import (
"fmt"
"testing"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"
)

Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import (
"os/exec"
"time"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

"example.com/memcached/test/utils"
Expand Down
1 change: 1 addition & 0 deletions docs/book/src/getting-started/testdata/project/test/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"os/exec"
"strings"

// nolint:revive
. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
)

Expand Down
1 change: 1 addition & 0 deletions docs/book/src/multiversion-tutorial/testdata/project/api/v1/cronjob_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package v1

import (
// nolint:revive
. "github.com/onsi/ginkgo/v2"
)

Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ import (
"testing"
"time"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

admissionv1 "k8s.io/api/admission/v1"
Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ import (
"testing"
"time"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

admissionv1 "k8s.io/api/admission/v1"
Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/multiversion-tutorial/testdata/project/internal/controller/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

"k8s.io/client-go/kubernetes/scheme"
Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ import (
"fmt"
"testing"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"
)

Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import (
"os/exec"
"time"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

"tutorial.kubebuilder.io/project/test/utils"
Expand Down
1 change: 1 addition & 0 deletions docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"os/exec"
"strings"

// nolint:revive
. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
)

Expand Down
2 changes: 2 additions & 0 deletions hack/docs/internal/cronjob-tutorial/writing_tests_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ import (
"reflect"
"time"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"
batchv1 "k8s.io/api/batch/v1"
v1 "k8s.io/api/core/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/alpha/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ using the current version of KubeBuilder binary available.
$ kubebuilder alpha generate --input-dir="./test" --output-dir="./my-output"
Then we will re-scaffold the project by Kubebuilder in the directory specified by 'output-dir'.
`,
PreRunE: func(cmd *cobra.Command, _ []string) error {
PreRunE: func(_ *cobra.Command, _ []string) error {
return opts.Validate()
},
Run: func(cmd *cobra.Command, args []string) {
Run: func(_ *cobra.Command, _ []string) {
if err := opts.Rescaffold(); err != nil {
log.Fatalf("Failed to rescaffold %s", err)
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/cli/cli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import (
"os"
"strings"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"
"github.com/spf13/afero"
"github.com/spf13/cobra"
Expand Down
8 changes: 4 additions & 4 deletions pkg/cli/completion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Linux:
MacOS:
$ %[1]s completion bash > /usr/local/etc/bash_completion.d/%[1]s
`, c.commandName),
RunE: func(cmd *cobra.Command, cmdArgs []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
return cmd.Root().GenBashCompletion(os.Stdout)
},
}
Expand All @@ -55,7 +55,7 @@ $ %[1]s completion zsh > "${fpath[1]}/_%[1]s"

# You will need to start a new shell for this setup to take effect.
`, c.commandName),
RunE: func(cmd *cobra.Command, cmdArgs []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
return cmd.Root().GenZshCompletion(os.Stdout)
},
}
Expand All @@ -71,7 +71,7 @@ $ %[1]s completion fish | source
# To load completions for each session, execute once:
$ %[1]s completion fish > ~/.config/fish/completions/%[1]s.fish
`, c.commandName),
RunE: func(cmd *cobra.Command, cmdArgs []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
return cmd.Root().GenFishCompletion(os.Stdout, true)
},
}
Expand All @@ -81,7 +81,7 @@ func (CLI) newPowerShellCmd() *cobra.Command {
return &cobra.Command{
Use: "powershell",
Short: "Load powershell completions",
RunE: func(cmd *cobra.Command, cmdArgs []string) error {
RunE: func(cmd *cobra.Command, _ []string) error {
return cmd.Root().GenPowerShellCompletion(os.Stdout)
},
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/cli/completion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ limitations under the License.
package cli

import (
// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (c CLI) newInitCmd() *cobra.Command {
For further help about a specific plugin, set --plugins.
`,
Example: c.getInitHelpExamples(),
Run: func(cmd *cobra.Command, args []string) {},
Run: func(_ *cobra.Command, _ []string) {},
}

// Register --project-version on the dynamically created command
Expand Down
6 changes: 4 additions & 2 deletions pkg/cli/options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ import (
"path/filepath"
"runtime"

// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"
"github.com/spf13/afero"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -383,7 +385,7 @@ var _ = Describe("Discover external plugins", func() {

It("should fail if pluginsroot is empty", func() {
errPluginsRoot := errors.New("could not retrieve plugins root")
retrievePluginsRoot = func(host string) (string, error) {
retrievePluginsRoot = func(_ string) (string, error) {
return "", errPluginsRoot
}

Expand All @@ -394,7 +396,7 @@ var _ = Describe("Discover external plugins", func() {
})

It("should skip parsing of directories if plugins root is not a directory", func() {
retrievePluginsRoot = func(host string) (string, error) {
retrievePluginsRoot = func(_ string) (string, error) {
return "externalplugin.sh", nil
}

Expand Down
2 changes: 2 additions & 0 deletions pkg/cli/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ limitations under the License.
package cli

import (
// nolint:revive
. "github.com/onsi/ginkgo/v2"
// nolint:revive
. "github.com/onsi/gomega"

"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
Expand Down
Loading
Loading