Update golangci-lint to 1.47.3

kubernetes-sigs · Aug 11, 2022 · 1f457a1 · 1f457a1
1 parent bcde6f0
commit 1f457a1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -19,5 +19,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.45.2
+          version: v1.47.3
           working-directory: ${{matrix.working-directory}}
diff --git a/pkg/certwatcher/example_test.go b/pkg/certwatcher/example_test.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"crypto/tls"
 	"net/http"
+	"time"
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/certwatcher"
@@ -56,7 +57,8 @@ func Example() {
 
 	// Initialize your tls server
 	srv := &http.Server{
-		Handler: &sampleServer{},
+		Handler:           &sampleServer{},
+		ReadHeaderTimeout: 5 * time.Second,
 	}
 
 	// Start goroutine for handling server shutdown.

diff --git a/pkg/client/apiutil/dynamicrestmapper.go b/pkg/client/apiutil/dynamicrestmapper.go
@@ -164,10 +164,7 @@ func (drm *dynamicRESTMapper) checkAndReload(needsReloadErr error, checkNeedsRel
 		return checkNeedsReload()
 	}()
 
-	// NB(directxman12): `Is` and `As` have a confusing relationship --
-	// `Is` is like `== or does this implement .Is`, whereas `As` says
-	// `can I type-assert into`
-	needsReload := errors.As(err, &needsReloadErr)
+	needsReload := errors.Is(err, needsReloadErr)
 	if !needsReload {
 		return err
 	}
@@ -178,7 +175,7 @@ func (drm *dynamicRESTMapper) checkAndReload(needsReloadErr error, checkNeedsRel
 
 	// ... and double-check that we didn't reload in the meantime
 	err = checkNeedsReload()
-	needsReload = errors.As(err, &needsReloadErr)
+	needsReload = errors.Is(err, needsReloadErr)
 	if !needsReload {
 		return err
 	}

diff --git a/pkg/internal/testing/process/process.go b/pkg/internal/testing/process/process.go
@@ -184,16 +184,12 @@ func (ps *State) Start(stdout, stderr io.Writer) (err error) {
 		ps.ready = true
 		return nil
 	case <-ps.waitDone:
-		if pollerStopCh != nil {
-			close(pollerStopCh)
-		}
+		close(pollerStopCh)
 		return fmt.Errorf("timeout waiting for process %s to start successfully "+
 			"(it may have failed to start, or stopped unexpectedly before becoming ready)",
 			path.Base(ps.Path))
 	case <-timedOut:
-		if pollerStopCh != nil {
-			close(pollerStopCh)
-		}
+		close(pollerStopCh)
 		if ps.Cmd != nil {
 			// intentionally ignore this -- we might've crashed, failed to start, etc
 			ps.Cmd.Process.Signal(syscall.SIGTERM) //nolint:errcheck