Update go.mod for golang/x/tools and staticcheck (#2832)

balancer/xds/lrs/lrs.go

@@ -97,7 +97,7 @@ func (ls *lrsStore) buildStats() []*loadreportpb.ClusterStats {
 	)
 	ls.drops.Range(func(category, countP interface{}) bool {
 		tempCount := atomic.SwapUint64(countP.(*uint64), 0)
-		if tempCount <= 0 {
+		if tempCount == 0 {
 			return true
 		}
 		totalDropped += tempCount

clientconn.go

@@ -621,7 +621,7 @@ func (cc *ClientConn) updateResolverState(s resolver.State) error {
 //
 // Caller must hold cc.mu.
 func (cc *ClientConn) switchBalancer(name string) {
-	if strings.ToLower(cc.curBalancerName) == strings.ToLower(name) {
+	if strings.EqualFold(cc.curBalancerName, name) {
 		return
 	}
 

credentials/credentials.go

@@ -278,24 +278,22 @@ type ChannelzSecurityValue interface {
 // TLSChannelzSecurityValue defines the struct that TLS protocol should return
 // from GetSecurityValue(), containing security info like cipher and certificate used.
 type TLSChannelzSecurityValue struct {
+	ChannelzSecurityValue
 	StandardName      string
 	LocalCertificate  []byte
 	RemoteCertificate []byte
 }
 
-func (*TLSChannelzSecurityValue) isChannelzSecurityValue() {}
-
 // OtherChannelzSecurityValue defines the struct that non-TLS protocol should return
 // from GetSecurityValue(), which contains protocol specific security info. Note
 // the Value field will be sent to users of channelz requesting channel info, and
 // thus sensitive info should better be avoided.
 type OtherChannelzSecurityValue struct {
+	ChannelzSecurityValue
 	Name  string
 	Value proto.Message
 }
 
-func (*OtherChannelzSecurityValue) isChannelzSecurityValue() {}
-
 var cipherSuiteLookup = map[uint16]string{
 	tls.TLS_RSA_WITH_RC4_128_SHA:                "TLS_RSA_WITH_RC4_128_SHA",
 	tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA:           "TLS_RSA_WITH_3DES_EDE_CBC_SHA",

go.mod

@@ -11,10 +11,9 @@ require (
 	golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3
 	golang.org/x/net v0.0.0-20190311183353-d8887717615a
 	golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
-	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect
 	golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a
-	golang.org/x/tools v0.0.0-20190311212946-11955173bddd
+	golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135
 	google.golang.org/appengine v1.1.0 // indirect
 	google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8
-	honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099
+	honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc
 )

go.sum

@@ -19,17 +19,19 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJV
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099 h1:XJP7lxbSxWLOMNdBE4B/STaqVy6L73o0knwj2vIlxnw=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

naming/naming.go

@@ -17,9 +17,8 @@
  */
 
 // Package naming defines the naming API and related data structures for gRPC.
-// The interface is EXPERIMENTAL and may be subject to change.
 //
-// Deprecated: please use package resolver.
+// This package is deprecated: please use package resolver instead.
 package naming
 
 // Operation defines the corresponding operations for a name resolution change.

test/rawConnWrapper.go

@@ -87,9 +87,8 @@ type rawConnWrapper struct {
 	hpackEnc  *hpack.Encoder
 
 	// reading frames:
-	frc       chan http2.Frame
-	frErrc    chan error
-	readTimer *time.Timer
+	frc    chan http2.Frame
+	frErrc chan error
 }
 
 func newRawConnWrapperFromConn(cc io.ReadWriteCloser) *rawConnWrapper {
@@ -109,116 +108,6 @@ func (rcw *rawConnWrapper) Close() error {
 	return rcw.cc.Close()
 }
 
-func (rcw *rawConnWrapper) readFrame() (http2.Frame, error) {
-	go func() {
-		fr, err := rcw.fr.ReadFrame()
-		if err != nil {
-			rcw.frErrc <- err
-		} else {
-			rcw.frc <- fr
-		}
-	}()
-	t := time.NewTimer(2 * time.Second)
-	defer t.Stop()
-	select {
-	case f := <-rcw.frc:
-		return f, nil
-	case err := <-rcw.frErrc:
-		return nil, err
-	case <-t.C:
-		return nil, fmt.Errorf("timeout waiting for frame")
-	}
-}
-
-// greet initiates the client's HTTP/2 connection into a state where
-// frames may be sent.
-func (rcw *rawConnWrapper) greet() error {
-	rcw.writePreface()
-	rcw.writeInitialSettings()
-	rcw.wantSettings()
-	rcw.writeSettingsAck()
-	for {
-		f, err := rcw.readFrame()
-		if err != nil {
-			return err
-		}
-		switch f := f.(type) {
-		case *http2.WindowUpdateFrame:
-			// grpc's transport/http2_server sends this
-			// before the settings ack. The Go http2
-			// server uses a setting instead.
-		case *http2.SettingsFrame:
-			if f.IsAck() {
-				return nil
-			}
-			return fmt.Errorf("during greet, got non-ACK settings frame")
-		default:
-			return fmt.Errorf("during greet, unexpected frame type %T", f)
-		}
-	}
-}
-
-func (rcw *rawConnWrapper) writePreface() error {
-	n, err := rcw.cc.Write([]byte(http2.ClientPreface))
-	if err != nil {
-		return fmt.Errorf("error writing client preface: %v", err)
-	}
-	if n != len(http2.ClientPreface) {
-		return fmt.Errorf("writing client preface, wrote %d bytes; want %d", n, len(http2.ClientPreface))
-	}
-	return nil
-}
-
-func (rcw *rawConnWrapper) writeInitialSettings() error {
-	if err := rcw.fr.WriteSettings(); err != nil {
-		return fmt.Errorf("error writing initial SETTINGS frame from client to server: %v", err)
-	}
-	return nil
-}
-
-func (rcw *rawConnWrapper) writeSettingsAck() error {
-	if err := rcw.fr.WriteSettingsAck(); err != nil {
-		return fmt.Errorf("error writing ACK of server's SETTINGS: %v", err)
-	}
-	return nil
-}
-
-func (rcw *rawConnWrapper) wantSettings() (*http2.SettingsFrame, error) {
-	f, err := rcw.readFrame()
-	if err != nil {
-		return nil, fmt.Errorf("error while expecting a SETTINGS frame: %v", err)
-	}
-	sf, ok := f.(*http2.SettingsFrame)
-	if !ok {
-		return nil, fmt.Errorf("got a %T; want *SettingsFrame", f)
-	}
-	return sf, nil
-}
-
-func (rcw *rawConnWrapper) wantSettingsAck() error {
-	f, err := rcw.readFrame()
-	if err != nil {
-		return err
-	}
-	sf, ok := f.(*http2.SettingsFrame)
-	if !ok {
-		return fmt.Errorf("wanting a settings ACK, received a %T", f)
-	}
-	if !sf.IsAck() {
-		return fmt.Errorf("settings Frame didn't have ACK set")
-	}
-	return nil
-}
-
-// wait for any activity from the server
-func (rcw *rawConnWrapper) wantAnyFrame() (http2.Frame, error) {
-	f, err := rcw.fr.ReadFrame()
-	if err != nil {
-		return nil, err
-	}
-	return f, nil
-}
-
 func (rcw *rawConnWrapper) encodeHeaderField(k, v string) error {
 	err := rcw.hpackEnc.WriteField(hpack.HeaderField{Name: k, Value: v})
 	if err != nil {
@@ -329,49 +218,20 @@ func (rcw *rawConnWrapper) encodeHeader(headers ...string) []byte {
 	return rcw.headerBuf.Bytes()
 }
 
-// writeHeadersGRPC is for usage on client side to write request header.
-func (rcw *rawConnWrapper) writeHeadersGRPC(streamID uint32, path string) {
-	rcw.writeHeaders(http2.HeadersFrameParam{
-		StreamID: streamID,
-		BlockFragment: rcw.encodeHeader(
-			":method", "POST",
-			":path", path,
-			"content-type", "application/grpc",
-			"te", "trailers",
-		),
-		EndStream:  false,
-		EndHeaders: true,
-	})
-}
-
 func (rcw *rawConnWrapper) writeHeaders(p http2.HeadersFrameParam) error {
 	if err := rcw.fr.WriteHeaders(p); err != nil {
 		return fmt.Errorf("error writing HEADERS: %v", err)
 	}
 	return nil
 }
 
-func (rcw *rawConnWrapper) writeData(streamID uint32, endStream bool, data []byte) error {
-	if err := rcw.fr.WriteData(streamID, endStream, data); err != nil {
-		return fmt.Errorf("error writing DATA: %v", err)
-	}
-	return nil
-}
-
 func (rcw *rawConnWrapper) writeRSTStream(streamID uint32, code http2.ErrCode) error {
 	if err := rcw.fr.WriteRSTStream(streamID, code); err != nil {
 		return fmt.Errorf("error writing RST_STREAM: %v", err)
 	}
 	return nil
 }
 
-func (rcw *rawConnWrapper) writeDataPadded(streamID uint32, endStream bool, data, padding []byte) error {
-	if err := rcw.fr.WriteDataPadded(streamID, endStream, data, padding); err != nil {
-		return fmt.Errorf("error writing DATA with padding: %v", err)
-	}
-	return nil
-}
-
 func (rcw *rawConnWrapper) writeGoAway(maxStreamID uint32, code http2.ErrCode, debugData []byte) error {
 	if err := rcw.fr.WriteGoAway(maxStreamID, code, debugData); err != nil {
 		return fmt.Errorf("error writing GoAway: %v", err)

test/servertester.go

@@ -48,9 +48,8 @@ type serverTester struct {
 	hpackEnc  *hpack.Encoder
 
 	// reading frames:
-	frc       chan http2.Frame
-	frErrc    chan error
-	readTimer *time.Timer
+	frc    chan http2.Frame
+	frErrc chan error
 }
 
 func newServerTesterFromConn(t testing.TB, cc io.ReadWriteCloser) *serverTester {
@@ -150,20 +149,6 @@ func (st *serverTester) wantSettings() *http2.SettingsFrame {
 	return sf
 }
 
-func (st *serverTester) wantSettingsAck() {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatal(err)
-	}
-	sf, ok := f.(*http2.SettingsFrame)
-	if !ok {
-		st.t.Fatalf("Wanting a settings ACK, received a %T", f)
-	}
-	if !sf.IsAck() {
-		st.t.Fatal("Settings Frame didn't have ACK set")
-	}
-}
-
 // wait for any activity from the server
 func (st *serverTester) wantAnyFrame() http2.Frame {
 	f, err := st.fr.ReadFrame()
@@ -272,9 +257,3 @@ func (st *serverTester) writeRSTStream(streamID uint32, code http2.ErrCode) {
 		st.t.Fatalf("Error writing RST_STREAM: %v", err)
 	}
 }
-
-func (st *serverTester) writeDataPadded(streamID uint32, endStream bool, data, padding []byte) {
-	if err := st.fr.WriteDataPadded(streamID, endStream, data, padding); err != nil {
-		st.t.Fatalf("Error writing DATA with padding: %v", err)
-	}
-}