account for error wrapping

Signed-off-by: Cassandra Coyle <[email protected]>
dapr · Dec 18, 2023 · b4bce9b · b4bce9b
1 parent 31585da
commit b4bce9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/errors/errors.go b/errors/errors.go
@@ -119,9 +119,9 @@ func FromError(err error) (*Error, bool) {
 		return nil, false
 	}
 
-	kitErr, ok := err.(Error)
-	if ok {
-		return &kitErr, ok
+	var kitErr Error
+	if errors.As(err, &kitErr) {
+		return &kitErr, true
 	}
 
 	return nil, false

diff --git a/errors/errors_test.go b/errors/errors_test.go
@@ -967,4 +967,10 @@ func TestFromError(t *testing.T) {
 	if result != nil || ok {
 		t.Errorf("Expected result to be nil and ok to be false, got result: %#v, ok: %t", result, ok)
 	}
+
+	wrapped := fmt.Errorf("wrapped: %w", kitErr)
+	result, ok = FromError(wrapped)
+	if !ok || !reflect.DeepEqual(result, &kitErr) {
+		t.Errorf("Expected result to be %#v and ok to be true, got result: %#v, ok: %t", &kitErr, result, ok)
+	}
 }