Merge pull request #2518 from thaJeztah/19.03_backport_bump_pkg_errors

[19.03 backport] vendor: pkg/errors v0.9.1
docker · May 11, 2020 · ae2012c · ae2012c
2 parents 052a71c + 9a57ea8
commit ae2012c
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 20 deletions.
diff --git a/cli-plugins/manager/error.go b/cli-plugins/manager/error.go
@@ -25,6 +25,11 @@ func (e *pluginError) Cause() error {
 	return e.cause
 }
 
+// Unwrap provides compatibility for Go 1.13 error chains.
+func (e *pluginError) Unwrap() error {
+	return e.cause
+}
+
 // MarshalText marshalls the pluginError into a textual form.
 func (e *pluginError) MarshalText() (text []byte, err error) {
 	return []byte(e.cause.Error()), nil

diff --git a/cli-plugins/manager/error_test.go b/cli-plugins/manager/error_test.go
@@ -16,7 +16,7 @@ func TestPluginError(t *testing.T) {
 	inner := fmt.Errorf("testing")
 	err = wrapAsPluginError(inner, "wrapping")
 	assert.Error(t, err, "wrapping: testing")
-	assert.Equal(t, inner, errors.Cause(err))
+	assert.Assert(t, errors.Is(err, inner))
 
 	actual, err := yaml.Marshal(err)
 	assert.NilError(t, err)

diff --git a/cli/config/config_test.go b/cli/config/config_test.go
@@ -80,7 +80,7 @@ func TestEmptyFile(t *testing.T) {
 	assert.NilError(t, err)
 
 	_, err = Load(tmpHome)
-	assert.Equal(t, errors.Cause(err), io.EOF)
+	assert.Assert(t, errors.Is(err, io.EOF))
 	assert.ErrorContains(t, err, ConfigFileName)
 }
 

diff --git a/vendor.conf b/vendor.conf
@@ -62,7 +62,7 @@ github.com/opencontainers/image-spec                d60099175f88c47cd379c4738d15
 github.com/opencontainers/runc                      425e105d5a03fabd737a126ad93d62a9eeede87f # v1.0.0-rc8
 github.com/opencontainers/runtime-spec              29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
 github.com/opentracing/opentracing-go               1361b9cd60be79c4c3a7fa9841b3c132e40066a7
-github.com/pkg/errors                               ba968bfe8b2f7e042a574c888954fccecfa385b4 # v0.8.1
+github.com/pkg/errors                               614d223910a179a466c1767a985424175c39b465 # v0.9.1
 github.com/prometheus/client_golang                 c5b7fccd204277076155f10851dad72b76a49317 # v0.8.0
 github.com/prometheus/client_model                  6f3806018612930941127f2a7c6c453ba2c527d2
 github.com/prometheus/common                        7600349dcfe1abd18d72d3a1770870d9800a7801

diff --git a/vendor/github.com/pkg/errors/README.md b/vendor/github.com/pkg/errors/README.md
diff --git a/vendor/github.com/pkg/errors/errors.go b/vendor/github.com/pkg/errors/errors.go
diff --git a/vendor/github.com/pkg/errors/go113.go b/vendor/github.com/pkg/errors/go113.go
diff --git a/vendor/github.com/pkg/errors/stack.go b/vendor/github.com/pkg/errors/stack.go