Merge pull request #18713 from mmorel-35/whitespace

fix: enable gofmt and whitespace linters

client/internal/v2/keys_bench_test.go

@@ -63,7 +63,6 @@ func benchmarkResponseUnmarshalling(b *testing.B, children, size int) {
 		if newResponse, err = unmarshalSuccessfulKeysResponse(header, body); err != nil {
 			b.Errorf("error unmarshalling response (%v)", err)
 		}
-
 	}
 	if !reflect.DeepEqual(response.Node, newResponse.Node) {
 		b.Errorf("Unexpected difference in a parsed response: \n%+v\n%+v", response, newResponse)

client/pkg/types/set_test.go

@@ -137,7 +137,6 @@ func driveSetTests(t *testing.T, s Set) {
 	} {
 		if tt.got != tt.want {
 			t.Fatalf("case %d: want %t, got %t", i, tt.want, tt.got)
-
 		}
 	}
 

client/v3/client_test.go

@@ -434,9 +434,7 @@ func TestClientRejectOldCluster(t *testing.T) {
 				t.Errorf("heckVersion err:%v", err)
 			}
 		})
-
 	}
-
 }
 
 type mockMaintenance struct {

client/v3/maintenance.go

@@ -217,7 +217,6 @@ func (m *maintenance) Status(ctx context.Context, endpoint string) (*StatusRespo
 func (m *maintenance) HashKV(ctx context.Context, endpoint string, rev int64) (*HashKVResponse, error) {
 	remote, cancel, err := m.dial(endpoint)
 	if err != nil {
-
 		return nil, ContextError(ctx, err)
 	}
 	defer cancel()

client/v3/retry_interceptor.go

@@ -277,7 +277,6 @@ func (s *serverStreamingRetryingStream) receiveMsgAndIndicateRetry(m any) (bool,
 			return false, err // return the original error for simplicity
 		}
 		return true, err
-
 	}
 	return isSafeRetry(s.client, err, s.callOpts), err
 }

client/v3/watch.go

@@ -732,7 +732,6 @@ func (w *watchGRPCStream) dispatchEvent(pbresp *pb.WatchResponse) bool {
 	}
 
 	return w.unicastResponse(wr, pbresp.WatchId)
-
 }
 
 // broadcastResponse send a watch response to all watch substreams.

contrib/raftexample/raft.go

@@ -86,7 +86,6 @@ var defaultSnapshotCount uint64 = 10000
 // current), then new log entries. To shutdown, close proposeC and read errorC.
 func newRaftNode(id int, peers []string, join bool, getSnapshot func() ([]byte, error), proposeC <-chan string,
 	confChangeC <-chan raftpb.ConfChange) (<-chan *commit, <-chan error, <-chan *snap.Snapshotter) {
-
 	commitC := make(chan *commit)
 	errorC := make(chan error)
 

etcdctl/ctlv3/command/printer_json.go

@@ -97,5 +97,4 @@ func printMemberListWithHexJSON(r clientv3.MemberListResponse) {
 	}
 	buffer.WriteString("}")
 	fmt.Println(buffer.String())
-
 }

etcdctl/ctlv3/command/watch_command.go

@@ -134,7 +134,6 @@ func watchInteractiveFunc(cmd *cobra.Command, osArgs []string, envKey, envRange
 			fmt.Fprintf(os.Stderr, "Invalid command %s (only support watch)\n", l)
 			continue
 		}
-
 	}
 }
 

pkg/adt/interval_tree.go

@@ -532,7 +532,6 @@ func (ivt *intervalTree) Insert(ivl Interval, val any) {
 func (ivt *intervalTree) insertFixup(z *intervalNode) {
 	for z.parent.color(ivt.sentinel) == red {
 		if z.parent == z.parent.parent.left { // line 3-15
-
 			y := z.parent.parent.right
 			if y.color(ivt.sentinel) == red {
 				y.c = black

pkg/expect/expect_test.go

@@ -254,7 +254,6 @@ func TestResponseMatchRegularExpr(t *testing.T) {
 	for _, tc := range testCases {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-
 			ep, err := NewExpect("echo", "-n", tc.mockOutput)
 			require.NoError(t, err)
 

pkg/netutil/routes_linux.go

@@ -152,7 +152,6 @@ func getIfaceAddr(idx uint32, family uint8) (*syscall.NetlinkMessage, error) {
 	}
 
 	return nil, fmt.Errorf("could not find address for interface index %v", idx)
-
 }
 
 // Used to get a name of interface.

server/auth/jwt_test.go

@@ -143,7 +143,6 @@ func testJWTInfo(t *testing.T, opts map[string]string) {
 			if !errors.Is(aerr, ErrVerifyOnly) {
 				t.Fatalf("unexpected error when attempting to sign with public key: %v", aerr)
 			}
-
 		})
 	}
 }
@@ -221,7 +220,6 @@ func TestJWTTokenWithMissingFields(t *testing.T) {
 }
 
 func TestJWTBad(t *testing.T) {
-
 	var badCases = map[string]map[string]string{
 		"no options": {},
 		"invalid method": {

server/auth/store.go

@@ -749,7 +749,6 @@ func (as *authStore) RoleDelete(r *pb.AuthRoleDeleteRequest) (*pb.AuthRoleDelete
 		}
 
 		tx.UnsafePutUser(updatedUser)
-
 	}
 
 	as.commitRevision(tx)
@@ -1114,7 +1113,6 @@ func decomposeOpts(lg *zap.Logger, optstr string) (string, map[string]string, er
 	}
 
 	return tokenType, typeSpecificOpts, nil
-
 }
 
 // NewTokenProvider creates a new token provider.

server/auth/store_test.go

@@ -177,7 +177,6 @@ func TestUserAdd(t *testing.T) {
 
 	if _, ok := as.rangePermCache[userName]; !ok {
 		t.Fatalf("user %s should be added but it doesn't exist in rangePermCache", userName)
-
 	}
 }
 
@@ -270,7 +269,6 @@ func TestUserDelete(t *testing.T) {
 
 	if _, ok := as.rangePermCache[userName]; ok {
 		t.Fatalf("user %s should be deleted but it exists in rangePermCache", userName)
-
 	}
 }
 
@@ -306,7 +304,6 @@ func TestUserDeleteAndPermCache(t *testing.T) {
 
 	if _, ok := as.rangePermCache[newUser]; !ok {
 		t.Fatalf("user %s should exist but it doesn't exist in rangePermCache", deletedUserName)
-
 	}
 }
 
@@ -458,7 +455,6 @@ func TestIsOpPermitted(t *testing.T) {
 	if err := as.isOpPermitted("foo", as.Revision(), perm.Key, perm.RangeEnd, perm.PermType); !errors.Is(err, ErrPermissionDenied) {
 		t.Fatal(err)
 	}
-
 }
 
 func TestGetUser(t *testing.T) {

server/embed/config_test.go

@@ -441,7 +441,6 @@ func TestInferLocalAddr(t *testing.T) {
 			require.Equal(t, tt.expectedLocalAddr, cfg.InferLocalAddr())
 		})
 	}
-
 }
 
 func (s *securityConfig) equals(t *transport.TLSInfo) bool {

server/etcdserver/api/membership/storev2.go

@@ -91,7 +91,6 @@ func mustDeleteMemberFromStore(lg *zap.Logger, s v2store.Store, id types.ID) {
 }
 
 func mustAddToRemovedMembersInStore(lg *zap.Logger, s v2store.Store, id types.ID) {
-
 	if _, err := s.Create(RemovedMemberStoreKey(id), false, "", false, v2store.TTLOptionSet{ExpireTime: v2store.Permanent}); err != nil {
 		lg.Panic(
 			"failed to create removedMember",

server/etcdserver/api/v2discovery/discovery_test.go

@@ -86,7 +86,6 @@ func TestNewProxyFunc(t *testing.T) {
 		if g.String() != w {
 			t.Errorf("%s: proxyURL=%q, want %q", in, g, w)
 		}
-
 	}
 }
 

server/etcdserver/api/v2error/error_test.go

@@ -46,5 +46,4 @@ func TestErrorWriteTo(t *testing.T) {
 			t.Errorf("HTTP headers %v, want %v", rr.HeaderMap, wheader)
 		}
 	}
-
 }

server/etcdserver/api/v2stats/queue.go

@@ -74,7 +74,6 @@ func (q *statsQueue) Insert(p *RequestStats) {
 
 	q.items[q.back] = p
 	q.totalReqSize += q.items[q.back].Size
-
 }
 
 // Rate function returns the package rate and byte rate

server/etcdserver/api/v2store/event_history.go

@@ -125,5 +125,4 @@ func (eh *EventHistory) clone() *EventHistory {
 		Queue:      clonedQueue,
 		LastIndex:  eh.LastIndex,
 	}
-
 }

server/etcdserver/api/v2store/event_test.go

@@ -24,7 +24,6 @@ import (
 // Add 200 events into that queue, and test if the
 // previous 100 events have been swapped out.
 func TestEventQueue(t *testing.T) {
-
 	eh := newEventHistory(100)
 
 	// Add
@@ -114,7 +113,6 @@ func TestEventIndexHistoryCleared(t *testing.T) {
 // Add 1000 events into that queue, and test if scanning
 // works still for previous events.
 func TestFullEventQueue(t *testing.T) {
-
 	eh := newEventHistory(10)
 
 	// Add

server/etcdserver/api/v2store/heap_test.go

@@ -41,7 +41,6 @@ func TestHeapPushPop(t *testing.T) {
 		}
 		min = node.ExpireTime
 	}
-
 }
 
 func TestHeapUpdate(t *testing.T) {
@@ -88,7 +87,5 @@ func TestHeapUpdate(t *testing.T) {
 				t.Fatal("heap sort wrong!")
 			}
 		}
-
 	}
-
 }

server/etcdserver/api/v2store/node.go

@@ -277,7 +277,6 @@ func (n *node) Repr(recursive, sorted bool, clock clockwork.Clock) *NodeExtern {
 		i := 0
 
 		for _, child := range children {
-
 			if child.IsHidden() { // get will not list hidden node
 				continue
 			}

server/etcdserver/api/v2store/node_extern.go

@@ -62,7 +62,6 @@ func (eNode *NodeExtern) loadInternalNode(n *node, recursive, sorted bool, clock
 		if sorted {
 			sort.Sort(eNode.Nodes)
 		}
-
 	} else { // node is a file
 		value, _ := n.Read()
 		eNode.Value = &value

server/etcdserver/api/v2store/store.go

@@ -258,7 +258,6 @@ func getCompareFailCause(n *node, which int, prevValue string, prevIndex uint64)
 
 func (s *store) CompareAndSwap(nodePath string, prevValue string, prevIndex uint64,
 	value string, expireOpts TTLOptionSet) (*Event, error) {
-
 	var err *v2error.Error
 
 	s.worldLock.Lock()
@@ -565,7 +564,6 @@ func (s *store) Update(nodePath string, newValue string, expireOpts TTLOptionSet
 
 func (s *store) internalCreate(nodePath string, dir bool, value string, unique, replace bool,
 	expireTime time.Time, action string) (*Event, *v2error.Error) {
-
 	currIndex, nextIndex := s.CurrentIndex, s.CurrentIndex+1
 
 	if unique { // append unique item under the node path
@@ -624,7 +622,6 @@ func (s *store) internalCreate(nodePath string, dir bool, value string, unique,
 		eNode.Value = &valueCopy
 
 		n = newKV(s, nodePath, value, nextIndex, d, expireTime)
-
 	} else { // create directory
 		eNode.Dir = true
 
@@ -653,7 +650,6 @@ func (s *store) internalGet(nodePath string) (*node, *v2error.Error) {
 	nodePath = path.Clean(path.Join("/", nodePath))
 
 	walkFunc := func(parent *node, name string) (*node, *v2error.Error) {
-
 		if !parent.IsDir() {
 			err := v2error.NewError(v2error.EcodeNotDir, parent.Path, s.CurrentIndex)
 			return nil, err
@@ -707,7 +703,6 @@ func (s *store) DeleteExpiredKeys(cutoff time.Time) {
 
 		s.WatcherHub.notify(e)
 	}
-
 }
 
 // checkDir will check whether the component is a directory under parent node.

server/etcdserver/api/v2store/store_bench_test.go

@@ -156,7 +156,6 @@ func BenchmarkWatchWithSetBatch(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		<-watchers[i].EventChan()
 	}
-
 }
 
 func BenchmarkWatchOneKey(b *testing.B) {

server/etcdserver/api/v2store/watcher_test.go

@@ -86,5 +86,4 @@ func TestWatcher(t *testing.T) {
 	if e != re {
 		t.Fatal("recv != send")
 	}
-
 }

server/etcdserver/api/v3rpc/grpc.go

@@ -57,7 +57,6 @@ func Server(s *etcdserver.EtcdServer, tls *tls.Config, interceptor grpc.UnarySer
 	if s.Cfg.ExperimentalEnableDistributedTracing {
 		chainUnaryInterceptors = append(chainUnaryInterceptors, otelgrpc.UnaryServerInterceptor(s.Cfg.ExperimentalTracerOptions...))
 		chainStreamInterceptors = append(chainStreamInterceptors, otelgrpc.StreamServerInterceptor(s.Cfg.ExperimentalTracerOptions...))
-
 	}
 
 	opts = append(opts, grpc.ChainUnaryInterceptor(chainUnaryInterceptors...))

server/etcdserver/apply/apply_auth_test.go

@@ -217,7 +217,6 @@ func TestAuthApplierV3_Apply(t *testing.T) {
 			require.Equalf(t, result, tc.expectResult, "Apply: got %v, expect: %v", result, tc.expectResult)
 		})
 	}
-
 }
 
 // TestAuthApplierV3_AdminPermission ensures the admin permission is checked for certain
@@ -823,5 +822,4 @@ func TestCheckLeasePutsKeys(t *testing.T) {
 
 	aa.authInfo = auth.AuthInfo{Username: "bob", Revision: aa.as.Revision()}
 	assert.NoError(t, aa.checkLeasePutsKeys(l), "bob should be able to access key 'a'")
-
 }

server/etcdserver/cindex/cindex_test.go

@@ -30,7 +30,6 @@ import (
 
 // TestConsistentIndex ensures that LoadConsistentIndex/Save/ConsistentIndex and backend.BatchTx can work well together.
 func TestConsistentIndex(t *testing.T) {
-
 	be, tmpPath := betesting.NewTmpBackend(t, time.Microsecond, 10)
 	ci := NewConsistentIndex(be)
 
@@ -133,7 +132,6 @@ func TestConsistentIndexDecrease(t *testing.T) {
 }
 
 func TestFakeConsistentIndex(t *testing.T) {
-
 	r := rand.Uint64()
 	ci := NewFakeConsistentIndex(r)
 	index := ci.ConsistentIndex()
@@ -146,5 +144,4 @@ func TestFakeConsistentIndex(t *testing.T) {
 	if index != r {
 		t.Errorf("expected %d,got %d", r, index)
 	}
-
 }

server/storage/backend/verify_test.go

@@ -73,7 +73,6 @@ func TestLockVerify(t *testing.T) {
 	defer revertVerifyFunc()
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-
 			be, _ := betesting.NewTmpBackend(t, time.Hour, 10000)
 			be.SetTxPostLockInsideApplyHook(tc.txPostLockInsideApplyHook)