Merge pull request #170 from mailgun/mbond/unwrap

Implement Unwrap for withContext Errors
mailgun · May 12, 2023 · 6210080 · 6210080
2 parents 2f66002 + cc7f46f
commit 6210080
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/errors/context_map.go b/errors/context_map.go
@@ -77,3 +77,7 @@ func (c *withContext) FormatFields() string {
 	}
 	return buf.String()
 }
+
+func (c *withContext) Unwrap() error {
+	return c.cause
+}
diff --git a/errors/with_context_test.go b/errors/with_context_test.go
@@ -1,6 +1,7 @@
 package errors_test
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"strings"
@@ -10,6 +11,8 @@ import (
 	"github.com/mailgun/holster/v4/callstack"
 	"github.com/mailgun/holster/v4/errors"
 	"github.com/stretchr/testify/assert"
+
+	stderrors "errors"
 )
 
 type TestError struct {
@@ -68,3 +71,11 @@ func TestWrapNil(t *testing.T) {
 	got := errors.WithContext{"some": "context"}.Wrap(nil, "no error")
 	assert.Nil(t, got)
 }
+
+func TestUnwrap(t *testing.T) {
+	holsterWrappedErr := errors.WithContext{"some": "context"}.Wrap(context.Canceled, "external timeout")
+	assert.True(t, stderrors.Is(holsterWrappedErr, context.Canceled))
+
+	stdWrappedErr := fmt.Errorf("%w external timeout", context.Canceled)
+	assert.True(t, stderrors.Is(stdWrappedErr, context.Canceled))
+}