Update Thrift to eac4d0c79a5f (osquery#84)

Fix breaking changes with socket timeouts

Fixes osquery#81

Author: zwass

go.mod

@@ -2,10 +2,12 @@ module github.com/kolide/osquery-go
 
 require (
 	github.com/Microsoft/go-winio v0.4.9
-	github.com/apache/thrift v0.12.0
+	github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f
 	github.com/davecgh/go-spew v1.1.0 // indirect
 	github.com/pkg/errors v0.8.0
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/testify v1.2.2
 	golang.org/x/sys v0.0.0-20180815093151-14742f9018cd // indirect
 )
+
+go 1.13

go.sum

@@ -1,7 +1,9 @@
 github.com/Microsoft/go-winio v0.4.9 h1:3RbgqgGVqmcpbOiwrjbVtDHLlJBGF6aE+yHmNtBNsFQ=
 github.com/Microsoft/go-winio v0.4.9/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
-github.com/apache/thrift v0.12.0 h1:pODnxUFNcjP9UTLZGTdeh+j16A8lJbRvD3rOtrk/7bs=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI=
+github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f h1:33BV5v3u8I6dA2dEoPuXWCsAaHHOJfPtdxZhAMQV4uo=
+github.com/apache/thrift v0.13.1-0.20200603211036-eac4d0c79a5f/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=

server_test.go

@@ -124,7 +124,7 @@ func testShutdownDeadlock(t *testing.T) {
 	addr, err := net.ResolveUnixAddr("unix", listenPath)
 	require.Nil(t, err)
 	timeout := 500 * time.Millisecond
-	trans := thrift.NewTSocketFromAddrTimeout(addr, timeout)
+	trans := thrift.NewTSocketFromAddrTimeout(addr, timeout, timeout)
 	err = trans.Open()
 	require.Nil(t, err)
 	client := osquery.NewExtensionManagerClientFactory(trans,

transport/transport.go

@@ -28,7 +28,7 @@ func Open(sockPath string, timeout time.Duration) (*thrift.TSocket, error) {
 		return nil, errors.Wrapf(err, "waiting for unix socket to be available: %s", sockPath)
 	}
 
-	trans := thrift.NewTSocketFromAddrTimeout(addr, timeout)
+	trans := thrift.NewTSocketFromAddrTimeout(addr, timeout, timeout)
 	if err := trans.Open(); err != nil {
 		return nil, errors.Wrap(err, "opening socket transport")
 	}