From 20bfaee8db277cccb4afb072dc377373a81b91c9 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 19 Dec 2022 17:19:18 -0500 Subject: [PATCH] GC: MSGRAPH Linked Library Upgrades (#1861) ## Description Upstream Breaking changes applied for upgrade to the following libraries. - kiota-abstractions-go from 0.14.0 to 0.15.1 - msgraph-sdk-go from 0.48.0 to 0.49.0 - msgraph-sdk-go-core from 0.30.1 to 0.31.0 - kiota-http-go from 0.9.0 to 0.10.0 ## Does this PR need a docs update or release note? - [x] :no_entry: No ## Type of change - [x] :hamster: Trivial/Minor --> Library support and Upstream bug fixes ## Issue(s) * closes #1856 ## Test Plan - [x] :zap: Unit test --- src/go.mod | 8 +-- src/go.sum | 16 ++--- .../exchange/attachment_uploadable.go | 16 +++-- .../exchange/contact_folder_cache.go | 2 +- .../exchange/event_calendar_cache.go | 2 +- .../connector/exchange/mail_folder_cache.go | 2 +- .../connector/exchange/query_options.go | 66 +++++++++---------- .../connector/exchange/service_iterators.go | 6 +- src/internal/connector/onedrive/drive.go | 12 ++-- src/internal/connector/onedrive/item.go | 3 +- src/internal/connector/sharepoint/list.go | 12 ++-- 11 files changed, 77 insertions(+), 68 deletions(-) diff --git a/src/go.mod b/src/go.mod index 138743bda..a5e208946 100644 --- a/src/go.mod +++ b/src/go.mod @@ -9,12 +9,12 @@ require ( github.com/google/uuid v1.3.0 github.com/hashicorp/go-multierror v1.1.1 github.com/kopia/kopia v0.12.0 - github.com/microsoft/kiota-abstractions-go v0.14.0 + github.com/microsoft/kiota-abstractions-go v0.15.1 github.com/microsoft/kiota-authentication-azure-go v0.5.0 - github.com/microsoft/kiota-http-go v0.9.0 + github.com/microsoft/kiota-http-go v0.10.0 github.com/microsoft/kiota-serialization-json-go v0.7.2 - github.com/microsoftgraph/msgraph-sdk-go v0.48.0 - github.com/microsoftgraph/msgraph-sdk-go-core v0.30.1 + github.com/microsoftgraph/msgraph-sdk-go v0.49.0 + github.com/microsoftgraph/msgraph-sdk-go-core v0.31.1 github.com/pkg/errors v0.9.1 github.com/rudderlabs/analytics-go v3.3.3+incompatible github.com/spf13/cobra v1.6.1 diff --git a/src/go.sum b/src/go.sum index eb813e2d3..f1dc19299 100644 --- a/src/go.sum +++ b/src/go.sum @@ -257,20 +257,20 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09 github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= -github.com/microsoft/kiota-abstractions-go v0.14.0 h1:TCYk1+CoBFNhTefKu8OTky4w4HnOoD72EJOeTsTNml8= -github.com/microsoft/kiota-abstractions-go v0.14.0/go.mod h1:/zQPz5M7868/bbN8D4tZHhnOE23Tcc/JBKSNwljOch4= +github.com/microsoft/kiota-abstractions-go v0.15.1 h1:RgN8h9Z3AoFav1K4ODVSkmA8Es933hTlAWNesll1G5U= +github.com/microsoft/kiota-abstractions-go v0.15.1/go.mod h1:YqOu8G6bZTG0eCIWrmEny8PaF750uaw7tLFac4psf+4= github.com/microsoft/kiota-authentication-azure-go v0.5.0 h1:RVA/tTgMnDIN3u4qPZtvYvVRsQDOFkd3yvi6KXjZJko= github.com/microsoft/kiota-authentication-azure-go v0.5.0/go.mod h1:1Io6h+88FlDRmrajdjSnXPz8oyObUVjNuQZLhrF9kQk= -github.com/microsoft/kiota-http-go v0.9.0 h1:q/JZpWOvHFbxrOjbd8pbODuTx4dlcLahTemM48di/y8= -github.com/microsoft/kiota-http-go v0.9.0/go.mod h1:F652dnY3jVNmwSk46qHXt+HeEbxLkbbn3dUi3lSLHws= +github.com/microsoft/kiota-http-go v0.10.0 h1:hJwIMkZqgPwRsoZfV5hC4O2OeMvPEZDuhTcyI7Xx3IM= +github.com/microsoft/kiota-http-go v0.10.0/go.mod h1:qr6x7O4SkEJiFVtnlwvNXapwmtJ85ifAiuqOYkKc7hY= github.com/microsoft/kiota-serialization-json-go v0.7.2 h1:DSb4fNDi5O+DqJwrHo+vRy2kSvfxG5VtN6m1EHzn5Vw= github.com/microsoft/kiota-serialization-json-go v0.7.2/go.mod h1:Ojum5prlijopyCOZ2XctRcVlE2pU8h+43r3tMdiWoDU= github.com/microsoft/kiota-serialization-text-go v0.6.0 h1:3N2vftYZlwKdog69AN7ha+FZT0QxPG7xp/hLv0/W2OQ= github.com/microsoft/kiota-serialization-text-go v0.6.0/go.mod h1:OUA4dNH+f6afiJUs+rQAatJos7QVF5PJkyrqoD89lx4= -github.com/microsoftgraph/msgraph-sdk-go v0.48.0 h1:N93MVg4LgM45lK70PNTRaKCk5kw8sdfgHTXS0qc1VFg= -github.com/microsoftgraph/msgraph-sdk-go v0.48.0/go.mod h1:I2iR+gJmKiZZ8ebE8mKQEiKXpePAahAIazx3F1kL6og= -github.com/microsoftgraph/msgraph-sdk-go-core v0.30.1 h1:jBuYexMqKnjsnQpyICfdu0RhZr7RFkEcKWRm3hf/jMM= -github.com/microsoftgraph/msgraph-sdk-go-core v0.30.1/go.mod h1:RyqsMRKmZADSA/feLQMcynQJRENMzKM/Wg4dgQ/lW+s= +github.com/microsoftgraph/msgraph-sdk-go v0.49.0 h1:ZCjnH6AElZ20wXXTzJn3sfZeG+2Q2+KGvUsFrmhJzZY= +github.com/microsoftgraph/msgraph-sdk-go v0.49.0/go.mod h1:pZ3XhqN+Ll9trl1HEGQhyS905PcqHv9EhuCMMxPR9EQ= +github.com/microsoftgraph/msgraph-sdk-go-core v0.31.1 h1:aVvnO5l8qLCEcvELc5n9grt7UXhAVtpog1QeQKLMlTE= +github.com/microsoftgraph/msgraph-sdk-go-core v0.31.1/go.mod h1:RE4F2qGCTehGtQGc9Txafc4l+XMpbjYuO4amDLFgOWE= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= github.com/minio/minio-go/v7 v7.0.39 h1:upnbu1jCGOqEvrGSpRauSN9ZG7RCHK7VHxXS8Vmg2zk= diff --git a/src/internal/connector/exchange/attachment_uploadable.go b/src/internal/connector/exchange/attachment_uploadable.go index b90c40777..5369dcfa6 100644 --- a/src/internal/connector/exchange/attachment_uploadable.go +++ b/src/internal/connector/exchange/attachment_uploadable.go @@ -4,6 +4,7 @@ import ( "context" "github.com/microsoftgraph/msgraph-sdk-go/models" + msusers "github.com/microsoftgraph/msgraph-sdk-go/users" "github.com/pkg/errors" "github.com/alcionai/corso/src/internal/connector/graph" @@ -55,11 +56,18 @@ func (mau *mailAttachmentUploader) uploadSession( attachmentName string, attachmentSize int64, ) (models.UploadSessionable, error) { - session := models.NewUsersItemMailFoldersItemMessagesItemAttachmentsCreateUploadSessionPostRequestBody() + session := msusers.NewItemMailFoldersItemMessagesItemAttachmentsCreateUploadSessionPostRequestBody() session.SetAttachmentItem(makeSessionAttachment(attachmentName, attachmentSize)) - r, err := mau.service.Client().UsersById(mau.userID).MailFoldersById(mau.folderID). - MessagesById(mau.itemID).Attachments().CreateUploadSession().Post(ctx, session, nil) + r, err := mau. + service. + Client(). + UsersById(mau.userID). + MailFoldersById(mau.folderID). + MessagesById(mau.itemID). + Attachments(). + CreateUploadSession(). + Post(ctx, session, nil) if err != nil { return nil, errors.Wrapf( err, @@ -103,7 +111,7 @@ func (eau *eventAttachmentUploader) uploadSession( attachmentName string, attachmentSize int64, ) (models.UploadSessionable, error) { - session := models.NewUsersItemCalendarEventsItemAttachmentsCreateUploadSessionPostRequestBody() + session := msusers.NewItemCalendarEventsItemAttachmentsCreateUploadSessionPostRequestBody() session.SetAttachmentItem(makeSessionAttachment(attachmentName, attachmentSize)) r, err := eau.service.Client(). diff --git a/src/internal/connector/exchange/contact_folder_cache.go b/src/internal/connector/exchange/contact_folder_cache.go index ffafc3081..de88cf1c9 100644 --- a/src/internal/connector/exchange/contact_folder_cache.go +++ b/src/internal/connector/exchange/contact_folder_cache.go @@ -112,7 +112,7 @@ func (cfc *contactFolderCache) Populate( break } - builder = msuser.NewUsersItemContactFoldersItemChildFoldersRequestBuilder(*resp.GetOdataNextLink(), cfc.gs.Adapter()) + builder = msuser.NewItemContactFoldersItemChildFoldersRequestBuilder(*resp.GetOdataNextLink(), cfc.gs.Adapter()) } if err := cfc.populatePaths(ctx); err != nil { diff --git a/src/internal/connector/exchange/event_calendar_cache.go b/src/internal/connector/exchange/event_calendar_cache.go index d3241dc0f..84d0934c1 100644 --- a/src/internal/connector/exchange/event_calendar_cache.go +++ b/src/internal/connector/exchange/event_calendar_cache.go @@ -68,7 +68,7 @@ func (ecc *eventCalendarCache) Populate( break } - builder = msuser.NewUsersItemCalendarsRequestBuilder(*resp.GetOdataNextLink(), ecc.gs.Adapter()) + builder = msuser.NewItemCalendarsRequestBuilder(*resp.GetOdataNextLink(), ecc.gs.Adapter()) } for _, container := range directories { diff --git a/src/internal/connector/exchange/mail_folder_cache.go b/src/internal/connector/exchange/mail_folder_cache.go index aa39df1e8..b62c03afe 100644 --- a/src/internal/connector/exchange/mail_folder_cache.go +++ b/src/internal/connector/exchange/mail_folder_cache.go @@ -114,7 +114,7 @@ func (mc *mailFolderCache) Populate( break } - query = msfolderdelta.NewUsersItemMailFoldersDeltaRequestBuilder(*link, mc.gs.Adapter()) + query = msfolderdelta.NewItemMailFoldersDeltaRequestBuilder(*link, mc.gs.Adapter()) } if err := mc.populatePaths(ctx); err != nil { diff --git a/src/internal/connector/exchange/query_options.go b/src/internal/connector/exchange/query_options.go index 351794662..76d9b8c63 100644 --- a/src/internal/connector/exchange/query_options.go +++ b/src/internal/connector/exchange/query_options.go @@ -115,16 +115,16 @@ func CategoryToOptionIdentifier(category path.CategoryType) optionIdentifier { func optionsForFolderMessagesDelta( moreOps []string, -) (*msuser.UsersItemMailFoldersItemMessagesDeltaRequestBuilderGetRequestConfiguration, error) { +) (*msuser.ItemMailFoldersItemMessagesDeltaRequestBuilderGetRequestConfiguration, error) { selecting, err := buildOptions(moreOps, messages) if err != nil { return nil, err } - requestParameters := &msuser.UsersItemMailFoldersItemMessagesDeltaRequestBuilderGetQueryParameters{ + requestParameters := &msuser.ItemMailFoldersItemMessagesDeltaRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemMailFoldersItemMessagesDeltaRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemMailFoldersItemMessagesDeltaRequestBuilderGetRequestConfiguration{ QueryParameters: requestParameters, } @@ -135,7 +135,7 @@ func optionsForFolderMessagesDelta( // @param moreOps should reflect elements from fieldsForCalendars // @return is first call in Calendars().GetWithRequestConfigurationAndResponseHandler func optionsForCalendars(moreOps []string) ( - *msuser.UsersItemCalendarsRequestBuilderGetRequestConfiguration, + *msuser.ItemCalendarsRequestBuilderGetRequestConfiguration, error, ) { selecting, err := buildOptions(moreOps, calendars) @@ -143,10 +143,10 @@ func optionsForCalendars(moreOps []string) ( return nil, err } // should be a CalendarsRequestBuilderGetRequestConfiguration - requestParams := &msuser.UsersItemCalendarsRequestBuilderGetQueryParameters{ + requestParams := &msuser.ItemCalendarsRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemCalendarsRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemCalendarsRequestBuilderGetRequestConfiguration{ QueryParameters: requestParams, } @@ -156,7 +156,7 @@ func optionsForCalendars(moreOps []string) ( // optionsForContactFolders places allowed options for exchange.ContactFolder object // @return is first call in ContactFolders().GetWithRequestConfigurationAndResponseHandler func optionsForContactFolders(moreOps []string) ( - *msuser.UsersItemContactFoldersRequestBuilderGetRequestConfiguration, + *msuser.ItemContactFoldersRequestBuilderGetRequestConfiguration, error, ) { selecting, err := buildOptions(moreOps, folders) @@ -164,10 +164,10 @@ func optionsForContactFolders(moreOps []string) ( return nil, err } - requestParameters := &msuser.UsersItemContactFoldersRequestBuilderGetQueryParameters{ + requestParameters := &msuser.ItemContactFoldersRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemContactFoldersRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemContactFoldersRequestBuilderGetRequestConfiguration{ QueryParameters: requestParameters, } @@ -175,7 +175,7 @@ func optionsForContactFolders(moreOps []string) ( } func optionsForContactFolderByID(moreOps []string) ( - *msuser.UsersItemContactFoldersContactFolderItemRequestBuilderGetRequestConfiguration, + *msuser.ItemContactFoldersContactFolderItemRequestBuilderGetRequestConfiguration, error, ) { selecting, err := buildOptions(moreOps, folders) @@ -183,10 +183,10 @@ func optionsForContactFolderByID(moreOps []string) ( return nil, err } - requestParameters := &msuser.UsersItemContactFoldersContactFolderItemRequestBuilderGetQueryParameters{ + requestParameters := &msuser.ItemContactFoldersContactFolderItemRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemContactFoldersContactFolderItemRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemContactFoldersContactFolderItemRequestBuilderGetRequestConfiguration{ QueryParameters: requestParameters, } @@ -198,16 +198,16 @@ func optionsForContactFolderByID(moreOps []string) ( // @return is first call in MailFolders().GetWithRequestConfigurationAndResponseHandler(options, handler) func optionsForMailFolders( moreOps []string, -) (*msuser.UsersItemMailFoldersRequestBuilderGetRequestConfiguration, error) { +) (*msuser.ItemMailFoldersRequestBuilderGetRequestConfiguration, error) { selecting, err := buildOptions(moreOps, folders) if err != nil { return nil, err } - requestParameters := &msuser.UsersItemMailFoldersRequestBuilderGetQueryParameters{ + requestParameters := &msuser.ItemMailFoldersRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemMailFoldersRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemMailFoldersRequestBuilderGetRequestConfiguration{ QueryParameters: requestParameters, } @@ -219,16 +219,16 @@ func optionsForMailFolders( // Returns first call in MailFoldersById().GetWithRequestConfigurationAndResponseHandler(options, handler) func optionsForMailFoldersItem( moreOps []string, -) (*msuser.UsersItemMailFoldersMailFolderItemRequestBuilderGetRequestConfiguration, error) { +) (*msuser.ItemMailFoldersMailFolderItemRequestBuilderGetRequestConfiguration, error) { selecting, err := buildOptions(moreOps, folders) if err != nil { return nil, err } - requestParameters := &msuser.UsersItemMailFoldersMailFolderItemRequestBuilderGetQueryParameters{ + requestParameters := &msuser.ItemMailFoldersMailFolderItemRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemMailFoldersMailFolderItemRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemMailFoldersMailFolderItemRequestBuilderGetRequestConfiguration{ QueryParameters: requestParameters, } @@ -237,17 +237,17 @@ func optionsForMailFoldersItem( func optionsForContactFoldersItemDelta( moreOps []string, -) (*msuser.UsersItemContactFoldersItemContactsDeltaRequestBuilderGetRequestConfiguration, error) { +) (*msuser.ItemContactFoldersItemContactsDeltaRequestBuilderGetRequestConfiguration, error) { selecting, err := buildOptions(moreOps, contacts) if err != nil { return nil, err } - requestParameters := &msuser.UsersItemContactFoldersItemContactsDeltaRequestBuilderGetQueryParameters{ + requestParameters := &msuser.ItemContactFoldersItemContactsDeltaRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemContactFoldersItemContactsDeltaRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemContactFoldersItemContactsDeltaRequestBuilderGetRequestConfiguration{ QueryParameters: requestParameters, } @@ -256,16 +256,16 @@ func optionsForContactFoldersItemDelta( // optionsForEvents ensures valid option inputs for exchange.Events // @return is first call in Events().GetWithRequestConfigurationAndResponseHandler(options, handler) -func optionsForEvents(moreOps []string) (*msuser.UsersItemEventsRequestBuilderGetRequestConfiguration, error) { +func optionsForEvents(moreOps []string) (*msuser.ItemEventsRequestBuilderGetRequestConfiguration, error) { selecting, err := buildOptions(moreOps, events) if err != nil { return nil, err } - requestParameters := &msuser.UsersItemEventsRequestBuilderGetQueryParameters{ + requestParameters := &msuser.ItemEventsRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemEventsRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemEventsRequestBuilderGetRequestConfiguration{ QueryParameters: requestParameters, } @@ -275,17 +275,17 @@ func optionsForEvents(moreOps []string) (*msuser.UsersItemEventsRequestBuilderGe // optionsForEvents ensures a valid option inputs for `exchange.Events` when selected from within a Calendar func optionsForEventsByCalendar( moreOps []string, -) (*msuser.UsersItemCalendarsItemEventsRequestBuilderGetRequestConfiguration, error) { +) (*msuser.ItemCalendarsItemEventsRequestBuilderGetRequestConfiguration, error) { selecting, err := buildOptions(moreOps, events) if err != nil { return nil, err } - requestParameters := &msuser.UsersItemCalendarsItemEventsRequestBuilderGetQueryParameters{ + requestParameters := &msuser.ItemCalendarsItemEventsRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemCalendarsItemEventsRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemCalendarsItemEventsRequestBuilderGetRequestConfiguration{ QueryParameters: requestParameters, } @@ -295,16 +295,16 @@ func optionsForEventsByCalendar( // optionsForContactChildFolders builds a contacts child folders request. func optionsForContactChildFolders( moreOps []string, -) (*msuser.UsersItemContactFoldersItemChildFoldersRequestBuilderGetRequestConfiguration, error) { +) (*msuser.ItemContactFoldersItemChildFoldersRequestBuilderGetRequestConfiguration, error) { selecting, err := buildOptions(moreOps, contacts) if err != nil { return nil, err } - requestParameters := &msuser.UsersItemContactFoldersItemChildFoldersRequestBuilderGetQueryParameters{ + requestParameters := &msuser.ItemContactFoldersItemChildFoldersRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemContactFoldersItemChildFoldersRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemContactFoldersItemChildFoldersRequestBuilderGetRequestConfiguration{ QueryParameters: requestParameters, } @@ -313,16 +313,16 @@ func optionsForContactChildFolders( // optionsForContacts transforms options into select query for MailContacts // @return is the first call in Contacts().GetWithRequestConfigurationAndResponseHandler(options, handler) -func optionsForContacts(moreOps []string) (*msuser.UsersItemContactsRequestBuilderGetRequestConfiguration, error) { +func optionsForContacts(moreOps []string) (*msuser.ItemContactsRequestBuilderGetRequestConfiguration, error) { selecting, err := buildOptions(moreOps, contacts) if err != nil { return nil, err } - requestParameters := &msuser.UsersItemContactsRequestBuilderGetQueryParameters{ + requestParameters := &msuser.ItemContactsRequestBuilderGetQueryParameters{ Select: selecting, } - options := &msuser.UsersItemContactsRequestBuilderGetRequestConfiguration{ + options := &msuser.ItemContactsRequestBuilderGetRequestConfiguration{ QueryParameters: requestParameters, } diff --git a/src/internal/connector/exchange/service_iterators.go b/src/internal/connector/exchange/service_iterators.go index aee60df19..082d4a03a 100644 --- a/src/internal/connector/exchange/service_iterators.go +++ b/src/internal/connector/exchange/service_iterators.go @@ -327,7 +327,7 @@ func FetchEventIDsFromCalendar( break } - builder = msuser.NewUsersItemCalendarsItemEventsRequestBuilder(*nextLink, gs.Adapter()) + builder = msuser.NewItemCalendarsItemEventsRequestBuilder(*nextLink, gs.Adapter()) } // Events don't have a delta endpoint so just return an empty string. @@ -402,7 +402,7 @@ func FetchContactIDsFromDirectory( break } - builder = msuser.NewUsersItemContactFoldersItemContactsDeltaRequestBuilder(*nextLink, gs.Adapter()) + builder = msuser.NewItemContactFoldersItemContactsDeltaRequestBuilder(*nextLink, gs.Adapter()) } return ids, deltaURL, errs.ErrorOrNil() @@ -476,7 +476,7 @@ func FetchMessageIDsFromDirectory( break } - builder = msuser.NewUsersItemMailFoldersItemMessagesDeltaRequestBuilder(*nextLink, gs.Adapter()) + builder = msuser.NewItemMailFoldersItemMessagesDeltaRequestBuilder(*nextLink, gs.Adapter()) } return ids, deltaURL, errs.ErrorOrNil() diff --git a/src/internal/connector/onedrive/drive.go b/src/internal/connector/onedrive/drive.go index 93f17de21..8934c729b 100644 --- a/src/internal/connector/onedrive/drive.go +++ b/src/internal/connector/onedrive/drive.go @@ -84,8 +84,8 @@ func drives( } func siteDrives(ctx context.Context, service graph.Servicer, site string) ([]models.Driveable, error) { - options := &sites.SitesItemDrivesRequestBuilderGetRequestConfiguration{ - QueryParameters: &sites.SitesItemDrivesRequestBuilderGetQueryParameters{ + options := &sites.ItemDrivesRequestBuilderGetRequestConfiguration{ + QueryParameters: &sites.ItemDrivesRequestBuilderGetQueryParameters{ Select: []string{"id", "name", "weburl", "system"}, }, } @@ -166,7 +166,7 @@ func collectItems( } logger.Ctx(ctx).Debugf("Found %s nextLink", *nextLink) - builder = msdrives.NewDrivesItemRootDeltaRequestBuilder(*nextLink, service.Adapter()) + builder = msdrives.NewItemRootDeltaRequestBuilder(*nextLink, service.Adapter()) } return nil @@ -184,7 +184,7 @@ func getFolder( // https://learn.microsoft.com/en-us/graph/onedrive-addressing-driveitems#path-based-addressing // - which allows us to lookup an item by its path relative to the parent ID rawURL := fmt.Sprintf(itemByPathRawURLFmt, driveID, parentFolderID, folderName) - builder := msdrive.NewDriveItemsDriveItemItemRequestBuilder(rawURL, service.Adapter()) + builder := msdrive.NewItemsDriveItemItemRequestBuilder(rawURL, service.Adapter()) foundItem, err := builder.Get(ctx, nil) if err != nil { @@ -223,7 +223,7 @@ func createItem( // here: https://github.com/microsoftgraph/msgraph-sdk-go/issues/155#issuecomment-1136254310 rawURL := fmt.Sprintf(itemChildrenRawURLFmt, driveID, parentFolderID) - builder := msdrive.NewDriveItemsRequestBuilder(rawURL, service.Adapter()) + builder := msdrive.NewItemsRequestBuilder(rawURL, service.Adapter()) newItem, err := builder.Post(ctx, newItem, nil) if err != nil { @@ -373,7 +373,7 @@ func hasDriveLicense( } for _, license := range skuIDs { - if *sku == license { + if sku.String() == license { hasDrive = true return false } diff --git a/src/internal/connector/onedrive/item.go b/src/internal/connector/onedrive/item.go index 9b71eeb9c..c011a43d2 100644 --- a/src/internal/connector/onedrive/item.go +++ b/src/internal/connector/onedrive/item.go @@ -5,6 +5,7 @@ import ( "io" "time" + msdrives "github.com/microsoftgraph/msgraph-sdk-go/drives" "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/pkg/errors" @@ -165,7 +166,7 @@ func driveItemWriter( driveID, itemID string, itemSize int64, ) (io.Writer, error) { - session := models.NewUsersItemDrivesItemItemsItemCreateUploadSessionPostRequestBody() + session := msdrives.NewItemItemsItemCreateUploadSessionPostRequestBody() r, err := service.Client().DrivesById(driveID).ItemsById(itemID).CreateUploadSession().Post(ctx, session, nil) if err != nil { diff --git a/src/internal/connector/sharepoint/list.go b/src/internal/connector/sharepoint/list.go index 2f4b29e53..e35487e9b 100644 --- a/src/internal/connector/sharepoint/list.go +++ b/src/internal/connector/sharepoint/list.go @@ -76,7 +76,7 @@ func loadLists( break } - builder = mssite.NewSitesItemListsRequestBuilder(*resp.GetOdataNextLink(), gs.Adapter()) + builder = mssite.NewItemListsRequestBuilder(*resp.GetOdataNextLink(), gs.Adapter()) } if errs != nil { @@ -125,7 +125,7 @@ func fetchListItems( break } - builder = mssite.NewSitesItemListsItemItemsRequestBuilder(*resp.GetOdataNextLink(), gs.Adapter()) + builder = mssite.NewItemListsItemItemsRequestBuilder(*resp.GetOdataNextLink(), gs.Adapter()) } if errs != nil { @@ -161,7 +161,7 @@ func fetchColumns( break } - builder = mssite.NewSitesItemListsItemColumnsRequestBuilder(*resp.GetOdataNextLink(), gs.Adapter()) + builder = mssite.NewItemListsItemColumnsRequestBuilder(*resp.GetOdataNextLink(), gs.Adapter()) } } else { builder := gs.Client().SitesById(siteID).ListsById(listID).ContentTypesById(cTypeID).Columns() @@ -178,7 +178,7 @@ func fetchColumns( break } - builder = mssite.NewSitesItemListsItemContentTypesItemColumnsRequestBuilder(*resp.GetOdataNextLink(), gs.Adapter()) + builder = mssite.NewItemListsItemContentTypesItemColumnsRequestBuilder(*resp.GetOdataNextLink(), gs.Adapter()) } } @@ -240,7 +240,7 @@ func fetchContentTypes( break } - builder = mssite.NewSitesItemListsItemContentTypesRequestBuilder(*resp.GetOdataNextLink(), gs.Adapter()) + builder = mssite.NewItemListsItemContentTypesRequestBuilder(*resp.GetOdataNextLink(), gs.Adapter()) } if errs != nil { @@ -273,7 +273,7 @@ func fetchColumnLinks( } builder = mssite. - NewSitesItemListsItemContentTypesItemColumnLinksRequestBuilder( + NewItemListsItemContentTypesItemColumnLinksRequestBuilder( *resp.GetOdataNextLink(), gs.Adapter(), )