Merge pull request #608 from rquitales/update-golangci-lint

chore: Bump golangci-lint version

Author: k8s-ci-robot

.golangci.yml

@@ -10,7 +10,6 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
     - depguard
     - dogsled
     - dupl
@@ -31,14 +30,12 @@ linters:
     - misspell
     - nakedret
     - staticcheck
-    - structcheck
     - stylecheck
     - revive
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
 
 

Makefile

@@ -16,7 +16,7 @@ all: generate license fix vet fmt test lint tidy
 	go install github.com/google/[email protected]
 
 "$(MYGOBIN)/golangci-lint":
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44.2
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.0
 
 "$(MYGOBIN)/deepcopy-gen":
 	go install k8s.io/code-generator/cmd/[email protected]

cmd/diff/cmddiff.go

@@ -4,7 +4,6 @@
 package diff
 
 import (
-	"io/ioutil"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -104,7 +103,7 @@ func Initialize(o *diff.DiffOptions, f util.Factory, args []string) (func(), err
 func createTempDir() (string, error) {
 	// Create a temporary file with the passed prefix in
 	// the default temporary directory.
-	tmpDir, err := ioutil.TempDir("", tmpDirPrefix)
+	tmpDir, err := os.MkdirTemp("", tmpDirPrefix)
 	if err != nil {
 		return "", err
 	}

pkg/apply/common_test.go

@@ -7,7 +7,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"regexp"
 	"testing"
@@ -240,20 +240,20 @@ func (g *genericHandler) handle(t *testing.T, req *http.Request) (*http.Response
 
 		if req.URL.Path == singlePath && req.Method == http.MethodGet {
 			if r.exists {
-				bodyRC := ioutil.NopCloser(bytes.NewReader(toJSONBytes(t, r.resource)))
+				bodyRC := io.NopCloser(bytes.NewReader(toJSONBytes(t, r.resource)))
 				return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: bodyRC}, true, nil
 			}
 			return &http.Response{StatusCode: http.StatusNotFound, Header: cmdtesting.DefaultHeader(), Body: cmdtesting.StringBody("")}, true, nil
 		}
 
 		if req.URL.Path == singlePath && req.Method == http.MethodPatch {
-			bodyRC := ioutil.NopCloser(bytes.NewReader(toJSONBytes(t, r.resource)))
+			bodyRC := io.NopCloser(bytes.NewReader(toJSONBytes(t, r.resource)))
 			return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: bodyRC}, true, nil
 		}
 
 		if req.URL.Path == singlePath && req.Method == http.MethodDelete {
 			if r.exists {
-				bodyRC := ioutil.NopCloser(bytes.NewReader(toJSONBytes(t, r.resource)))
+				bodyRC := io.NopCloser(bytes.NewReader(toJSONBytes(t, r.resource)))
 				return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: bodyRC}, true, nil
 			}
 
@@ -271,12 +271,12 @@ func (g *genericHandler) handle(t *testing.T, req *http.Request) (*http.Response
 					Kind: r.resource.GetKind(),
 				},
 			}
-			bodyRC := ioutil.NopCloser(bytes.NewReader(toJSONBytes(t, result)))
+			bodyRC := io.NopCloser(bytes.NewReader(toJSONBytes(t, result)))
 			return &http.Response{StatusCode: status, Header: cmdtesting.DefaultHeader(), Body: bodyRC}, true, nil
 		}
 
 		if req.URL.Path == allPath && req.Method == http.MethodPost {
-			bodyRC := ioutil.NopCloser(bytes.NewReader(toJSONBytes(t, r.resource)))
+			bodyRC := io.NopCloser(bytes.NewReader(toJSONBytes(t, r.resource)))
 			return &http.Response{StatusCode: http.StatusCreated, Header: cmdtesting.DefaultHeader(), Body: bodyRC}, true, nil
 		}
 	}
@@ -341,7 +341,7 @@ func (n *nsHandler) handle(t *testing.T, req *http.Request) (*http.Response, boo
 				Name: nsName,
 			},
 		}
-		bodyRC := ioutil.NopCloser(bytes.NewReader(toJSONBytes(t, &ns)))
+		bodyRC := io.NopCloser(bytes.NewReader(toJSONBytes(t, &ns)))
 		return &http.Response{StatusCode: http.StatusOK, Header: cmdtesting.DefaultHeader(), Body: bodyRC}, true, nil
 	}
 	return nil, false, nil

pkg/apply/event/event.go

@@ -13,6 +13,7 @@ import (
 )
 
 // Type determines the type of events that are available.
+//
 //go:generate stringer -type=Type
 type Type int
 

pkg/apply/prune/event-factory.go

@@ -33,6 +33,7 @@ func CreateEventFactory(isDelete bool, groupName string) EventFactory {
 
 // PruneEventFactory implements EventFactory interface as a concrete
 // representation of for prune events.
+//
 //nolint:revive // stuttering ok because Prune is a type of PruneEvent
 type PruneEventFactory struct {
 	groupName string

pkg/apply/prune/prune.go

@@ -80,11 +80,12 @@ type Options struct {
 // automatically prune/delete).
 //
 // Parameters:
-//   objs - objects to prune (delete)
-//   pruneFilters - list of filters for deletion permission
-//   taskContext - task for apply/prune
-//   taskName - name of the parent task group, for events
-//   opts - options for dry-run
+//
+//	objs - objects to prune (delete)
+//	pruneFilters - list of filters for deletion permission
+//	taskContext - task for apply/prune
+//	taskName - name of the parent task group, for events
+//	opts - options for dry-run
 func (p *Pruner) Prune(
 	objs object.UnstructuredSet,
 	pruneFilters []filter.ValidationFilter,

pkg/apply/task/apply_task.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -192,8 +192,8 @@ func newApplyOptions(taskName string, eventChannel chan<- event.Event, serverSid
 		OpenAPIPatch:      true, // Normally set in apply.NewApplyOptions
 		Recorder:          genericclioptions.NoopRecorder{},
 		IOStreams: genericclioptions.IOStreams{
-			Out:    ioutil.Discard,
-			ErrOut: ioutil.Discard, // TODO: Warning for no lastConfigurationAnnotation
+			Out:    io.Discard,
+			ErrOut: io.Discard, // TODO: Warning for no lastConfigurationAnnotation
 			// is printed directly to stderr in ApplyOptions. We
 			// should turn that into a warning on the event channel.
 		},

pkg/apply/taskrunner/runner.go

@@ -42,11 +42,11 @@ type Options struct {
 //
 // The tasks run in a loop where a single goroutine will process events from
 // three different channels.
-// - taskQueue is read to allow updating the task queue at runtime.
-// - statusChannel is read to allow updates to the resource cache and triggering
-//   validation of wait conditions.
-// - eventChannel is written to with events based on status updates, if
-//   emitStatusEvents is true.
+//   - taskQueue is read to allow updating the task queue at runtime.
+//   - statusChannel is read to allow updates to the resource cache and triggering
+//     validation of wait conditions.
+//   - eventChannel is written to with events based on status updates, if
+//     emitStatusEvents is true.
 func (tsr *TaskStatusRunner) Run(
 	ctx context.Context,
 	taskContext *TaskContext,

pkg/common/common.go

@@ -90,6 +90,7 @@ const (
 )
 
 // ClientDryRun returns true if input drs is DryRunClient
+//
 //nolint:stylecheck  // Prevent lint errors on receiver names caused by string generation above
 func (drs DryRunStrategy) ClientDryRun() bool {
 	return drs == DryRunClient