From 49903a11ae1f67fe0771e92053c96f1199b886d7 Mon Sep 17 00:00:00 2001 From: Keepers Date: Thu, 15 Jun 2023 10:38:55 -0600 Subject: [PATCH] quick logging fixes (#3624) Co-authored-by: aviator-app[bot] <48659329+aviator-app[bot]@users.noreply.github.com> --- src/internal/m365/exchange/mock/mail.go | 6 +++--- src/internal/m365/exchange/restore.go | 2 +- src/pkg/services/m365/api/serialization.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/internal/m365/exchange/mock/mail.go b/src/internal/m365/exchange/mock/mail.go index cb6e296d1..05b259154 100644 --- a/src/internal/m365/exchange/mock/mail.go +++ b/src/internal/m365/exchange/mock/mail.go @@ -744,10 +744,10 @@ func serialize(t *testing.T, item serialization.Parsable) []byte { return byteArray } -func hydrateMessage(byteArray []byte) (models.Messageable, error) { - parseNode, err := kjson.NewJsonParseNodeFactory().GetRootParseNode("application/json", byteArray) +func hydrateMessage(body []byte) (models.Messageable, error) { + parseNode, err := kjson.NewJsonParseNodeFactory().GetRootParseNode("application/json", body) if err != nil { - return nil, clues.Wrap(err, "deserializing bytes into base m365 object") + return nil, clues.Wrap(err, "deserializing bytes into base m365 object").With("body_size", len(body)) } anObject, err := parseNode.GetObjectValue(models.CreateMessageFromDiscriminatorValue) diff --git a/src/internal/m365/exchange/restore.go b/src/internal/m365/exchange/restore.go index f540e621d..77ffbe9f8 100644 --- a/src/internal/m365/exchange/restore.go +++ b/src/internal/m365/exchange/restore.go @@ -174,7 +174,7 @@ func restoreCollection( info, err := ir.restore(ictx, body, userID, destinationID, errs) if err != nil { - el.AddRecoverable(ctx, err) + el.AddRecoverable(ictx, err) continue } diff --git a/src/pkg/services/m365/api/serialization.go b/src/pkg/services/m365/api/serialization.go index 2410ca090..86dad6eb4 100644 --- a/src/pkg/services/m365/api/serialization.go +++ b/src/pkg/services/m365/api/serialization.go @@ -13,7 +13,7 @@ func createFromBytes( ) (serialization.Parsable, error) { parseNode, err := kjson.NewJsonParseNodeFactory().GetRootParseNode("application/json", bytes) if err != nil { - return nil, clues.Wrap(err, "deserializing bytes into base m365 object") + return nil, clues.Wrap(err, "deserializing bytes into base m365 object").With("bytes_len", len(bytes)) } v, err := parseNode.GetObjectValue(createFunc)