Revert "migrate errdefs package to github.com/containerd/errdefs module"

This reverts commit 47ff8cf.

Signed-off-by: Derek McGowan <[email protected]>

Author: dmcgowan

errdefs/errdefs_deprecated.go

@@ -0,0 +1,103 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package errdefs
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"testing"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+func TestGRPCRoundTrip(t *testing.T) {
+	errShouldLeaveAlone := errors.New("unknown to package")
+
+	for _, testcase := range []struct {
+		input error
+		cause error
+		str   string
+	}{
+		{
+			input: ErrAlreadyExists,
+			cause: ErrAlreadyExists,
+		},
+		{
+			input: ErrNotFound,
+			cause: ErrNotFound,
+		},
+		//nolint:dupword
+		{
+			input: fmt.Errorf("test test test: %w", ErrFailedPrecondition),
+			cause: ErrFailedPrecondition,
+			str:   "test test test: failed precondition",
+		},
+		{
+			input: status.Errorf(codes.Unavailable, "should be not available"),
+			cause: ErrUnavailable,
+			str:   "should be not available: unavailable",
+		},
+		{
+			input: errShouldLeaveAlone,
+			cause: ErrUnknown,
+			str:   errShouldLeaveAlone.Error() + ": " + ErrUnknown.Error(),
+		},
+		{
+			input: context.Canceled,
+			cause: context.Canceled,
+			str:   "context canceled",
+		},
+		{
+			input: fmt.Errorf("this is a test cancel: %w", context.Canceled),
+			cause: context.Canceled,
+			str:   "this is a test cancel: context canceled",
+		},
+		{
+			input: context.DeadlineExceeded,
+			cause: context.DeadlineExceeded,
+			str:   "context deadline exceeded",
+		},
+		{
+			input: fmt.Errorf("this is a test deadline exceeded: %w", context.DeadlineExceeded),
+			cause: context.DeadlineExceeded,
+			str:   "this is a test deadline exceeded: context deadline exceeded",
+		},
+	} {
+		t.Run(testcase.input.Error(), func(t *testing.T) {
+			t.Logf("input: %v", testcase.input)
+			gerr := ToGRPC(testcase.input)
+			t.Logf("grpc: %v", gerr)
+			ferr := FromGRPC(gerr)
+			t.Logf("recovered: %v", ferr)
+
+			if !errors.Is(ferr, testcase.cause) {
+				t.Fatalf("unexpected cause: !errors.Is(%v, %v)", ferr, testcase.cause)
+			}
+
+			expected := testcase.str
+			if expected == "" {
+				expected = testcase.cause.Error()
+			}
+			if ferr.Error() != expected {
+				t.Fatalf("unexpected string: %q != %q", ferr.Error(), expected)
+			}
+		})
+	}
+
+}

vendor/github.com/containerd/errdefs/errors.go renamed to errdefs/errors.go

@@ -14,7 +14,6 @@ require (
 	github.com/containerd/console v1.0.3
 	github.com/containerd/containerd/api v1.7.19
 	github.com/containerd/continuity v0.4.2
-	github.com/containerd/errdefs v0.1.0
 	github.com/containerd/fifo v1.1.0
 	github.com/containerd/go-cni v1.1.9
 	github.com/containerd/go-runc v1.0.0

vendor/github.com/containerd/errdefs/grpc.go renamed to errdefs/grpc.go

@@ -171,8 +171,6 @@ github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR
 github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ=
 github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
 github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
-github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
-github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
 github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=

errdefs/grpc_test.go

@@ -32,7 +32,6 @@ require (
 	github.com/cilium/ebpf v0.9.1 // indirect
 	github.com/containerd/cgroups v1.1.0 // indirect
 	github.com/containerd/console v1.0.3 // indirect
-	github.com/containerd/errdefs v0.1.0 // indirect
 	github.com/containerd/fifo v1.1.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect

go.mod

@@ -1304,8 +1304,6 @@ github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EX
 github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
 github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
 github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
-github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
-github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
 github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4=
 github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY=
 github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o=