modify code to compile on updated containerd

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

pkg/server/events_test.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/api/services/execution"
-	"github.com/containerd/containerd/api/types/container"
+	"github.com/containerd/containerd/api/types/task"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
@@ -46,9 +46,9 @@ func TestHandleEvent(t *testing.T) {
 		StartedAt: testStartedAt,
 	}
 	testExitedAt := time.Now()
-	testExitEvent := container.Event{
+	testExitEvent := task.Event{
 		ID:         testID,
-		Type:       container.Event_EXIT,
+		Type:       task.Event_EXIT,
 		Pid:        testPid,
 		ExitStatus: 1,
 		ExitedAt:   testExitedAt,
@@ -64,16 +64,16 @@ func TestHandleEvent(t *testing.T) {
 		ExitCode:   1,
 	}
 	assert.Equal(t, runtime.ContainerState_CONTAINER_RUNNING, testMetadata.State())
-	testContainerdContainer := container.Container{
+	testContainerdContainer := task.Task{
 		ID:     testID,
 		Pid:    testPid,
-		Status: container.Status_RUNNING,
+		Status: task.StatusRunning,
 	}
 
 	for desc, test := range map[string]struct {
-		event               *container.Event
+		event               *task.Event
 		metadata            *metadata.ContainerMetadata
-		containerdContainer *container.Container
+		containerdContainer *task.Task
 		containerdErr       error
 		expected            *metadata.ContainerMetadata
 	}{
@@ -82,9 +82,9 @@ func TestHandleEvent(t *testing.T) {
 			expected: nil,
 		},
 		"should not update state when exited process is not init process": {
-			event: &container.Event{
+			event: &task.Event{
 				ID:         testID,
-				Type:       container.Event_EXIT,
+				Type:       task.Event_EXIT,
 				Pid:        9999,
 				ExitStatus: 1,
 				ExitedAt:   testExitedAt,
@@ -101,9 +101,9 @@ func TestHandleEvent(t *testing.T) {
 			expected:            &testMetadata,
 		},
 		"should not update state for non-exited events": {
-			event: &container.Event{
+			event: &task.Event{
 				ID:         testID,
-				Type:       container.Event_OOM,
+				Type:       task.Event_OOM,
 				Pid:        testPid,
 				ExitStatus: 1,
 				ExitedAt:   testExitedAt,
@@ -141,7 +141,7 @@ func TestHandleEvent(t *testing.T) {
 		}
 		// Inject containerd container.
 		if test.containerdContainer != nil {
-			fake.SetFakeContainers([]container.Container{*test.containerdContainer})
+			fake.SetFakeContainers([]task.Task{*test.containerdContainer})
 		}
 		// Inject containerd delete error.
 		if test.containerdErr != nil {