bump containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636

thaJeztah · thaJeztah · commit 79f6941d219f · 2019-04-29T15:25:10.000-07:00
full diff: containerd/ttrpc@f02858b...699c4e4 - containerd/ttrpc#33 Fix returns error message - containerd/ttrpc#35 Make onclose an option Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 8c5779c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go
@@ -172,8 +172,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
@@ -97,8 +97,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
@@ -75,8 +75,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
@@ -36,7 +36,7 @@ github.com/Microsoft/go-winio v0.4.11
 github.com/Microsoft/hcsshim v0.8.1
 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
 golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
-github.com/containerd/ttrpc f02858b1457c5ca3aaec3a0803eb0d59f96e41d6
+github.com/containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
 github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
 gotest.tools v2.1.0
 github.com/google/go-cmp v0.1.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
`@@ -172,8 +172,7 @@ func WithConnect(address string, onClose func()) Opt {`
`172`	`172`	`if err != nil {`
`173`	`173`	`return nil, nil, err`
`174`	`174`	`}`
`175`		`- client := ttrpc.NewClient(conn)`
`176`		`- client.OnClose(onClose)`
	`175`	`+ client := ttrpc.NewClient(conn, ttrpc.WithOnClose(onClose))`
`177`	`176`	`return shimapi.NewShimClient(client), conn, nil`
`178`	`177`	`}`
`179`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ func loadShim(ctx context.Context, bundle Bundle, events exchange.Exchange, rt`
`75`	`75`	`}`
`76`	`76`	`}()`
`77`	`77`
`78`		`- client := ttrpc.NewClient(conn)`
`79`		`- client.OnClose(func() { conn.Close() })`
	`78`	`+ client := ttrpc.NewClient(conn, ttrpc.WithOnClose(func() { _ = conn.Close() }))`
`80`	`79`	`s := &shim{`
`81`	`80`	`client: client,`
`82`	`81`	`task: task.NewTaskClient(client),`