Merge pull request #9742 from mxpv/envelope

Move Message proto to types
This commit is contained in:
Samuel Karp
2024-02-03 06:32:01 +00:00
committed by GitHub
15 changed files with 411 additions and 472 deletions

View File

@@ -22,6 +22,7 @@ import (
"time"
v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1"
apitypes "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/ttrpcutil"
"github.com/containerd/containerd/v2/protobuf"
@@ -56,7 +57,7 @@ func TestClientTTRPC_Reconnect(t *testing.T) {
// Send test request to make sure its alive after reconnect
_, err = service.Forward(context.Background(), &v1.ForwardRequest{
Envelope: &v1.Envelope{
Envelope: &apitypes.Envelope{
Timestamp: protobuf.ToTimestamp(time.Now()),
Namespace: namespaces.Default,
Topic: "/test",
@@ -82,7 +83,7 @@ func TestClientTTRPC_Close(t *testing.T) {
err = client.Close()
assert.NoError(t, err)
_, err = service.Forward(context.Background(), &v1.ForwardRequest{Envelope: &v1.Envelope{}})
_, err = service.Forward(context.Background(), &v1.ForwardRequest{Envelope: &apitypes.Envelope{}})
assert.Equal(t, err, ttrpc.ErrClosed)
err = client.Close()