Skip to content

Commit 7f79fbb

Browse files
mxpvmxpv
committed
Move ttrpc client to pkg/ttrpcutil
Signed-off-by: Maksym Pavlenko <[email protected]>
1 parent 7b06c9a commit 7f79fbb

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎client_ttrpc_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,22 @@ import (
2323

2424
v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1"
2525
"github.com/containerd/containerd/namespaces"
26+
"github.com/containerd/containerd/pkg/ttrpcutil"
2627
"github.com/containerd/ttrpc"
2728
"github.com/gogo/protobuf/types"
2829
"gotest.tools/assert"
2930
)
3031

3132
func TestClientTTRPC_New(t *testing.T) {
32-
client, err := NewTTRPC(address + ".ttrpc")
33+
client, err := ttrpcutil.NewClient(address + ".ttrpc")
3334
assert.NilError(t, err)
3435

3536
err = client.Close()
3637
assert.NilError(t, err)
3738
}
3839

3940
func TestClientTTRPC_Reconnect(t *testing.T) {
40-
client, err := NewTTRPC(address + ".ttrpc")
41+
client, err := ttrpcutil.NewClient(address + ".ttrpc")
4142
assert.NilError(t, err)
4243

4344
err = client.Reconnect()
@@ -59,7 +60,7 @@ func TestClientTTRPC_Reconnect(t *testing.T) {
5960
}
6061

6162
func TestClientTTRPC_Close(t *testing.T) {
62-
client, err := NewTTRPC(address + ".ttrpc")
63+
client, err := ttrpcutil.NewClient(address + ".ttrpc")
6364
assert.NilError(t, err)
6465

6566
err = client.Close()

client_ttrpc.go renamed to pkg/ttrpcutil/client.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
limitations under the License.
1515
*/
1616

17-
package containerd
17+
package ttrpcutil
1818

1919
import (
2020
"sync"
@@ -29,16 +29,16 @@ const ttrpcDialTimeout = 5 * time.Second
2929

3030
type ttrpcConnector func() (*ttrpc.Client, error)
3131

32-
// ClientTTRPC is the client to interact with TTRPC part of containerd server (plugins, events)
33-
type ClientTTRPC struct {
32+
// Client is the client to interact with TTRPC part of containerd server (plugins, events)
33+
type Client struct {
3434
mu sync.Mutex
3535
connector ttrpcConnector
3636
client *ttrpc.Client
3737
closed bool
3838
}
3939

40-
// NewTTRPC returns a new containerd TTRPC client that is connected to the containerd instance provided by address
41-
func NewTTRPC(address string, opts ...ttrpc.ClientOpts) (*ClientTTRPC, error) {
40+
// NewClient returns a new containerd TTRPC client that is connected to the containerd instance provided by address
41+
func NewClient(address string, opts ...ttrpc.ClientOpts) (*Client, error) {
4242
connector := func() (*ttrpc.Client, error) {
4343
conn, err := ttrpcDial(address, ttrpcDialTimeout)
4444
if err != nil {
@@ -54,14 +54,14 @@ func NewTTRPC(address string, opts ...ttrpc.ClientOpts) (*ClientTTRPC, error) {
5454
return nil, err
5555
}
5656

57-
return &ClientTTRPC{
57+
return &Client{
5858
connector: connector,
5959
client: client,
6060
}, nil
6161
}
6262

6363
// Reconnect re-establishes the TTRPC connection to the containerd daemon
64-
func (c *ClientTTRPC) Reconnect() error {
64+
func (c *Client) Reconnect() error {
6565
c.mu.Lock()
6666
defer c.mu.Unlock()
6767

@@ -83,20 +83,20 @@ func (c *ClientTTRPC) Reconnect() error {
8383
}
8484

8585
// EventsService creates an EventsService client
86-
func (c *ClientTTRPC) EventsService() v1.EventsService {
86+
func (c *Client) EventsService() v1.EventsService {
8787
return v1.NewEventsClient(c.Client())
8888
}
8989

9090
// Client returns the underlying TTRPC client object
91-
func (c *ClientTTRPC) Client() *ttrpc.Client {
91+
func (c *Client) Client() *ttrpc.Client {
9292
c.mu.Lock()
9393
defer c.mu.Unlock()
9494

9595
return c.client
9696
}
9797

9898
// Close closes the clients TTRPC connection to containerd
99-
func (c *ClientTTRPC) Close() error {
99+
func (c *Client) Close() error {
100100
c.mu.Lock()
101101
defer c.mu.Unlock()
102102

client_ttrpc_unix.go renamed to pkg/ttrpcutil/client_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
limitations under the License.
1717
*/
1818

19-
package containerd
19+
package ttrpcutil
2020

2121
import (
2222
"net"

client_ttrpc_windows.go renamed to pkg/ttrpcutil/client_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
limitations under the License.
1717
*/
1818

19-
package containerd
19+
package ttrpcutil
2020

2121
import (
2222
"net"

‎runtime/v2/shim/publisher.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ import (
2121
"sync"
2222
"time"
2323

24-
"github.com/containerd/ttrpc"
25-
"github.com/containerd/typeurl"
26-
"github.com/sirupsen/logrus"
27-
28-
"github.com/containerd/containerd"
2924
v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1"
3025
"github.com/containerd/containerd/events"
3126
"github.com/containerd/containerd/namespaces"
27+
"github.com/containerd/containerd/pkg/ttrpcutil"
28+
"github.com/containerd/ttrpc"
29+
"github.com/containerd/typeurl"
30+
"github.com/sirupsen/logrus"
3231
)
3332

3433
const (
@@ -43,7 +42,7 @@ type item struct {
4342
}
4443

4544
func newPublisher(address string) (*remoteEventsPublisher, error) {
46-
client, err := containerd.NewTTRPC(address)
45+
client, err := ttrpcutil.NewClient(address)
4746
if err != nil {
4847
return nil, err
4948
}
@@ -59,7 +58,7 @@ func newPublisher(address string) (*remoteEventsPublisher, error) {
5958
}
6059

6160
type remoteEventsPublisher struct {
62-
client *containerd.ClientTTRPC
61+
client *ttrpcutil.Client
6362
closed chan struct{}
6463
closer sync.Once
6564
requeue chan *item

0 commit comments

Comments
 (0)