switch usage directly to errdefs.(ErrAlreadyExists and ErrNotFound)

Signed-off-by: Zou Nengren <zouyee1989@gmail.com>

pkg/cri/store/sandbox/sandbox.go

@@ -20,10 +20,10 @@ import (
 	"sync"
 
 	"github.com/containerd/containerd"
+	"github.com/containerd/containerd/errdefs"
+	"github.com/containerd/containerd/pkg/cri/store"
 	"github.com/containerd/containerd/pkg/cri/store/label"
 	"github.com/containerd/containerd/pkg/cri/store/truncindex"
-
-	"github.com/containerd/containerd/pkg/cri/store"
 	"github.com/containerd/containerd/pkg/netns"
 )
 
@@ -80,7 +80,7 @@ func (s *Store) Add(sb Sandbox) error {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 	if _, ok := s.sandboxes[sb.ID]; ok {
-		return store.ErrAlreadyExist
+		return errdefs.ErrAlreadyExists
 	}
 	if err := s.labels.Reserve(sb.ProcessLabel); err != nil {
 		return err
@@ -100,14 +100,14 @@ func (s *Store) Get(id string) (Sandbox, error) {
 	id, err := s.idIndex.Get(id)
 	if err != nil {
 		if err == truncindex.ErrNotExist {
-			err = store.ErrNotExist
+			err = errdefs.ErrNotFound
 		}
 		return Sandbox{}, err
 	}
 	if sb, ok := s.sandboxes[id]; ok {
 		return sb, nil
 	}
-	return Sandbox{}, store.ErrNotExist
+	return Sandbox{}, errdefs.ErrNotFound
 }
 
 // List lists all sandboxes.

pkg/cri/store/sandbox/sandbox_test.go

@@ -19,11 +19,11 @@ package sandbox
 import (
 	"testing"
 
+	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/pkg/cri/store/label"
+
 	assertlib "github.com/stretchr/testify/assert"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
-
-	"github.com/containerd/containerd/pkg/cri/store"
 )
 
 func TestSandboxStore(t *testing.T) {
@@ -140,7 +140,7 @@ func TestSandboxStore(t *testing.T) {
 		truncID := genTruncIndex(testID)
 
 		t.Logf("add should return already exists error for duplicated sandbox")
-		assert.Equal(store.ErrAlreadyExist, s.Add(v))
+		assert.Equal(errdefs.ErrAlreadyExists, s.Add(v))
 
 		t.Logf("should be able to delete sandbox")
 		s.Delete(truncID)
@@ -151,6 +151,6 @@ func TestSandboxStore(t *testing.T) {
 		t.Logf("get should return not exist error after deletion")
 		sb, err := s.Get(truncID)
 		assert.Equal(Sandbox{}, sb)
-		assert.Equal(store.ErrNotExist, err)
+		assert.Equal(errdefs.ErrNotFound, err)
 	}
 }