InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

container: replace uses of errdefs package

Browse Source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL
2025-05-28 05:38:15 +00:00
parent 415fc7b41e
commit 364d8d8b31
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
container/container.go
View File

@@ -14,6 +14,7 @@ import (
"time"
"github.com/containerd/containerd/v2/pkg/cio"
cerrdefs "github.com/containerd/errdefs"
"github.com/containerd/log"
"github.com/containerd/platforms"
containertypes "github.com/docker/docker/api/types/container"
@@ -814,7 +815,7 @@ func (container *Container) RestoreTask(ctx context.Context, client libcontainer
return err
}
container.task, err = container.ctr.AttachTask(ctx, container.InitializeStdio)
if err != nil && !errdefs.IsNotFound(err) {
if err != nil && !cerrdefs.IsNotFound(err) {
return err
}
return nil

8
container/view_test.go
View File

@@ -7,8 +7,8 @@ import (
"path/filepath"
"testing"
cerrdefs "github.com/containerd/errdefs"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/pkg/stringid"
"github.com/google/uuid"
"gotest.tools/v3/assert"
@@ -87,7 +87,7 @@ func TestNames(t *testing.T) {
assert.Check(t, db.ReserveName("name2", "containerid2"))
err = db.ReserveName("name2", "containerid3")
assert.Check(t, is.ErrorType(err, errdefs.IsConflict))
assert.Check(t, is.ErrorType(err, cerrdefs.IsConflict))
assert.Check(t, is.Error(err, "name is reserved"))
// Releasing a name allows the name to point to something else later.
@@ -105,7 +105,7 @@ func TestNames(t *testing.T) {
assert.Check(t, is.Equal("containerid3", id))
_, err = view.GetID("notreserved")
assert.Check(t, is.ErrorType(err, errdefs.IsNotFound))
assert.Check(t, is.ErrorType(err, cerrdefs.IsNotFound))
assert.Check(t, is.Error(err, "name is not reserved"))
// Releasing and re-reserving a name doesn't affect the snapshot.
@@ -163,7 +163,7 @@ func TestTruncIndex(t *testing.T) {
// Get on an empty index
_, err = db.GetByPrefix("foobar")
assert.Check(t, is.ErrorType(err, errdefs.IsNotFound))
assert.Check(t, is.ErrorType(err, cerrdefs.IsNotFound))
// Add an id
const id = "99b36c2c326ccc11e726eee6ee78a0baf166ef96"