Remove buildinfo from connection handshake

GODRIVER-441

Change-Id: I56f01cc62e5eff13bcaa1cda9a1c922ea2632f6d

Author: rfblue2

core/auth/auth.go

@@ -91,7 +91,7 @@ func RegisterAuthenticatorFactory(name string, factory AuthenticatorFactory) {
 // }
 
 // Handshaker creates a connection handshaker for the given authenticator. The
-// handshaker will handle calling isMaster and buildInfo.
+// handshaker will handle calling isMaster.
 func Handshaker(appName string, h connection.Handshaker, authenticator Authenticator) connection.Handshaker {
 	return connection.HandshakerFunc(func(ctx context.Context, addr address.Address, rw wiremessage.ReadWriter) (description.Server, error) {
 		desc, err := (&command.Handshake{Client: command.ClientDoc(appName)}).Handshake(ctx, addr, rw)

core/auth/default.go

@@ -29,7 +29,7 @@ type DefaultAuthenticator struct {
 func (a *DefaultAuthenticator) Auth(ctx context.Context, desc description.Server, rw wiremessage.ReadWriter) error {
 	var actual Authenticator
 	var err error
-	if err = description.ScramSHA1Supported(desc.Version); err != nil {
+	if err = description.ScramSHA1Supported(desc.WireVersion); err != nil {
 		actual, err = newMongoDBCRAuthenticator(a.Cred)
 	} else {
 		actual, err = newScramSHA1Authenticator(a.Cred)

core/auth/x509.go

@@ -34,7 +34,7 @@ func (a *MongoDBX509Authenticator) Auth(ctx context.Context, desc description.Se
 		bson.EC.String("mechanism", MongoDBX509),
 	)
 
-	if !desc.Version.AtLeast(3, 4) {
+	if desc.WireVersion.Max < 5 {
 		authRequestDoc.Append(bson.EC.String("user", a.User))
 	}
 

core/command/handshake.go

@@ -25,38 +25,26 @@ import (
 type Handshake struct {
 	Client *bson.Document
 
-	ismstr  result.IsMaster
-	bldinfo result.BuildInfo
-	err     error
+	ismstr result.IsMaster
+	err    error
 }
 
-// Encode will encode the handshake commands into two wire messages. The wire
-// messages are ordered with the isMaster command first and the buildInfo command
-// second.
-func (h *Handshake) Encode() ([2]wiremessage.WireMessage, error) {
-	var wms [2]wiremessage.WireMessage
+// Encode will encode the handshake commands into a wire message containing isMaster
+func (h *Handshake) Encode() (wiremessage.WireMessage, error) {
+	var wm wiremessage.WireMessage
 	ismstr, err := (&IsMaster{Client: h.Client}).Encode()
 	if err != nil {
-		return wms, err
+		return wm, err
 	}
-	buildinfo, err := (&BuildInfo{}).Encode()
-	if err != nil {
-		return wms, err
-	}
-	wms[0], wms[1] = ismstr, buildinfo
-	return wms, nil
+	wm = ismstr
+	return wm, nil
 }
 
-// Decode will decode the wire messages. The order of the wire messages are
-// expected to be an isMaster response first and a buildInfo response second.
+// Decode will decode the wire messages.
 // Errors during decoding are deferred until either the Result or Err methods
 // are called.
-func (h *Handshake) Decode(wms [2]wiremessage.WireMessage) *Handshake {
-	h.ismstr, h.err = (&IsMaster{}).Decode(wms[0]).Result()
-	if h.err != nil {
-		return h
-	}
-	h.bldinfo, h.err = (&BuildInfo{}).Decode(wms[1]).Result()
+func (h *Handshake) Decode(wm wiremessage.WireMessage) *Handshake {
+	h.ismstr, h.err = (&IsMaster{}).Decode(wm).Result()
 	if h.err != nil {
 		return h
 	}
@@ -68,40 +56,31 @@ func (h *Handshake) Result(addr address.Address) (description.Server, error) {
 	if h.err != nil {
 		return description.Server{}, h.err
 	}
-	return description.NewServer(addr, h.ismstr, h.bldinfo), nil
+	return description.NewServer(addr, h.ismstr), nil
 }
 
 // Err returns the error set on this Handshake.
 func (h *Handshake) Err() error { return h.err }
 
 // Handshake implements the connection.Handshaker interface. It is identical
 // to the RoundTrip methods on other types in this package. It will execute
-// the isMaster and buildInfo commands, using pipelining to enable a single
-// roundtrip.
+// the isMaster command.
 func (h *Handshake) Handshake(ctx context.Context, addr address.Address, rw wiremessage.ReadWriter) (description.Server, error) {
-	wms, err := h.Encode()
+	wm, err := h.Encode()
 	if err != nil {
 		return description.Server{}, err
 	}
 
-	err = rw.WriteWireMessage(ctx, wms[0])
-	if err != nil {
-		return description.Server{}, err
-	}
-	err = rw.WriteWireMessage(ctx, wms[1])
+	err = rw.WriteWireMessage(ctx, wm)
 	if err != nil {
 		return description.Server{}, err
 	}
 
-	wms[0], err = rw.ReadWireMessage(ctx)
-	if err != nil {
-		return description.Server{}, err
-	}
-	wms[1], err = rw.ReadWireMessage(ctx)
+	wm, err = rw.ReadWireMessage(ctx)
 	if err != nil {
 		return description.Server{}, err
 	}
-	return h.Decode(wms).Result(addr)
+	return h.Decode(wm).Result(addr)
 }
 
 // ClientDoc creates a client information document for use in an isMaster

core/description/feature.go

@@ -12,8 +12,8 @@ import (
 
 // MaxStalenessSupported returns an error if the given server version
 // does not support max staleness.
-func MaxStalenessSupported(serverVersion Version, wireVersion *VersionRange) error {
-	if !serverVersion.AtLeast(3, 4, 0) || (wireVersion != nil && wireVersion.Max < 5) {
+func MaxStalenessSupported(wireVersion *VersionRange) error {
+	if wireVersion != nil && wireVersion.Max < 5 {
 		return fmt.Errorf("max staleness is only supported for servers 3.4 or newer")
 	}
 
@@ -22,8 +22,8 @@ func MaxStalenessSupported(serverVersion Version, wireVersion *VersionRange) err
 
 // ScramSHA1Supported returns an error if the given server version
 // does not support scram-sha-1.
-func ScramSHA1Supported(version Version) error {
-	if !version.AtLeast(3, 0, 0) {
+func ScramSHA1Supported(wireVersion *VersionRange) error {
+	if wireVersion != nil && wireVersion.Max < 3 {
 		return fmt.Errorf("SCRAM-SHA-1 is only supported for servers 3.0 or newer")
 	}
 

core/description/feature_test.go

@@ -35,7 +35,7 @@ func TestMaxStaleness(t *testing.T) {
 		t.Run(test.version.String(), func(t *testing.T) {
 			t.Parallel()
 
-			err := MaxStalenessSupported(test.version, test.wire)
+			err := MaxStalenessSupported(test.wire)
 			if test.expected {
 				require.NoError(t, err)
 			} else {

core/description/selector_test.go

@@ -178,7 +178,7 @@ var readPrefTestPrimary = Server{
 	LastUpdateTime:    time.Date(2017, 2, 11, 14, 0, 2, 0, time.UTC),
 	Kind:              RSPrimary,
 	Tags:              tag.Set{tag.Tag{Name: "a", Value: "1"}},
-	Version:           Version{Parts: []uint8{3, 4, 0}},
+	WireVersion:       &VersionRange{Min: 0, Max: 5},
 }
 var readPrefTestSecondary1 = Server{
 	Addr:              address.Address("localhost:27018"),
@@ -187,7 +187,7 @@ var readPrefTestSecondary1 = Server{
 	LastUpdateTime:    time.Date(2017, 2, 11, 14, 0, 2, 0, time.UTC),
 	Kind:              RSSecondary,
 	Tags:              tag.Set{tag.Tag{Name: "a", Value: "1"}},
-	Version:           Version{Parts: []uint8{3, 4, 0}},
+	WireVersion:       &VersionRange{Min: 0, Max: 5},
 }
 var readPrefTestSecondary2 = Server{
 	Addr:              address.Address("localhost:27018"),
@@ -196,7 +196,7 @@ var readPrefTestSecondary2 = Server{
 	LastUpdateTime:    time.Date(2017, 2, 11, 14, 0, 2, 0, time.UTC),
 	Kind:              RSSecondary,
 	Tags:              tag.Set{tag.Tag{Name: "a", Value: "2"}},
-	Version:           Version{Parts: []uint8{3, 4, 0}},
+	WireVersion:       &VersionRange{Min: 0, Max: 5},
 }
 var readPrefTestTopology = Topology{
 	Kind:    ReplicaSetWithPrimary,
@@ -215,7 +215,7 @@ func TestSelector_Sharded(t *testing.T) {
 		LastWriteTime:     time.Date(2017, 2, 11, 14, 0, 0, 0, time.UTC),
 		LastUpdateTime:    time.Date(2017, 2, 11, 14, 0, 2, 0, time.UTC),
 		Kind:              Mongos,
-		Version:           Version{Parts: []uint8{3, 4, 0}},
+		WireVersion:       &VersionRange{Min: 0, Max: 5},
 	}
 	c := Topology{
 		Kind:    Sharded,
@@ -241,7 +241,7 @@ func TestSelector_Single(t *testing.T) {
 		LastWriteTime:     time.Date(2017, 2, 11, 14, 0, 0, 0, time.UTC),
 		LastUpdateTime:    time.Date(2017, 2, 11, 14, 0, 2, 0, time.UTC),
 		Kind:              Mongos,
-		Version:           Version{Parts: []uint8{3, 4, 0}},
+		WireVersion:       &VersionRange{Min: 0, Max: 5},
 	}
 	c := Topology{
 		Kind:    Single,
@@ -674,7 +674,7 @@ func TestSelector_Max_staleness_is_less_than_90_seconds(t *testing.T) {
 		LastWriteTime:     time.Date(2017, 2, 11, 14, 0, 0, 0, time.UTC),
 		LastUpdateTime:    time.Date(2017, 2, 11, 14, 0, 2, 0, time.UTC),
 		Kind:              RSPrimary,
-		Version:           Version{Parts: []uint8{3, 4, 0}},
+		WireVersion:       &VersionRange{Min: 0, Max: 5},
 	}
 	c := Topology{
 		Kind:    ReplicaSetWithPrimary,
@@ -700,7 +700,7 @@ func TestSelector_Max_staleness_is_too_low(t *testing.T) {
 		LastWriteTime:     time.Date(2017, 2, 11, 14, 0, 0, 0, time.UTC),
 		LastUpdateTime:    time.Date(2017, 2, 11, 14, 0, 2, 0, time.UTC),
 		Kind:              RSPrimary,
-		Version:           Version{Parts: []uint8{3, 4, 0}},
+		WireVersion:       &VersionRange{Min: 0, Max: 5},
 	}
 	c := Topology{
 		Kind:    ReplicaSetWithPrimary,

core/description/server.go

@@ -34,7 +34,6 @@ type Server struct {
 	AverageRTTSet     bool
 	CanonicalAddr     address.Address
 	ElectionID        objectid.ObjectID
-	GitVersion        string
 	HeartbeatInterval time.Duration
 	LastError         error
 	LastUpdateTime    time.Time
@@ -49,11 +48,10 @@ type Server struct {
 	Tags              tag.Set
 	Kind              ServerKind
 	WireVersion       *VersionRange
-	Version           Version
 }
 
 // NewServer creates a new server description from the given parameters.
-func NewServer(addr address.Address, isMaster result.IsMaster, buildInfo result.BuildInfo) Server {
+func NewServer(addr address.Address, isMaster result.IsMaster) Server {
 	i := Server{
 		Addr: addr,
 
@@ -69,12 +67,6 @@ func NewServer(addr address.Address, isMaster result.IsMaster, buildInfo result.
 		Tags:            tag.NewTagSetFromMap(isMaster.Tags),
 	}
 
-	if !buildInfo.IsZero() {
-		i.GitVersion = buildInfo.GitVersion
-		i.Version.Desc = buildInfo.Version
-		i.Version.Parts = buildInfo.VersionArray
-	}
-
 	if i.CanonicalAddr == "" {
 		i.CanonicalAddr = addr
 	}

core/description/server_selector.go

@@ -120,7 +120,7 @@ func ReadPrefSelector(rp *readpref.ReadPref) ServerSelector {
 		if _, set := rp.MaxStaleness(); set {
 			for _, s := range candidates {
 				if s.Kind != Unknown {
-					if err := MaxStalenessSupported(s.Version, s.WireVersion); err != nil {
+					if err := MaxStalenessSupported(s.WireVersion); err != nil {
 						return nil, err
 					}
 				}

core/description/shared_spec_test.go

@@ -189,8 +189,8 @@ func selectServers(t *testing.T, test *testCase) error {
 		}
 
 		// Max staleness can't be sent to servers older than 3.4.
-		if test.ReadPreference.MaxStaleness != nil {
-			server.Version = Version{Desc: "3.4.0", Parts: []uint8{3, 4, 0}}
+		if test.ReadPreference.MaxStaleness != nil && server.WireVersion == nil {
+			server.WireVersion = &VersionRange{Max: 5}
 		}
 
 		servers = append(servers, server)