Skip to content

Commit be820ac

Browse files
dmcgowandmcgowan
authored
Merge pull request #10266 from thaJeztah/1.7_migrate_to_errdefs_module
[release/1.7] migrate errdefs package to github.com/containerd/errdefs module
2 parents 566c535 + 308341a commit be820ac

File tree

238 files changed

+622
-351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+622
-351
lines changed

‎client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import (
4444
"github.com/containerd/containerd/content"
4545
contentproxy "github.com/containerd/containerd/content/proxy"
4646
"github.com/containerd/containerd/defaults"
47-
"github.com/containerd/containerd/errdefs"
4847
"github.com/containerd/containerd/events"
4948
"github.com/containerd/containerd/images"
5049
"github.com/containerd/containerd/leases"
@@ -61,6 +60,7 @@ import (
6160
"github.com/containerd/containerd/services/introspection"
6261
"github.com/containerd/containerd/snapshots"
6362
snproxy "github.com/containerd/containerd/snapshots/proxy"
63+
"github.com/containerd/errdefs"
6464
"github.com/containerd/typeurl/v2"
6565
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
6666
"github.com/opencontainers/runtime-spec/specs-go"

‎cmd/containerd/command/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ import (
2828
"time"
2929

3030
"github.com/containerd/containerd/defaults"
31-
"github.com/containerd/containerd/errdefs"
3231
"github.com/containerd/containerd/log"
3332
_ "github.com/containerd/containerd/metrics" // import containerd build info
3433
"github.com/containerd/containerd/mount"
3534
"github.com/containerd/containerd/services/server"
3635
srvconfig "github.com/containerd/containerd/services/server/config"
3736
"github.com/containerd/containerd/sys"
3837
"github.com/containerd/containerd/version"
38+
"github.com/containerd/errdefs"
3939
"github.com/urfave/cli"
4040
"google.golang.org/grpc/grpclog"
4141
)

‎cmd/containerd/command/publish.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"time"
2626

2727
eventsapi "github.com/containerd/containerd/api/services/events/v1"
28-
"github.com/containerd/containerd/errdefs"
2928
"github.com/containerd/containerd/namespaces"
3029
"github.com/containerd/containerd/pkg/dialer"
3130
"github.com/containerd/containerd/protobuf/proto"
3231
"github.com/containerd/containerd/protobuf/types"
32+
"github.com/containerd/errdefs"
3333
"github.com/urfave/cli"
3434
"google.golang.org/grpc"
3535
"google.golang.org/grpc/backoff"

‎cmd/containerd/command/service_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"path/filepath"
2525
"time"
2626

27-
"github.com/containerd/containerd/errdefs"
2827
"github.com/containerd/containerd/services/server"
28+
"github.com/containerd/errdefs"
2929
"github.com/sirupsen/logrus"
3030
"github.com/urfave/cli"
3131
"golang.org/x/sys/windows"

‎cmd/ctr/commands/containers/checkpoint.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/containerd/containerd"
2424
"github.com/containerd/containerd/cmd/ctr/commands"
25-
"github.com/containerd/containerd/errdefs"
25+
"github.com/containerd/errdefs"
2626
"github.com/urfave/cli"
2727
)
2828

‎cmd/ctr/commands/containers/containers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"github.com/containerd/containerd/cmd/ctr/commands"
2929
"github.com/containerd/containerd/cmd/ctr/commands/run"
3030
"github.com/containerd/containerd/containers"
31-
"github.com/containerd/containerd/errdefs"
3231
"github.com/containerd/containerd/log"
32+
"github.com/containerd/errdefs"
3333
"github.com/containerd/typeurl/v2"
3434
"github.com/urfave/cli"
3535
)

‎cmd/ctr/commands/containers/restore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/containerd/containerd/cio"
2525
"github.com/containerd/containerd/cmd/ctr/commands"
2626
"github.com/containerd/containerd/cmd/ctr/commands/tasks"
27-
"github.com/containerd/containerd/errdefs"
27+
"github.com/containerd/errdefs"
2828
"github.com/sirupsen/logrus"
2929
"github.com/urfave/cli"
3030
)

‎cmd/ctr/commands/content/content.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929

3030
"github.com/containerd/containerd/cmd/ctr/commands"
3131
"github.com/containerd/containerd/content"
32-
"github.com/containerd/containerd/errdefs"
3332
"github.com/containerd/containerd/log"
3433
"github.com/containerd/containerd/remotes"
34+
"github.com/containerd/errdefs"
3535
units "github.com/docker/go-units"
3636
digest "github.com/opencontainers/go-digest"
3737
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

‎cmd/ctr/commands/content/fetch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import (
2929
"github.com/containerd/containerd"
3030
"github.com/containerd/containerd/cmd/ctr/commands"
3131
"github.com/containerd/containerd/content"
32-
"github.com/containerd/containerd/errdefs"
3332
"github.com/containerd/containerd/images"
3433
"github.com/containerd/containerd/log"
3534
"github.com/containerd/containerd/pkg/progress"
3635
"github.com/containerd/containerd/platforms"
3736
"github.com/containerd/containerd/remotes"
37+
"github.com/containerd/errdefs"
3838
"github.com/opencontainers/go-digest"
3939
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
4040
"github.com/urfave/cli"

‎cmd/ctr/commands/images/images.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"text/tabwriter"
2626

2727
"github.com/containerd/containerd/cmd/ctr/commands"
28-
"github.com/containerd/containerd/errdefs"
2928
"github.com/containerd/containerd/images"
3029
"github.com/containerd/containerd/log"
3130
"github.com/containerd/containerd/pkg/progress"
3231
"github.com/containerd/containerd/platforms"
32+
"github.com/containerd/errdefs"
3333
"github.com/urfave/cli"
3434
)
3535

‎cmd/ctr/commands/images/mount.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222

2323
"github.com/containerd/containerd"
2424
"github.com/containerd/containerd/cmd/ctr/commands"
25-
"github.com/containerd/containerd/errdefs"
2625
"github.com/containerd/containerd/leases"
2726
"github.com/containerd/containerd/mount"
2827
"github.com/containerd/containerd/platforms"
28+
"github.com/containerd/errdefs"
2929
"github.com/opencontainers/image-spec/identity"
3030
"github.com/urfave/cli"
3131
)

‎cmd/ctr/commands/images/tag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"github.com/urfave/cli"
2323

2424
"github.com/containerd/containerd/cmd/ctr/commands"
25-
"github.com/containerd/containerd/errdefs"
2625
"github.com/containerd/containerd/pkg/transfer/image"
26+
"github.com/containerd/errdefs"
2727
)
2828

2929
var tagCommand = cli.Command{

‎cmd/ctr/commands/images/unmount.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"fmt"
2121

2222
"github.com/containerd/containerd/cmd/ctr/commands"
23-
"github.com/containerd/containerd/errdefs"
2423
"github.com/containerd/containerd/leases"
2524
"github.com/containerd/containerd/mount"
25+
"github.com/containerd/errdefs"
2626
"github.com/urfave/cli"
2727
)
2828

‎cmd/ctr/commands/namespaces/namespaces.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"text/tabwriter"
2626

2727
"github.com/containerd/containerd/cmd/ctr/commands"
28-
"github.com/containerd/containerd/errdefs"
2928
"github.com/containerd/containerd/log"
29+
"github.com/containerd/errdefs"
3030
"github.com/urfave/cli"
3131
)
3232

‎cmd/ctr/commands/signals.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"syscall"
2424

2525
"github.com/containerd/containerd"
26-
"github.com/containerd/containerd/errdefs"
26+
"github.com/containerd/errdefs"
2727
"github.com/sirupsen/logrus"
2828
)
2929

‎container.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import (
2929
tasktypes "github.com/containerd/containerd/api/types/task"
3030
"github.com/containerd/containerd/cio"
3131
"github.com/containerd/containerd/containers"
32-
"github.com/containerd/containerd/errdefs"
3332
"github.com/containerd/containerd/images"
3433
"github.com/containerd/containerd/oci"
3534
"github.com/containerd/containerd/protobuf"
3635
"github.com/containerd/containerd/runtime/v2/runc/options"
36+
"github.com/containerd/errdefs"
3737
"github.com/containerd/fifo"
3838
"github.com/containerd/typeurl/v2"
3939
ver "github.com/opencontainers/image-spec/specs-go"

‎container_opts.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import (
2424

2525
"github.com/containerd/containerd/containers"
2626
"github.com/containerd/containerd/content"
27-
"github.com/containerd/containerd/errdefs"
2827
"github.com/containerd/containerd/images"
2928
"github.com/containerd/containerd/namespaces"
3029
"github.com/containerd/containerd/oci"
3130
"github.com/containerd/containerd/protobuf"
3231
"github.com/containerd/containerd/snapshots"
32+
"github.com/containerd/errdefs"
3333
"github.com/containerd/typeurl/v2"
3434
"github.com/opencontainers/image-spec/identity"
3535
v1 "github.com/opencontainers/image-spec/specs-go/v1"

‎container_opts_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"syscall"
2727

2828
"github.com/containerd/containerd/containers"
29-
"github.com/containerd/containerd/errdefs"
3029
"github.com/containerd/containerd/mount"
30+
"github.com/containerd/errdefs"
3131
"github.com/opencontainers/image-spec/identity"
3232
)
3333

‎containerstore.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323

2424
containersapi "github.com/containerd/containerd/api/services/containers/v1"
2525
"github.com/containerd/containerd/containers"
26-
"github.com/containerd/containerd/errdefs"
2726
"github.com/containerd/containerd/protobuf"
2827
ptypes "github.com/containerd/containerd/protobuf/types"
28+
"github.com/containerd/errdefs"
2929
"github.com/containerd/typeurl/v2"
3030
"google.golang.org/grpc/codes"
3131
"google.golang.org/grpc/status"

‎content/helpers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"sync"
2525
"time"
2626

27-
"github.com/containerd/containerd/errdefs"
2827
"github.com/containerd/containerd/log"
2928
"github.com/containerd/containerd/pkg/randutil"
29+
"github.com/containerd/errdefs"
3030
"github.com/opencontainers/go-digest"
3131
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3232
)

‎content/helpers_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"strings"
2626
"testing"
2727

28-
"github.com/containerd/containerd/errdefs"
28+
"github.com/containerd/errdefs"
2929
"github.com/opencontainers/go-digest"
3030
"github.com/stretchr/testify/assert"
3131
)

‎content/local/locks.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"sync"
2222
"time"
2323

24-
"github.com/containerd/containerd/errdefs"
24+
"github.com/containerd/errdefs"
2525
)
2626

2727
// Handles locking references

‎content/local/readerat.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os"
2323

2424
"github.com/containerd/containerd/content"
25-
"github.com/containerd/containerd/errdefs"
25+
"github.com/containerd/errdefs"
2626
)
2727

2828
// readerat implements io.ReaderAt in a completely stateless manner by opening

‎content/local/store.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import (
2828
"time"
2929

3030
"github.com/containerd/containerd/content"
31-
"github.com/containerd/containerd/errdefs"
3231
"github.com/containerd/containerd/filters"
3332
"github.com/containerd/containerd/log"
3433
"github.com/containerd/containerd/pkg/randutil"
34+
"github.com/containerd/errdefs"
3535
"github.com/sirupsen/logrus"
3636

3737
"github.com/opencontainers/go-digest"

‎content/local/store_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ import (
3434

3535
"github.com/containerd/containerd/content"
3636
"github.com/containerd/containerd/content/testsuite"
37-
"github.com/containerd/containerd/errdefs"
3837
"github.com/containerd/containerd/pkg/randutil"
3938
"github.com/containerd/containerd/pkg/testutil"
39+
"github.com/containerd/errdefs"
4040

4141
"github.com/opencontainers/go-digest"
4242
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

‎content/local/writer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"time"
2828

2929
"github.com/containerd/containerd/content"
30-
"github.com/containerd/containerd/errdefs"
3130
"github.com/containerd/containerd/log"
31+
"github.com/containerd/errdefs"
3232
"github.com/opencontainers/go-digest"
3333
)
3434

‎content/proxy/content_store.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222

2323
contentapi "github.com/containerd/containerd/api/services/content/v1"
2424
"github.com/containerd/containerd/content"
25-
"github.com/containerd/containerd/errdefs"
2625
"github.com/containerd/containerd/protobuf"
2726
protobuftypes "github.com/containerd/containerd/protobuf/types"
27+
"github.com/containerd/errdefs"
2828
digest "github.com/opencontainers/go-digest"
2929
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3030
)

‎content/proxy/content_writer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
contentapi "github.com/containerd/containerd/api/services/content/v1"
2525
"github.com/containerd/containerd/content"
26-
"github.com/containerd/containerd/errdefs"
2726
"github.com/containerd/containerd/protobuf"
27+
"github.com/containerd/errdefs"
2828
digest "github.com/opencontainers/go-digest"
2929
)
3030

‎content/testsuite/testsuite.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929
"time"
3030

3131
"github.com/containerd/containerd/content"
32-
"github.com/containerd/containerd/errdefs"
3332
"github.com/containerd/containerd/log/logtest"
3433
"github.com/containerd/containerd/pkg/testutil"
34+
"github.com/containerd/errdefs"
3535
"github.com/opencontainers/go-digest"
3636
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3737
"github.com/stretchr/testify/assert"

‎contrib/diffservice/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
diffapi "github.com/containerd/containerd/api/services/diff/v1"
2323
"github.com/containerd/containerd/api/types"
2424
"github.com/containerd/containerd/diff"
25-
"github.com/containerd/containerd/errdefs"
2625
"github.com/containerd/containerd/mount"
26+
"github.com/containerd/errdefs"
2727
"github.com/containerd/typeurl/v2"
2828
"github.com/opencontainers/go-digest"
2929
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

‎contrib/snapshotservice/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121

2222
snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1"
2323
"github.com/containerd/containerd/api/types"
24-
"github.com/containerd/containerd/errdefs"
2524
"github.com/containerd/containerd/mount"
2625
"github.com/containerd/containerd/protobuf"
2726
ptypes "github.com/containerd/containerd/protobuf/types"
2827
"github.com/containerd/containerd/snapshots"
28+
"github.com/containerd/errdefs"
2929
)
3030

3131
var empty = &ptypes.Empty{}

‎diff/apply/apply_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"strings"
2525

2626
"github.com/containerd/containerd/archive"
27-
"github.com/containerd/containerd/errdefs"
2827
"github.com/containerd/containerd/mount"
2928
"github.com/containerd/containerd/pkg/userns"
29+
"github.com/containerd/errdefs"
3030

3131
"golang.org/x/sys/unix"
3232
)

‎diff/lcow/lcow.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ import (
3232
"github.com/Microsoft/hcsshim/ext4/tar2ext4"
3333
"github.com/containerd/containerd/content"
3434
"github.com/containerd/containerd/diff"
35-
"github.com/containerd/containerd/errdefs"
3635
"github.com/containerd/containerd/log"
3736
"github.com/containerd/containerd/metadata"
3837
"github.com/containerd/containerd/mount"
3938
"github.com/containerd/containerd/plugin"
39+
"github.com/containerd/errdefs"
4040
digest "github.com/opencontainers/go-digest"
4141
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
4242
)

‎diff/proxy/differ.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
diffapi "github.com/containerd/containerd/api/services/diff/v1"
2323
"github.com/containerd/containerd/api/types"
2424
"github.com/containerd/containerd/diff"
25-
"github.com/containerd/containerd/errdefs"
2625
"github.com/containerd/containerd/mount"
2726
"github.com/containerd/containerd/pkg/epoch"
2827
"github.com/containerd/containerd/protobuf"
2928
ptypes "github.com/containerd/containerd/protobuf/types"
29+
"github.com/containerd/errdefs"
3030
"github.com/opencontainers/go-digest"
3131
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3232

‎diff/walking/differ.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import (
2929
"github.com/containerd/containerd/archive/compression"
3030
"github.com/containerd/containerd/content"
3131
"github.com/containerd/containerd/diff"
32-
"github.com/containerd/containerd/errdefs"
3332
"github.com/containerd/containerd/labels"
3433
"github.com/containerd/containerd/log"
3534
"github.com/containerd/containerd/mount"
3635
"github.com/containerd/containerd/pkg/epoch"
36+
"github.com/containerd/errdefs"
3737
digest "github.com/opencontainers/go-digest"
3838
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3939
)

0 commit comments

Comments
 (0)