etcdctl: remaining errors.Is conversions for error equality and inequ…

…ality checks Signed-off-by: redwrasse <[email protected]>
redwrasse · Sep 20, 2024 · 0a355d3 · 0a355d3
1 parent d59fa33
commit 0a355d3
Show file tree

Hide file tree

Showing 67 changed files with 156 additions and 205 deletions.
diff --git a/client/internal/v2/client.go b/client/internal/v2/client.go
@@ -365,10 +365,10 @@ func (c *httpClusterClient) Do(ctx context.Context, act httpAction) (*http.Respo
 		resp, body, err = hc.Do(ctx, action)
 		if err != nil {
 			cerr.Errors = append(cerr.Errors, err)
-			if errors.Is(err, ctx.Err()) {
+			if err == ctx.Err() {
 				return nil, nil, ctx.Err()
 			}
-			if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
+			if err == context.Canceled || err == context.DeadlineExceeded {
 				return nil, nil, err
 			}
 		} else if resp.StatusCode/100 == 5 {

diff --git a/client/internal/v2/client_test.go b/client/internal/v2/client_test.go
@@ -169,7 +169,7 @@ func TestSimpleHTTPClientDoNilRequest(t *testing.T) {
 	tr.errchan <- errors.New("fixture")
 
 	_, _, err := c.Do(context.Background(), &nilAction{})
-	if !errors.Is(err, ErrNoRequest) {
+	if err != ErrNoRequest {
 		t.Fatalf("expected non-nil error, got nil")
 	}
 }
@@ -256,7 +256,7 @@ func TestSimpleHTTPClientDoCancelContextResponseBodyClosedWithBlockingBody(t *te
 	}()
 
 	_, _, err := c.Do(ctx, &fakeAction{})
-	if !errors.Is(err, context.Canceled) {
+	if err != context.Canceled {
 		t.Fatalf("expected %+v, got %+v", context.Canceled, err)
 	}
 
@@ -478,7 +478,7 @@ func TestHTTPClusterClientDoDeadlineExceedContext(t *testing.T) {
 
 	select {
 	case err := <-errc:
-		if !errors.Is(err, context.DeadlineExceeded) {
+		if err != context.DeadlineExceeded {
 			t.Errorf("err = %+v, want %+v", err, context.DeadlineExceeded)
 		}
 	case <-time.After(time.Second):
@@ -528,7 +528,7 @@ func TestHTTPClusterClientDoCanceledContext(t *testing.T) {
 
 	select {
 	case err := <-errc:
-		if !errors.Is(err, errFakeCancelContext) {
+		if err != errFakeCancelContext {
 			t.Errorf("err = %+v, want %+v", err, errFakeCancelContext)
 		}
 	case <-time.After(time.Second):
@@ -881,7 +881,7 @@ func TestHTTPClusterClientAutoSyncCancelContext(t *testing.T) {
 	cancel()
 
 	err = hc.AutoSync(ctx, time.Hour)
-	if !errors.Is(err, context.Canceled) {
+	if err != context.Canceled {
 		t.Fatalf("incorrect error value: want=%v got=%v", context.Canceled, err)
 	}
 }

diff --git a/client/internal/v2/keys.go b/client/internal/v2/keys.go
@@ -459,7 +459,7 @@ func (hw *httpWatcher) Next(ctx context.Context) (*Response, error) {
 
 		resp, err := unmarshalHTTPResponse(httpresp.StatusCode, httpresp.Header, body)
 		if err != nil {
-			if errors.Is(err, ErrEmptyBody) {
+			if err == ErrEmptyBody {
 				continue
 			}
 			return nil, err

diff --git a/client/pkg/fileutil/lock_linux.go b/client/pkg/fileutil/lock_linux.go
@@ -17,7 +17,6 @@
 package fileutil
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -65,7 +64,7 @@ func ofdTryLockFile(path string, flag int, perm os.FileMode) (*LockedFile, error
 	flock := wrlck
 	if err = syscall.FcntlFlock(f.Fd(), unix.F_OFD_SETLK, &flock); err != nil {
 		f.Close()
-		if errors.Is(err, syscall.EWOULDBLOCK) {
+		if err == syscall.EWOULDBLOCK {
 			err = ErrLocked
 		}
 		return nil, err

diff --git a/client/pkg/fileutil/lock_solaris.go b/client/pkg/fileutil/lock_solaris.go
@@ -17,7 +17,6 @@
 package fileutil
 
 import (
-	"errors"
 	"os"
 	"syscall"
 )
@@ -36,7 +35,7 @@ func TryLockFile(path string, flag int, perm os.FileMode) (*LockedFile, error) {
 	}
 	if err := syscall.FcntlFlock(f.Fd(), syscall.F_SETLK, &lock); err != nil {
 		f.Close()
-		if errors.Is(err, syscall.EAGAIN) {
+		if err == syscall.EAGAIN {
 			err = ErrLocked
 		}
 		return nil, err

diff --git a/client/pkg/fileutil/lock_test.go b/client/pkg/fileutil/lock_test.go
@@ -15,7 +15,6 @@
 package fileutil
 
 import (
-	"errors"
 	"os"
 	"testing"
 	"time"
@@ -41,7 +40,7 @@ func TestLockAndUnlock(t *testing.T) {
 	}
 
 	// try lock a locked file
-	if _, err = TryLockFile(f.Name(), os.O_WRONLY, PrivateFileMode); !errors.Is(err, ErrLocked) {
+	if _, err = TryLockFile(f.Name(), os.O_WRONLY, PrivateFileMode); err != ErrLocked {
 		t.Fatal(err)
 	}
 

diff --git a/client/pkg/fileutil/lock_windows.go b/client/pkg/fileutil/lock_windows.go
@@ -88,9 +88,9 @@ func lockFile(fd windows.Handle, flags uint32) error {
 	err := windows.LockFileEx(fd, flags|windows.LOCKFILE_EXCLUSIVE_LOCK, 0, 1, 0, &windows.Overlapped{})
 	if err == nil {
 		return nil
-	} else if errors.Is(err, errLocked) {
+	} else if err.Error() == errLocked.Error() {
 		return ErrLocked
-	} else if !errors.Is(err, windows.ERROR_LOCK_VIOLATION) {
+	} else if err != windows.ERROR_LOCK_VIOLATION {
 		return err
 	}
 	return nil

diff --git a/client/pkg/fileutil/preallocate_darwin.go b/client/pkg/fileutil/preallocate_darwin.go
@@ -17,7 +17,6 @@
 package fileutil
 
 import (
-	"errors"
 	"os"
 	"syscall"
 
@@ -45,7 +44,7 @@ func preallocFixed(f *os.File, sizeInBytes int64) error {
 	}
 
 	// wrong argument to fallocate syscall
-	if errors.Is(err, unix.EINVAL) {
+	if err == unix.EINVAL {
 		// filesystem "st_blocks" are allocated in the units of
 		// "Allocation Block Size" (run "diskutil info /" command)
 		var stat syscall.Stat_t

diff --git a/client/v3/client.go b/client/v3/client.go
@@ -294,7 +294,7 @@ func (c *Client) getToken(ctx context.Context) error {
 
 	resp, err := c.Auth.Authenticate(ctx, c.Username, c.Password)
 	if err != nil {
-		if errors.Is(err, rpctypes.ErrAuthNotEnabled) {
+		if err == rpctypes.ErrAuthNotEnabled {
 			c.authTokenBundle.UpdateAuthToken("")
 			return nil
 		}
@@ -627,7 +627,7 @@ func canceledByCaller(stopCtx context.Context, err error) bool {
 		return false
 	}
 
-	return errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)
+	return err == context.Canceled || err == context.DeadlineExceeded
 }
 
 // IsConnCanceled returns true, if error is from a closed gRPC connection.
@@ -645,7 +645,7 @@ func IsConnCanceled(err error) bool {
 	}
 
 	// >= gRPC v1.10.x
-	if errors.Is(err, context.Canceled) {
+	if err == context.Canceled {
 		return true
 	}
 

diff --git a/client/v3/client_test.go b/client/v3/client_test.go
@@ -449,7 +449,7 @@ func TestClientRejectOldCluster(t *testing.T) {
 				},
 			}
 
-			if err := c.checkVersion(); !errors.Is(err, tt.expectedError) {
+			if err := c.checkVersion(); err != tt.expectedError {
 				t.Errorf("heckVersion err:%v", err)
 			}
 		})

diff --git a/client/v3/experimental/recipes/key.go b/client/v3/experimental/recipes/key.go
@@ -16,7 +16,6 @@ package recipe
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -52,7 +51,7 @@ func newUniqueKV(kv v3.KV, prefix string, val string) (*RemoteKV, error) {
 		if err == nil {
 			return &RemoteKV{kv, newKey, rev, val}, nil
 		}
-		if !errors.Is(err, ErrKeyExists) {
+		if err != ErrKeyExists {
 			return nil, err
 		}
 	}
@@ -156,7 +155,7 @@ func newUniqueEphemeralKV(s *concurrency.Session, prefix, val string) (ek *Ephem
 	for {
 		newKey := fmt.Sprintf("%s/%v", prefix, time.Now().UnixNano())
 		ek, err = newEphemeralKV(s, newKey, val)
-		if err == nil || !errors.Is(err, ErrKeyExists) {
+		if err == nil || err != ErrKeyExists {
 			break
 		}
 	}

diff --git a/client/v3/watch.go b/client/v3/watch.go
@@ -395,7 +395,7 @@ func (w *watcher) Close() (err error) {
 		}
 	}
 	// Consider context.Canceled as a successful close
-	if errors.Is(err, context.Canceled) {
+	if err == context.Canceled {
 		err = nil
 	}
 	return err

diff --git a/contrib/raftexample/kvstore.go b/contrib/raftexample/kvstore.go
@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"encoding/gob"
 	"encoding/json"
-	"errors"
 	"log"
 	"strings"
 	"sync"
@@ -114,7 +113,7 @@ func (s *kvstore) getSnapshot() ([]byte, error) {
 
 func (s *kvstore) loadSnapshot() (*raftpb.Snapshot, error) {
 	snapshot, err := s.snapshotter.Load()
-	if errors.Is(err, snap.ErrNoSnapshot) {
+	if err == snap.ErrNoSnapshot {
 		return nil, nil
 	}
 	if err != nil {

diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go
@@ -16,7 +16,6 @@ package main
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"log"
 	"net/http"
@@ -393,7 +392,7 @@ func (rc *raftNode) maybeTriggerSnapshot(applyDoneC <-chan struct{}) {
 		compactIndex = rc.appliedIndex - snapshotCatchUpEntriesN
 	}
 	if err := rc.raftStorage.Compact(compactIndex); err != nil {
-		if !errors.Is(err, raft.ErrCompacted) {
+		if err != raft.ErrCompacted {
 			panic(err)
 		}
 	} else {

diff --git a/pkg/ioutil/readcloser_test.go b/pkg/ioutil/readcloser_test.go
@@ -16,7 +16,6 @@ package ioutil
 
 import (
 	"bytes"
-	"errors"
 	"io"
 	"testing"
 )
@@ -29,7 +28,7 @@ func (rc *readerNilCloser) Close() error { return nil }
 func TestExactReadCloserExpectEOF(t *testing.T) {
 	buf := bytes.NewBuffer(make([]byte, 10))
 	rc := NewExactReadCloser(&readerNilCloser{buf}, 1)
-	if _, err := rc.Read(make([]byte, 10)); !errors.Is(err, ErrExpectEOF) {
+	if _, err := rc.Read(make([]byte, 10)); err != ErrExpectEOF {
 		t.Fatalf("expected %v, got %v", ErrExpectEOF, err)
 	}
 }
@@ -41,7 +40,7 @@ func TestExactReadCloserShort(t *testing.T) {
 	if _, err := rc.Read(make([]byte, 10)); err != nil {
 		t.Fatalf("Read expected nil err, got %v", err)
 	}
-	if err := rc.Close(); !errors.Is(err, ErrShortRead) {
+	if err := rc.Close(); err != ErrShortRead {
 		t.Fatalf("Close expected %v, got %v", ErrShortRead, err)
 	}
 }
diff --git a/server/auth/jwt_test.go b/server/auth/jwt_test.go
@@ -16,7 +16,6 @@ package auth
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"testing"
 	"time"
@@ -140,7 +139,7 @@ func testJWTInfo(t *testing.T, opts map[string]string) {
 			}
 
 			_, aerr := verify.assign(ctx, "abc", 123)
-			if !errors.Is(aerr, ErrVerifyOnly) {
+			if aerr != ErrVerifyOnly {
 				t.Fatalf("unexpected error when attempting to sign with public key: %v", aerr)
 			}