From 84c58e9e9c18309c84b48ef6390105675fd504cb Mon Sep 17 00:00:00 2001 From: Keepers Date: Fri, 30 Jun 2023 10:47:16 -0600 Subject: [PATCH] clues version bump (#3692) Bumps clues, fixes double clues trace wrappers. --- src/go.mod | 2 +- src/go.sum | 4 ++-- src/pkg/services/m365/api/users.go | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/go.mod b/src/go.mod index 734bc0aa0..395746f09 100644 --- a/src/go.mod +++ b/src/go.mod @@ -6,7 +6,7 @@ replace github.com/kopia/kopia => github.com/alcionai/kopia v0.12.2-0.2023061602 require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0 - github.com/alcionai/clues v0.0.0-20230613181047-258ea4f19225 + github.com/alcionai/clues v0.0.0-20230627234334-37ce6dd74e20 github.com/armon/go-metrics v0.4.1 github.com/aws/aws-sdk-go v1.44.293 github.com/aws/aws-xray-sdk-go v1.8.1 diff --git a/src/go.sum b/src/go.sum index ed0861824..a75046eab 100644 --- a/src/go.sum +++ b/src/go.sum @@ -53,8 +53,8 @@ github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1o github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= -github.com/alcionai/clues v0.0.0-20230613181047-258ea4f19225 h1:mjUjCCGvJpmnLh3fuVzpfOSFC9lp9TOIOfjj51L5Rs0= -github.com/alcionai/clues v0.0.0-20230613181047-258ea4f19225/go.mod h1:DeaMbAwDvYM6ZfPMR/GUl3hceqI5C8jIQ1lstjB2IW8= +github.com/alcionai/clues v0.0.0-20230627234334-37ce6dd74e20 h1:5yY4MRjy5Elf30zsaLs2pPXIKUk0Q5DGqc4AggD/0Ew= +github.com/alcionai/clues v0.0.0-20230627234334-37ce6dd74e20/go.mod h1:MLEWSZ0cjEMg6hiGCRvE7AtrOhs7deBcm7ZrJBpfGRM= github.com/alcionai/kopia v0.12.2-0.20230616023302-6c5412bbf417 h1:s0B7Be1qqZW+XDRStDYvyXZ7ovQAMkg0N1F/ji4TJyc= github.com/alcionai/kopia v0.12.2-0.20230616023302-6c5412bbf417/go.mod h1:Iic7CcKhsq+A7MLR9hh6VJfgpcJhLx3Kn+BgjY+azvI= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= diff --git a/src/pkg/services/m365/api/users.go b/src/pkg/services/m365/api/users.go index 41382268f..8b50a86bb 100644 --- a/src/pkg/services/m365/api/users.go +++ b/src/pkg/services/m365/api/users.go @@ -199,14 +199,12 @@ func (c Users) GetInfo(ctx context.Context, userID string) (*UserInfo, error) { if graph.IsErrUserNotFound(err) { logger.CtxErr(ctx, err).Error("user not found") - // FIXME(ashmrtn): This shouldn't need clues.Wrap. - return nil, clues.Wrap(clues.Stack(graph.ErrResourceOwnerNotFound, err), "") + return nil, clues.Stack(graph.ErrResourceOwnerNotFound, err) } if !graph.IsErrExchangeMailFolderNotFound(err) { logger.CtxErr(ctx, err).Error("getting user's mail folder") - // FIXME(ashmrtn): This should use clues.Stack. - return nil, clues.Wrap(err, "") + return nil, clues.Stack(err) } logger.Ctx(ctx).Info("resource owner does not have a mailbox enabled") @@ -244,8 +242,7 @@ func (c Users) GetInfo(ctx context.Context, userID string) (*UserInfo, error) { err = c.getFirstInboxMessage(ctx, userID, ptr.Val(inbx.GetId())) if err != nil { if !graph.IsErrQuotaExceeded(err) { - // FIXME(ashmrtn): This should use clues.Stack. - return nil, clues.Wrap(err, "") + return nil, clues.Stack(err) } userInfo.Mailbox.QuotaExceeded = graph.IsErrQuotaExceeded(err)