remove more lingering linter issues - this is bizzarre, i didnt see t…

…hem the last time i pushed
arvindbr8 · Aug 30, 2024 · 278b5a4 · 278b5a4
1 parent 25ade27
commit 278b5a4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/balancer/grpclb/grpclb_test.go b/balancer/grpclb/grpclb_test.go
@@ -1640,8 +1640,12 @@ func (s) TestGRPCLBStatsQuashEmpty(t *testing.T) {
 			// Success.
 		}
 		go func() {
-			for range ch {
+			for {
 				// Drain statsChan until it is closed.
+				_, ok := <-ch
+				if !ok {
+					break
+				}
 			}
 		}()
 	}, &rpcStats{

diff --git a/clientconn_test.go b/clientconn_test.go
@@ -1266,7 +1266,10 @@ func (ccw *stateRecordingCCWrapper) NewSubConn(addrs []resolver.Address, opts ba
 // accepted in a timely fashion.
 func keepReading(conn net.Conn) {
 	buf := make([]byte, 1024)
-	for _, err := conn.Read(buf); err == nil; _, err = conn.Read(buf) {
+	for _, err := conn.Read(buf); ; _, err = conn.Read(buf) {
+		if err != nil {
+			break
+		}
 	}
 }
 

diff --git a/internal/channelz/socket.go b/internal/channelz/socket.go
@@ -74,10 +74,13 @@ type EphemeralSocketMetrics struct {
 type SocketType string
 
 const (
+	// SocketTypeNormal is used to connect to a remote server.
 	SocketTypeNormal = "NormalSocket"
+	// SocketTypeListen is used to accept connections from remote servers.
 	SocketTypeListen = "ListenSocket"
 )
 
+// Socket is a channelz entry representing a socket.
 type Socket struct {
 	Entity
 	SocketType       SocketType

diff --git a/test/clientconn_state_transition_test.go b/test/clientconn_state_transition_test.go
@@ -505,7 +505,10 @@ func (ccw *stateRecordingCCWrapper) NewSubConn(addrs []resolver.Address, opts ba
 // accepted in a timely fashion.
 func keepReading(conn net.Conn) {
 	buf := make([]byte, 1024)
-	for _, err := conn.Read(buf); err == nil; _, err = conn.Read(buf) {
+	for _, err := conn.Read(buf); ; _, err = conn.Read(buf) {
+		if err != nil {
+			break
+		}
 	}
 }
 

diff --git a/xds/internal/httpfilter/rbac/rbac.go b/xds/internal/httpfilter/rbac/rbac.go
@@ -156,12 +156,12 @@ func (builder) ParseFilterConfigOverride(override proto.Message) (httpfilter.Fil
 	if override == nil {
 		return nil, fmt.Errorf("rbac: nil configuration message provided")
 	}
-	any, ok := override.(*anypb.Any)
+	om, ok := override.(*anypb.Any)
 	if !ok {
 		return nil, fmt.Errorf("rbac: error parsing override config %v: unknown type %T", override, override)
 	}
 	msg := new(rpb.RBACPerRoute)
-	if err := any.UnmarshalTo(msg); err != nil {
+	if err := om.UnmarshalTo(msg); err != nil {
 		return nil, fmt.Errorf("rbac: error parsing override config %v: %v", override, err)
 	}
 	return parseConfig(msg.Rbac)