Merge pull request #3246 from thaJeztah/bump_ttrpc

crosbymichael · web-flow · commit bf5a4246798a · 2019-04-29T17:32:19.000-04:00
bump containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go
@@ -219,8 +219,7 @@ func WithConnect(address string, onClose func()) Opt {
 		if err != nil {
 			return nil, nil, err
 		}
-		client := ttrpc.NewClient(conn)
-		client.OnClose(onClose)
+		client := ttrpc.NewClient(conn, ttrpc.WithOnClose(onClose))
 		return shimapi.NewShimClient(client), conn, nil
 	}
 }
diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go
@@ -96,8 +96,7 @@ func (b *binary) Start(ctx context.Context) (_ *shim, err error) {
 	if err != nil {
 		return nil, err
 	}
-	client := ttrpc.NewClient(conn)
-	client.OnClose(func() { conn.Close() })
+	client := ttrpc.NewClient(conn, ttrpc.WithOnClose(func() { _ = conn.Close() }))
 	return &shim{
 		bundle:  b.bundle,
 		client:  client,
diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go
@@ -74,8 +74,7 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt
 		}
 	}()
 
-	client := ttrpc.NewClient(conn)
-	client.OnClose(func() { conn.Close() })
+	client := ttrpc.NewClient(conn, ttrpc.WithOnClose(func() { _ = conn.Close() }))
 	s := &shim{
 		client:  client,
 		task:    task.NewTaskClient(client),
diff --git a/vendor.conf b/vendor.conf
@@ -37,7 +37,7 @@ github.com/Microsoft/go-winio 84b4ab48a50763fe7b3abcef38e5205c12027fac
 github.com/Microsoft/hcsshim 8abdbb8205e4192c68b5f84c31197156f31be517
 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
 golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
-github.com/containerd/ttrpc f02858b1457c5ca3aaec3a0803eb0d59f96e41d6
+github.com/containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
 github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
 gotest.tools v2.3.0
 github.com/google/go-cmp v0.2.0
diff --git a/vendor/github.com/containerd/ttrpc/client.go b/vendor/github.com/containerd/ttrpc/client.go
diff --git a/vendor/github.com/containerd/ttrpc/services.go b/vendor/github.com/containerd/ttrpc/services.go

Original file line number	Diff line number	Diff line change
`@@ -219,8 +219,7 @@ func WithConnect(address string, onClose func()) Opt {`
`219`	`219`	`if err != nil {`
`220`	`220`	`return nil, nil, err`
`221`	`221`	`}`
`222`		`- client := ttrpc.NewClient(conn)`
`223`		`- client.OnClose(onClose)`
	`222`	`+ client := ttrpc.NewClient(conn, ttrpc.WithOnClose(onClose))`
`224`	`223`	`return shimapi.NewShimClient(client), conn, nil`
`225`	`224`	`}`
`226`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,7 @@ func loadShim(ctx context.Context, bundle Bundle, events exchange.Exchange, rt`
`74`	`74`	`}`
`75`	`75`	`}()`
`76`	`76`
`77`		`- client := ttrpc.NewClient(conn)`
`78`		`- client.OnClose(func() { conn.Close() })`
	`77`	`+ client := ttrpc.NewClient(conn, ttrpc.WithOnClose(func() { _ = conn.Close() }))`
`79`	`78`	`s := &shim{`
`80`	`79`	`client: client,`
`81`	`80`	`task: task.NewTaskClient(client),`