Skip to content

Commit e82d201

Browse files
dmcgowandmcgowan
committed
Revert "replace uses of github.com/containerd/containerd/errdefs"
This reverts commit 308341a. Signed-off-by: Derek McGowan <[email protected]>
1 parent 5193923 commit e82d201

226 files changed

Lines changed: 572 additions & 484 deletions

File tree

Some content is hidden

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

‎client.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ import (
2727
"sync"
2828
"time"
2929

30+
"github.com/containerd/platforms"
31+
"github.com/containerd/typeurl/v2"
32+
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
33+
"github.com/opencontainers/runtime-spec/specs-go"
34+
"golang.org/x/sync/semaphore"
35+
"google.golang.org/grpc"
36+
"google.golang.org/grpc/backoff"
37+
"google.golang.org/grpc/credentials/insecure"
38+
"google.golang.org/grpc/health/grpc_health_v1"
39+
3040
containersapi "github.com/containerd/containerd/api/services/containers/v1"
3141
contentapi "github.com/containerd/containerd/api/services/content/v1"
3242
diffapi "github.com/containerd/containerd/api/services/diff/v1"
@@ -44,6 +54,7 @@ import (
4454
"github.com/containerd/containerd/content"
4555
contentproxy "github.com/containerd/containerd/content/proxy"
4656
"github.com/containerd/containerd/defaults"
57+
"github.com/containerd/containerd/errdefs"
4758
"github.com/containerd/containerd/events"
4859
"github.com/containerd/containerd/images"
4960
"github.com/containerd/containerd/leases"
@@ -59,16 +70,6 @@ import (
5970
"github.com/containerd/containerd/services/introspection"
6071
"github.com/containerd/containerd/snapshots"
6172
snproxy "github.com/containerd/containerd/snapshots/proxy"
62-
"github.com/containerd/errdefs"
63-
"github.com/containerd/platforms"
64-
"github.com/containerd/typeurl/v2"
65-
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
66-
"github.com/opencontainers/runtime-spec/specs-go"
67-
"golang.org/x/sync/semaphore"
68-
"google.golang.org/grpc"
69-
"google.golang.org/grpc/backoff"
70-
"google.golang.org/grpc/credentials/insecure"
71-
"google.golang.org/grpc/health/grpc_health_v1"
7273
)
7374

7475
func init() {

‎cmd/containerd/command/main.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,18 @@ import (
2727
"runtime"
2828
"time"
2929

30+
"github.com/containerd/log"
31+
"github.com/urfave/cli"
32+
"google.golang.org/grpc/grpclog"
33+
3034
"github.com/containerd/containerd/defaults"
35+
"github.com/containerd/containerd/errdefs"
3136
_ "github.com/containerd/containerd/metrics" // import containerd build info
3237
"github.com/containerd/containerd/mount"
3338
"github.com/containerd/containerd/services/server"
3439
srvconfig "github.com/containerd/containerd/services/server/config"
3540
"github.com/containerd/containerd/sys"
3641
"github.com/containerd/containerd/version"
37-
"github.com/containerd/errdefs"
38-
"github.com/containerd/log"
39-
"github.com/urfave/cli"
40-
"google.golang.org/grpc/grpclog"
4142
)
4243

4344
const usage = `

‎cmd/containerd/command/publish.go‎

Lines changed: 1 addition & 1 deletion
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"
2829
"github.com/containerd/containerd/namespaces"
2930
"github.com/containerd/containerd/pkg/dialer"
3031
"github.com/containerd/containerd/protobuf/proto"
3132
"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‎

Lines changed: 1 addition & 1 deletion
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"
2728
"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‎

Lines changed: 1 addition & 1 deletion
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/errdefs"
25+
"github.com/containerd/containerd/errdefs"
2626
"github.com/urfave/cli"
2727
)
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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/errdefs"
31+
"github.com/containerd/containerd/errdefs"
3232
"github.com/containerd/log"
3333
"github.com/containerd/typeurl/v2"
3434
"github.com/urfave/cli"

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

Lines changed: 1 addition & 1 deletion
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/errdefs"
27+
"github.com/containerd/containerd/errdefs"
2828
"github.com/sirupsen/logrus"
2929
"github.com/urfave/cli"
3030
)

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,16 @@ import (
2727
"text/tabwriter"
2828
"time"
2929

30-
"github.com/containerd/containerd/cmd/ctr/commands"
31-
"github.com/containerd/containerd/content"
32-
"github.com/containerd/containerd/remotes"
33-
"github.com/containerd/errdefs"
3430
"github.com/containerd/log"
3531
units "github.com/docker/go-units"
3632
digest "github.com/opencontainers/go-digest"
3733
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3834
"github.com/urfave/cli"
35+
36+
"github.com/containerd/containerd/cmd/ctr/commands"
37+
"github.com/containerd/containerd/content"
38+
"github.com/containerd/containerd/errdefs"
39+
"github.com/containerd/containerd/remotes"
3940
)
4041

4142
var (

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,19 @@ import (
2626
"text/tabwriter"
2727
"time"
2828

29+
"github.com/containerd/log"
30+
"github.com/containerd/platforms"
31+
"github.com/opencontainers/go-digest"
32+
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
33+
"github.com/urfave/cli"
34+
2935
"github.com/containerd/containerd"
3036
"github.com/containerd/containerd/cmd/ctr/commands"
3137
"github.com/containerd/containerd/content"
38+
"github.com/containerd/containerd/errdefs"
3239
"github.com/containerd/containerd/images"
3340
"github.com/containerd/containerd/pkg/progress"
3441
"github.com/containerd/containerd/remotes"
35-
"github.com/containerd/errdefs"
36-
"github.com/containerd/log"
37-
"github.com/containerd/platforms"
38-
"github.com/opencontainers/go-digest"
39-
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
40-
"github.com/urfave/cli"
4142
)
4243

4344
var fetchCommand = cli.Command{

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ import (
2424
"strings"
2525
"text/tabwriter"
2626

27-
"github.com/containerd/containerd/cmd/ctr/commands"
28-
"github.com/containerd/containerd/images"
29-
"github.com/containerd/containerd/pkg/progress"
30-
"github.com/containerd/errdefs"
3127
"github.com/containerd/log"
3228
"github.com/containerd/platforms"
3329
"github.com/urfave/cli"
30+
31+
"github.com/containerd/containerd/cmd/ctr/commands"
32+
"github.com/containerd/containerd/errdefs"
33+
"github.com/containerd/containerd/images"
34+
"github.com/containerd/containerd/pkg/progress"
3435
)
3536

3637
// Command is the cli command for managing images

0 commit comments

Comments
 (0)