add ProtocolVersion to ReattachConfig (#171)

* add ProtocolVersion to ReattachConfig

A client connecting to a plugin process needs to know the resolved ProtocolVersion, so this PR adds that information to the returned reattach config. Prior to this, client.NegotiatedVersion() always returned 0.

* Add a test for correct protocol version in reattach config

Author: mildwonkey

client.go

@@ -209,9 +209,10 @@ type ClientConfig struct {
 // already-running plugin process. You can retrieve this information by
 // calling ReattachConfig on Client.
 type ReattachConfig struct {
-	Protocol Protocol
-	Addr     net.Addr
-	Pid      int
+	Protocol        Protocol
+	ProtocolVersion int
+	Addr            net.Addr
+	Pid             int
 
 	// Test is set to true if this is reattaching to to a plugin in "test mode"
 	// (see ServeConfig.Test). In this mode, client.Kill will NOT kill the
@@ -839,6 +840,10 @@ func (c *Client) reattach() (net.Addr, error) {
 		c.protocol = ProtocolNetRPC
 	}
 
+	if c.config.Reattach.Test {
+		c.negotiatedVersion = c.config.Reattach.ProtocolVersion
+	}
+
 	// If we're in test mode, we do NOT set the process. This avoids the
 	// process being killed (the only purpose we have for c.process), since
 	// in test mode the process is responsible for exiting on its own.

server.go

@@ -415,10 +415,11 @@ func Serve(opts *ServeConfig) {
 		// quite ready if they connect immediately but the client should
 		// retry a few times.
 		ch <- &ReattachConfig{
-			Protocol: protoType,
-			Addr:     listener.Addr(),
-			Pid:      os.Getpid(),
-			Test:     true,
+			Protocol:        protoType,
+			ProtocolVersion: protoVersion,
+			Addr:            listener.Addr(),
+			Pid:             os.Getpid(),
+			Test:            true,
 		}
 	}
 

server_test.go

@@ -42,6 +42,11 @@ func TestServer_testMode(t *testing.T) {
 		t.Fatal("config should not be nil")
 	}
 
+	// Check that the reattach config includes the negotiated protocol version
+	if config.ProtocolVersion != int(testHandshake.ProtocolVersion) {
+		t.Fatalf("wrong protocol version in reattach config. got %d, expected %d", config.ProtocolVersion, testHandshake.ProtocolVersion)
+	}
+
 	// Connect!
 	c := NewClient(&ClientConfig{
 		Cmd:              nil,