From ccf8df354891eba9071ff6a4db137d3d58e30add Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Thu, 21 Sep 2023 12:31:07 +0530 Subject: [PATCH] Bump msgraph sdk to 1.19.0 (#4314) Needed some changes in the func names. ``` bash $ sed -i "s/By\([a-zA-Z]*\)IdString/By\1Id/g" **/*.go ``` --- #### Does this PR need a docs update or release note? - [ ] :white_check_mark: Yes, it's included - [ ] :clock1: Yes, but in a later PR - [x] :no_entry: No #### Type of change - [ ] :sunflower: Feature - [ ] :bug: Bugfix - [ ] :world_map: Documentation - [ ] :robot: Supportability/Tests - [ ] :computer: CI/Deployment - [ ] :broom: Tech Debt/Cleanup #### Issue(s) * # #### Test Plan - [x] :muscle: Manual - [x] :zap: Unit test - [x] :green_heart: E2E --- src/cmd/factory/impl/common.go | 4 +- src/cmd/sanity_test/export/onedrive.go | 2 +- src/cmd/sanity_test/export/sharepoint.go | 2 +- src/cmd/sanity_test/restore/exchange.go | 14 ++-- src/cmd/sanity_test/restore/onedrive.go | 16 ++--- src/cmd/sanity_test/restore/sharepoint.go | 2 +- src/go.mod | 12 ++-- src/go.sum | 12 ++++ .../m365/collection/exchange/restore_test.go | 4 +- .../m365/collection/site/collection_test.go | 2 +- src/internal/m365/collection/site/lists.go | 26 +++---- src/internal/m365/collection/site/restore.go | 6 +- src/internal/m365/graph/middleware_test.go | 4 +- .../operations/test/sharepoint_test.go | 16 ++--- src/pkg/services/m365/api/channels.go | 12 ++-- src/pkg/services/m365/api/channels_pager.go | 20 +++--- src/pkg/services/m365/api/contacts.go | 28 ++++---- src/pkg/services/m365/api/contacts_pager.go | 12 ++-- .../services/m365/api/contacts_pager_test.go | 8 +-- src/pkg/services/m365/api/drive.go | 36 +++++----- src/pkg/services/m365/api/drive_pager.go | 18 ++--- src/pkg/services/m365/api/drive_pager_test.go | 8 +-- src/pkg/services/m365/api/drive_test.go | 4 +- src/pkg/services/m365/api/events.go | 48 ++++++------- src/pkg/services/m365/api/events_pager.go | 6 +- .../services/m365/api/events_pager_test.go | 4 +- src/pkg/services/m365/api/groups.go | 6 +- src/pkg/services/m365/api/helper_test.go | 1 + src/pkg/services/m365/api/lists.go | 4 +- src/pkg/services/m365/api/mail.go | 68 +++++++++---------- src/pkg/services/m365/api/mail_pager.go | 8 +-- src/pkg/services/m365/api/mail_pager_test.go | 8 +-- src/pkg/services/m365/api/sites.go | 6 +- src/pkg/services/m365/api/users.go | 12 ++-- 34 files changed, 226 insertions(+), 213 deletions(-) diff --git a/src/cmd/factory/impl/common.go b/src/cmd/factory/impl/common.go index 7ce382072..466595587 100644 --- a/src/cmd/factory/impl/common.go +++ b/src/cmd/factory/impl/common.go @@ -250,7 +250,7 @@ func generateAndRestoreDriveItems( d, err := ctrl.AC.Stable. Client(). Sites(). - BySiteIdString(protectedResource.ID()). + BySiteId(protectedResource.ID()). Drive(). Get(ctx, nil) if err != nil { @@ -261,7 +261,7 @@ func generateAndRestoreDriveItems( default: d, err := ctrl.AC.Stable.Client(). Users(). - ByUserIdString(protectedResource.ID()). + ByUserId(protectedResource.ID()). Drive(). Get(ctx, nil) if err != nil { diff --git a/src/cmd/sanity_test/export/onedrive.go b/src/cmd/sanity_test/export/onedrive.go index 014f89090..3d5564bcc 100644 --- a/src/cmd/sanity_test/export/onedrive.go +++ b/src/cmd/sanity_test/export/onedrive.go @@ -22,7 +22,7 @@ func CheckOneDriveExport( ) { drive, err := client. Users(). - ByUserIdString(userID). + ByUserId(userID). Drive(). Get(ctx, nil) if err != nil { diff --git a/src/cmd/sanity_test/export/sharepoint.go b/src/cmd/sanity_test/export/sharepoint.go index 47dbd8096..55ab8ed5c 100644 --- a/src/cmd/sanity_test/export/sharepoint.go +++ b/src/cmd/sanity_test/export/sharepoint.go @@ -22,7 +22,7 @@ func CheckSharePointExport( ) { drive, err := client. Sites(). - BySiteIdString(siteID). + BySiteId(siteID). Drive(). Get(ctx, nil) if err != nil { diff --git a/src/cmd/sanity_test/restore/exchange.go b/src/cmd/sanity_test/restore/exchange.go index 60096d77c..2dc65e6e1 100644 --- a/src/cmd/sanity_test/restore/exchange.go +++ b/src/cmd/sanity_test/restore/exchange.go @@ -29,7 +29,7 @@ func CheckEmailRestoration( restoreFolder models.MailFolderable itemCount = make(map[string]int32) restoreItemCount = make(map[string]int32) - builder = client.Users().ByUserIdString(testUser).MailFolders() + builder = client.Users().ByUserId(testUser).MailFolders() ) for { @@ -73,9 +73,9 @@ func CheckEmailRestoration( childFolder, err := client. Users(). - ByUserIdString(testUser). + ByUserId(testUser). MailFolders(). - ByMailFolderIdString(folderID). + ByMailFolderId(folderID). ChildFolders(). Get(ctx, nil) if err != nil { @@ -136,9 +136,9 @@ func getAllMailSubFolders( childFolder, err := client. Users(). - ByUserIdString(testUser). + ByUserId(testUser). MailFolders(). - ByMailFolderIdString(folderID). + ByMailFolderId(folderID). ChildFolders(). Get(ctx, options) if err != nil { @@ -188,9 +188,9 @@ func checkAllSubFolder( childFolder, err := client. Users(). - ByUserIdString(testUser). + ByUserId(testUser). MailFolders(). - ByMailFolderIdString(folderID). + ByMailFolderId(folderID). ChildFolders(). Get(ctx, options) if err != nil { diff --git a/src/cmd/sanity_test/restore/onedrive.go b/src/cmd/sanity_test/restore/onedrive.go index 0b669ada4..14fa3b8cd 100644 --- a/src/cmd/sanity_test/restore/onedrive.go +++ b/src/cmd/sanity_test/restore/onedrive.go @@ -27,7 +27,7 @@ func CheckOneDriveRestoration( ) { drive, err := client. Users(). - ByUserIdString(userID). + ByUserId(userID). Drive(). Get(ctx, nil) if err != nil { @@ -115,9 +115,9 @@ func PopulateDriveDetails( response, err := client. Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString("root"). + ByDriveItemId("root"). Children(). Get(ctx, nil) if err != nil { @@ -234,7 +234,7 @@ func getOneDriveChildFolder( folderPermission map[string][]common.PermissionInfo, startTime time.Time, ) { - response, err := client.Drives().ByDriveIdString(driveID).Items().ByDriveItemIdString(itemID).Children().Get(ctx, nil) + response, err := client.Drives().ByDriveId(driveID).Items().ByDriveItemId(itemID).Children().Get(ctx, nil) if err != nil { common.Fatal(ctx, "getting child folder", err) } @@ -283,9 +283,9 @@ func getRestoredDrive( ) { restored, err := client. Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(restoreFolderID). + ByDriveItemId(restoreFolderID). Children(). Get(ctx, nil) if err != nil { @@ -326,9 +326,9 @@ func permissionIn( pcr, err := client. Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(itemID). + ByDriveItemId(itemID). Permissions(). Get(ctx, nil) if err != nil { diff --git a/src/cmd/sanity_test/restore/sharepoint.go b/src/cmd/sanity_test/restore/sharepoint.go index c2439ff21..a5146d7a4 100644 --- a/src/cmd/sanity_test/restore/sharepoint.go +++ b/src/cmd/sanity_test/restore/sharepoint.go @@ -19,7 +19,7 @@ func CheckSharePointRestoration( ) { drive, err := client. Sites(). - BySiteIdString(siteID). + BySiteId(siteID). Drive(). Get(ctx, nil) if err != nil { diff --git a/src/go.mod b/src/go.mod index 547d8dfea..29122e3fd 100644 --- a/src/go.mod +++ b/src/go.mod @@ -13,12 +13,12 @@ require ( github.com/google/uuid v1.3.1 github.com/h2non/gock v1.2.0 github.com/kopia/kopia v0.13.0 - github.com/microsoft/kiota-abstractions-go v1.2.0 + github.com/microsoft/kiota-abstractions-go v1.2.1 github.com/microsoft/kiota-authentication-azure-go v1.0.0 github.com/microsoft/kiota-http-go v1.1.0 github.com/microsoft/kiota-serialization-form-go v1.0.0 github.com/microsoft/kiota-serialization-json-go v1.0.4 - github.com/microsoftgraph/msgraph-sdk-go v1.17.0 + github.com/microsoftgraph/msgraph-sdk-go v1.19.0 github.com/microsoftgraph/msgraph-sdk-go-core v1.0.0 github.com/pkg/errors v0.9.1 github.com/puzpuzpuz/xsync/v2 v2.5.0 @@ -59,12 +59,12 @@ require ( github.com/subosito/gotenv v1.4.2 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.48.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect + go.opentelemetry.io/otel/metric v1.18.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect ) require ( - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 // indirect github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -115,8 +115,8 @@ require ( github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect github.com/yosida95/uritemplate/v3 v3.0.2 // indirect github.com/zeebo/blake3 v0.2.3 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel v1.18.0 // indirect + go.opentelemetry.io/otel/trace v1.18.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.13.0 // indirect golang.org/x/mod v0.12.0 // indirect diff --git a/src/go.sum b/src/go.sum index 30f3c7f47..dd05f4403 100644 --- a/src/go.sum +++ b/src/go.sum @@ -38,6 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1 h1:/iHxaJhsFr0+xVFfbMr5vxz848jyiWuIEDhYq3y5odY= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2 h1:t5+QXLCK9SVi0PPdaY0PrFvYUo24KwA0QwxnaHRSVd4= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.2/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 h1:LNHhpdK7hzUcx/k1LIcuh5k7k1LGIWLQfCjaneSj7Fc= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1/go.mod h1:uE9zaUfEQT/nbQjVi2IblCG9iaLtZsuYZ8ne+PuQ02M= github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY= @@ -289,6 +291,8 @@ github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQ github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/microsoft/kiota-abstractions-go v1.2.0 h1:lUriJgqdCY/QajwWQOgTCQE9Atywfe2NHhgoTCSXTRE= github.com/microsoft/kiota-abstractions-go v1.2.0/go.mod h1:RkxyZ5x87Njik7iVeQY9M2wtrrL1MJZcXiI/BxD/82g= +github.com/microsoft/kiota-abstractions-go v1.2.1 h1:TnLF7rjy1GfhuGK2ra/a3Vuz6piFXTR1OfdNoqesagA= +github.com/microsoft/kiota-abstractions-go v1.2.1/go.mod h1:rEeeaytcnal/If3f1tz6/spFz4V+Hiqvz3rxF+oWQFA= github.com/microsoft/kiota-authentication-azure-go v1.0.0 h1:29FNZZ/4nnCOwFcGWlB/sxPvWz487HA2bXH8jR5k2Rk= github.com/microsoft/kiota-authentication-azure-go v1.0.0/go.mod h1:rnx3PRlkGdXDcA/0lZQTbBwyYGmc+3POt7HpE/e4jGw= github.com/microsoft/kiota-http-go v1.1.0 h1:L5I93EiNtlP/X6YzeTlhjWt7Q1DxzC9CmWSVtX3b0tE= @@ -303,6 +307,8 @@ github.com/microsoft/kiota-serialization-text-go v1.0.0 h1:XOaRhAXy+g8ZVpcq7x7a0 github.com/microsoft/kiota-serialization-text-go v1.0.0/go.mod h1:sM1/C6ecnQ7IquQOGUrUldaO5wj+9+v7G2W3sQ3fy6M= github.com/microsoftgraph/msgraph-sdk-go v1.17.0 h1:ODua+yyogMmYos5ihqK90fQ01yaj+S2A+pM2MYxzjJ8= github.com/microsoftgraph/msgraph-sdk-go v1.17.0/go.mod h1:DdshtIL3VJ3abSG6O+gmlvbc/pX7Xh7xbruLTWoRjfU= +github.com/microsoftgraph/msgraph-sdk-go v1.19.0 h1:hx+SvDTm5ENYZFqmMIskF7tOn48zzT2Xv3OVFrxl2dc= +github.com/microsoftgraph/msgraph-sdk-go v1.19.0/go.mod h1:3DArbqPS7riix0VsJhdtYsgPaAFAH9Jer64psW55riI= github.com/microsoftgraph/msgraph-sdk-go-core v1.0.0 h1:7NWTfyXvOjoizW7PmxNp3+8wCKPgpODs/D1cUZ3fkAY= github.com/microsoftgraph/msgraph-sdk-go-core v1.0.0/go.mod h1:tQb4q3YMIj2dWhhXhQSJ4ELpol931ANKzHSYK5kX1qE= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= @@ -451,10 +457,16 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel v1.18.0 h1:TgVozPGZ01nHyDZxK5WGPFB9QexeTMXEH7+tIClWfzs= +go.opentelemetry.io/otel v1.18.0/go.mod h1:9lWqYO0Db579XzVuCKFNPDl4s73Voa+zEck3wHaAYQI= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel/metric v1.18.0 h1:JwVzw94UYmbx3ej++CwLUQZxEODDj/pOuTCvzhtRrSQ= +go.opentelemetry.io/otel/metric v1.18.0/go.mod h1:nNSpsVDjWGfb7chbRLUNW+PBNdcSTHD4Uu5pfFMOI0k= go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.18.0 h1:NY+czwbHbmndxojTEKiSMHkG2ClNH2PwmcHrdo0JY10= +go.opentelemetry.io/otel/trace v1.18.0/go.mod h1:T2+SGJGuYZY3bjj5rgh/hN7KIrlpWC5nS8Mjvzckz+0= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= diff --git a/src/internal/m365/collection/exchange/restore_test.go b/src/internal/m365/collection/exchange/restore_test.go index c8d1b6fd3..1fea2f0c7 100644 --- a/src/internal/m365/collection/exchange/restore_test.go +++ b/src/internal/m365/collection/exchange/restore_test.go @@ -422,9 +422,9 @@ func (suite *RestoreIntgSuite) TestRestoreAndBackupEvent_recurringInstancesWithA ec, err := handler.ac.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars(). - ByCalendarIdString(calendarID). + ByCalendarId(calendarID). Events(). Get(ctx, nil) require.NoError(t, err, clues.ToCore(err)) diff --git a/src/internal/m365/collection/site/collection_test.go b/src/internal/m365/collection/site/collection_test.go index d7b369326..0be5c2dc8 100644 --- a/src/internal/m365/collection/site/collection_test.go +++ b/src/internal/m365/collection/site/collection_test.go @@ -224,7 +224,7 @@ func (suite *SharePointCollectionSuite) TestListCollection_Restore() { // Clean-Up var ( - builder = service.Client().Sites().BySiteIdString(suite.siteID).Lists() + builder = service.Client().Sites().BySiteId(suite.siteID).Lists() isFound bool deleteID string ) diff --git a/src/internal/m365/collection/site/lists.go b/src/internal/m365/collection/site/lists.go index 8bbc615cb..e717f8d67 100644 --- a/src/internal/m365/collection/site/lists.go +++ b/src/internal/m365/collection/site/lists.go @@ -57,7 +57,7 @@ func PreFetchLists( siteID string, ) ([]ListTuple, error) { var ( - builder = gs.Client().Sites().BySiteIdString(siteID).Lists() + builder = gs.Client().Sites().BySiteId(siteID).Lists() options = preFetchListOptions() listTuples = make([]ListTuple, 0) ) @@ -149,7 +149,7 @@ func loadSiteLists( err error ) - entry, err = gs.Client().Sites().BySiteIdString(siteID).Lists().ByListIdString(id).Get(ctx, nil) + entry, err = gs.Client().Sites().BySiteId(siteID).Lists().ByListId(id).Get(ctx, nil) if err != nil { el.AddRecoverable(ctx, graph.Wrap(ctx, err, "getting site list")) return @@ -216,7 +216,7 @@ func fetchListItems( errs *fault.Bus, ) ([]models.ListItemable, error) { var ( - prefix = gs.Client().Sites().BySiteIdString(siteID).Lists().ByListIdString(listID) + prefix = gs.Client().Sites().BySiteId(siteID).Lists().ByListId(listID) builder = prefix.Items() itms = make([]models.ListItemable, 0) el = errs.Local() @@ -237,7 +237,7 @@ func fetchListItems( break } - newPrefix := prefix.Items().ByListItemIdString(ptr.Val(itm.GetId())) + newPrefix := prefix.Items().ByListItemId(ptr.Val(itm.GetId())) fields, err := newPrefix.Fields().Get(ctx, nil) if err != nil { @@ -273,7 +273,7 @@ func fetchColumns( cs := make([]models.ColumnDefinitionable, 0) if len(cTypeID) == 0 { - builder := gs.Client().Sites().BySiteIdString(siteID).Lists().ByListIdString(listID).Columns() + builder := gs.Client().Sites().BySiteId(siteID).Lists().ByListId(listID).Columns() for { resp, err := builder.Get(ctx, nil) @@ -293,11 +293,11 @@ func fetchColumns( } else { builder := gs.Client(). Sites(). - BySiteIdString(siteID). + BySiteId(siteID). Lists(). - ByListIdString(listID). + ByListId(listID). ContentTypes(). - ByContentTypeIdString(cTypeID). + ByContentTypeId(cTypeID). Columns() for { @@ -335,7 +335,7 @@ func fetchContentTypes( var ( el = errs.Local() cTypes = make([]models.ContentTypeable, 0) - builder = gs.Client().Sites().BySiteIdString(siteID).Lists().ByListIdString(listID).ContentTypes() + builder = gs.Client().Sites().BySiteId(siteID).Lists().ByListId(listID).ContentTypes() ) for { @@ -393,11 +393,11 @@ func fetchColumnLinks( var ( builder = gs.Client(). Sites(). - BySiteIdString(siteID). + BySiteId(siteID). Lists(). - ByListIdString(listID). + ByListId(listID). ContentTypes(). - ByContentTypeIdString(cTypeID). + ByContentTypeId(cTypeID). ColumnLinks() links = make([]models.ColumnLinkable, 0) ) @@ -431,7 +431,7 @@ func DeleteList( gs graph.Servicer, siteID, listID string, ) error { - err := gs.Client().Sites().BySiteIdString(siteID).Lists().ByListIdString(listID).Delete(ctx, nil) + err := gs.Client().Sites().BySiteId(siteID).Lists().ByListId(listID).Delete(ctx, nil) if err != nil { return graph.Wrap(ctx, err, "deleting list") } diff --git a/src/internal/m365/collection/site/restore.go b/src/internal/m365/collection/site/restore.go index 589b94569..20be1aff0 100644 --- a/src/internal/m365/collection/site/restore.go +++ b/src/internal/m365/collection/site/restore.go @@ -177,7 +177,7 @@ func restoreListItem( newList.SetItems(contents) // Restore to List base to M365 back store - restoredList, err := service.Client().Sites().BySiteIdString(siteID).Lists().Post(ctx, newList, nil) + restoredList, err := service.Client().Sites().BySiteId(siteID).Lists().Post(ctx, newList, nil) if err != nil { return dii, graph.Wrap(ctx, err, "restoring list") } @@ -188,9 +188,9 @@ func restoreListItem( for _, lItem := range contents { _, err := service.Client(). Sites(). - BySiteIdString(siteID). + BySiteId(siteID). Lists(). - ByListIdString(ptr.Val(restoredList.GetId())). + ByListId(ptr.Val(restoredList.GetId())). Items(). Post(ctx, lItem, nil) if err != nil { diff --git a/src/internal/m365/graph/middleware_test.go b/src/internal/m365/graph/middleware_test.go index 4cc2abe2a..4dca30146 100644 --- a/src/internal/m365/graph/middleware_test.go +++ b/src/internal/m365/graph/middleware_test.go @@ -289,7 +289,7 @@ func (suite *RetryMWIntgSuite) TestRetryMiddleware_RetryRequest_resetBodyAfter50 _, err = NewService(adpt). Client(). Users(). - ByUserIdString("user"). + ByUserId("user"). MailFolders(). Post(ctx, body, nil) require.NoError(t, err, clues.ToCore(err)) @@ -326,7 +326,7 @@ func (suite *RetryMWIntgSuite) TestRetryMiddleware_RetryResponse_maintainBodyAft _, err = NewService(adpt). Client(). Users(). - ByUserIdString("user"). + ByUserId("user"). MailFolders(). Post(ctx, models.NewMailFolder(), nil) require.Error(t, err, clues.ToCore(err)) diff --git a/src/internal/operations/test/sharepoint_test.go b/src/internal/operations/test/sharepoint_test.go index ec1cb940c..ffe4eb2c3 100644 --- a/src/internal/operations/test/sharepoint_test.go +++ b/src/internal/operations/test/sharepoint_test.go @@ -305,7 +305,7 @@ func (suite *SharePointRestoreNightlyIntgSuite) TestRestore_Run_sharepointDelete md, err = graphClient. Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Patch(ctx, patchBody, nil) require.NoError(t, err, clues.ToCore(graph.Stack(ctx, err))) @@ -330,9 +330,9 @@ func (suite *SharePointRestoreNightlyIntgSuite) TestRestore_Run_sharepointDelete resp, err := graphClient. Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(rootFolderID). + ByDriveItemId(rootFolderID). Children(). Get(ctx, nil) require.NoError(t, err, clues.ToCore(graph.Stack(ctx, err))) @@ -356,7 +356,7 @@ func (suite *SharePointRestoreNightlyIntgSuite) TestRestore_Run_sharepointDelete err = graphClient. Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Delete(ctx, nil) require.NoError(t, err, clues.ToCore(graph.Stack(ctx, err))) @@ -407,9 +407,9 @@ func (suite *SharePointRestoreNightlyIntgSuite) TestRestore_Run_sharepointDelete resp, err := graphClient. Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(rootFolderID). + ByDriveItemId(rootFolderID). Children(). Get(ctx, nil) require.NoError(t, err, clues.ToCore(graph.Stack(ctx, err))) @@ -450,9 +450,9 @@ func (suite *SharePointRestoreNightlyIntgSuite) TestRestore_Run_sharepointDelete resp, err := graphClient. Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(rootFolderID). + ByDriveItemId(rootFolderID). Children(). Get(ctx, nil) require.NoError(t, err, clues.ToCore(graph.Stack(ctx, err))) diff --git a/src/pkg/services/m365/api/channels.go b/src/pkg/services/m365/api/channels.go index a41b5b46b..e178c2340 100644 --- a/src/pkg/services/m365/api/channels.go +++ b/src/pkg/services/m365/api/channels.go @@ -46,9 +46,9 @@ func (c Channels) GetChannel( resp, err := c.Stable. Client(). Teams(). - ByTeamIdString(teamID). + ByTeamId(teamID). Channels(). - ByChannelIdString(containerID). + ByChannelId(containerID). Get(ctx, config) if err != nil { return nil, graph.Stack(ctx, err) @@ -74,7 +74,7 @@ func (c Channels) GetChannelByName( resp, err := c.Stable. Client(). Teams(). - ByTeamIdString(teamID). + ByTeamId(teamID). Channels(). Get(ctx, options) if err != nil { @@ -111,11 +111,11 @@ func (c Channels) GetChannelMessage( message, err := c.Stable. Client(). Teams(). - ByTeamIdString(teamID). + ByTeamId(teamID). Channels(). - ByChannelIdString(channelID). + ByChannelId(channelID). Messages(). - ByChatMessageIdString(messageID). + ByChatMessageId(messageID). Get(ctx, nil) if err != nil { return nil, nil, graph.Stack(ctx, err) diff --git a/src/pkg/services/m365/api/channels_pager.go b/src/pkg/services/m365/api/channels_pager.go index b8551ede7..e9fb76637 100644 --- a/src/pkg/services/m365/api/channels_pager.go +++ b/src/pkg/services/m365/api/channels_pager.go @@ -47,9 +47,9 @@ func (c Channels) NewChannelMessagePager( builder := c.Stable. Client(). Teams(). - ByTeamIdString(teamID). + ByTeamId(teamID). Channels(). - ByChannelIdString(channelID). + ByChannelId(channelID). Messages() options := &teams.ItemChannelsItemMessagesRequestBuilderGetRequestConfiguration{ @@ -98,9 +98,9 @@ func (p *channelMessageDeltaPageCtrl) Reset(context.Context) { p.builder = p.gs. Client(). Teams(). - ByTeamIdString(p.resourceID). + ByTeamId(p.resourceID). Channels(). - ByChannelIdString(p.channelID). + ByChannelId(p.channelID). Messages(). Delta() } @@ -116,9 +116,9 @@ func (c Channels) NewChannelMessageDeltaPager( builder := c.Stable. Client(). Teams(). - ByTeamIdString(teamID). + ByTeamId(teamID). Channels(). - ByChannelIdString(channelID). + ByChannelId(channelID). Messages(). Delta() @@ -211,11 +211,11 @@ func (c Channels) NewChannelMessageRepliesPager( builder: c.Stable. Client(). Teams(). - ByTeamIdString(teamID). + ByTeamId(teamID). Channels(). - ByChannelIdString(channelID). + ByChannelId(channelID). Messages(). - ByChatMessageIdString(messageID). + ByChatMessageId(messageID). Replies(), } @@ -272,7 +272,7 @@ func (c Channels) NewChannelPager( builder: c.Stable. Client(). Teams(). - ByTeamIdString(teamID). + ByTeamId(teamID). Channels(), } diff --git a/src/pkg/services/m365/api/contacts.go b/src/pkg/services/m365/api/contacts.go index 065b90051..36a8ab16f 100644 --- a/src/pkg/services/m365/api/contacts.go +++ b/src/pkg/services/m365/api/contacts.go @@ -46,7 +46,7 @@ func (c Contacts) CreateContainer( mdl, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). ContactFolders(). Post(ctx, body, nil) if err != nil { @@ -71,9 +71,9 @@ func (c Contacts) DeleteContainer( err = srv. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). ContactFolders(). - ByContactFolderIdString(containerID). + ByContactFolderId(containerID). Delete(ctx, nil) if err != nil { return graph.Stack(ctx, err) @@ -95,9 +95,9 @@ func (c Contacts) GetContainerByID( resp, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). ContactFolders(). - ByContactFolderIdString(containerID). + ByContactFolderId(containerID). Get(ctx, config) if err != nil { return nil, graph.Stack(ctx, err) @@ -124,7 +124,7 @@ func (c Contacts) GetContainerByName( resp, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). ContactFolders(). Get(ctx, options) if err != nil { @@ -164,9 +164,9 @@ func (c Contacts) PatchFolder( _, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). ContactFolders(). - ByContactFolderIdString(containerID). + ByContactFolderId(containerID). Patch(ctx, body, nil) if err != nil { return graph.Wrap(ctx, err, "patching contact folder") @@ -193,9 +193,9 @@ func (c Contacts) GetItem( cont, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Contacts(). - ByContactIdString(itemID). + ByContactId(itemID). Get(ctx, options) if err != nil { return nil, nil, graph.Stack(ctx, err) @@ -212,9 +212,9 @@ func (c Contacts) PostItem( itm, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). ContactFolders(). - ByContactFolderIdString(containerID). + ByContactFolderId(containerID). Contacts(). Post(ctx, body, nil) if err != nil { @@ -238,9 +238,9 @@ func (c Contacts) DeleteItem( err = srv. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Contacts(). - ByContactIdString(itemID). + ByContactId(itemID). Delete(ctx, nil) if err != nil { return graph.Wrap(ctx, err, "deleting contact") diff --git a/src/pkg/services/m365/api/contacts_pager.go b/src/pkg/services/m365/api/contacts_pager.go index 46fe9d19b..6c8d90e74 100644 --- a/src/pkg/services/m365/api/contacts_pager.go +++ b/src/pkg/services/m365/api/contacts_pager.go @@ -40,9 +40,9 @@ func (c Contacts) EnumerateContainers( builder := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). ContactFolders(). - ByContactFolderIdString(baseContainerID). + ByContactFolderId(baseContainerID). ChildFolders() for { @@ -118,9 +118,9 @@ func (c Contacts) NewContactsPager( builder := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). ContactFolders(). - ByContactFolderIdString(containerID). + ByContactFolderId(containerID). Contacts() return &contactsPageCtrl{c.Stable, builder, options} @@ -204,9 +204,9 @@ func getContactDeltaBuilder( ) *users.ItemContactFoldersItemContactsDeltaRequestBuilder { builder := gs.Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). ContactFolders(). - ByContactFolderIdString(containerID). + ByContactFolderId(containerID). Contacts(). Delta() diff --git a/src/pkg/services/m365/api/contacts_pager_test.go b/src/pkg/services/m365/api/contacts_pager_test.go index e5fb4fea7..5d859cd12 100644 --- a/src/pkg/services/m365/api/contacts_pager_test.go +++ b/src/pkg/services/m365/api/contacts_pager_test.go @@ -45,9 +45,9 @@ func (suite *ContactsPagerIntgSuite) TestContacts_GetItemsInContainerByCollision conts, err := ac.Stable. Client(). Users(). - ByUserIdString(suite.its.user.id). + ByUserId(suite.its.user.id). ContactFolders(). - ByContactFolderIdString(ptr.Val(container.GetId())). + ByContactFolderId(ptr.Val(container.GetId())). Contacts(). Get(ctx, nil) require.NoError(t, err, clues.ToCore(err)) @@ -97,9 +97,9 @@ func (suite *ContactsPagerIntgSuite) TestContacts_GetItemsIDsInContainer() { msgs, err := ac.Stable. Client(). Users(). - ByUserIdString(suite.its.user.id). + ByUserId(suite.its.user.id). ContactFolders(). - ByContactFolderIdString(ptr.Val(container.GetId())). + ByContactFolderId(ptr.Val(container.GetId())). Contacts(). Get(ctx, nil) require.NoError(t, err, clues.ToCore(err)) diff --git a/src/pkg/services/m365/api/drive.go b/src/pkg/services/m365/api/drive.go index 318c783c0..e40d7497a 100644 --- a/src/pkg/services/m365/api/drive.go +++ b/src/pkg/services/m365/api/drive.go @@ -74,7 +74,7 @@ func (c Drives) GetRootFolder( root, err := c.Stable. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Root(). Get(ctx, nil) if err != nil { @@ -96,9 +96,9 @@ func (c Drives) GetItem( di, err := c.Stable. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(itemID). + ByDriveItemId(itemID). Get(ctx, nil) if err != nil { return nil, graph.Wrap(ctx, err, "getting item") @@ -116,9 +116,9 @@ func (c Drives) NewItemContentUpload( r, err := c.Stable. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(itemID). + ByDriveItemId(itemID). CreateUploadSession(). Post(ctx, session, nil) if err != nil { @@ -180,9 +180,9 @@ func (c Drives) PatchItem( _, err := c.Stable. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(itemID). + ByDriveItemId(itemID). Patch(ctx, item, nil) if err != nil { return graph.Wrap(ctx, err, "patching drive item") @@ -199,9 +199,9 @@ func (c Drives) PutItemContent( _, err := c.Stable. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(itemID). + ByDriveItemId(itemID). Content(). Put(ctx, content, nil) if err != nil { @@ -227,9 +227,9 @@ func (c Drives) DeleteItem( err = srv. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(itemID). + ByDriveItemId(itemID). Delete(ctx, nil) if err != nil { return graph.Wrap(ctx, err, "deleting item").With("item_id", itemID) @@ -249,9 +249,9 @@ func (c Drives) GetItemPermission( perm, err := c.Stable. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(itemID). + ByDriveItemId(itemID). Permissions(). Get(ctx, nil) if err != nil { @@ -271,9 +271,9 @@ func (c Drives) PostItemPermissionUpdate( itm, err := c.Stable. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(itemID). + ByDriveItemId(itemID). Invite(). Post(ctx, body, nil) if err != nil { @@ -297,11 +297,11 @@ func (c Drives) DeleteItemPermission( err = srv. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(itemID). + ByDriveItemId(itemID). Permissions(). - ByPermissionIdString(permissionID). + ByPermissionId(permissionID). Delete(graph.ConsumeNTokens(ctx, graph.PermissionsLC), nil) if err != nil { return graph.Wrap(ctx, err, "deleting drive item permission") diff --git a/src/pkg/services/m365/api/drive_pager.go b/src/pkg/services/m365/api/drive_pager.go index 6e36b5004..c592fa656 100644 --- a/src/pkg/services/m365/api/drive_pager.go +++ b/src/pkg/services/m365/api/drive_pager.go @@ -42,9 +42,9 @@ func (c Drives) NewDriveItemPager( builder := c.Stable. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(containerID). + ByDriveItemId(containerID). Children() return &driveItemPageCtrl{c.Stable, builder, options} @@ -156,9 +156,9 @@ func (c Drives) NewDriveItemDeltaPager( builder: c.Stable. Client(). Drives(). - ByDriveIdString(driveID). + ByDriveId(driveID). Items(). - ByDriveItemIdString(onedrive.RootID). + ByDriveItemId(onedrive.RootID). Delta(), } @@ -183,9 +183,9 @@ func (p *DriveItemDeltaPageCtrl) SetNextLink(link string) { func (p *DriveItemDeltaPageCtrl) Reset(context.Context) { p.builder = p.gs.Client(). Drives(). - ByDriveIdString(p.driveID). + ByDriveId(p.driveID). Items(). - ByDriveItemIdString(onedrive.RootID). + ByDriveItemId(onedrive.RootID). Delta() } @@ -223,7 +223,7 @@ func (c Drives) NewUserDrivePager( builder: c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Drives(), } @@ -249,7 +249,7 @@ func (p *userDrivePager) GetPage( d, err := p.gs. Client(). Users(). - ByUserIdString(p.userID). + ByUserId(p.userID). Drive(). Get(ctx, nil) @@ -297,7 +297,7 @@ func (c Drives) NewSiteDrivePager( builder: c.Stable. Client(). Sites(). - BySiteIdString(siteID). + BySiteId(siteID). Drives(), } diff --git a/src/pkg/services/m365/api/drive_pager_test.go b/src/pkg/services/m365/api/drive_pager_test.go index 370cacbbf..f28277eee 100644 --- a/src/pkg/services/m365/api/drive_pager_test.go +++ b/src/pkg/services/m365/api/drive_pager_test.go @@ -61,9 +61,9 @@ func (suite *DrivePagerIntgSuite) TestDrives_GetItemsInContainerByCollisionKey() items, err := suite.its.ac.Stable. Client(). Drives(). - ByDriveIdString(test.driveID). + ByDriveId(test.driveID). Items(). - ByDriveItemIdString(test.rootFolderID). + ByDriveItemId(test.rootFolderID). Children(). Get(ctx, nil) require.NoError(t, err, clues.ToCore(err)) @@ -135,9 +135,9 @@ func (suite *DrivePagerIntgSuite) TestDrives_GetItemIDsInContainer() { items, err := suite.its.ac.Stable. Client(). Drives(). - ByDriveIdString(test.driveID). + ByDriveId(test.driveID). Items(). - ByDriveItemIdString(test.rootFolderID). + ByDriveItemId(test.rootFolderID). Children(). Get(ctx, nil) require.NoError(t, err, clues.ToCore(err)) diff --git a/src/pkg/services/m365/api/drive_test.go b/src/pkg/services/m365/api/drive_test.go index 089cfb99c..28173c27a 100644 --- a/src/pkg/services/m365/api/drive_test.go +++ b/src/pkg/services/m365/api/drive_test.go @@ -274,9 +274,9 @@ func (suite *DriveAPIIntgSuite) TestDrives_PostItemInContainer_replaceFolderRegr resultFileColl, err := acd.Stable. Client(). Drives(). - ByDriveIdString(suite.its.user.driveID). + ByDriveId(suite.its.user.driveID). Items(). - ByDriveItemIdString(ptr.Val(resultFolder.GetId())). + ByDriveItemId(ptr.Val(resultFolder.GetId())). Children(). Get(ctx, nil) err = graph.Stack(ctx, err).OrNil() diff --git a/src/pkg/services/m365/api/events.go b/src/pkg/services/m365/api/events.go index 9f4d5fed4..2590baa85 100644 --- a/src/pkg/services/m365/api/events.go +++ b/src/pkg/services/m365/api/events.go @@ -55,7 +55,7 @@ func (c Events) CreateContainer( container, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars(). Post(ctx, body, nil) if err != nil { @@ -80,9 +80,9 @@ func (c Events) DeleteContainer( err = srv.Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars(). - ByCalendarIdString(containerID). + ByCalendarId(containerID). Delete(ctx, nil) if err != nil { return graph.Stack(ctx, err) @@ -104,9 +104,9 @@ func (c Events) GetContainerByID( resp, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars(). - ByCalendarIdString(containerID). + ByCalendarId(containerID). Get(ctx, config) if err != nil { return nil, graph.Stack(ctx, err) @@ -133,7 +133,7 @@ func (c Events) GetContainerByName( resp, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars(). Get(ctx, options) if err != nil { @@ -169,9 +169,9 @@ func (c Events) PatchCalendar( _, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars(). - ByCalendarIdString(containerID). + ByCalendarId(containerID). Patch(ctx, body, nil) if err != nil { return graph.Wrap(ctx, err, "patching event calendar") @@ -381,9 +381,9 @@ func (c Events) GetAttachments( attached, err := c.LargeItem. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Events(). - ByEventIdString(itemID). + ByEventId(itemID). Attachments(). Get(ctx, config) if err != nil { @@ -400,13 +400,13 @@ func (c Events) DeleteAttachment( return c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars(). - ByCalendarIdString(calendarID). + ByCalendarId(calendarID). Events(). - ByEventIdString(eventID). + ByEventId(eventID). Attachments(). - ByAttachmentIdString(attachmentID). + ByAttachmentId(attachmentID). Delete(ctx, nil) } @@ -425,9 +425,9 @@ func (c Events) GetItemInstances( events, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Events(). - ByEventIdString(itemID). + ByEventId(itemID). Instances(). Get(ctx, config) if err != nil { @@ -483,9 +483,9 @@ func (c Events) DeleteItem( err = srv. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Events(). - ByEventIdString(itemID). + ByEventId(itemID). Delete(ctx, nil) if err != nil { return graph.Wrap(ctx, err, "deleting calendar event") @@ -502,11 +502,11 @@ func (c Events) PostSmallAttachment( _, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars(). - ByCalendarIdString(containerID). + ByCalendarId(containerID). Events(). - ByEventIdString(parentItemID). + ByEventId(parentItemID). Attachments(). Post(ctx, body, nil) if err != nil { @@ -528,11 +528,11 @@ func (c Events) PostLargeAttachment( us, err := c.LargeItem. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars(). - ByCalendarIdString(containerID). + ByCalendarId(containerID). Events(). - ByEventIdString(parentItemID). + ByEventId(parentItemID). Attachments(). CreateUploadSession(). Post(ctx, session, nil) diff --git a/src/pkg/services/m365/api/events_pager.go b/src/pkg/services/m365/api/events_pager.go index 755c19539..b1ea1bedc 100644 --- a/src/pkg/services/m365/api/events_pager.go +++ b/src/pkg/services/m365/api/events_pager.go @@ -42,7 +42,7 @@ func (c Events) EnumerateContainers( builder = c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars() ) @@ -123,9 +123,9 @@ func (c Events) NewEventsPager( builder := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Calendars(). - ByCalendarIdString(containerID). + ByCalendarId(containerID). Events() return &eventsPageCtrl{c.Stable, builder, options} diff --git a/src/pkg/services/m365/api/events_pager_test.go b/src/pkg/services/m365/api/events_pager_test.go index e1100d33f..610b449af 100644 --- a/src/pkg/services/m365/api/events_pager_test.go +++ b/src/pkg/services/m365/api/events_pager_test.go @@ -45,9 +45,9 @@ func (suite *EventsPagerIntgSuite) TestEvents_GetItemsInContainerByCollisionKey( evts, err := ac.Stable. Client(). Users(). - ByUserIdString(suite.its.user.id). + ByUserId(suite.its.user.id). Calendars(). - ByCalendarIdString(ptr.Val(container.GetId())). + ByCalendarId(ptr.Val(container.GetId())). Events(). Get(ctx, nil) require.NoError(t, err, clues.ToCore(err)) diff --git a/src/pkg/services/m365/api/groups.go b/src/pkg/services/m365/api/groups.go index 01f7ed019..e69876233 100644 --- a/src/pkg/services/m365/api/groups.go +++ b/src/pkg/services/m365/api/groups.go @@ -119,7 +119,7 @@ func (c Groups) GetByID( group, err = service. Client(). Groups(). - ByGroupIdString(identifier). + ByGroupId(identifier). Get(ctx, nil) if err == nil { return group, nil @@ -165,9 +165,9 @@ func (c Groups) GetRootSite( resp, err := service. Client(). Groups(). - ByGroupIdString(identifier). + ByGroupId(identifier). Sites(). - BySiteIdString("root"). + BySiteId("root"). Get(ctx, nil) if err != nil { return nil, clues.Wrap(err, "getting root site for group") diff --git a/src/pkg/services/m365/api/helper_test.go b/src/pkg/services/m365/api/helper_test.go index 76adb3891..b3de4f43e 100644 --- a/src/pkg/services/m365/api/helper_test.go +++ b/src/pkg/services/m365/api/helper_test.go @@ -39,6 +39,7 @@ func odErr(code string) *odataerrors.ODataError { odErr := odataerrors.NewODataError() merr := odataerrors.NewMainError() merr.SetCode(&code) + merr.SetMessage(&code) // sdk expect message to be available odErr.SetErrorEscaped(merr) return odErr diff --git a/src/pkg/services/m365/api/lists.go b/src/pkg/services/m365/api/lists.go index 1784cebc3..fb6abaa48 100644 --- a/src/pkg/services/m365/api/lists.go +++ b/src/pkg/services/m365/api/lists.go @@ -42,7 +42,7 @@ func (c Lists) PostDrive( builder := c.Stable. Client(). Sites(). - BySiteIdString(siteID). + BySiteId(siteID). Lists() newList, err := builder.Post(ctx, list, nil) @@ -56,7 +56,7 @@ func (c Lists) PostDrive( // drive information is not returned by the list creation. drive, err := builder. - ByListIdString(ptr.Val(newList.GetId())). + ByListId(ptr.Val(newList.GetId())). Drive(). Get(ctx, nil) diff --git a/src/pkg/services/m365/api/mail.go b/src/pkg/services/m365/api/mail.go index 4599bdc6e..0064da90b 100644 --- a/src/pkg/services/m365/api/mail.go +++ b/src/pkg/services/m365/api/mail.go @@ -53,9 +53,9 @@ func (c Mail) CreateContainer( mdl, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(parentContainerID). + ByMailFolderId(parentContainerID). ChildFolders(). Post(ctx, body, nil) if err != nil { @@ -80,9 +80,9 @@ func (c Mail) DeleteContainer( err = srv.Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(containerID). + ByMailFolderId(containerID). Delete(ctx, nil) if err != nil { return graph.Stack(ctx, err) @@ -104,9 +104,9 @@ func (c Mail) GetContainerByID( resp, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(containerID). + ByMailFolderId(containerID). Get(ctx, config) if err != nil { return nil, graph.Stack(ctx, err) @@ -128,7 +128,7 @@ func (c Mail) GetContainerByName( builder = c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders() resp models.MailFolderCollectionResponseable err error @@ -142,7 +142,7 @@ func (c Mail) GetContainerByName( } resp, err = builder. - ByMailFolderIdString(parentContainerID). + ByMailFolderId(parentContainerID). ChildFolders(). Get(ctx, options) } else { @@ -192,9 +192,9 @@ func (c Mail) MoveContainer( _, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(containerID). + ByMailFolderId(containerID). Move(). Post(ctx, body, nil) if err != nil { @@ -212,9 +212,9 @@ func (c Mail) PatchFolder( _, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(containerID). + ByMailFolderId(containerID). Patch(ctx, body, nil) if err != nil { return graph.Wrap(ctx, err, "patching mail folder") @@ -246,9 +246,9 @@ func (c Mail) GetItem( mail, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Messages(). - ByMessageIdString(itemID). + ByMessageId(itemID). Get(ctx, config) if err != nil { return nil, nil, graph.Stack(ctx, err) @@ -276,9 +276,9 @@ func (c Mail) GetItem( attached, err := c.LargeItem. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Messages(). - ByMessageIdString(itemID). + ByMessageId(itemID). Attachments(). Get(ctx, attachConfig) if err == nil { @@ -309,9 +309,9 @@ func (c Mail) GetItem( attachments, err := c.LargeItem. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Messages(). - ByMessageIdString(itemID). + ByMessageId(itemID). Attachments(). Get(ctx, attachConfig) if err != nil { @@ -331,11 +331,11 @@ func (c Mail) GetItem( att, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Messages(). - ByMessageIdString(itemID). + ByMessageId(itemID). Attachments(). - ByAttachmentIdString(ptr.Val(a.GetId())). + ByAttachmentId(ptr.Val(a.GetId())). Get(ctx, attachConfig) if err != nil { // CannotOpenFileAttachment errors are not transient and @@ -376,9 +376,9 @@ func (c Mail) PostItem( itm, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(containerID). + ByMailFolderId(containerID). Messages(). Post(ctx, body, nil) if err != nil { @@ -402,11 +402,11 @@ func (c Mail) MoveItem( resp, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(oldContainerID). + ByMailFolderId(oldContainerID). Messages(). - ByMessageIdString(itemID). + ByMessageId(itemID). Move(). Post(ctx, body, nil) if err != nil { @@ -430,9 +430,9 @@ func (c Mail) DeleteItem( err = srv. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Messages(). - ByMessageIdString(itemID). + ByMessageId(itemID). Delete(ctx, nil) if err != nil { return graph.Wrap(ctx, err, "deleting mail message") @@ -449,11 +449,11 @@ func (c Mail) PostSmallAttachment( _, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(containerID). + ByMailFolderId(containerID). Messages(). - ByMessageIdString(parentItemID). + ByMessageId(parentItemID). Attachments(). Post(ctx, body, nil) if err != nil { @@ -475,11 +475,11 @@ func (c Mail) PostLargeAttachment( us, err := c.LargeItem. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(containerID). + ByMailFolderId(containerID). Messages(). - ByMessageIdString(parentItemID). + ByMessageId(parentItemID). Attachments(). CreateUploadSession(). Post(ctx, session, nil) diff --git a/src/pkg/services/m365/api/mail_pager.go b/src/pkg/services/m365/api/mail_pager.go index d7199ec97..7d32e6ce2 100644 --- a/src/pkg/services/m365/api/mail_pager.go +++ b/src/pkg/services/m365/api/mail_pager.go @@ -148,9 +148,9 @@ func (c Mail) NewMailPager( builder := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(containerID). + ByMailFolderId(containerID). Messages() return &mailsPageCtrl{c.Stable, builder, options} @@ -234,9 +234,9 @@ func getMailDeltaBuilder( ) *users.ItemMailFoldersItemMessagesDeltaRequestBuilder { builder := gs.Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(containerID). + ByMailFolderId(containerID). Messages(). Delta() diff --git a/src/pkg/services/m365/api/mail_pager_test.go b/src/pkg/services/m365/api/mail_pager_test.go index cc0d18555..7f367de1d 100644 --- a/src/pkg/services/m365/api/mail_pager_test.go +++ b/src/pkg/services/m365/api/mail_pager_test.go @@ -46,9 +46,9 @@ func (suite *MailPagerIntgSuite) TestMail_GetItemsInContainerByCollisionKey() { msgs, err := ac.Stable. Client(). Users(). - ByUserIdString(suite.its.user.id). + ByUserId(suite.its.user.id). MailFolders(). - ByMailFolderIdString(ptr.Val(container.GetId())). + ByMailFolderId(ptr.Val(container.GetId())). Messages(). Get(ctx, nil) require.NoError(t, err, clues.ToCore(err)) @@ -101,9 +101,9 @@ func (suite *MailPagerIntgSuite) TestMail_GetItemsIDsInContainer() { msgs, err := ac.Stable. Client(). Users(). - ByUserIdString(suite.its.user.id). + ByUserId(suite.its.user.id). MailFolders(). - ByMailFolderIdString(api.MailInbox). + ByMailFolderId(api.MailInbox). Messages(). Get(ctx, config) require.NoError(t, err, clues.ToCore(err)) diff --git a/src/pkg/services/m365/api/sites.go b/src/pkg/services/m365/api/sites.go index 36719470f..303d97344 100644 --- a/src/pkg/services/m365/api/sites.go +++ b/src/pkg/services/m365/api/sites.go @@ -45,7 +45,7 @@ func (c Sites) GetRoot(ctx context.Context) (models.Siteable, error) { resp, err := c.Stable. Client(). Sites(). - BySiteIdString("root"). + BySiteId("root"). Get(ctx, options) if err != nil { return nil, graph.Wrap(ctx, err, "getting root site") @@ -134,7 +134,7 @@ func (c Sites) GetByID(ctx context.Context, identifier string) (models.Siteable, resp, err = c.Stable. Client(). Sites(). - BySiteIdString(identifier). + BySiteId(identifier). Get(ctx, options) if err != nil { err := graph.Wrap(ctx, err, "getting site by id") @@ -210,7 +210,7 @@ func (c Sites) GetDefaultDrive( d, err := c.Stable. Client(). Sites(). - BySiteIdString(site). + BySiteId(site). Drive(). Get(ctx, nil) if err != nil { diff --git a/src/pkg/services/m365/api/users.go b/src/pkg/services/m365/api/users.go index 30650c1b8..a3cff2dfc 100644 --- a/src/pkg/services/m365/api/users.go +++ b/src/pkg/services/m365/api/users.go @@ -120,7 +120,7 @@ func (c Users) GetByID(ctx context.Context, identifier string) (models.Userable, err error ) - resp, err = c.Stable.Client().Users().ByUserIdString(identifier).Get(ctx, nil) + resp, err = c.Stable.Client().Users().ByUserId(identifier).Get(ctx, nil) if err != nil { return nil, graph.Wrap(ctx, err, "getting user") @@ -222,9 +222,9 @@ func (c Users) GetMailInbox( inbox, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(MailInbox). + ByMailFolderId(MailInbox). Get(ctx, nil) if err != nil { return nil, graph.Wrap(ctx, err, "getting MailFolders") @@ -240,7 +240,7 @@ func (c Users) GetDefaultDrive( d, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). Drive(). Get(ctx, nil) if err != nil { @@ -269,9 +269,9 @@ func (c Users) GetFirstInboxMessage( _, err := c.Stable. Client(). Users(). - ByUserIdString(userID). + ByUserId(userID). MailFolders(). - ByMailFolderIdString(inboxID). + ByMailFolderId(inboxID). Messages(). Delta(). Get(ctx, config)