update golangci-lint version and add modernize lint

Signed-off-by: jiangdong <jiangdong@iflytek.com>

Author: jiangdong

.github/workflows/golangci-lint.yml

@@ -34,6 +34,6 @@ jobs:
  - name: golangci-lint
  uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # tag=v9.0.0
  with:
- version: v2.5.0
+ version: v2.6.1
  args: --output.text.print-linter-name=true --output.text.colors=true --timeout 10m
  working-directory: ${{matrix.working-directory}}

.golangci.yml

@@ -31,6 +31,7 @@ linters:
  - iotamixing
  - makezero
  - misspell
+ - modernize
  - nakedret
  - nilerr
  - nolintlint
@@ -75,6 +76,9 @@ linters:
  - pkg: sigs.k8s.io/controller-runtime
  alias: ctrl
  no-unaliased: true
+ modernize:
+ disable:
+ - omitzero
  revive:
  rules:
  # The following rules are recommended https://github.com/mgechev/revive#recommended-configuration
@@ -125,6 +129,9 @@ linters:
  - linters:
  - staticcheck
  text: 'SA1019: .*The component config package has been deprecated and will be removed in a future release.'
+ - linters:
+ - staticcheck
+ text: 'SA1019: .* is deprecated: .* is deprecated, use .* instead '
  # With Go 1.16, the new embed directive can be used with an un-named import,
  # revive (previously, golint) only allows these to be imported in a main.go, which wouldn't work for us.
  # This directive allows the embed package to be imported with an underscore everywhere.

hack/tools/cmd/gomodcheck/main.go

@@ -162,7 +162,7 @@ func modulesFromUpstreamModGraph(upstreamRefList []string) (map[string]map[strin
 }
 
 modToVersionToUpstreamRef := make(map[string]map[string]string)
-for _, line := range strings.Split(graph, "\n") {
+for line := range strings.SplitSeq(graph, "\n") {
 ref := strings.SplitN(line, "@", 2)[0]
 
 if _, ok := upstreamRefs[ref]; !ok {

pkg/builder/controller.go

@@ -312,7 +312,7 @@ func (blder *TypedBuilder[request]) doWatch() error {
 return err
 }
 
-if reflect.TypeFor[request]() != reflect.TypeOf(reconcile.Request{}) {
+if reflect.TypeFor[request]() != reflect.TypeFor[reconcile.Request]() {
 return fmt.Errorf("For() can only be used with reconcile.Request, got %T", *new(request))
 }
 

pkg/builder/controller_test.go

@@ -61,10 +61,10 @@ func (l *testLogger) Enabled(int) bool {
 return true
 }
 
-func (l *testLogger) Info(level int, msg string, keysAndValues ...interface{}) {
+func (l *testLogger) Info(level int, msg string, keysAndValues ...any) {
 }
 
-func (l *testLogger) WithValues(keysAndValues ...interface{}) logr.LogSink {
+func (l *testLogger) WithValues(keysAndValues ...any) logr.LogSink {
 return l
 }
 

pkg/builder/webhook.go

@@ -64,6 +64,7 @@ func WebhookManagedBy[T runtime.Object](m manager.Manager, object T) *WebhookBui
 
 // WithCustomDefaulter takes an admission.CustomDefaulter interface, a MutatingWebhook with the provided opts (admission.DefaulterOption)
 // will be wired for this type.
+//
 // Deprecated: Use WithDefaulter instead.
 func (blder *WebhookBuilder[T]) WithCustomDefaulter(defaulter admission.CustomDefaulter, opts ...admission.DefaulterOption) *WebhookBuilder[T] {
 blder.customDefaulter = defaulter
@@ -79,6 +80,7 @@ func (blder *WebhookBuilder[T]) WithDefaulter(defaulter admission.Defaulter[T],
 }
 
 // WithCustomValidator takes a admission.CustomValidator interface, a ValidatingWebhook will be wired for this type.
+//
 // Deprecated: Use WithValidator instead.
 func (blder *WebhookBuilder[T]) WithCustomValidator(validator admission.CustomValidator) *WebhookBuilder[T] {
 blder.customValidator = validator

pkg/cache/cache_test.go

@@ -216,7 +216,7 @@ var _ = Describe("Cache with transformers", func() {
 
 By("creating the informer cache")
 informerCache, err = cache.New(cfg, cache.Options{
-DefaultTransform: func(i interface{}) (interface{}, error) {
+DefaultTransform: func(i any) (any, error) {
 obj := i.(runtime.Object)
 Expect(obj).NotTo(BeNil())
 
@@ -238,7 +238,7 @@ var _ = Describe("Cache with transformers", func() {
 },
 ByObject: map[client.Object]cache.ByObject{
 &corev1.Pod{}: {
-Transform: func(i interface{}) (interface{}, error) {
+Transform: func(i any) (any, error) {
 obj := i.(runtime.Object)
 Expect(obj).NotTo(BeNil())
 accessor, err := meta.Accessor(obj)
@@ -1103,7 +1103,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 Expect(out).To(Equal(uKnownPod2))
 
 By("altering a field in the retrieved pod")
-m, _ := out.Object["spec"].(map[string]interface{})
+m, _ := out.Object["spec"].(map[string]any)
 m["activeDeadlineSeconds"] = 4
 
 By("verifying the pods are no longer equal")
@@ -1954,8 +1954,8 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 Expect(sii.HasSynced()).To(BeTrue())
 
 By("adding an event handler listening for object creation which sends the object to a channel")
-out := make(chan interface{})
-addFunc := func(obj interface{}) {
+out := make(chan any)
+addFunc := func(obj any) {
 out <- obj
 }
 _, _ = sii.AddEventHandler(kcache.ResourceEventHandlerFuncs{AddFunc: addFunc})
@@ -2014,8 +2014,8 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 Expect(sii.HasSynced()).To(BeTrue())
 
 By("adding an event handler listening for object creation which sends the object to a channel")
-out := make(chan interface{})
-addFunc := func(obj interface{}) {
+out := make(chan any)
+addFunc := func(obj any) {
 out <- obj
 }
 _, _ = sii.AddEventHandler(kcache.ResourceEventHandlerFuncs{AddFunc: addFunc})
@@ -2196,9 +2196,9 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 By("getting a shared index informer for a pod")
 
 pod := &unstructured.Unstructured{
-Object: map[string]interface{}{
-"spec": map[string]interface{}{
-"containers": []map[string]interface{}{
+Object: map[string]any{
+"spec": map[string]any{
+"containers": []map[string]any{
 {
 "name": "nginx",
 "image": "nginx",
@@ -2220,8 +2220,8 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 Expect(sii.HasSynced()).To(BeTrue())
 
 By("adding an event handler listening for object creation which sends the object to a channel")
-out := make(chan interface{})
-addFunc := func(obj interface{}) {
+out := make(chan any)
+addFunc := func(obj any) {
 out <- obj
 }
 _, _ = sii.AddEventHandler(kcache.ResourceEventHandlerFuncs{AddFunc: addFunc})
@@ -2239,9 +2239,9 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 It("should be able to stop and restart informers", func(ctx SpecContext) {
 By("getting a shared index informer for a pod")
 pod := &unstructured.Unstructured{
-Object: map[string]interface{}{
-"spec": map[string]interface{}{
-"containers": []map[string]interface{}{
+Object: map[string]any{
+"spec": map[string]any{
+"containers": []map[string]any{
 {
 "name": "nginx",
 "image": "nginx",
@@ -2294,7 +2294,7 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 if !ok {
 return []string{}
 }
-m, ok := s.(map[string]interface{})
+m, ok := s.(map[string]any)
 if !ok {
 return []string{}
 }
@@ -2379,8 +2379,8 @@ func CacheTest(createCacheFunc func(config *rest.Config, opts cache.Options) (ca
 Expect(sii.HasSynced()).To(BeTrue())
 
 By("adding an event handler listening for object creation which sends the object to a channel")
-out := make(chan interface{})
-addFunc := func(obj interface{}) {
+out := make(chan any)
+addFunc := func(obj any) {
 out <- obj
 }
 _, _ = sii.AddEventHandler(kcache.ResourceEventHandlerFuncs{AddFunc: addFunc})

pkg/cache/defaulting_test.go

@@ -474,11 +474,9 @@ func TestDefaultOptsRace(t *testing.T) {
 // Start go routines which re-use the above options struct.
 wg := sync.WaitGroup{}
 for range 2 {
-wg.Add(1)
-go func() {
+wg.Go(func() {
 _, _ = defaultOpts(&rest.Config{}, opts)
-wg.Done()
-}()
+})
 }
 
 // Wait for the go routines to finish.
@@ -509,7 +507,7 @@ func TestDefaultConfigConsidersAllFields(t *testing.T) {
 },
 )
 
-for i := 0; i < 100; i++ {
+for range 100 {
 fuzzed := Config{}
 f.Fuzz(&fuzzed)
 

pkg/cache/delegating_by_gvk_cache.go

@@ -81,13 +81,11 @@ func (dbt *delegatingByGVKCache) Start(ctx context.Context) error {
 errs := make(chan error)
 for idx := range allCaches {
 cache := allCaches[idx]
-wg.Add(1)
-go func() {
-defer wg.Done()
+wg.Go(func() {
 if err := cache.Start(ctx); err != nil {
 errs <- err
 }
-}()
+})
 }
 
 select {

pkg/cache/informer_cache.go

@@ -221,7 +221,7 @@ func (ic *informerCache) IndexField(ctx context.Context, obj client.Object, fiel
 }
 
 func indexByField(informer Informer, field string, extractValue client.IndexerFunc) error {
-indexFunc := func(objRaw interface{}) ([]string, error) {
+indexFunc := func(objRaw any) ([]string, error) {
 // TODO(directxman12): check if this is the correct type?
 obj, isObj := objRaw.(client.Object)
 if !isObj {