From 53621371165b98bf672e463a38726183d69934b0 Mon Sep 17 00:00:00 2001 From: Keepers Date: Fri, 10 Nov 2023 12:26:59 -0700 Subject: [PATCH] expose graph options to sdk clients (#4653) 1. moves the m365/graph package from internal to pkg/services/api so that options are accessible to sdk users. 2. exposes graph.Options in the api client.Service call. --- #### Does this PR need a docs update or release note? - [x] :no_entry: No #### Type of change - [x] :sunflower: Feature --- src/.golangci.yml | 2 +- src/cli/backup/backup.go | 2 +- src/cli/backup/helpers_test.go | 4 ++-- src/cmd/sanity_test/sanity_tests.go | 2 +- src/internal/kopia/upload.go | 4 ++-- src/internal/m365/backup.go | 2 +- src/internal/m365/collection/drive/collection.go | 2 +- src/internal/m365/collection/drive/collection_test.go | 2 +- src/internal/m365/collection/drive/collections.go | 2 +- src/internal/m365/collection/drive/collections_test.go | 2 +- src/internal/m365/collection/drive/item.go | 2 +- .../m365/collection/drive/item_collector_test.go | 2 +- src/internal/m365/collection/drive/item_test.go | 2 +- src/internal/m365/collection/drive/permission.go | 2 +- src/internal/m365/collection/drive/restore.go | 2 +- src/internal/m365/collection/drive/restore_caches.go | 2 +- src/internal/m365/collection/drive/restore_test.go | 2 +- src/internal/m365/collection/drive/url_cache_test.go | 2 +- src/internal/m365/collection/exchange/backup.go | 2 +- src/internal/m365/collection/exchange/backup_test.go | 2 +- src/internal/m365/collection/exchange/cache_container.go | 2 +- src/internal/m365/collection/exchange/collection.go | 2 +- src/internal/m365/collection/exchange/collection_test.go | 2 +- src/internal/m365/collection/exchange/contacts_backup.go | 2 +- .../m365/collection/exchange/contacts_container_cache.go | 2 +- .../m365/collection/exchange/contacts_restore.go | 2 +- .../m365/collection/exchange/contacts_restore_test.go | 2 +- .../m365/collection/exchange/container_resolver.go | 2 +- .../m365/collection/exchange/container_resolver_test.go | 2 +- src/internal/m365/collection/exchange/events_backup.go | 2 +- .../m365/collection/exchange/events_container_cache.go | 2 +- src/internal/m365/collection/exchange/events_restore.go | 2 +- .../m365/collection/exchange/events_restore_test.go | 2 +- src/internal/m365/collection/exchange/handlers.go | 2 +- src/internal/m365/collection/exchange/mail_backup.go | 2 +- .../m365/collection/exchange/mail_container_cache.go | 2 +- src/internal/m365/collection/exchange/mail_restore.go | 2 +- .../m365/collection/exchange/mail_restore_test.go | 2 +- src/internal/m365/collection/exchange/restore.go | 2 +- src/internal/m365/collection/groups/backup.go | 2 +- src/internal/m365/collection/groups/backup_test.go | 2 +- src/internal/m365/collection/groups/channel_handler.go | 2 +- src/internal/m365/collection/groups/handlers.go | 2 +- src/internal/m365/collection/site/backup.go | 2 +- src/internal/m365/collection/site/backup_test.go | 2 +- src/internal/m365/collection/site/collection.go | 2 +- src/internal/m365/collection/site/helper_test.go | 2 +- src/internal/m365/collection/site/lists.go | 2 +- src/internal/m365/collection/site/lists_test.go | 2 +- src/internal/m365/collection/site/pages.go | 2 +- src/internal/m365/collection/site/pages_test.go | 2 +- src/internal/m365/collection/site/restore.go | 2 +- src/internal/m365/controller.go | 2 +- src/internal/m365/onedrive_test.go | 2 +- src/internal/m365/restore.go | 2 +- src/internal/m365/service/exchange/backup.go | 2 +- src/internal/m365/service/exchange/enabled.go | 2 +- src/internal/m365/service/exchange/enabled_test.go | 2 +- src/internal/m365/service/exchange/restore.go | 2 +- src/internal/m365/service/exchange/testdata/handlers.go | 2 +- src/internal/m365/service/groups/backup.go | 2 +- src/internal/m365/service/groups/enabled_test.go | 2 +- src/internal/m365/service/groups/restore.go | 2 +- src/internal/m365/service/groups/restore_test.go | 2 +- src/internal/m365/service/onedrive/backup.go | 2 +- src/internal/m365/service/onedrive/enabled.go | 2 +- src/internal/m365/service/onedrive/enabled_test.go | 4 ++-- src/internal/m365/service/sharepoint/api/beta_service.go | 2 +- .../m365/service/sharepoint/api/beta_service_test.go | 4 ++-- src/internal/m365/service/sharepoint/api/pages.go | 6 +++--- src/internal/m365/service/sharepoint/api/pages_test.go | 2 +- .../m365/service/sharepoint/api/serialization.go | 2 +- .../m365/service/sharepoint/api/serialization_test.go | 2 +- src/internal/m365/service/sharepoint/backup.go | 2 +- src/internal/m365/service/sharepoint/enabled.go | 2 +- src/internal/m365/service/sharepoint/enabled_test.go | 2 +- src/internal/operations/backup.go | 2 +- src/internal/operations/backup_test.go | 2 +- src/internal/operations/maintenance_test.go | 2 +- src/internal/operations/restore.go | 2 +- src/internal/operations/restore_test.go | 2 +- src/internal/operations/test/exchange_test.go | 2 +- src/internal/operations/test/helper_test.go | 4 ++-- src/internal/operations/test/onedrive_test.go | 2 +- src/internal/operations/test/sharepoint_test.go | 2 +- src/pkg/errs/errs.go | 2 +- src/pkg/errs/errs_test.go | 2 +- src/pkg/logger/example_logger_test.go | 2 +- src/pkg/services/m365/api/access.go | 2 +- src/pkg/services/m365/api/channels.go | 2 +- src/pkg/services/m365/api/channels_pager.go | 2 +- src/pkg/services/m365/api/client.go | 9 ++++++--- src/pkg/services/m365/api/contacts.go | 2 +- src/pkg/services/m365/api/contacts_pager.go | 2 +- src/pkg/services/m365/api/conversations.go | 2 +- src/pkg/services/m365/api/conversations_pager.go | 2 +- src/pkg/services/m365/api/drive.go | 2 +- src/pkg/services/m365/api/drive_pager.go | 2 +- src/pkg/services/m365/api/drive_test.go | 2 +- src/pkg/services/m365/api/events.go | 2 +- src/pkg/services/m365/api/events_pager.go | 2 +- .../services/m365/api}/graph/betasdk/beta_client.go | 2 +- .../services/m365/api}/graph/betasdk/beta_client_test.go | 2 +- .../services/m365/api}/graph/betasdk/kiota-lock.json | 2 +- .../services/m365/api}/graph/betasdk/models/base_item.go | 0 .../m365/api}/graph/betasdk/models/canvas_layout.go | 0 .../m365/api}/graph/betasdk/models/canvas_layoutable.go | 0 .../m365/api}/graph/betasdk/models/horizontal_section.go | 0 .../models/horizontal_section_collection_response.go | 0 .../models/horizontal_section_collection_responseable.go | 0 .../graph/betasdk/models/horizontal_section_column.go | 0 .../horizontal_section_column_collection_response.go | 0 .../horizontal_section_column_collection_responseable.go | 0 .../betasdk/models/horizontal_section_columnable.go | 0 .../betasdk/models/horizontal_section_layout_type.go | 0 .../api}/graph/betasdk/models/horizontal_sectionable.go | 0 .../graph/betasdk/models/meta_data_key_string_pair.go | 0 .../meta_data_key_string_pair_collection_response.go | 0 .../meta_data_key_string_pair_collection_responseable.go | 0 .../betasdk/models/meta_data_key_string_pairable.go | 0 .../graph/betasdk/models/meta_data_key_value_pair.go | 0 .../meta_data_key_value_pair_collection_response.go | 0 .../meta_data_key_value_pair_collection_responseable.go | 0 .../graph/betasdk/models/meta_data_key_value_pairable.go | 0 .../m365/api}/graph/betasdk/models/page_layout_type.go | 0 .../api}/graph/betasdk/models/page_promotion_type.go | 0 .../m365/api}/graph/betasdk/models/publication_facet.go | 0 .../api}/graph/betasdk/models/publication_facetable.go | 0 .../m365/api}/graph/betasdk/models/reactions_facet.go | 0 .../api}/graph/betasdk/models/reactions_facetable.go | 0 .../api}/graph/betasdk/models/section_emphasis_type.go | 0 .../graph/betasdk/models/server_processed_content.go | 0 .../graph/betasdk/models/server_processed_contentable.go | 0 .../m365/api}/graph/betasdk/models/site_access_type.go | 0 .../services/m365/api}/graph/betasdk/models/site_page.go | 0 .../betasdk/models/site_page_collection_response.go | 0 .../betasdk/models/site_page_collection_responseable.go | 0 .../m365/api}/graph/betasdk/models/site_pageable.go | 0 .../api}/graph/betasdk/models/site_security_level.go | 0 .../m365/api}/graph/betasdk/models/site_settings.go | 0 .../m365/api}/graph/betasdk/models/site_settingsable.go | 0 .../m365/api}/graph/betasdk/models/standard_web_part.go | 0 .../models/standard_web_part_collection_response.go | 0 .../models/standard_web_part_collection_responseable.go | 0 .../api}/graph/betasdk/models/standard_web_partable.go | 0 .../m365/api}/graph/betasdk/models/text_web_part.go | 0 .../betasdk/models/text_web_part_collection_response.go | 0 .../models/text_web_part_collection_responseable.go | 0 .../m365/api}/graph/betasdk/models/text_web_partable.go | 0 .../m365/api}/graph/betasdk/models/title_area.go | 0 .../api}/graph/betasdk/models/title_area_layout_type.go | 0 .../betasdk/models/title_area_text_alignment_type.go | 0 .../m365/api}/graph/betasdk/models/title_areaable.go | 0 .../m365/api}/graph/betasdk/models/vertical_section.go | 0 .../api}/graph/betasdk/models/vertical_sectionable.go | 0 .../services/m365/api}/graph/betasdk/models/web_part.go | 0 .../graph/betasdk/models/web_part_collection_response.go | 0 .../betasdk/models/web_part_collection_responseable.go | 0 .../m365/api}/graph/betasdk/models/web_part_data.go | 0 .../m365/api}/graph/betasdk/models/web_part_dataable.go | 0 .../m365/api}/graph/betasdk/models/web_part_position.go | 0 .../api}/graph/betasdk/models/web_part_positionable.go | 0 .../m365/api}/graph/betasdk/models/web_partable.go | 0 .../api}/graph/betasdk/sites/count_request_builder.go | 0 .../betasdk/sites/item_pages_count_request_builder.go | 0 ...s_layout_horizontal_sections_count_request_builder.go | 0 ...l_sections_horizontal_section_item_request_builder.go | 2 +- ...zontal_sections_item_columns_count_request_builder.go | 0 ...mns_horizontal_section_column_item_request_builder.go | 2 +- ...s_item_columns_item_webparts_count_request_builder.go | 0 ...arts_item_get_position_of_web_part_request_builder.go | 2 +- ...ections_item_columns_item_webparts_request_builder.go | 2 +- ...olumns_item_webparts_web_part_item_request_builder.go | 2 +- ...t_horizontal_sections_item_columns_request_builder.go | 2 +- ..._canvas_layout_horizontal_sections_request_builder.go | 2 +- .../item_pages_item_canvas_layout_request_builder.go | 2 +- ...tem_canvas_layout_vertical_section_request_builder.go | 2 +- ...ut_vertical_section_webparts_count_request_builder.go | 0 ...arts_item_get_position_of_web_part_request_builder.go | 2 +- ...s_layout_vertical_section_webparts_request_builder.go | 2 +- ...cal_section_webparts_web_part_item_request_builder.go | 2 +- ...s_item_get_web_parts_by_position_post_request_body.go | 0 ...em_get_web_parts_by_position_post_request_bodyable.go | 0 ...ges_item_get_web_parts_by_position_request_builder.go | 0 ...item_pages_item_get_web_parts_by_position_response.go | 2 +- ..._pages_item_get_web_parts_by_position_responseable.go | 2 +- .../sites/item_pages_item_publish_request_builder.go | 0 .../item_pages_item_web_parts_count_request_builder.go | 0 ...arts_item_get_position_of_web_part_request_builder.go | 2 +- .../sites/item_pages_item_web_parts_request_builder.go | 2 +- ...pages_item_web_parts_web_part_item_request_builder.go | 2 +- .../graph/betasdk/sites/item_pages_request_builder.go | 2 +- .../sites/item_pages_site_page_item_request_builder.go | 2 +- .../betasdk/sites/item_sites_count_request_builder.go | 0 .../sites/item_sites_site_item_request_builder.go | 0 .../graph/betasdk/sites/site_item_request_builder.go | 0 .../services/m365/api}/graph/cache_container.go | 0 .../m365 => pkg/services/m365/api}/graph/collections.go | 0 .../services/m365/api}/graph/collections_test.go | 0 .../services/m365/api}/graph/concurrency_middleware.go | 0 .../m365/api}/graph/concurrency_middleware_test.go | 0 .../m365 => pkg/services/m365/api}/graph/consts.go | 0 .../m365 => pkg/services/m365/api}/graph/consts_test.go | 0 .../m365 => pkg/services/m365/api}/graph/errors.go | 0 .../m365 => pkg/services/m365/api}/graph/errors_test.go | 0 .../m365 => pkg/services/m365/api}/graph/http_wrapper.go | 0 .../services/m365/api}/graph/http_wrapper_test.go | 0 .../m365 => pkg/services/m365/api}/graph/interfaces.go | 0 .../m365 => pkg/services/m365/api}/graph/logging.go | 0 .../services/m365/api}/graph/metadata/metadata.go | 0 .../services/m365/api}/graph/metadata/metadata_test.go | 2 +- .../services/m365/api}/graph/metadata_collection.go | 0 .../services/m365/api}/graph/metadata_collection_test.go | 0 .../m365 => pkg/services/m365/api}/graph/middleware.go | 0 .../services/m365/api}/graph/middleware_test.go | 0 .../m365 => pkg/services/m365/api}/graph/mock/service.go | 2 +- .../m365 => pkg/services/m365/api}/graph/service.go | 0 .../m365 => pkg/services/m365/api}/graph/service_test.go | 0 .../services/m365/api}/graph/uploadsession.go | 0 .../services/m365/api}/graph/uploadsession_test.go | 0 src/pkg/services/m365/api/groups.go | 2 +- src/pkg/services/m365/api/helper_test.go | 4 ++-- src/pkg/services/m365/api/lists.go | 2 +- src/pkg/services/m365/api/lists_test.go | 2 +- src/pkg/services/m365/api/mail.go | 2 +- src/pkg/services/m365/api/mail_pager.go | 2 +- src/pkg/services/m365/api/pagers/pagers.go | 2 +- src/pkg/services/m365/api/pagers/pagers_test.go | 2 +- src/pkg/services/m365/api/sites.go | 2 +- src/pkg/services/m365/api/sites_test.go | 2 +- src/pkg/services/m365/api/users.go | 2 +- src/pkg/services/m365/api/users_test.go | 2 +- src/pkg/services/m365/groups_test.go | 2 +- src/pkg/services/m365/sites.go | 2 +- src/pkg/services/m365/sites_test.go | 2 +- src/pkg/services/m365/users_test.go | 2 +- 236 files changed, 154 insertions(+), 151 deletions(-) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/beta_client.go (98%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/beta_client_test.go (97%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/kiota-lock.json (98%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/base_item.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/canvas_layout.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/canvas_layoutable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/horizontal_section.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/horizontal_section_collection_response.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/horizontal_section_collection_responseable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/horizontal_section_column.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/horizontal_section_column_collection_response.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/horizontal_section_column_collection_responseable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/horizontal_section_columnable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/horizontal_section_layout_type.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/horizontal_sectionable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/meta_data_key_string_pair.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/meta_data_key_string_pair_collection_response.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/meta_data_key_string_pair_collection_responseable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/meta_data_key_string_pairable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/meta_data_key_value_pair.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/meta_data_key_value_pair_collection_response.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/meta_data_key_value_pair_collection_responseable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/meta_data_key_value_pairable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/page_layout_type.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/page_promotion_type.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/publication_facet.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/publication_facetable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/reactions_facet.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/reactions_facetable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/section_emphasis_type.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/server_processed_content.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/server_processed_contentable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/site_access_type.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/site_page.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/site_page_collection_response.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/site_page_collection_responseable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/site_pageable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/site_security_level.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/site_settings.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/site_settingsable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/standard_web_part.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/standard_web_part_collection_response.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/standard_web_part_collection_responseable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/standard_web_partable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/text_web_part.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/text_web_part_collection_response.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/text_web_part_collection_responseable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/text_web_partable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/title_area.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/title_area_layout_type.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/title_area_text_alignment_type.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/title_areaable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/vertical_section.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/vertical_sectionable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/web_part.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/web_part_collection_response.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/web_part_collection_responseable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/web_part_data.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/web_part_dataable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/web_part_position.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/web_part_positionable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/models/web_partable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/count_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_count_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_count_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_horizontal_section_item_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_count_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_horizontal_section_column_item_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_count_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_item_get_position_of_web_part_request_builder.go (98%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_web_part_item_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_count_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_item_get_position_of_web_part_request_builder.go (98%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_web_part_item_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_post_request_body.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_post_request_bodyable.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_response.go (97%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_responseable.go (90%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_publish_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_web_parts_count_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_web_parts_item_get_position_of_web_part_request_builder.go (98%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_web_parts_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_item_web_parts_web_part_item_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_pages_site_page_item_request_builder.go (99%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_sites_count_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/item_sites_site_item_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/betasdk/sites/site_item_request_builder.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/cache_container.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/collections.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/collections_test.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/concurrency_middleware.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/concurrency_middleware_test.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/consts.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/consts_test.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/errors.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/errors_test.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/http_wrapper.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/http_wrapper_test.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/interfaces.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/logging.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/metadata/metadata.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/metadata/metadata_test.go (97%) rename src/{internal/m365 => pkg/services/m365/api}/graph/metadata_collection.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/metadata_collection_test.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/middleware.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/middleware_test.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/mock/service.go (95%) rename src/{internal/m365 => pkg/services/m365/api}/graph/service.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/service_test.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/uploadsession.go (100%) rename src/{internal/m365 => pkg/services/m365/api}/graph/uploadsession_test.go (100%) diff --git a/src/.golangci.yml b/src/.golangci.yml index 7cb697ba9..3c7cdd063 100644 --- a/src/.golangci.yml +++ b/src/.golangci.yml @@ -128,7 +128,7 @@ issues: - path: internal/m365/collection/drive/collections_test.go linters: - lll - - path: internal/m365/graph/betasdk + - path: pkg/services/m365/api/graph/betasdk linters: - wsl - revive diff --git a/src/cli/backup/backup.go b/src/cli/backup/backup.go index 2d3db4597..92342a475 100644 --- a/src/cli/backup/backup.go +++ b/src/cli/backup/backup.go @@ -14,7 +14,6 @@ import ( "github.com/alcionai/corso/src/cli/utils" "github.com/alcionai/corso/src/internal/common/idname" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/control" @@ -22,6 +21,7 @@ import ( "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/repository" "github.com/alcionai/corso/src/pkg/selectors" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/store" ) diff --git a/src/cli/backup/helpers_test.go b/src/cli/backup/helpers_test.go index 66d27a762..b43bf0bd9 100644 --- a/src/cli/backup/helpers_test.go +++ b/src/cli/backup/helpers_test.go @@ -16,8 +16,6 @@ import ( "github.com/alcionai/corso/src/cli/print" cliTD "github.com/alcionai/corso/src/cli/testdata" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" - gmock "github.com/alcionai/corso/src/internal/m365/graph/mock" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/account" @@ -26,6 +24,8 @@ import ( "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/repository" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" + gmock "github.com/alcionai/corso/src/pkg/services/m365/api/graph/mock" "github.com/alcionai/corso/src/pkg/storage" "github.com/alcionai/corso/src/pkg/storage/testdata" ) diff --git a/src/cmd/sanity_test/sanity_tests.go b/src/cmd/sanity_test/sanity_tests.go index 58e529860..e6b742cde 100644 --- a/src/cmd/sanity_test/sanity_tests.go +++ b/src/cmd/sanity_test/sanity_tests.go @@ -12,8 +12,8 @@ import ( "github.com/alcionai/corso/src/cmd/sanity_test/common" "github.com/alcionai/corso/src/cmd/sanity_test/export" "github.com/alcionai/corso/src/cmd/sanity_test/restore" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/internal/kopia/upload.go b/src/internal/kopia/upload.go index 8c77abae3..bbdcc46c3 100644 --- a/src/internal/kopia/upload.go +++ b/src/internal/kopia/upload.go @@ -20,13 +20,13 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/diagnostics" - "github.com/alcionai/corso/src/internal/m365/graph" - "github.com/alcionai/corso/src/internal/m365/graph/metadata" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/count" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph/metadata" ) const maxInflateTraversalDepth = 500 diff --git a/src/internal/m365/backup.go b/src/internal/m365/backup.go index 02ecd2579..477980f71 100644 --- a/src/internal/m365/backup.go +++ b/src/internal/m365/backup.go @@ -9,7 +9,6 @@ import ( "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/diagnostics" kinject "github.com/alcionai/corso/src/internal/kopia/inject" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/service/exchange" "github.com/alcionai/corso/src/internal/m365/service/groups" "github.com/alcionai/corso/src/internal/m365/service/onedrive" @@ -21,6 +20,7 @@ import ( "github.com/alcionai/corso/src/pkg/filters" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/internal/m365/collection/drive/collection.go b/src/internal/m365/collection/drive/collection.go index 518aaaf24..e27a94cdb 100644 --- a/src/internal/m365/collection/drive/collection.go +++ b/src/internal/m365/collection/drive/collection.go @@ -18,7 +18,6 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/observe" "github.com/alcionai/corso/src/pkg/backup/details" @@ -28,6 +27,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) const ( diff --git a/src/internal/m365/collection/drive/collection_test.go b/src/internal/m365/collection/drive/collection_test.go index 923a062ee..a6ecd2002 100644 --- a/src/internal/m365/collection/drive/collection_test.go +++ b/src/internal/m365/collection/drive/collection_test.go @@ -23,7 +23,6 @@ import ( "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" metaTD "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata/testdata" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/service/onedrive/mock" odTD "github.com/alcionai/corso/src/internal/m365/service/onedrive/testdata" "github.com/alcionai/corso/src/internal/m365/support" @@ -33,6 +32,7 @@ import ( "github.com/alcionai/corso/src/pkg/extensions" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/internal/m365/collection/drive/collections.go b/src/internal/m365/collection/drive/collections.go index 7014642bd..7a1fa0327 100644 --- a/src/internal/m365/collection/drive/collections.go +++ b/src/internal/m365/collection/drive/collections.go @@ -16,7 +16,6 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" - "github.com/alcionai/corso/src/internal/m365/graph" odConsts "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/observe" @@ -27,6 +26,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/collection/drive/collections_test.go b/src/internal/m365/collection/drive/collections_test.go index 2ca7f4e47..0f0619089 100644 --- a/src/internal/m365/collection/drive/collections_test.go +++ b/src/internal/m365/collection/drive/collections_test.go @@ -19,7 +19,6 @@ import ( "github.com/alcionai/corso/src/internal/data" dataMock "github.com/alcionai/corso/src/internal/data/mock" "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" - "github.com/alcionai/corso/src/internal/m365/graph" odConsts "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts" "github.com/alcionai/corso/src/internal/m365/service/onedrive/mock" "github.com/alcionai/corso/src/internal/m365/support" @@ -29,6 +28,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" apiMock "github.com/alcionai/corso/src/pkg/services/m365/api/mock" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/collection/drive/item.go b/src/internal/m365/collection/drive/item.go index 6d86d10be..0ffbdb976 100644 --- a/src/internal/m365/collection/drive/item.go +++ b/src/internal/m365/collection/drive/item.go @@ -16,10 +16,10 @@ import ( "github.com/alcionai/corso/src/internal/common/readers" "github.com/alcionai/corso/src/internal/common/str" "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/count" "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) const ( diff --git a/src/internal/m365/collection/drive/item_collector_test.go b/src/internal/m365/collection/drive/item_collector_test.go index 8f2a53055..8a199a507 100644 --- a/src/internal/m365/collection/drive/item_collector_test.go +++ b/src/internal/m365/collection/drive/item_collector_test.go @@ -13,7 +13,6 @@ import ( "github.com/alcionai/corso/src/internal/common/idname" "github.com/alcionai/corso/src/internal/common/prefixmatcher" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/account" @@ -22,6 +21,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/mock" ) diff --git a/src/internal/m365/collection/drive/item_test.go b/src/internal/m365/collection/drive/item_test.go index bec6d6f57..29f63cd5b 100644 --- a/src/internal/m365/collection/drive/item_test.go +++ b/src/internal/m365/collection/drive/item_test.go @@ -17,7 +17,6 @@ import ( "github.com/alcionai/corso/src/internal/common/dttm" "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/common/str" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/control" @@ -25,6 +24,7 @@ import ( "github.com/alcionai/corso/src/pkg/count" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type ItemIntegrationSuite struct { diff --git a/src/internal/m365/collection/drive/permission.go b/src/internal/m365/collection/drive/permission.go index 78ac06793..3ba664a5b 100644 --- a/src/internal/m365/collection/drive/permission.go +++ b/src/internal/m365/collection/drive/permission.go @@ -12,11 +12,11 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/version" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) func getParentMetadata( diff --git a/src/internal/m365/collection/drive/restore.go b/src/internal/m365/collection/drive/restore.go index a014f29ba..729d6b4a7 100644 --- a/src/internal/m365/collection/drive/restore.go +++ b/src/internal/m365/collection/drive/restore.go @@ -18,7 +18,6 @@ import ( "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/diagnostics" "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/observe" "github.com/alcionai/corso/src/internal/operations/inject" @@ -30,6 +29,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) const ( diff --git a/src/internal/m365/collection/drive/restore_caches.go b/src/internal/m365/collection/drive/restore_caches.go index 169f47a8b..8fec5fc5f 100644 --- a/src/internal/m365/collection/drive/restore_caches.go +++ b/src/internal/m365/collection/drive/restore_caches.go @@ -11,8 +11,8 @@ import ( "github.com/alcionai/corso/src/internal/common/idname" "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type driveInfo struct { diff --git a/src/internal/m365/collection/drive/restore_test.go b/src/internal/m365/collection/drive/restore_test.go index b7efd6f11..5e0fded00 100644 --- a/src/internal/m365/collection/drive/restore_test.go +++ b/src/internal/m365/collection/drive/restore_test.go @@ -14,7 +14,6 @@ import ( "github.com/alcionai/corso/src/internal/common/idname" "github.com/alcionai/corso/src/internal/common/ptr" dataMock "github.com/alcionai/corso/src/internal/data/mock" - "github.com/alcionai/corso/src/internal/m365/graph" odConsts "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts" odMock "github.com/alcionai/corso/src/internal/m365/service/onedrive/mock" odStub "github.com/alcionai/corso/src/internal/m365/service/onedrive/stub" @@ -26,6 +25,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" apiMock "github.com/alcionai/corso/src/pkg/services/m365/api/mock" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/collection/drive/url_cache_test.go b/src/internal/m365/collection/drive/url_cache_test.go index f5338890d..37fb9c5a4 100644 --- a/src/internal/m365/collection/drive/url_cache_test.go +++ b/src/internal/m365/collection/drive/url_cache_test.go @@ -18,7 +18,6 @@ import ( "github.com/alcionai/corso/src/internal/common/dttm" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/service/onedrive/mock" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" @@ -27,6 +26,7 @@ import ( "github.com/alcionai/corso/src/pkg/count" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/collection/exchange/backup.go b/src/internal/m365/collection/exchange/backup.go index 9ff603f4d..8fab92834 100644 --- a/src/internal/m365/collection/exchange/backup.go +++ b/src/internal/m365/collection/exchange/backup.go @@ -8,7 +8,6 @@ import ( "github.com/alcionai/corso/src/internal/common/pii" "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/observe" "github.com/alcionai/corso/src/internal/operations/inject" @@ -19,6 +18,7 @@ import ( "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/collection/exchange/backup_test.go b/src/internal/m365/collection/exchange/backup_test.go index 58ff0bdf2..eaa81a435 100644 --- a/src/internal/m365/collection/exchange/backup_test.go +++ b/src/internal/m365/collection/exchange/backup_test.go @@ -18,7 +18,6 @@ import ( "github.com/alcionai/corso/src/internal/common/readers" "github.com/alcionai/corso/src/internal/data" dataMock "github.com/alcionai/corso/src/internal/data/mock" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/operations/inject" "github.com/alcionai/corso/src/internal/tester" @@ -32,6 +31,7 @@ import ( "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/collection/exchange/cache_container.go b/src/internal/m365/collection/exchange/cache_container.go index b4be9e801..efd089df8 100644 --- a/src/internal/m365/collection/exchange/cache_container.go +++ b/src/internal/m365/collection/exchange/cache_container.go @@ -4,7 +4,7 @@ import ( "github.com/alcionai/clues" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // checkIDAndName is a helper function to ensure that diff --git a/src/internal/m365/collection/exchange/collection.go b/src/internal/m365/collection/exchange/collection.go index 74ac0e88f..3aa9b9ced 100644 --- a/src/internal/m365/collection/exchange/collection.go +++ b/src/internal/m365/collection/exchange/collection.go @@ -15,13 +15,13 @@ import ( "golang.org/x/exp/maps" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/observe" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var ( diff --git a/src/internal/m365/collection/exchange/collection_test.go b/src/internal/m365/collection/exchange/collection_test.go index c52a9eca0..4f8d51921 100644 --- a/src/internal/m365/collection/exchange/collection_test.go +++ b/src/internal/m365/collection/exchange/collection_test.go @@ -20,13 +20,13 @@ import ( "github.com/alcionai/corso/src/internal/common/readers" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/exchange/mock" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type CollectionUnitSuite struct { diff --git a/src/internal/m365/collection/exchange/contacts_backup.go b/src/internal/m365/collection/exchange/contacts_backup.go index 91c7f3748..6a69c9b4c 100644 --- a/src/internal/m365/collection/exchange/contacts_backup.go +++ b/src/internal/m365/collection/exchange/contacts_backup.go @@ -1,8 +1,8 @@ package exchange import ( - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var _ backupHandler = &contactBackupHandler{} diff --git a/src/internal/m365/collection/exchange/contacts_container_cache.go b/src/internal/m365/collection/exchange/contacts_container_cache.go index 39fbcf04e..cf5ab827c 100644 --- a/src/internal/m365/collection/exchange/contacts_container_cache.go +++ b/src/internal/m365/collection/exchange/contacts_container_cache.go @@ -7,9 +7,9 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var ( diff --git a/src/internal/m365/collection/exchange/contacts_restore.go b/src/internal/m365/collection/exchange/contacts_restore.go index fd29705b6..bf887dc4d 100644 --- a/src/internal/m365/collection/exchange/contacts_restore.go +++ b/src/internal/m365/collection/exchange/contacts_restore.go @@ -7,7 +7,6 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/count" @@ -15,6 +14,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var _ itemRestorer = &contactRestoreHandler{} diff --git a/src/internal/m365/collection/exchange/contacts_restore_test.go b/src/internal/m365/collection/exchange/contacts_restore_test.go index f2030ea16..9ac34b995 100644 --- a/src/internal/m365/collection/exchange/contacts_restore_test.go +++ b/src/internal/m365/collection/exchange/contacts_restore_test.go @@ -10,7 +10,6 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/service/exchange/mock" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" @@ -20,6 +19,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var _ contactRestorer = &contactRestoreMock{} diff --git a/src/internal/m365/collection/exchange/container_resolver.go b/src/internal/m365/collection/exchange/container_resolver.go index 64ae691bf..40b80dd70 100644 --- a/src/internal/m365/collection/exchange/container_resolver.go +++ b/src/internal/m365/collection/exchange/container_resolver.go @@ -6,10 +6,10 @@ import ( "github.com/alcionai/clues" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/internal/m365/collection/exchange/container_resolver_test.go b/src/internal/m365/collection/exchange/container_resolver_test.go index a552f20ba..9ec895945 100644 --- a/src/internal/m365/collection/exchange/container_resolver_test.go +++ b/src/internal/m365/collection/exchange/container_resolver_test.go @@ -13,7 +13,6 @@ import ( "github.com/stretchr/testify/suite" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/account" @@ -22,6 +21,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/internal/m365/collection/exchange/events_backup.go b/src/internal/m365/collection/exchange/events_backup.go index a4e9991ed..14a8c7ce8 100644 --- a/src/internal/m365/collection/exchange/events_backup.go +++ b/src/internal/m365/collection/exchange/events_backup.go @@ -1,8 +1,8 @@ package exchange import ( - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var _ backupHandler = &eventBackupHandler{} diff --git a/src/internal/m365/collection/exchange/events_container_cache.go b/src/internal/m365/collection/exchange/events_container_cache.go index 926c9c3e8..a965db24c 100644 --- a/src/internal/m365/collection/exchange/events_container_cache.go +++ b/src/internal/m365/collection/exchange/events_container_cache.go @@ -7,10 +7,10 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var _ graph.ContainerResolver = &eventContainerCache{} diff --git a/src/internal/m365/collection/exchange/events_restore.go b/src/internal/m365/collection/exchange/events_restore.go index 5cb40e26c..a55fa086b 100644 --- a/src/internal/m365/collection/exchange/events_restore.go +++ b/src/internal/m365/collection/exchange/events_restore.go @@ -8,7 +8,6 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/count" @@ -16,6 +15,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var _ itemRestorer = &eventRestoreHandler{} diff --git a/src/internal/m365/collection/exchange/events_restore_test.go b/src/internal/m365/collection/exchange/events_restore_test.go index ed0fbc60c..41409808e 100644 --- a/src/internal/m365/collection/exchange/events_restore_test.go +++ b/src/internal/m365/collection/exchange/events_restore_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/service/exchange/mock" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" @@ -21,6 +20,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var _ eventRestorer = &eventRestoreMock{} diff --git a/src/internal/m365/collection/exchange/handlers.go b/src/internal/m365/collection/exchange/handlers.go index 18b97dcb8..35fb04c57 100644 --- a/src/internal/m365/collection/exchange/handlers.go +++ b/src/internal/m365/collection/exchange/handlers.go @@ -5,13 +5,13 @@ import ( "github.com/microsoft/kiota-abstractions-go/serialization" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/count" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/collection/exchange/mail_backup.go b/src/internal/m365/collection/exchange/mail_backup.go index d1d92a109..5720ba565 100644 --- a/src/internal/m365/collection/exchange/mail_backup.go +++ b/src/internal/m365/collection/exchange/mail_backup.go @@ -1,8 +1,8 @@ package exchange import ( - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var _ backupHandler = &mailBackupHandler{} diff --git a/src/internal/m365/collection/exchange/mail_container_cache.go b/src/internal/m365/collection/exchange/mail_container_cache.go index 81d977c74..1d5584758 100644 --- a/src/internal/m365/collection/exchange/mail_container_cache.go +++ b/src/internal/m365/collection/exchange/mail_container_cache.go @@ -6,10 +6,10 @@ import ( "github.com/alcionai/clues" "github.com/microsoftgraph/msgraph-sdk-go/models" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var ( diff --git a/src/internal/m365/collection/exchange/mail_restore.go b/src/internal/m365/collection/exchange/mail_restore.go index e8a7e8b52..0fa0c53d3 100644 --- a/src/internal/m365/collection/exchange/mail_restore.go +++ b/src/internal/m365/collection/exchange/mail_restore.go @@ -8,7 +8,6 @@ import ( "github.com/alcionai/corso/src/internal/common/dttm" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/count" @@ -16,6 +15,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var _ itemRestorer = &mailRestoreHandler{} diff --git a/src/internal/m365/collection/exchange/mail_restore_test.go b/src/internal/m365/collection/exchange/mail_restore_test.go index 58fdcd7cb..c48511259 100644 --- a/src/internal/m365/collection/exchange/mail_restore_test.go +++ b/src/internal/m365/collection/exchange/mail_restore_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/service/exchange/mock" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" @@ -21,6 +20,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var _ mailRestorer = &mailRestoreMock{} diff --git a/src/internal/m365/collection/exchange/restore.go b/src/internal/m365/collection/exchange/restore.go index 487ce0d4d..ed175eb6c 100644 --- a/src/internal/m365/collection/exchange/restore.go +++ b/src/internal/m365/collection/exchange/restore.go @@ -11,7 +11,6 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/diagnostics" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/observe" "github.com/alcionai/corso/src/pkg/backup/details" @@ -20,6 +19,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // RestoreCollection handles restoration of an individual collection. diff --git a/src/internal/m365/collection/groups/backup.go b/src/internal/m365/collection/groups/backup.go index 1b317c785..03ba727aa 100644 --- a/src/internal/m365/collection/groups/backup.go +++ b/src/internal/m365/collection/groups/backup.go @@ -11,7 +11,6 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/common/str" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/operations/inject" "github.com/alcionai/corso/src/pkg/backup/metadata" @@ -21,6 +20,7 @@ import ( "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // TODO: incremental support diff --git a/src/internal/m365/collection/groups/backup_test.go b/src/internal/m365/collection/groups/backup_test.go index a02e83541..399c0a069 100644 --- a/src/internal/m365/collection/groups/backup_test.go +++ b/src/internal/m365/collection/groups/backup_test.go @@ -14,7 +14,6 @@ import ( inMock "github.com/alcionai/corso/src/internal/common/idname/mock" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/groups/testdata" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/operations/inject" "github.com/alcionai/corso/src/internal/tester" @@ -30,6 +29,7 @@ import ( "github.com/alcionai/corso/src/pkg/selectors" selTD "github.com/alcionai/corso/src/pkg/selectors/testdata" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/collection/groups/channel_handler.go b/src/internal/m365/collection/groups/channel_handler.go index e049df042..55b2dc7bc 100644 --- a/src/internal/m365/collection/groups/channel_handler.go +++ b/src/internal/m365/collection/groups/channel_handler.go @@ -6,11 +6,11 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/collection/groups/handlers.go b/src/internal/m365/collection/groups/handlers.go index c4dc5fdbf..95b3d64b5 100644 --- a/src/internal/m365/collection/groups/handlers.go +++ b/src/internal/m365/collection/groups/handlers.go @@ -5,11 +5,11 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/models" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/collection/site/backup.go b/src/internal/m365/collection/site/backup.go index a8565c29f..cecbf979f 100644 --- a/src/internal/m365/collection/site/backup.go +++ b/src/internal/m365/collection/site/backup.go @@ -8,7 +8,6 @@ import ( "github.com/alcionai/corso/src/internal/common/prefixmatcher" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/drive" - "github.com/alcionai/corso/src/internal/m365/graph" betaAPI "github.com/alcionai/corso/src/internal/m365/service/sharepoint/api" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/operations/inject" @@ -19,6 +18,7 @@ import ( "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // CollectLibraries constructs a onedrive Collections struct and Get()s diff --git a/src/internal/m365/collection/site/backup_test.go b/src/internal/m365/collection/site/backup_test.go index dc05a6583..d80abe358 100644 --- a/src/internal/m365/collection/site/backup_test.go +++ b/src/internal/m365/collection/site/backup_test.go @@ -9,7 +9,6 @@ import ( "github.com/stretchr/testify/suite" "github.com/alcionai/corso/src/internal/common/idname/mock" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/operations/inject" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" @@ -19,6 +18,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type SharePointPagesSuite struct { diff --git a/src/internal/m365/collection/site/collection.go b/src/internal/m365/collection/site/collection.go index 43676b954..e4617bedc 100644 --- a/src/internal/m365/collection/site/collection.go +++ b/src/internal/m365/collection/site/collection.go @@ -11,7 +11,6 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/m365/graph" betaAPI "github.com/alcionai/corso/src/internal/m365/service/sharepoint/api" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/observe" @@ -22,6 +21,7 @@ import ( "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type DataCategory int diff --git a/src/internal/m365/collection/site/helper_test.go b/src/internal/m365/collection/site/helper_test.go index 2663696bd..e9f396a10 100644 --- a/src/internal/m365/collection/site/helper_test.go +++ b/src/internal/m365/collection/site/helper_test.go @@ -7,10 +7,10 @@ import ( msgraphsdk "github.com/microsoftgraph/msgraph-sdk-go" "github.com/stretchr/testify/require" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/count" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/internal/m365/collection/site/lists.go b/src/internal/m365/collection/site/lists.go index e717f8d67..a46d03e2e 100644 --- a/src/internal/m365/collection/site/lists.go +++ b/src/internal/m365/collection/site/lists.go @@ -9,9 +9,9 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/sites" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/fault" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // ListToSPInfo translates models.Listable metadata into searchable content diff --git a/src/internal/m365/collection/site/lists_test.go b/src/internal/m365/collection/site/lists_test.go index 90cb274e6..bd58a3e70 100644 --- a/src/internal/m365/collection/site/lists_test.go +++ b/src/internal/m365/collection/site/lists_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/fault" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type ListsUnitSuite struct { diff --git a/src/internal/m365/collection/site/pages.go b/src/internal/m365/collection/site/pages.go index 23e4e0e9f..12c4290ed 100644 --- a/src/internal/m365/collection/site/pages.go +++ b/src/internal/m365/collection/site/pages.go @@ -4,8 +4,8 @@ import ( "time" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" "github.com/alcionai/corso/src/pkg/backup/details" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // pageToSPInfo propagates metadata from the SharePoint Page data type diff --git a/src/internal/m365/collection/site/pages_test.go b/src/internal/m365/collection/site/pages_test.go index a1c044aaf..32d0b23b5 100644 --- a/src/internal/m365/collection/site/pages_test.go +++ b/src/internal/m365/collection/site/pages_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/backup/details" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) type PagesUnitSuite struct { diff --git a/src/internal/m365/collection/site/restore.go b/src/internal/m365/collection/site/restore.go index 80574db26..b4472eb26 100644 --- a/src/internal/m365/collection/site/restore.go +++ b/src/internal/m365/collection/site/restore.go @@ -16,7 +16,6 @@ import ( "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/diagnostics" "github.com/alcionai/corso/src/internal/m365/collection/drive" - "github.com/alcionai/corso/src/internal/m365/graph" betaAPI "github.com/alcionai/corso/src/internal/m365/service/sharepoint/api" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/operations/inject" @@ -27,6 +26,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // ConsumeRestoreCollections will restore the specified data collections into OneDrive diff --git a/src/internal/m365/controller.go b/src/internal/m365/controller.go index d5b8d629a..b2ee92443 100644 --- a/src/internal/m365/controller.go +++ b/src/internal/m365/controller.go @@ -9,7 +9,6 @@ import ( "github.com/alcionai/corso/src/internal/common/idname" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/resource" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/operations/inject" @@ -19,6 +18,7 @@ import ( "github.com/alcionai/corso/src/pkg/count" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var ErrNoResourceLookup = clues.New("missing resource lookup client") diff --git a/src/internal/m365/onedrive_test.go b/src/internal/m365/onedrive_test.go index 6617f1bfa..4b9e86ea2 100644 --- a/src/internal/m365/onedrive_test.go +++ b/src/internal/m365/onedrive_test.go @@ -15,7 +15,6 @@ import ( "github.com/alcionai/corso/src/internal/common/dttm" "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" - "github.com/alcionai/corso/src/internal/m365/graph" odConsts "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts" "github.com/alcionai/corso/src/internal/m365/service/onedrive/stub" "github.com/alcionai/corso/src/internal/tester" @@ -25,6 +24,7 @@ import ( "github.com/alcionai/corso/src/pkg/control/testdata" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) var ( diff --git a/src/internal/m365/restore.go b/src/internal/m365/restore.go index b7c5f3746..4237412cc 100644 --- a/src/internal/m365/restore.go +++ b/src/internal/m365/restore.go @@ -8,7 +8,6 @@ import ( "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/diagnostics" "github.com/alcionai/corso/src/internal/m365/collection/drive" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/service/exchange" "github.com/alcionai/corso/src/internal/m365/service/groups" "github.com/alcionai/corso/src/internal/m365/service/onedrive" @@ -19,6 +18,7 @@ import ( "github.com/alcionai/corso/src/pkg/count" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // ConsumeRestoreCollections restores data from the specified collections diff --git a/src/internal/m365/service/exchange/backup.go b/src/internal/m365/service/exchange/backup.go index 306125d2c..e885ace18 100644 --- a/src/internal/m365/service/exchange/backup.go +++ b/src/internal/m365/service/exchange/backup.go @@ -8,13 +8,13 @@ import ( "github.com/alcionai/corso/src/internal/common/prefixmatcher" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/exchange" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/operations/inject" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // ProduceBackupCollections returns a DataCollection which the caller can diff --git a/src/internal/m365/service/exchange/enabled.go b/src/internal/m365/service/exchange/enabled.go index eff1ea799..33c74dd63 100644 --- a/src/internal/m365/service/exchange/enabled.go +++ b/src/internal/m365/service/exchange/enabled.go @@ -7,9 +7,9 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type getMailInboxer interface { diff --git a/src/internal/m365/service/exchange/enabled_test.go b/src/internal/m365/service/exchange/enabled_test.go index bb0308f91..f81cf2a14 100644 --- a/src/internal/m365/service/exchange/enabled_test.go +++ b/src/internal/m365/service/exchange/enabled_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/mock" ) diff --git a/src/internal/m365/service/exchange/restore.go b/src/internal/m365/service/exchange/restore.go index 2298acbfb..f8c439226 100644 --- a/src/internal/m365/service/exchange/restore.go +++ b/src/internal/m365/service/exchange/restore.go @@ -7,7 +7,6 @@ import ( "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/exchange" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/operations/inject" "github.com/alcionai/corso/src/pkg/backup/details" @@ -15,6 +14,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // ConsumeRestoreCollections restores M365 objects in data.RestoreCollection to MSFT diff --git a/src/internal/m365/service/exchange/testdata/handlers.go b/src/internal/m365/service/exchange/testdata/handlers.go index 93b230310..390cd8651 100644 --- a/src/internal/m365/service/exchange/testdata/handlers.go +++ b/src/internal/m365/service/exchange/testdata/handlers.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/require" "github.com/alcionai/corso/src/internal/m365/collection/exchange" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) func PopulateContainerCache( diff --git a/src/internal/m365/service/groups/backup.go b/src/internal/m365/service/groups/backup.go index 0bb9a9b44..e60160833 100644 --- a/src/internal/m365/service/groups/backup.go +++ b/src/internal/m365/service/groups/backup.go @@ -14,7 +14,6 @@ import ( "github.com/alcionai/corso/src/internal/m365/collection/drive" "github.com/alcionai/corso/src/internal/m365/collection/groups" "github.com/alcionai/corso/src/internal/m365/collection/site" - "github.com/alcionai/corso/src/internal/m365/graph" odConsts "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/observe" @@ -27,6 +26,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) func ProduceBackupCollections( diff --git a/src/internal/m365/service/groups/enabled_test.go b/src/internal/m365/service/groups/enabled_test.go index d032be415..aaca21b3e 100644 --- a/src/internal/m365/service/groups/enabled_test.go +++ b/src/internal/m365/service/groups/enabled_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type EnabledUnitSuite struct { diff --git a/src/internal/m365/service/groups/restore.go b/src/internal/m365/service/groups/restore.go index be99f1c79..dc600e9bf 100644 --- a/src/internal/m365/service/groups/restore.go +++ b/src/internal/m365/service/groups/restore.go @@ -12,7 +12,6 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/drive" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/operations/inject" "github.com/alcionai/corso/src/pkg/backup/details" @@ -22,6 +21,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // ConsumeRestoreCollections will restore the specified data collections into OneDrive diff --git a/src/internal/m365/service/groups/restore_test.go b/src/internal/m365/service/groups/restore_test.go index c047b8a38..68fc0b5dd 100644 --- a/src/internal/m365/service/groups/restore_test.go +++ b/src/internal/m365/service/groups/restore_test.go @@ -13,7 +13,6 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/data/mock" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/operations/inject" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" @@ -22,6 +21,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type GroupsUnitSuite struct { diff --git a/src/internal/m365/service/onedrive/backup.go b/src/internal/m365/service/onedrive/backup.go index e587c3058..ff242b2a7 100644 --- a/src/internal/m365/service/onedrive/backup.go +++ b/src/internal/m365/service/onedrive/backup.go @@ -8,7 +8,6 @@ import ( "github.com/alcionai/corso/src/internal/common/prefixmatcher" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/drive" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/operations/inject" "github.com/alcionai/corso/src/internal/version" @@ -16,6 +15,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) func ProduceBackupCollections( diff --git a/src/internal/m365/service/onedrive/enabled.go b/src/internal/m365/service/onedrive/enabled.go index 850322c06..68b57ed6d 100644 --- a/src/internal/m365/service/onedrive/enabled.go +++ b/src/internal/m365/service/onedrive/enabled.go @@ -6,7 +6,7 @@ import ( "github.com/alcionai/clues" "github.com/microsoftgraph/msgraph-sdk-go/models" - "github.com/alcionai/corso/src/internal/m365/graph" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type getDefaultDriver interface { diff --git a/src/internal/m365/service/onedrive/enabled_test.go b/src/internal/m365/service/onedrive/enabled_test.go index 81a0fcc2f..06c7c69fd 100644 --- a/src/internal/m365/service/onedrive/enabled_test.go +++ b/src/internal/m365/service/onedrive/enabled_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type EnabledUnitSuite struct { @@ -33,7 +33,7 @@ func (m mockDGDD) GetDefaultDrive(context.Context, string) (models.Driveable, er return m.response, m.err } -// Copied from src/internal/m365/graph/errors_test.go +// Copied from src/pkg/services/m365/api/graph/errors_test.go func odErrMsg(code, message string) *odataerrors.ODataError { odErr := odataerrors.NewODataError() merr := odataerrors.NewMainError() diff --git a/src/internal/m365/service/sharepoint/api/beta_service.go b/src/internal/m365/service/sharepoint/api/beta_service.go index ce1ad1d90..b259d0a91 100644 --- a/src/internal/m365/service/sharepoint/api/beta_service.go +++ b/src/internal/m365/service/sharepoint/api/beta_service.go @@ -5,7 +5,7 @@ import ( abstractions "github.com/microsoft/kiota-abstractions-go" "github.com/microsoft/kiota-abstractions-go/serialization" - "github.com/alcionai/corso/src/internal/m365/graph/betasdk" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk" ) // Service wraps BetaClient's functionality. diff --git a/src/internal/m365/service/sharepoint/api/beta_service_test.go b/src/internal/m365/service/sharepoint/api/beta_service_test.go index e9222badb..1565d1d44 100644 --- a/src/internal/m365/service/sharepoint/api/beta_service_test.go +++ b/src/internal/m365/service/sharepoint/api/beta_service_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" - "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/count" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) type BetaUnitSuite struct { diff --git a/src/internal/m365/service/sharepoint/api/pages.go b/src/internal/m365/service/sharepoint/api/pages.go index df346c2d9..bdb9667a3 100644 --- a/src/internal/m365/service/sharepoint/api/pages.go +++ b/src/internal/m365/service/sharepoint/api/pages.go @@ -11,11 +11,11 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/diagnostics" - "github.com/alcionai/corso/src/internal/m365/graph" - betamodels "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" - betasites "github.com/alcionai/corso/src/internal/m365/graph/betasdk/sites" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/fault" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" + betamodels "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" + betasites "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/sites" ) type NameID struct { diff --git a/src/internal/m365/service/sharepoint/api/pages_test.go b/src/internal/m365/service/sharepoint/api/pages_test.go index 15f352f64..0f9bb20af 100644 --- a/src/internal/m365/service/sharepoint/api/pages_test.go +++ b/src/internal/m365/service/sharepoint/api/pages_test.go @@ -12,7 +12,6 @@ import ( "github.com/stretchr/testify/suite" "github.com/alcionai/corso/src/internal/data" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/service/sharepoint/api" spMock "github.com/alcionai/corso/src/internal/m365/service/sharepoint/mock" "github.com/alcionai/corso/src/internal/tester" @@ -21,6 +20,7 @@ import ( "github.com/alcionai/corso/src/pkg/control/testdata" "github.com/alcionai/corso/src/pkg/count" "github.com/alcionai/corso/src/pkg/fault" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) func createTestBetaService(t *testing.T, credentials account.M365Config) *api.BetaService { diff --git a/src/internal/m365/service/sharepoint/api/serialization.go b/src/internal/m365/service/sharepoint/api/serialization.go index b3cd0f918..c125e0057 100644 --- a/src/internal/m365/service/sharepoint/api/serialization.go +++ b/src/internal/m365/service/sharepoint/api/serialization.go @@ -9,7 +9,7 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/alcionai/corso/src/internal/common/ptr" - betamodels "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + betamodels "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // createFromBytes generates an m365 object form bytes. diff --git a/src/internal/m365/service/sharepoint/api/serialization_test.go b/src/internal/m365/service/sharepoint/api/serialization_test.go index 8673cd95e..c79a82284 100644 --- a/src/internal/m365/service/sharepoint/api/serialization_test.go +++ b/src/internal/m365/service/sharepoint/api/serialization_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - bmodels "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" spMock "github.com/alcionai/corso/src/internal/m365/service/sharepoint/mock" "github.com/alcionai/corso/src/internal/tester" + bmodels "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) type SerializationUnitSuite struct { diff --git a/src/internal/m365/service/sharepoint/backup.go b/src/internal/m365/service/sharepoint/backup.go index a9f2d7fdf..0f9e83b3a 100644 --- a/src/internal/m365/service/sharepoint/backup.go +++ b/src/internal/m365/service/sharepoint/backup.go @@ -9,7 +9,6 @@ import ( "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/m365/collection/drive" "github.com/alcionai/corso/src/internal/m365/collection/site" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/observe" "github.com/alcionai/corso/src/internal/operations/inject" @@ -18,6 +17,7 @@ import ( "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) func ProduceBackupCollections( diff --git a/src/internal/m365/service/sharepoint/enabled.go b/src/internal/m365/service/sharepoint/enabled.go index b5507af0f..f0b289b98 100644 --- a/src/internal/m365/service/sharepoint/enabled.go +++ b/src/internal/m365/service/sharepoint/enabled.go @@ -6,8 +6,8 @@ import ( "github.com/alcionai/clues" "github.com/microsoftgraph/msgraph-sdk-go/models" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type getSiteRooter interface { diff --git a/src/internal/m365/service/sharepoint/enabled_test.go b/src/internal/m365/service/sharepoint/enabled_test.go index 49d59b909..757c5db1f 100644 --- a/src/internal/m365/service/sharepoint/enabled_test.go +++ b/src/internal/m365/service/sharepoint/enabled_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type EnabledUnitSuite struct { diff --git a/src/internal/operations/backup.go b/src/internal/operations/backup.go index a49f44ad2..4a6f9c061 100644 --- a/src/internal/operations/backup.go +++ b/src/internal/operations/backup.go @@ -16,7 +16,6 @@ import ( "github.com/alcionai/corso/src/internal/events" "github.com/alcionai/corso/src/internal/kopia" kinject "github.com/alcionai/corso/src/internal/kopia/inject" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/model" "github.com/alcionai/corso/src/internal/observe" "github.com/alcionai/corso/src/internal/operations/inject" @@ -33,6 +32,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/store" ) diff --git a/src/internal/operations/backup_test.go b/src/internal/operations/backup_test.go index ab24e33be..b6479a875 100644 --- a/src/internal/operations/backup_test.go +++ b/src/internal/operations/backup_test.go @@ -18,7 +18,6 @@ import ( dataMock "github.com/alcionai/corso/src/internal/data/mock" evmock "github.com/alcionai/corso/src/internal/events/mock" "github.com/alcionai/corso/src/internal/kopia" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/mock" odConsts "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts" odMock "github.com/alcionai/corso/src/internal/m365/service/onedrive/mock" @@ -46,6 +45,7 @@ import ( "github.com/alcionai/corso/src/pkg/selectors" selTD "github.com/alcionai/corso/src/pkg/selectors/testdata" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" storeTD "github.com/alcionai/corso/src/pkg/storage/testdata" "github.com/alcionai/corso/src/pkg/store" ) diff --git a/src/internal/operations/maintenance_test.go b/src/internal/operations/maintenance_test.go index 26657e755..1efe6599e 100644 --- a/src/internal/operations/maintenance_test.go +++ b/src/internal/operations/maintenance_test.go @@ -16,7 +16,6 @@ import ( dataMock "github.com/alcionai/corso/src/internal/data/mock" evmock "github.com/alcionai/corso/src/internal/events/mock" "github.com/alcionai/corso/src/internal/kopia" - "github.com/alcionai/corso/src/internal/m365/graph" odConsts "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts" "github.com/alcionai/corso/src/internal/m365/support" "github.com/alcionai/corso/src/internal/model" @@ -30,6 +29,7 @@ import ( "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" selTD "github.com/alcionai/corso/src/pkg/selectors/testdata" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" storeTD "github.com/alcionai/corso/src/pkg/storage/testdata" "github.com/alcionai/corso/src/pkg/store" ) diff --git a/src/internal/operations/restore.go b/src/internal/operations/restore.go index 669db972c..b630290cf 100644 --- a/src/internal/operations/restore.go +++ b/src/internal/operations/restore.go @@ -16,7 +16,6 @@ import ( "github.com/alcionai/corso/src/internal/diagnostics" "github.com/alcionai/corso/src/internal/events" "github.com/alcionai/corso/src/internal/kopia" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/service/onedrive" "github.com/alcionai/corso/src/internal/model" "github.com/alcionai/corso/src/internal/observe" @@ -32,6 +31,7 @@ import ( "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/store" ) diff --git a/src/internal/operations/restore_test.go b/src/internal/operations/restore_test.go index 129a6e88f..7e0114678 100644 --- a/src/internal/operations/restore_test.go +++ b/src/internal/operations/restore_test.go @@ -17,7 +17,6 @@ import ( evmock "github.com/alcionai/corso/src/internal/events/mock" "github.com/alcionai/corso/src/internal/kopia" "github.com/alcionai/corso/src/internal/m365" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/mock" exchMock "github.com/alcionai/corso/src/internal/m365/service/exchange/mock" "github.com/alcionai/corso/src/internal/operations/inject" @@ -30,6 +29,7 @@ import ( "github.com/alcionai/corso/src/pkg/control/testdata" "github.com/alcionai/corso/src/pkg/count" "github.com/alcionai/corso/src/pkg/selectors" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" storeTD "github.com/alcionai/corso/src/pkg/storage/testdata" "github.com/alcionai/corso/src/pkg/store" ) diff --git a/src/internal/operations/test/exchange_test.go b/src/internal/operations/test/exchange_test.go index d31e6d0c1..f534c19a7 100644 --- a/src/internal/operations/test/exchange_test.go +++ b/src/internal/operations/test/exchange_test.go @@ -18,7 +18,6 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/events" evmock "github.com/alcionai/corso/src/internal/events/mock" - "github.com/alcionai/corso/src/internal/m365/graph" exchMock "github.com/alcionai/corso/src/internal/m365/service/exchange/mock" exchTD "github.com/alcionai/corso/src/internal/m365/service/exchange/testdata" "github.com/alcionai/corso/src/internal/tester" @@ -34,6 +33,7 @@ import ( "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" storeTD "github.com/alcionai/corso/src/pkg/storage/testdata" ) diff --git a/src/internal/operations/test/helper_test.go b/src/internal/operations/test/helper_test.go index a36ef94c5..b5079556c 100644 --- a/src/internal/operations/test/helper_test.go +++ b/src/internal/operations/test/helper_test.go @@ -19,8 +19,6 @@ import ( evmock "github.com/alcionai/corso/src/internal/events/mock" "github.com/alcionai/corso/src/internal/kopia" "github.com/alcionai/corso/src/internal/m365" - "github.com/alcionai/corso/src/internal/m365/graph" - gmock "github.com/alcionai/corso/src/internal/m365/graph/mock" exchMock "github.com/alcionai/corso/src/internal/m365/service/exchange/mock" odConsts "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts" "github.com/alcionai/corso/src/internal/model" @@ -41,6 +39,8 @@ import ( "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" + gmock "github.com/alcionai/corso/src/pkg/services/m365/api/graph/mock" "github.com/alcionai/corso/src/pkg/storage" storeTD "github.com/alcionai/corso/src/pkg/storage/testdata" "github.com/alcionai/corso/src/pkg/store" diff --git a/src/internal/operations/test/onedrive_test.go b/src/internal/operations/test/onedrive_test.go index bccccec30..6cda5b601 100644 --- a/src/internal/operations/test/onedrive_test.go +++ b/src/internal/operations/test/onedrive_test.go @@ -24,7 +24,6 @@ import ( "github.com/alcionai/corso/src/internal/m365" "github.com/alcionai/corso/src/internal/m365/collection/drive" "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" - "github.com/alcionai/corso/src/internal/m365/graph" odConsts "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts" "github.com/alcionai/corso/src/internal/model" "github.com/alcionai/corso/src/internal/streamstore" @@ -44,6 +43,7 @@ import ( "github.com/alcionai/corso/src/pkg/selectors" selTD "github.com/alcionai/corso/src/pkg/selectors/testdata" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" storeTD "github.com/alcionai/corso/src/pkg/storage/testdata" ) diff --git a/src/internal/operations/test/sharepoint_test.go b/src/internal/operations/test/sharepoint_test.go index e6a7fc8cf..1449b0f02 100644 --- a/src/internal/operations/test/sharepoint_test.go +++ b/src/internal/operations/test/sharepoint_test.go @@ -14,7 +14,6 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" evmock "github.com/alcionai/corso/src/internal/events/mock" "github.com/alcionai/corso/src/internal/m365/collection/drive" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/internal/version" @@ -26,6 +25,7 @@ import ( "github.com/alcionai/corso/src/pkg/selectors" selTD "github.com/alcionai/corso/src/pkg/selectors/testdata" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" storeTD "github.com/alcionai/corso/src/pkg/storage/testdata" ) diff --git a/src/pkg/errs/errs.go b/src/pkg/errs/errs.go index 566be9489..d01ec9da6 100644 --- a/src/pkg/errs/errs.go +++ b/src/pkg/errs/errs.go @@ -3,8 +3,8 @@ package errs import ( "errors" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/repository" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // expose enums, rather than errors, for Is checks. The enum should diff --git a/src/pkg/errs/errs_test.go b/src/pkg/errs/errs_test.go index f651c819b..8b91910c6 100644 --- a/src/pkg/errs/errs_test.go +++ b/src/pkg/errs/errs_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/repository" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type ErrUnitSuite struct { diff --git a/src/pkg/logger/example_logger_test.go b/src/pkg/logger/example_logger_test.go index 3c97bfd0e..fff03592c 100644 --- a/src/pkg/logger/example_logger_test.go +++ b/src/pkg/logger/example_logger_test.go @@ -5,10 +5,10 @@ import ( "github.com/alcionai/clues" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/resource" "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/access.go b/src/pkg/services/m365/api/access.go index 956f9db05..0dd5759df 100644 --- a/src/pkg/services/m365/api/access.go +++ b/src/pkg/services/m365/api/access.go @@ -8,7 +8,7 @@ import ( "github.com/alcionai/clues" - "github.com/alcionai/corso/src/internal/m365/graph" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/channels.go b/src/pkg/services/m365/api/channels.go index 55060df3d..fc535c360 100644 --- a/src/pkg/services/m365/api/channels.go +++ b/src/pkg/services/m365/api/channels.go @@ -13,9 +13,9 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/common/str" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/channels_pager.go b/src/pkg/services/m365/api/channels_pager.go index ac06204cf..107651e24 100644 --- a/src/pkg/services/m365/api/channels_pager.go +++ b/src/pkg/services/m365/api/channels_pager.go @@ -8,7 +8,7 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/teams" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/pkg/services/m365/api/client.go b/src/pkg/services/m365/api/client.go index adcd08e05..60e8cbfbb 100644 --- a/src/pkg/services/m365/api/client.go +++ b/src/pkg/services/m365/api/client.go @@ -7,11 +7,11 @@ import ( "github.com/alcionai/clues" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/count" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- @@ -93,8 +93,11 @@ func InitConcurrencyLimit(ctx context.Context, pst path.ServiceType) { // so that in-flight state within the adapter doesn't get clobbered. // Most calls should use the Client.Stable property instead of calling this // func, unless it is explicitly necessary. -func (c Client) Service(counter *count.Bus) (graph.Servicer, error) { - return NewService(c.Credentials, counter) +func (c Client) Service( + counter *count.Bus, + opts ...graph.Option, +) (graph.Servicer, error) { + return NewService(c.Credentials, counter, opts...) } func NewService( diff --git a/src/pkg/services/m365/api/contacts.go b/src/pkg/services/m365/api/contacts.go index 89daaef92..d102e4489 100644 --- a/src/pkg/services/m365/api/contacts.go +++ b/src/pkg/services/m365/api/contacts.go @@ -11,9 +11,9 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/users" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/fault" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/contacts_pager.go b/src/pkg/services/m365/api/contacts_pager.go index 3e1f4a315..50dde9117 100644 --- a/src/pkg/services/m365/api/contacts_pager.go +++ b/src/pkg/services/m365/api/contacts_pager.go @@ -8,8 +8,8 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/users" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/pkg/services/m365/api/conversations.go b/src/pkg/services/m365/api/conversations.go index 104fd3cd8..f58fbec81 100644 --- a/src/pkg/services/m365/api/conversations.go +++ b/src/pkg/services/m365/api/conversations.go @@ -10,8 +10,8 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/common/str" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/conversations_pager.go b/src/pkg/services/m365/api/conversations_pager.go index 93a80d446..a946470f8 100644 --- a/src/pkg/services/m365/api/conversations_pager.go +++ b/src/pkg/services/m365/api/conversations_pager.go @@ -7,7 +7,7 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/groups" "github.com/microsoftgraph/msgraph-sdk-go/models" - "github.com/alcionai/corso/src/internal/m365/graph" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/pkg/services/m365/api/drive.go b/src/pkg/services/m365/api/drive.go index 802c42bfc..c8c2eb464 100644 --- a/src/pkg/services/m365/api/drive.go +++ b/src/pkg/services/m365/api/drive.go @@ -9,8 +9,8 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/control" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/drive_pager.go b/src/pkg/services/m365/api/drive_pager.go index 59efb729d..49093ca34 100644 --- a/src/pkg/services/m365/api/drive_pager.go +++ b/src/pkg/services/m365/api/drive_pager.go @@ -10,9 +10,9 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/users" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" onedrive "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/pkg/services/m365/api/drive_test.go b/src/pkg/services/m365/api/drive_test.go index 5964ef8b6..99ebb4e95 100644 --- a/src/pkg/services/m365/api/drive_test.go +++ b/src/pkg/services/m365/api/drive_test.go @@ -13,11 +13,11 @@ import ( "golang.org/x/exp/slices" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/control/testdata" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type DriveAPIIntgSuite struct { diff --git a/src/pkg/services/m365/api/events.go b/src/pkg/services/m365/api/events.go index 2403c04a8..55e70f7cf 100644 --- a/src/pkg/services/m365/api/events.go +++ b/src/pkg/services/m365/api/events.go @@ -19,10 +19,10 @@ import ( "github.com/alcionai/corso/src/internal/common/dttm" "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/common/str" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/events_pager.go b/src/pkg/services/m365/api/events_pager.go index e58fe321b..6304042ad 100644 --- a/src/pkg/services/m365/api/events_pager.go +++ b/src/pkg/services/m365/api/events_pager.go @@ -9,8 +9,8 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/users" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/internal/m365/graph/betasdk/beta_client.go b/src/pkg/services/m365/api/graph/betasdk/beta_client.go similarity index 98% rename from src/internal/m365/graph/betasdk/beta_client.go rename to src/pkg/services/m365/api/graph/betasdk/beta_client.go index fcf4f7088..cd4b703d2 100644 --- a/src/internal/m365/graph/betasdk/beta_client.go +++ b/src/pkg/services/m365/api/graph/betasdk/beta_client.go @@ -7,7 +7,7 @@ import ( kw "github.com/microsoft/kiota-serialization-json-go" ktext "github.com/microsoft/kiota-serialization-text-go" - i1a3c1a5501c5e41b7fd169f2d4c768dce9b096ac28fb5431bf02afcc57295411 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/sites" + i1a3c1a5501c5e41b7fd169f2d4c768dce9b096ac28fb5431bf02afcc57295411 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/sites" ) // BetaClient the main entry point of the SDK, exposes the configuration and the fluent API. diff --git a/src/internal/m365/graph/betasdk/beta_client_test.go b/src/pkg/services/m365/api/graph/betasdk/beta_client_test.go similarity index 97% rename from src/internal/m365/graph/betasdk/beta_client_test.go rename to src/pkg/services/m365/api/graph/betasdk/beta_client_test.go index 6add009ab..4f1428267 100644 --- a/src/internal/m365/graph/betasdk/beta_client_test.go +++ b/src/pkg/services/m365/api/graph/betasdk/beta_client_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/count" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type BetaClientSuite struct { diff --git a/src/internal/m365/graph/betasdk/kiota-lock.json b/src/pkg/services/m365/api/graph/betasdk/kiota-lock.json similarity index 98% rename from src/internal/m365/graph/betasdk/kiota-lock.json rename to src/pkg/services/m365/api/graph/betasdk/kiota-lock.json index c1819639e..912a88b43 100644 --- a/src/internal/m365/graph/betasdk/kiota-lock.json +++ b/src/pkg/services/m365/api/graph/betasdk/kiota-lock.json @@ -2,7 +2,7 @@ "lockFileVersion": "1.0.0", "kiotaVersion": "0.10.0.0", "clientClassName": "BetaClient", - "clientNamespaceName": "github.com/alcionai/corso/src/internal/m365/graph/betasdk", + "clientNamespaceName": "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk", "language": "Go", "betaVersion": "0.53.0", "usesBackingStore": false, diff --git a/src/internal/m365/graph/betasdk/models/base_item.go b/src/pkg/services/m365/api/graph/betasdk/models/base_item.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/base_item.go rename to src/pkg/services/m365/api/graph/betasdk/models/base_item.go diff --git a/src/internal/m365/graph/betasdk/models/canvas_layout.go b/src/pkg/services/m365/api/graph/betasdk/models/canvas_layout.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/canvas_layout.go rename to src/pkg/services/m365/api/graph/betasdk/models/canvas_layout.go diff --git a/src/internal/m365/graph/betasdk/models/canvas_layoutable.go b/src/pkg/services/m365/api/graph/betasdk/models/canvas_layoutable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/canvas_layoutable.go rename to src/pkg/services/m365/api/graph/betasdk/models/canvas_layoutable.go diff --git a/src/internal/m365/graph/betasdk/models/horizontal_section.go b/src/pkg/services/m365/api/graph/betasdk/models/horizontal_section.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/horizontal_section.go rename to src/pkg/services/m365/api/graph/betasdk/models/horizontal_section.go diff --git a/src/internal/m365/graph/betasdk/models/horizontal_section_collection_response.go b/src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_collection_response.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/horizontal_section_collection_response.go rename to src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_collection_response.go diff --git a/src/internal/m365/graph/betasdk/models/horizontal_section_collection_responseable.go b/src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_collection_responseable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/horizontal_section_collection_responseable.go rename to src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_collection_responseable.go diff --git a/src/internal/m365/graph/betasdk/models/horizontal_section_column.go b/src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_column.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/horizontal_section_column.go rename to src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_column.go diff --git a/src/internal/m365/graph/betasdk/models/horizontal_section_column_collection_response.go b/src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_column_collection_response.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/horizontal_section_column_collection_response.go rename to src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_column_collection_response.go diff --git a/src/internal/m365/graph/betasdk/models/horizontal_section_column_collection_responseable.go b/src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_column_collection_responseable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/horizontal_section_column_collection_responseable.go rename to src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_column_collection_responseable.go diff --git a/src/internal/m365/graph/betasdk/models/horizontal_section_columnable.go b/src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_columnable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/horizontal_section_columnable.go rename to src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_columnable.go diff --git a/src/internal/m365/graph/betasdk/models/horizontal_section_layout_type.go b/src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_layout_type.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/horizontal_section_layout_type.go rename to src/pkg/services/m365/api/graph/betasdk/models/horizontal_section_layout_type.go diff --git a/src/internal/m365/graph/betasdk/models/horizontal_sectionable.go b/src/pkg/services/m365/api/graph/betasdk/models/horizontal_sectionable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/horizontal_sectionable.go rename to src/pkg/services/m365/api/graph/betasdk/models/horizontal_sectionable.go diff --git a/src/internal/m365/graph/betasdk/models/meta_data_key_string_pair.go b/src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_string_pair.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/meta_data_key_string_pair.go rename to src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_string_pair.go diff --git a/src/internal/m365/graph/betasdk/models/meta_data_key_string_pair_collection_response.go b/src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_string_pair_collection_response.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/meta_data_key_string_pair_collection_response.go rename to src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_string_pair_collection_response.go diff --git a/src/internal/m365/graph/betasdk/models/meta_data_key_string_pair_collection_responseable.go b/src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_string_pair_collection_responseable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/meta_data_key_string_pair_collection_responseable.go rename to src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_string_pair_collection_responseable.go diff --git a/src/internal/m365/graph/betasdk/models/meta_data_key_string_pairable.go b/src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_string_pairable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/meta_data_key_string_pairable.go rename to src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_string_pairable.go diff --git a/src/internal/m365/graph/betasdk/models/meta_data_key_value_pair.go b/src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_value_pair.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/meta_data_key_value_pair.go rename to src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_value_pair.go diff --git a/src/internal/m365/graph/betasdk/models/meta_data_key_value_pair_collection_response.go b/src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_value_pair_collection_response.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/meta_data_key_value_pair_collection_response.go rename to src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_value_pair_collection_response.go diff --git a/src/internal/m365/graph/betasdk/models/meta_data_key_value_pair_collection_responseable.go b/src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_value_pair_collection_responseable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/meta_data_key_value_pair_collection_responseable.go rename to src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_value_pair_collection_responseable.go diff --git a/src/internal/m365/graph/betasdk/models/meta_data_key_value_pairable.go b/src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_value_pairable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/meta_data_key_value_pairable.go rename to src/pkg/services/m365/api/graph/betasdk/models/meta_data_key_value_pairable.go diff --git a/src/internal/m365/graph/betasdk/models/page_layout_type.go b/src/pkg/services/m365/api/graph/betasdk/models/page_layout_type.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/page_layout_type.go rename to src/pkg/services/m365/api/graph/betasdk/models/page_layout_type.go diff --git a/src/internal/m365/graph/betasdk/models/page_promotion_type.go b/src/pkg/services/m365/api/graph/betasdk/models/page_promotion_type.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/page_promotion_type.go rename to src/pkg/services/m365/api/graph/betasdk/models/page_promotion_type.go diff --git a/src/internal/m365/graph/betasdk/models/publication_facet.go b/src/pkg/services/m365/api/graph/betasdk/models/publication_facet.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/publication_facet.go rename to src/pkg/services/m365/api/graph/betasdk/models/publication_facet.go diff --git a/src/internal/m365/graph/betasdk/models/publication_facetable.go b/src/pkg/services/m365/api/graph/betasdk/models/publication_facetable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/publication_facetable.go rename to src/pkg/services/m365/api/graph/betasdk/models/publication_facetable.go diff --git a/src/internal/m365/graph/betasdk/models/reactions_facet.go b/src/pkg/services/m365/api/graph/betasdk/models/reactions_facet.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/reactions_facet.go rename to src/pkg/services/m365/api/graph/betasdk/models/reactions_facet.go diff --git a/src/internal/m365/graph/betasdk/models/reactions_facetable.go b/src/pkg/services/m365/api/graph/betasdk/models/reactions_facetable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/reactions_facetable.go rename to src/pkg/services/m365/api/graph/betasdk/models/reactions_facetable.go diff --git a/src/internal/m365/graph/betasdk/models/section_emphasis_type.go b/src/pkg/services/m365/api/graph/betasdk/models/section_emphasis_type.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/section_emphasis_type.go rename to src/pkg/services/m365/api/graph/betasdk/models/section_emphasis_type.go diff --git a/src/internal/m365/graph/betasdk/models/server_processed_content.go b/src/pkg/services/m365/api/graph/betasdk/models/server_processed_content.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/server_processed_content.go rename to src/pkg/services/m365/api/graph/betasdk/models/server_processed_content.go diff --git a/src/internal/m365/graph/betasdk/models/server_processed_contentable.go b/src/pkg/services/m365/api/graph/betasdk/models/server_processed_contentable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/server_processed_contentable.go rename to src/pkg/services/m365/api/graph/betasdk/models/server_processed_contentable.go diff --git a/src/internal/m365/graph/betasdk/models/site_access_type.go b/src/pkg/services/m365/api/graph/betasdk/models/site_access_type.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/site_access_type.go rename to src/pkg/services/m365/api/graph/betasdk/models/site_access_type.go diff --git a/src/internal/m365/graph/betasdk/models/site_page.go b/src/pkg/services/m365/api/graph/betasdk/models/site_page.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/site_page.go rename to src/pkg/services/m365/api/graph/betasdk/models/site_page.go diff --git a/src/internal/m365/graph/betasdk/models/site_page_collection_response.go b/src/pkg/services/m365/api/graph/betasdk/models/site_page_collection_response.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/site_page_collection_response.go rename to src/pkg/services/m365/api/graph/betasdk/models/site_page_collection_response.go diff --git a/src/internal/m365/graph/betasdk/models/site_page_collection_responseable.go b/src/pkg/services/m365/api/graph/betasdk/models/site_page_collection_responseable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/site_page_collection_responseable.go rename to src/pkg/services/m365/api/graph/betasdk/models/site_page_collection_responseable.go diff --git a/src/internal/m365/graph/betasdk/models/site_pageable.go b/src/pkg/services/m365/api/graph/betasdk/models/site_pageable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/site_pageable.go rename to src/pkg/services/m365/api/graph/betasdk/models/site_pageable.go diff --git a/src/internal/m365/graph/betasdk/models/site_security_level.go b/src/pkg/services/m365/api/graph/betasdk/models/site_security_level.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/site_security_level.go rename to src/pkg/services/m365/api/graph/betasdk/models/site_security_level.go diff --git a/src/internal/m365/graph/betasdk/models/site_settings.go b/src/pkg/services/m365/api/graph/betasdk/models/site_settings.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/site_settings.go rename to src/pkg/services/m365/api/graph/betasdk/models/site_settings.go diff --git a/src/internal/m365/graph/betasdk/models/site_settingsable.go b/src/pkg/services/m365/api/graph/betasdk/models/site_settingsable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/site_settingsable.go rename to src/pkg/services/m365/api/graph/betasdk/models/site_settingsable.go diff --git a/src/internal/m365/graph/betasdk/models/standard_web_part.go b/src/pkg/services/m365/api/graph/betasdk/models/standard_web_part.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/standard_web_part.go rename to src/pkg/services/m365/api/graph/betasdk/models/standard_web_part.go diff --git a/src/internal/m365/graph/betasdk/models/standard_web_part_collection_response.go b/src/pkg/services/m365/api/graph/betasdk/models/standard_web_part_collection_response.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/standard_web_part_collection_response.go rename to src/pkg/services/m365/api/graph/betasdk/models/standard_web_part_collection_response.go diff --git a/src/internal/m365/graph/betasdk/models/standard_web_part_collection_responseable.go b/src/pkg/services/m365/api/graph/betasdk/models/standard_web_part_collection_responseable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/standard_web_part_collection_responseable.go rename to src/pkg/services/m365/api/graph/betasdk/models/standard_web_part_collection_responseable.go diff --git a/src/internal/m365/graph/betasdk/models/standard_web_partable.go b/src/pkg/services/m365/api/graph/betasdk/models/standard_web_partable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/standard_web_partable.go rename to src/pkg/services/m365/api/graph/betasdk/models/standard_web_partable.go diff --git a/src/internal/m365/graph/betasdk/models/text_web_part.go b/src/pkg/services/m365/api/graph/betasdk/models/text_web_part.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/text_web_part.go rename to src/pkg/services/m365/api/graph/betasdk/models/text_web_part.go diff --git a/src/internal/m365/graph/betasdk/models/text_web_part_collection_response.go b/src/pkg/services/m365/api/graph/betasdk/models/text_web_part_collection_response.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/text_web_part_collection_response.go rename to src/pkg/services/m365/api/graph/betasdk/models/text_web_part_collection_response.go diff --git a/src/internal/m365/graph/betasdk/models/text_web_part_collection_responseable.go b/src/pkg/services/m365/api/graph/betasdk/models/text_web_part_collection_responseable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/text_web_part_collection_responseable.go rename to src/pkg/services/m365/api/graph/betasdk/models/text_web_part_collection_responseable.go diff --git a/src/internal/m365/graph/betasdk/models/text_web_partable.go b/src/pkg/services/m365/api/graph/betasdk/models/text_web_partable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/text_web_partable.go rename to src/pkg/services/m365/api/graph/betasdk/models/text_web_partable.go diff --git a/src/internal/m365/graph/betasdk/models/title_area.go b/src/pkg/services/m365/api/graph/betasdk/models/title_area.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/title_area.go rename to src/pkg/services/m365/api/graph/betasdk/models/title_area.go diff --git a/src/internal/m365/graph/betasdk/models/title_area_layout_type.go b/src/pkg/services/m365/api/graph/betasdk/models/title_area_layout_type.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/title_area_layout_type.go rename to src/pkg/services/m365/api/graph/betasdk/models/title_area_layout_type.go diff --git a/src/internal/m365/graph/betasdk/models/title_area_text_alignment_type.go b/src/pkg/services/m365/api/graph/betasdk/models/title_area_text_alignment_type.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/title_area_text_alignment_type.go rename to src/pkg/services/m365/api/graph/betasdk/models/title_area_text_alignment_type.go diff --git a/src/internal/m365/graph/betasdk/models/title_areaable.go b/src/pkg/services/m365/api/graph/betasdk/models/title_areaable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/title_areaable.go rename to src/pkg/services/m365/api/graph/betasdk/models/title_areaable.go diff --git a/src/internal/m365/graph/betasdk/models/vertical_section.go b/src/pkg/services/m365/api/graph/betasdk/models/vertical_section.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/vertical_section.go rename to src/pkg/services/m365/api/graph/betasdk/models/vertical_section.go diff --git a/src/internal/m365/graph/betasdk/models/vertical_sectionable.go b/src/pkg/services/m365/api/graph/betasdk/models/vertical_sectionable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/vertical_sectionable.go rename to src/pkg/services/m365/api/graph/betasdk/models/vertical_sectionable.go diff --git a/src/internal/m365/graph/betasdk/models/web_part.go b/src/pkg/services/m365/api/graph/betasdk/models/web_part.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/web_part.go rename to src/pkg/services/m365/api/graph/betasdk/models/web_part.go diff --git a/src/internal/m365/graph/betasdk/models/web_part_collection_response.go b/src/pkg/services/m365/api/graph/betasdk/models/web_part_collection_response.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/web_part_collection_response.go rename to src/pkg/services/m365/api/graph/betasdk/models/web_part_collection_response.go diff --git a/src/internal/m365/graph/betasdk/models/web_part_collection_responseable.go b/src/pkg/services/m365/api/graph/betasdk/models/web_part_collection_responseable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/web_part_collection_responseable.go rename to src/pkg/services/m365/api/graph/betasdk/models/web_part_collection_responseable.go diff --git a/src/internal/m365/graph/betasdk/models/web_part_data.go b/src/pkg/services/m365/api/graph/betasdk/models/web_part_data.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/web_part_data.go rename to src/pkg/services/m365/api/graph/betasdk/models/web_part_data.go diff --git a/src/internal/m365/graph/betasdk/models/web_part_dataable.go b/src/pkg/services/m365/api/graph/betasdk/models/web_part_dataable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/web_part_dataable.go rename to src/pkg/services/m365/api/graph/betasdk/models/web_part_dataable.go diff --git a/src/internal/m365/graph/betasdk/models/web_part_position.go b/src/pkg/services/m365/api/graph/betasdk/models/web_part_position.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/web_part_position.go rename to src/pkg/services/m365/api/graph/betasdk/models/web_part_position.go diff --git a/src/internal/m365/graph/betasdk/models/web_part_positionable.go b/src/pkg/services/m365/api/graph/betasdk/models/web_part_positionable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/web_part_positionable.go rename to src/pkg/services/m365/api/graph/betasdk/models/web_part_positionable.go diff --git a/src/internal/m365/graph/betasdk/models/web_partable.go b/src/pkg/services/m365/api/graph/betasdk/models/web_partable.go similarity index 100% rename from src/internal/m365/graph/betasdk/models/web_partable.go rename to src/pkg/services/m365/api/graph/betasdk/models/web_partable.go diff --git a/src/internal/m365/graph/betasdk/sites/count_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/count_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/count_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/count_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_count_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_count_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_pages_count_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_count_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_count_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_count_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_count_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_count_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_horizontal_section_item_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_horizontal_section_item_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_horizontal_section_item_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_horizontal_section_item_request_builder.go index c09936d6a..4a0f299b8 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_horizontal_section_item_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_horizontal_section_item_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutHorizontalSectionsHorizontalSectionItemRequestBuilder diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_count_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_count_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_count_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_count_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_horizontal_section_column_item_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_horizontal_section_column_item_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_horizontal_section_column_item_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_horizontal_section_column_item_request_builder.go index 3ca145885..8bbf054a9 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_horizontal_section_column_item_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_horizontal_section_column_item_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutHorizontalSectionsItemColumnsHorizontalSectionColumnItemRequestBuilder provides operations to manage the columns property of the microsoft.graph.horizontalSection entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_count_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_count_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_count_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_count_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_item_get_position_of_web_part_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_item_get_position_of_web_part_request_builder.go similarity index 98% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_item_get_position_of_web_part_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_item_get_position_of_web_part_request_builder.go index 8e7e069ac..17b7a2967 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_item_get_position_of_web_part_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_item_get_position_of_web_part_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutHorizontalSectionsItemColumnsItemWebpartsItemGetPositionOfWebPartRequestBuilder provides operations to call the getPositionOfWebPart method. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_request_builder.go index e4627c8d2..943cf7f43 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutHorizontalSectionsItemColumnsItemWebpartsRequestBuilder provides operations to manage the webparts property of the microsoft.graph.horizontalSectionColumn entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_web_part_item_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_web_part_item_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_web_part_item_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_web_part_item_request_builder.go index 728610b97..e1be2edb1 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_web_part_item_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_item_webparts_web_part_item_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutHorizontalSectionsItemColumnsItemWebpartsWebPartItemRequestBuilder provides operations to manage the webparts property of the microsoft.graph.horizontalSectionColumn entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_request_builder.go index df91fde72..c199d69fa 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_item_columns_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutHorizontalSectionsItemColumnsRequestBuilder provides operations to manage the columns property of the microsoft.graph.horizontalSection entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_request_builder.go index ddce74a8c..b4400d67a 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_horizontal_sections_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutHorizontalSectionsRequestBuilder provides operations to manage the horizontalSections property of the microsoft.graph.canvasLayout entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_request_builder.go index f9f5bd641..4385c4f48 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutRequestBuilder provides operations to manage the canvasLayout property of the microsoft.graph.sitePage entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_request_builder.go index 1b056e0af..085077df0 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutVerticalSectionRequestBuilder provides operations to manage the verticalSection property of the microsoft.graph.canvasLayout entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_count_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_count_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_count_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_count_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_item_get_position_of_web_part_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_item_get_position_of_web_part_request_builder.go similarity index 98% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_item_get_position_of_web_part_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_item_get_position_of_web_part_request_builder.go index 095417526..2b968e10c 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_item_get_position_of_web_part_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_item_get_position_of_web_part_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutVerticalSectionWebpartsItemGetPositionOfWebPartRequestBuilder provides operations to call the getPositionOfWebPart method. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_request_builder.go index c6e339cc2..0845614f1 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutVerticalSectionWebpartsRequestBuilder provides operations to manage the webparts property of the microsoft.graph.verticalSection entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_web_part_item_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_web_part_item_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_web_part_item_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_web_part_item_request_builder.go index 02fa2b0ac..f69b2f9f9 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_web_part_item_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_canvas_layout_vertical_section_webparts_web_part_item_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemCanvasLayoutVerticalSectionWebpartsWebPartItemRequestBuilder provides operations to manage the webparts property of the microsoft.graph.verticalSection entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_post_request_body.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_post_request_body.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_post_request_body.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_post_request_body.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_post_request_bodyable.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_post_request_bodyable.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_post_request_bodyable.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_post_request_bodyable.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_response.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_response.go similarity index 97% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_response.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_response.go index 3e2b17cd8..c7a054df9 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_response.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_response.go @@ -4,7 +4,7 @@ import ( i878a80d2330e89d26896388a3f487eef27b0a0e6c010c493bf80be1452208f91 "github.com/microsoft/kiota-abstractions-go/serialization" msmodel "github.com/microsoftgraph/msgraph-sdk-go/models" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemGetWebPartsByPositionResponse provides operations to call the getWebPartsByPosition method. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_responseable.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_responseable.go similarity index 90% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_responseable.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_responseable.go index ef91ec75c..882aa6f6e 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_responseable.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_get_web_parts_by_position_responseable.go @@ -4,7 +4,7 @@ import ( i878a80d2330e89d26896388a3f487eef27b0a0e6c010c493bf80be1452208f91 "github.com/microsoft/kiota-abstractions-go/serialization" msmodel "github.com/microsoftgraph/msgraph-sdk-go/models" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemGetWebPartsByPositionResponseable diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_publish_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_publish_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_publish_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_publish_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_count_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_count_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_count_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_count_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_item_get_position_of_web_part_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_item_get_position_of_web_part_request_builder.go similarity index 98% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_item_get_position_of_web_part_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_item_get_position_of_web_part_request_builder.go index af2795798..6345b13e6 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_item_get_position_of_web_part_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_item_get_position_of_web_part_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemWebPartsItemGetPositionOfWebPartRequestBuilder provides operations to call the getPositionOfWebPart method. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_request_builder.go index 6d93b9b76..5b37d1650 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemWebPartsRequestBuilder provides operations to manage the webParts property of the microsoft.graph.sitePage entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_web_part_item_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_web_part_item_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_web_part_item_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_web_part_item_request_builder.go index e8be53a64..90141f6b4 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_item_web_parts_web_part_item_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_item_web_parts_web_part_item_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesItemWebPartsWebPartItemRequestBuilder provides operations to manage the webParts property of the microsoft.graph.sitePage entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_request_builder.go index aa5e63865..f23a1f055 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesRequestBuilder provides operations to manage the pages property of the microsoft.graph.site entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_pages_site_page_item_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_site_page_item_request_builder.go similarity index 99% rename from src/internal/m365/graph/betasdk/sites/item_pages_site_page_item_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_pages_site_page_item_request_builder.go index 6213cbfe2..fae8928ec 100644 --- a/src/internal/m365/graph/betasdk/sites/item_pages_site_page_item_request_builder.go +++ b/src/pkg/services/m365/api/graph/betasdk/sites/item_pages_site_page_item_request_builder.go @@ -6,7 +6,7 @@ import ( i2ae4187f7daee263371cb1c977df639813ab50ffa529013b7437480d1ec0158f "github.com/microsoft/kiota-abstractions-go" i7ad325c11fbf3db4d761c429267362d8b24daa1eda0081f914ebc3cdc85181a0 "github.com/microsoftgraph/msgraph-sdk-go/models/odataerrors" - ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/internal/m365/graph/betasdk/models" + ifda19816f54f079134d70c11e75d6b26799300cf72079e282f1d3bb9a6750354 "github.com/alcionai/corso/src/pkg/services/m365/api/graph/betasdk/models" ) // ItemPagesSitePageItemRequestBuilder provides operations to manage the pages property of the microsoft.graph.site entity. diff --git a/src/internal/m365/graph/betasdk/sites/item_sites_count_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_sites_count_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_sites_count_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_sites_count_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/item_sites_site_item_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/item_sites_site_item_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/item_sites_site_item_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/item_sites_site_item_request_builder.go diff --git a/src/internal/m365/graph/betasdk/sites/site_item_request_builder.go b/src/pkg/services/m365/api/graph/betasdk/sites/site_item_request_builder.go similarity index 100% rename from src/internal/m365/graph/betasdk/sites/site_item_request_builder.go rename to src/pkg/services/m365/api/graph/betasdk/sites/site_item_request_builder.go diff --git a/src/internal/m365/graph/cache_container.go b/src/pkg/services/m365/api/graph/cache_container.go similarity index 100% rename from src/internal/m365/graph/cache_container.go rename to src/pkg/services/m365/api/graph/cache_container.go diff --git a/src/internal/m365/graph/collections.go b/src/pkg/services/m365/api/graph/collections.go similarity index 100% rename from src/internal/m365/graph/collections.go rename to src/pkg/services/m365/api/graph/collections.go diff --git a/src/internal/m365/graph/collections_test.go b/src/pkg/services/m365/api/graph/collections_test.go similarity index 100% rename from src/internal/m365/graph/collections_test.go rename to src/pkg/services/m365/api/graph/collections_test.go diff --git a/src/internal/m365/graph/concurrency_middleware.go b/src/pkg/services/m365/api/graph/concurrency_middleware.go similarity index 100% rename from src/internal/m365/graph/concurrency_middleware.go rename to src/pkg/services/m365/api/graph/concurrency_middleware.go diff --git a/src/internal/m365/graph/concurrency_middleware_test.go b/src/pkg/services/m365/api/graph/concurrency_middleware_test.go similarity index 100% rename from src/internal/m365/graph/concurrency_middleware_test.go rename to src/pkg/services/m365/api/graph/concurrency_middleware_test.go diff --git a/src/internal/m365/graph/consts.go b/src/pkg/services/m365/api/graph/consts.go similarity index 100% rename from src/internal/m365/graph/consts.go rename to src/pkg/services/m365/api/graph/consts.go diff --git a/src/internal/m365/graph/consts_test.go b/src/pkg/services/m365/api/graph/consts_test.go similarity index 100% rename from src/internal/m365/graph/consts_test.go rename to src/pkg/services/m365/api/graph/consts_test.go diff --git a/src/internal/m365/graph/errors.go b/src/pkg/services/m365/api/graph/errors.go similarity index 100% rename from src/internal/m365/graph/errors.go rename to src/pkg/services/m365/api/graph/errors.go diff --git a/src/internal/m365/graph/errors_test.go b/src/pkg/services/m365/api/graph/errors_test.go similarity index 100% rename from src/internal/m365/graph/errors_test.go rename to src/pkg/services/m365/api/graph/errors_test.go diff --git a/src/internal/m365/graph/http_wrapper.go b/src/pkg/services/m365/api/graph/http_wrapper.go similarity index 100% rename from src/internal/m365/graph/http_wrapper.go rename to src/pkg/services/m365/api/graph/http_wrapper.go diff --git a/src/internal/m365/graph/http_wrapper_test.go b/src/pkg/services/m365/api/graph/http_wrapper_test.go similarity index 100% rename from src/internal/m365/graph/http_wrapper_test.go rename to src/pkg/services/m365/api/graph/http_wrapper_test.go diff --git a/src/internal/m365/graph/interfaces.go b/src/pkg/services/m365/api/graph/interfaces.go similarity index 100% rename from src/internal/m365/graph/interfaces.go rename to src/pkg/services/m365/api/graph/interfaces.go diff --git a/src/internal/m365/graph/logging.go b/src/pkg/services/m365/api/graph/logging.go similarity index 100% rename from src/internal/m365/graph/logging.go rename to src/pkg/services/m365/api/graph/logging.go diff --git a/src/internal/m365/graph/metadata/metadata.go b/src/pkg/services/m365/api/graph/metadata/metadata.go similarity index 100% rename from src/internal/m365/graph/metadata/metadata.go rename to src/pkg/services/m365/api/graph/metadata/metadata.go diff --git a/src/internal/m365/graph/metadata/metadata_test.go b/src/pkg/services/m365/api/graph/metadata/metadata_test.go similarity index 97% rename from src/internal/m365/graph/metadata/metadata_test.go rename to src/pkg/services/m365/api/graph/metadata/metadata_test.go index 6419f991c..7fa8e71a0 100644 --- a/src/internal/m365/graph/metadata/metadata_test.go +++ b/src/pkg/services/m365/api/graph/metadata/metadata_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/suite" odmetadata "github.com/alcionai/corso/src/internal/m365/collection/drive/metadata" - "github.com/alcionai/corso/src/internal/m365/graph/metadata" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph/metadata" ) type boolfAssertionFunc func(assert.TestingT, bool, string, ...any) bool diff --git a/src/internal/m365/graph/metadata_collection.go b/src/pkg/services/m365/api/graph/metadata_collection.go similarity index 100% rename from src/internal/m365/graph/metadata_collection.go rename to src/pkg/services/m365/api/graph/metadata_collection.go diff --git a/src/internal/m365/graph/metadata_collection_test.go b/src/pkg/services/m365/api/graph/metadata_collection_test.go similarity index 100% rename from src/internal/m365/graph/metadata_collection_test.go rename to src/pkg/services/m365/api/graph/metadata_collection_test.go diff --git a/src/internal/m365/graph/middleware.go b/src/pkg/services/m365/api/graph/middleware.go similarity index 100% rename from src/internal/m365/graph/middleware.go rename to src/pkg/services/m365/api/graph/middleware.go diff --git a/src/internal/m365/graph/middleware_test.go b/src/pkg/services/m365/api/graph/middleware_test.go similarity index 100% rename from src/internal/m365/graph/middleware_test.go rename to src/pkg/services/m365/api/graph/middleware_test.go diff --git a/src/internal/m365/graph/mock/service.go b/src/pkg/services/m365/api/graph/mock/service.go similarity index 95% rename from src/internal/m365/graph/mock/service.go rename to src/pkg/services/m365/api/graph/mock/service.go index 4f35a24ec..0456e3693 100644 --- a/src/internal/m365/graph/mock/service.go +++ b/src/pkg/services/m365/api/graph/mock/service.go @@ -5,9 +5,9 @@ import ( "github.com/h2non/gock" msgraphsdkgo "github.com/microsoftgraph/msgraph-sdk-go" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/count" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) func NewService( diff --git a/src/internal/m365/graph/service.go b/src/pkg/services/m365/api/graph/service.go similarity index 100% rename from src/internal/m365/graph/service.go rename to src/pkg/services/m365/api/graph/service.go diff --git a/src/internal/m365/graph/service_test.go b/src/pkg/services/m365/api/graph/service_test.go similarity index 100% rename from src/internal/m365/graph/service_test.go rename to src/pkg/services/m365/api/graph/service_test.go diff --git a/src/internal/m365/graph/uploadsession.go b/src/pkg/services/m365/api/graph/uploadsession.go similarity index 100% rename from src/internal/m365/graph/uploadsession.go rename to src/pkg/services/m365/api/graph/uploadsession.go diff --git a/src/internal/m365/graph/uploadsession_test.go b/src/pkg/services/m365/api/graph/uploadsession_test.go similarity index 100% rename from src/internal/m365/graph/uploadsession_test.go rename to src/pkg/services/m365/api/graph/uploadsession_test.go diff --git a/src/pkg/services/m365/api/groups.go b/src/pkg/services/m365/api/groups.go index adcb1b5b3..d240d6470 100644 --- a/src/pkg/services/m365/api/groups.go +++ b/src/pkg/services/m365/api/groups.go @@ -15,9 +15,9 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/common/str" "github.com/alcionai/corso/src/internal/common/tform" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) const ( diff --git a/src/pkg/services/m365/api/helper_test.go b/src/pkg/services/m365/api/helper_test.go index 920e07cef..c8fb30a0c 100644 --- a/src/pkg/services/m365/api/helper_test.go +++ b/src/pkg/services/m365/api/helper_test.go @@ -13,13 +13,13 @@ import ( "github.com/stretchr/testify/require" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" - gmock "github.com/alcionai/corso/src/internal/m365/graph/mock" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/count" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" + gmock "github.com/alcionai/corso/src/pkg/services/m365/api/graph/mock" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/lists.go b/src/pkg/services/m365/api/lists.go index fb6abaa48..1e804bb81 100644 --- a/src/pkg/services/m365/api/lists.go +++ b/src/pkg/services/m365/api/lists.go @@ -7,7 +7,7 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/lists_test.go b/src/pkg/services/m365/api/lists_test.go index 795a59247..a76c30636 100644 --- a/src/pkg/services/m365/api/lists_test.go +++ b/src/pkg/services/m365/api/lists_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/control/testdata" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type ListsAPIIntgSuite struct { diff --git a/src/pkg/services/m365/api/mail.go b/src/pkg/services/m365/api/mail.go index 33edb25a1..f2d611c94 100644 --- a/src/pkg/services/m365/api/mail.go +++ b/src/pkg/services/m365/api/mail.go @@ -14,10 +14,10 @@ import ( "github.com/alcionai/corso/src/internal/common/dttm" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) const ( diff --git a/src/pkg/services/m365/api/mail_pager.go b/src/pkg/services/m365/api/mail_pager.go index 50ad1ea43..b734c7018 100644 --- a/src/pkg/services/m365/api/mail_pager.go +++ b/src/pkg/services/m365/api/mail_pager.go @@ -9,8 +9,8 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/users" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/path" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/pagers" ) diff --git a/src/pkg/services/m365/api/pagers/pagers.go b/src/pkg/services/m365/api/pagers/pagers.go index da1556afc..decfdf0cb 100644 --- a/src/pkg/services/m365/api/pagers/pagers.go +++ b/src/pkg/services/m365/api/pagers/pagers.go @@ -10,8 +10,8 @@ import ( "github.com/alcionai/corso/src/internal/common/dttm" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/logger" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/pagers/pagers_test.go b/src/pkg/services/m365/api/pagers/pagers_test.go index bb69c3be9..bcd1fa5bd 100644 --- a/src/pkg/services/m365/api/pagers/pagers_test.go +++ b/src/pkg/services/m365/api/pagers/pagers_test.go @@ -14,8 +14,8 @@ import ( "golang.org/x/exp/maps" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/sites.go b/src/pkg/services/m365/api/sites.go index 466ea89f1..2736ef1fd 100644 --- a/src/pkg/services/m365/api/sites.go +++ b/src/pkg/services/m365/api/sites.go @@ -13,8 +13,8 @@ import ( "github.com/microsoftgraph/msgraph-sdk-go/sites" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/fault" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // --------------------------------------------------------------------------- diff --git a/src/pkg/services/m365/api/sites_test.go b/src/pkg/services/m365/api/sites_test.go index 0cea6f4aa..5a4e4c938 100644 --- a/src/pkg/services/m365/api/sites_test.go +++ b/src/pkg/services/m365/api/sites_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/fault" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type SitesUnitSuite struct { diff --git a/src/pkg/services/m365/api/users.go b/src/pkg/services/m365/api/users.go index 36844437a..a01eae34f 100644 --- a/src/pkg/services/m365/api/users.go +++ b/src/pkg/services/m365/api/users.go @@ -13,8 +13,8 @@ import ( "github.com/alcionai/corso/src/internal/common/idname" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/fault" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) // Variables diff --git a/src/pkg/services/m365/api/users_test.go b/src/pkg/services/m365/api/users_test.go index b40289622..6ce6ec94a 100644 --- a/src/pkg/services/m365/api/users_test.go +++ b/src/pkg/services/m365/api/users_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type UsersUnitSuite struct { diff --git a/src/pkg/services/m365/groups_test.go b/src/pkg/services/m365/groups_test.go index d0a1cfd3d..7b2a1d651 100644 --- a/src/pkg/services/m365/groups_test.go +++ b/src/pkg/services/m365/groups_test.go @@ -9,7 +9,6 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/account" @@ -17,6 +16,7 @@ import ( "github.com/alcionai/corso/src/pkg/errs" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/services/m365" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type GroupsIntgSuite struct { diff --git a/src/pkg/services/m365/sites.go b/src/pkg/services/m365/sites.go index 55e830114..ba19ad685 100644 --- a/src/pkg/services/m365/sites.go +++ b/src/pkg/services/m365/sites.go @@ -10,12 +10,12 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/common/str" "github.com/alcionai/corso/src/internal/common/tform" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type SiteOwnerType string diff --git a/src/pkg/services/m365/sites_test.go b/src/pkg/services/m365/sites_test.go index 275c0bcda..cafc45dc9 100644 --- a/src/pkg/services/m365/sites_test.go +++ b/src/pkg/services/m365/sites_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/suite" "github.com/alcionai/corso/src/internal/common/ptr" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/credentials" "github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" "github.com/alcionai/corso/src/pkg/services/m365/api/mock" ) diff --git a/src/pkg/services/m365/users_test.go b/src/pkg/services/m365/users_test.go index 5e793f89e..16270330d 100644 --- a/src/pkg/services/m365/users_test.go +++ b/src/pkg/services/m365/users_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/tester" "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/credentials" "github.com/alcionai/corso/src/pkg/services/m365/api" + "github.com/alcionai/corso/src/pkg/services/m365/api/graph" ) type userIntegrationSuite struct {