Update README.md (#5466)

<!-- PR description-->

---

#### Does this PR need a docs update or release note?

- [ ] ✅ Yes, it's included
- [ ] 🕐 Yes, but in a later PR
- [ ] ⛔ No

#### Type of change

<!--- Please check the type of change your PR introduces: --->
- [ ] 🌻 Feature
- [ ] 🐛 Bugfix
- [ ] 🗺️ Documentation
- [ ] 🤖 Supportability/Tests
- [ ] 💻 CI/Deployment
- [ ] 🧹 Tech Debt/Cleanup

#### Issue(s)

<!-- Can reference multiple issues. Use one of the following "magic
words" - "closes, fixes" to auto-close the Github issue. -->
* #<issue>

#### Test Plan

<!-- How will this be tested prior to merging.-->
- [ ] 💪 Manual
- [ ] ⚡ Unit test
- [ ] 💚 E2E

.github/actions/backup-restore-test/action.yml

@@ -1,4 +1,5 @@
 name: Backup Restore Test
+description: Run various backup/restore/export tests for a service.
 
 inputs:
   service:

.github/actions/go-setup-cache/action.yml

@@ -1,4 +1,5 @@
 name: Setup and Cache Golang
+description: Build golang binaries for later use in CI.
 
 # clone of: https://github.com/magnetikonline/action-golang-cache/blob/main/action.yaml
 #

.github/actions/publish-binary/action.yml

@@ -1,4 +1,5 @@
 name: Publish Binary
+description: Publish binary artifacts.
 
 inputs:
   version:

.github/actions/publish-website/action.yml

@@ -1,4 +1,5 @@
 name: Publish Website
+description: Publish website artifacts.
 
 inputs:
   aws-iam-role:

.github/actions/purge-m365-data/action.yml

@@ -1,4 +1,5 @@
 name: Purge M365 User Data
+description: Deletes M365 data generated during CI tests.
 
 # Hard deletion of an m365 user's data.  Our CI processes create a lot
 # of data churn (creation and immediate deletion) of files, the likes
@@ -30,12 +31,19 @@ inputs:
     description: Secret value of for AZURE_CLIENT_ID
   azure-client-secret:
     description: Secret value of for AZURE_CLIENT_SECRET
+  azure-pnp-client-id:
+    description: Secret value of AZURE_PNP_CLIENT_ID
+  azure-pnp-client-cert:
+    description: Base64 encoded private certificate for the azure-pnp-client-id (Secret value of AZURE_PNP_CLIENT_CERT)
   azure-tenant-id:
-    description: Secret value of for AZURE_TENANT_ID
+    description: Secret value of AZURE_TENANT_ID
   m365-admin-user:
     description: Secret value of for M365_TENANT_ADMIN_USER
   m365-admin-password:
     description: Secret value of for M365_TENANT_ADMIN_PASSWORD
+  tenant-domain:
+    description: The domain of the tenant (ex. 10rqc2.onmicrosft.com)
+    required: true
 
 runs:
   using: composite
@@ -53,7 +61,13 @@ runs:
         AZURE_CLIENT_ID: ${{ inputs.azure-client-id }}
         AZURE_CLIENT_SECRET: ${{ inputs.azure-client-secret }}
         AZURE_TENANT_ID: ${{ inputs.azure-tenant-id }}
-      run: ./exchangePurge.ps1 -User ${{ inputs.user }} -FolderNamePurgeList PersonMetadata -FolderPrefixPurgeList "${{ inputs.folder-prefix }}".Split(",") -PurgeBeforeTimestamp ${{ inputs.older-than }}
+      run: |
+        for ($ATTEMPT_NUM = 1; $ATTEMPT_NUM -le 3; $ATTEMPT_NUM++)
+        {
+          if (./exchangePurge.ps1 -User ${{ inputs.user }} -FolderNamePurgeList PersonMetadata -FolderPrefixPurgeList "${{ inputs.folder-prefix }}".Split(",") -PurgeBeforeTimestamp ${{ inputs.older-than }}) {
+            break
+          }
+        }
 
     # TODO(ashmrtn): Re-enable when we figure out errors we're seeing with Get-Mailbox call.
     #- name: Reset retention for all mailboxes to 0
@@ -74,10 +88,16 @@ runs:
       shell: pwsh
       working-directory: ./src/cmd/purge/scripts
       env:
-        M365_TENANT_ADMIN_USER: ${{ inputs.m365-admin-user }}
+        AZURE_CLIENT_ID: ${{ inputs.azure-pnp-client-id }}
-        M365_TENANT_ADMIN_PASSWORD: ${{ inputs.m365-admin-password }}
+        AZURE_APP_CERT: ${{ inputs.azure-pnp-client-cert }}
+        TENANT_DOMAIN:  ${{ inputs.tenant-domain }}
       run: |
-        ./onedrivePurge.ps1 -User ${{ inputs.user }} -FolderPrefixPurgeList "${{ inputs.folder-prefix }}".Split(",") -PurgeBeforeTimestamp ${{ inputs.older-than }}
+        for ($ATTEMPT_NUM = 1; $ATTEMPT_NUM -le 3; $ATTEMPT_NUM++)
+        {
+          if (./onedrivePurge.ps1 -User ${{ inputs.user }} -FolderPrefixPurgeList "${{ inputs.folder-prefix }}".Split(",") -PurgeBeforeTimestamp ${{ inputs.older-than }}) {
+            break
+          }
+        }
 
     ################################################################################################################
     # Sharepoint
@@ -88,6 +108,14 @@ runs:
       shell: pwsh
       working-directory: ./src/cmd/purge/scripts
       env:
-        M365_TENANT_ADMIN_USER: ${{ inputs.m365-admin-user }}
+        AZURE_CLIENT_ID: ${{ inputs.azure-pnp-client-id }}
-        M365_TENANT_ADMIN_PASSWORD: ${{ inputs.m365-admin-password }}
+        AZURE_APP_CERT: ${{ inputs.azure-pnp-client-cert }}
-      run: ./onedrivePurge.ps1 -Site ${{ inputs.site }} -LibraryNameList "${{ inputs.libraries }}".split(",") -FolderPrefixPurgeList ${{ inputs.folder-prefix }} -LibraryPrefixDeleteList ${{ inputs.library-prefix && inputs.library-prefix || '[]' }} -PurgeBeforeTimestamp ${{ inputs.older-than }}
+        TENANT_DOMAIN:  ${{ inputs.tenant-domain }}
+      run: |
+        for ($ATTEMPT_NUM = 1; $ATTEMPT_NUM -le 3; $ATTEMPT_NUM++)
+        {
+          if (./onedrivePurge.ps1 -Site ${{ inputs.site }} -LibraryNameList "${{ inputs.libraries }}".split(",") -FolderPrefixPurgeList ${{ inputs.folder-prefix }} -LibraryPrefixDeleteList ${{ inputs.library-prefix && inputs.library-prefix || '[]' }} -PurgeBeforeTimestamp ${{ inputs.older-than }}) {
+            break
+          }
+        }
+

.github/actions/teams-message/action.yml

@@ -1,4 +1,5 @@
 name: Send a message to Teams
+description: Send messages to communication apps.
 
 inputs:
   msg:

.github/actions/website-linting/action.yml

@@ -1,4 +1,5 @@
 name: Lint Website
+description: Lint website content.
 
 inputs:
   version:

.github/workflows/binary-publish.yml

@@ -40,5 +40,5 @@ jobs:
         if: failure()
         uses: ./.github/actions/teams-message
         with:
-          msg: "[FAILED] Publishing Binary"
+          msg: "[CORSO FAILED] Publishing Binary"
           teams_url: ${{ secrets.TEAMS_CORSO_CI_WEBHOOK_URL }}

.github/workflows/ci.yml

@@ -463,7 +463,7 @@ jobs:
           go-version-file: src/go.mod
 
       - name: Go Lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           # Keep pinned to a verson as sometimes updates will add new lint
           # failures in unchanged code.

.github/workflows/ci_test_cleanup.yml

@@ -12,7 +12,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        user: [ CORSO_M365_TEST_USER_ID, CORSO_SECONDARY_M365_TEST_USER_ID, '' ]
+        user: [CORSO_M365_TEST_USER_ID, CORSO_SECONDARY_M365_TEST_USER_ID, ""]
 
     steps:
       - uses: actions/checkout@v4
@@ -33,12 +33,15 @@ jobs:
           azure-tenant-id: ${{ secrets.TENANT_ID }}
           m365-admin-user: ${{ secrets.M365_TENANT_ADMIN_USER }}
           m365-admin-password: ${{ secrets.M365_TENANT_ADMIN_PASSWORD }}
+          azure-pnp-client-id: ${{ secrets.AZURE_PNP_CLIENT_ID }}
+          azure-pnp-client-cert: ${{ secrets.AZURE_PNP_CLIENT_CERT }}
+          tenant-domain: ${{ vars.TENANT_DOMAIN }}
 
       - name: Notify failure in teams
         if: failure()
         uses: ./.github/actions/teams-message
         with:
-          msg: "[FAILED] ${{ vars[matrix.user] }} CI Cleanup"
+          msg: "[CORSO FAILED] ${{ vars[matrix.user] }} CI Cleanup"
           teams_url: ${{ secrets.TEAMS_CORSO_CI_WEBHOOK_URL }}
 
   Test-Site-Data-Cleanup:
@@ -47,7 +50,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        site: [ CORSO_M365_TEST_SITE_URL, CORSO_M365_TEST_GROUPS_SITE_URL ] 
+        site: [CORSO_M365_TEST_SITE_URL, CORSO_M365_TEST_GROUPS_SITE_URL]
 
     steps:
       - uses: actions/checkout@v4
@@ -70,10 +73,13 @@ jobs:
           azure-tenant-id: ${{ secrets.TENANT_ID }}
           m365-admin-user: ${{ secrets.M365_TENANT_ADMIN_USER }}
           m365-admin-password: ${{ secrets.M365_TENANT_ADMIN_PASSWORD }}
+          azure-pnp-client-id: ${{ secrets.AZURE_PNP_CLIENT_ID }}
+          azure-pnp-client-cert: ${{ secrets.AZURE_PNP_CLIENT_CERT }}
+          tenant-domain: ${{ vars.TENANT_DOMAIN }}
 
       - name: Notify failure in teams
         if: failure()
         uses: ./.github/actions/teams-message
         with:
-          msg: "[FAILED] ${{ vars[matrix.site] }} CI Cleanup"
+          msg: "[CORSO FAILED] ${{ vars[matrix.site] }} CI Cleanup"
           teams_url: ${{ secrets.TEAMS_CORSO_CI_WEBHOOK_URL }}

.github/workflows/load_test.yml

@@ -155,3 +155,6 @@ jobs:
           azure-tenant-id: ${{ secrets.TENANT_ID }}
           m365-admin-user: ${{ secrets.M365_TENANT_ADMIN_USER }}
           m365-admin-password: ${{ secrets.M365_TENANT_ADMIN_PASSWORD }}
+          azure-pnp-client-id: ${{ secrets.AZURE_PNP_CLIENT_ID }}
+          azure-pnp-client-cert: ${{ secrets.AZURE_PNP_CLIENT_CERT }}
+          tenant-domain: ${{ vars.TENANT_DOMAIN }}

.github/workflows/longevity_test.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
     inputs:
       user:
-        description: 'User to run longevity test on'
+        description: "User to run longevity test on"
 
 permissions:
   # required to retrieve AWS credentials
@@ -23,7 +23,7 @@ jobs:
     uses: alcionai/corso/.github/workflows/accSelector.yaml@main
 
   Longevity-Tests:
-    needs: [ SetM365App ]
+    needs: [SetM365App]
     environment: Testing
     runs-on: ubuntu-latest
     env:
@@ -37,7 +37,7 @@ jobs:
       CORSO_LOG_FILE: ${{ github.workspace }}/src/testlog/run-longevity.log
       RESTORE_DEST_PFX: Corso_Test_Longevity_
       TEST_USER: ${{ github.event.inputs.user != '' && github.event.inputs.user || vars.CORSO_M365_TEST_USER_ID }}
-      PREFIX: 'longevity'
+      PREFIX: "longevity"
 
       # Options for retention.
       RETENTION_MODE: GOVERNANCE
@@ -46,7 +46,7 @@ jobs:
     defaults:
       run:
         working-directory: src
-        
+
     ############################################################################
     # setup
     steps:
@@ -78,7 +78,7 @@ jobs:
 
       - run: go build -o corso
         timeout-minutes: 10
-      
+
       - run: mkdir ${CORSO_LOG_DIR}
 
         # Use shorter-lived credentials obtained from assume-role since these
@@ -113,7 +113,6 @@ jobs:
             --extend-retention \
             --prefix ${{ env.PREFIX }} \
             --bucket ${{ secrets.CI_RETENTION_TESTS_S3_BUCKET }} \
-            --succeed-if-exists \
             2>&1 | tee ${{ env.CORSO_LOG_DIR }}/gotest-repo-init.log
 
           if  grep -q 'Failed to' ${{ env.CORSO_LOG_DIR }}/gotest-repo-init.log
@@ -164,7 +163,7 @@ jobs:
 
           data=$( echo $resultjson | jq -r '.[0] | .id' )
           echo result=$data >> $GITHUB_OUTPUT
- 
+
       ##########################################################################
       # Onedrive
 
@@ -329,7 +328,7 @@ jobs:
           --hide-progress \
           --force \
           --json \
-          2>&1 | tee ${{ env.CORSO_LOG_DIR }}/maintenance_metadata.txt 
+          2>&1 | tee ${{ env.CORSO_LOG_DIR }}/maintenance_metadata.txt
 
       - name: Maintenance test Weekly
         id: maintenance-test-weekly
@@ -393,5 +392,5 @@ jobs:
         if: failure()
         uses: ./.github/actions/teams-message
         with:
-          msg: "[FAILED] Longevity Test"
+          msg: "[CORSO FAILED] Longevity Test"
           teams_url: ${{ secrets.TEAMS_CORSO_CI_WEBHOOK_URL }}

.github/workflows/nightly_test.yml

@@ -48,7 +48,7 @@ jobs:
   # ----------------------------------------------------------------------------------------------------
 
   Test-Suite-Trusted:
-    needs: [ Checkout, SetM365App] 
+    needs: [Checkout, SetM365App]
     environment: Testing
     runs-on: ubuntu-latest
     defaults:
@@ -100,9 +100,9 @@ jobs:
           -timeout 2h  \
           ./... 2>&1 | tee ./testlog/gotest-nightly.log | gotestfmt -hide successful-tests
 
-##########################################################################################################################################
+      ##########################################################################################################################################
 
-# Logging & Notifications
+      # Logging & Notifications
 
       # Upload the original go test output as an artifact for later review.
       - name: Upload test log
@@ -118,5 +118,5 @@ jobs:
         if: failure()
         uses: ./.github/actions/teams-message
         with:
-          msg: "[FAILED] Nightly Checks"
+          msg: "[COROS FAILED] Nightly Checks"
           teams_url: ${{ secrets.TEAMS_CORSO_CI_WEBHOOK_URL }}

.github/workflows/ok-to-test.yml

@@ -19,7 +19,7 @@ jobs:
           private_key: ${{ secrets.PRIVATE_KEY }}
 
       - name: Slash Command Dispatch
-        uses: peter-evans/slash-command-dispatch@v3
+        uses: peter-evans/slash-command-dispatch@v4
         env:
           TOKEN: ${{ steps.generate_token.outputs.token }}
         with:

.github/workflows/sanity-test.yaml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
     inputs:
       user:
-        description: 'User to run sanity test on'
+        description: "User to run sanity test on"
 
 permissions:
   # required to retrieve AWS credentials
@@ -23,7 +23,7 @@ jobs:
     uses: alcionai/corso/.github/workflows/accSelector.yaml@main
 
   Sanity-Tests:
-    needs: [ SetM365App ]
+    needs: [SetM365App]
     environment: Testing
     runs-on: ubuntu-latest
     env:
@@ -43,12 +43,11 @@ jobs:
     defaults:
       run:
         working-directory: src
-        
-##########################################################################################################################################
 
-# setup
+    ##########################################################################################################################################
+
+    # setup
     steps:
-
       - uses: actions/checkout@v4
 
       - name: Setup Golang with cache
@@ -64,9 +63,9 @@ jobs:
 
       - run: mkdir ${CORSO_LOG_DIR}
 
-##########################################################################################################################################
+      ##########################################################################################################################################
 
-# Pre-Run cleanup
+      # Pre-Run cleanup
 
       # unlike CI tests, sanity tests are not expected to run concurrently.
       # however, the sanity yaml concurrency is set to a maximum of 1 run, preferring
@@ -91,6 +90,9 @@ jobs:
           azure-tenant-id: ${{ secrets.TENANT_ID }}
           m365-admin-user: ${{ secrets.M365_TENANT_ADMIN_USER }}
           m365-admin-password: ${{ secrets.M365_TENANT_ADMIN_PASSWORD }}
+          azure-pnp-client-id: ${{ secrets.AZURE_PNP_CLIENT_ID }}
+          azure-pnp-client-cert: ${{ secrets.AZURE_PNP_CLIENT_CERT }}
+          tenant-domain: ${{ vars.TENANT_DOMAIN }}
 
       - name: Purge CI-Produced Folders for Sites
         timeout-minutes: 30
@@ -99,17 +101,20 @@ jobs:
         with:
           site: ${{ vars.CORSO_M365_TEST_SITE_URL }}
           folder-prefix: ${{ env.RESTORE_DEST_PFX }}
-          libraries: ${{ vars.CORSO_M365_TEST_SITE_LIBRARIES }} 
+          libraries: ${{ vars.CORSO_M365_TEST_SITE_LIBRARIES }}
           older-than: ${{ env.NOW }}
           azure-client-id: ${{ secrets[needs.SetM365App.outputs.client_id_env] }}
           azure-client-secret: ${{ secrets[needs.SetM365App.outputs.client_secret_env] }}
           azure-tenant-id: ${{ secrets.TENANT_ID }}
           m365-admin-user: ${{ secrets.M365_TENANT_ADMIN_USER }}
           m365-admin-password: ${{ secrets.M365_TENANT_ADMIN_PASSWORD }}
+          azure-pnp-client-id: ${{ secrets.AZURE_PNP_CLIENT_ID }}
+          azure-pnp-client-cert: ${{ secrets.AZURE_PNP_CLIENT_CERT }}
+          tenant-domain: ${{ vars.TENANT_DOMAIN }}
 
-##########################################################################################################################################
+      ##########################################################################################################################################
 
-# Repository commands
+      # Repository commands
 
       - name: Version Test
         timeout-minutes: 10
@@ -169,9 +174,9 @@ jobs:
             --mode complete \
             2>&1 | tee ${{ env.CORSO_LOG_DIR }}/gotest-repo-maintenance.log
 
-##########################################################################################################################################
+      ##########################################################################################################################################
 
-# Exchange
+      # Exchange
 
       # generate new entries to roll into the next load test
       # only runs if the test was successful
@@ -193,8 +198,8 @@ jobs:
           service: exchange
           kind: first-backup
           backup-args: '--mailbox "${{ env.TEST_USER }}" --data "email"'
-          restore-args: '--email-folder ${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}'
+          restore-args: "--email-folder ${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}"
-          restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}'
+          restore-container: "${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}"
           log-dir: ${{ env.CORSO_LOG_DIR }}
           with-export: true
 
@@ -206,8 +211,8 @@ jobs:
           service: exchange
           kind: incremental
           backup-args: '--mailbox "${{ env.TEST_USER }}" --data "email"'
-          restore-args: '--email-folder ${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}'
+          restore-args: "--email-folder ${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}"
-          restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}'
+          restore-container: "${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}"
           backup-id: ${{ steps.exchange-backup.outputs.backup-id }}
           log-dir: ${{ env.CORSO_LOG_DIR }}
           with-export: true
@@ -220,8 +225,8 @@ jobs:
           service: exchange
           kind: non-delta
           backup-args: '--mailbox "${{ env.TEST_USER }}" --data "email" --disable-delta'
-          restore-args: '--email-folder ${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}'
+          restore-args: "--email-folder ${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}"
-          restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}'
+          restore-container: "${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}"
           backup-id: ${{ steps.exchange-backup.outputs.backup-id }}
           log-dir: ${{ env.CORSO_LOG_DIR }}
           with-export: true
@@ -234,16 +239,15 @@ jobs:
           service: exchange
           kind: non-delta-incremental
           backup-args: '--mailbox "${{ env.TEST_USER }}" --data "email"'
-          restore-args: '--email-folder ${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}'
+          restore-args: "--email-folder ${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}"
-          restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}'
+          restore-container: "${{ env.RESTORE_DEST_PFX }}${{ steps.repo-init.outputs.result }}"
           backup-id: ${{ steps.exchange-backup.outputs.backup-id }}
           log-dir: ${{ env.CORSO_LOG_DIR }}
           with-export: true
 
+      ##########################################################################################################################################
 
-##########################################################################################################################################
+      # Onedrive
-
-# Onedrive
 
       # generate new entries for test
       - name: OneDrive - Create new data
@@ -270,8 +274,8 @@ jobs:
           service: onedrive
           kind: first-backup
           backup-args: '--user "${{ env.TEST_USER }}"'
-          restore-args: '--folder ${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-onedrive.outputs.result }}'
+          restore-args: "--folder ${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-onedrive.outputs.result }}"
-          restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-onedrive.outputs.result }}'
+          restore-container: "${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-onedrive.outputs.result }}"
           log-dir: ${{ env.CORSO_LOG_DIR }}
           with-export: true
 
@@ -295,14 +299,14 @@ jobs:
           service: onedrive
           kind: incremental
           backup-args: '--user "${{ env.TEST_USER }}"'
-          restore-args: '--folder ${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-onedrive.outputs.result }}'
+          restore-args: "--folder ${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-onedrive.outputs.result }}"
-          restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-onedrive.outputs.result }}'
+          restore-container: "${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-onedrive.outputs.result }}"
           log-dir: ${{ env.CORSO_LOG_DIR }}
           with-export: true
 
-##########################################################################################################################################
+      ##########################################################################################################################################
 
-# Sharepoint Library
+      # Sharepoint Library
 
       # generate new entries for test
       - name: SharePoint - Create new data
@@ -330,8 +334,8 @@ jobs:
           service: sharepoint
           kind: first-backup
           backup-args: '--site "${{ vars.CORSO_M365_TEST_SITE_URL }}" --data libraries'
-          restore-args: '--folder ${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-sharepoint.outputs.result }}'
+          restore-args: "--folder ${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-sharepoint.outputs.result }}"
-          restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-sharepoint.outputs.result }}'
+          restore-container: "${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-sharepoint.outputs.result }}"
           log-dir: ${{ env.CORSO_LOG_DIR }}
           with-export: true
           category: libraries
@@ -357,15 +361,15 @@ jobs:
           service: sharepoint
           kind: incremental
           backup-args: '--site "${{ vars.CORSO_M365_TEST_SITE_URL }}" --data libraries'
-          restore-args: '--folder ${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-sharepoint.outputs.result }}'
+          restore-args: "--folder ${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-sharepoint.outputs.result }}"
-          restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-sharepoint.outputs.result }}'
+          restore-container: "${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-sharepoint.outputs.result }}"
           log-dir: ${{ env.CORSO_LOG_DIR }}
           with-export: true
           category: libraries
 
-##########################################################################################################################################
+      ##########################################################################################################################################
 
-# Sharepoint Lists
+      # Sharepoint Lists
 
       # generate new entries for test
       # The `awk | tr | sed` command chain is used to get a comma separated list of SharePoint list names.
@@ -418,7 +422,7 @@ jobs:
         working-directory: ./src/cmd/factory
         run: |
           suffix=$(date +"%Y-%m-%d_%H-%M-%S")
-          
+
           go run . sharepoint lists  \
             --site ${{ vars.CORSO_M365_TEST_SITE_URL }} \
             --user ${{ env.TEST_USER }} \
@@ -454,9 +458,9 @@ jobs:
           category: lists
           on-collision: copy
 
-##########################################################################################################################################
+      ##########################################################################################################################################
 
-# Groups and Teams
+      # Groups and Teams
 
       # generate new entries for test
       - name: Groups - Create new data
@@ -483,8 +487,8 @@ jobs:
         with:
           service: groups
           kind: first-backup
-          backup-args: '--group "${{ vars.CORSO_M365_TEST_TEAM_ID }}"'
+          backup-args: '--group "${{ vars.CORSO_M365_TEST_TEAM_ID }}" --data messages,libraries'
-          restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-groups.outputs.result }}'
+          restore-container: "${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-groups.outputs.result }}"
           log-dir: ${{ env.CORSO_LOG_DIR }}
           with-export: true
 
@@ -508,15 +512,15 @@ jobs:
         with:
           service: groups
           kind: incremental
-          backup-args: '--group "${{ vars.CORSO_M365_TEST_TEAM_ID }}"'
+          backup-args: '--group "${{ vars.CORSO_M365_TEST_TEAM_ID }}" --data messages,libraries'
           restore-args: '--site "${{ vars.CORSO_M365_TEST_GROUPS_SITE_URL }}" --folder ${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-groups.outputs.result }}'
-          restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-groups.outputs.result }}'
+          restore-container: "${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-groups.outputs.result }}"
           log-dir: ${{ env.CORSO_LOG_DIR }}
           with-export: true
 
-##########################################################################################################################################
+      ##########################################################################################################################################
 
-# Logging & Notifications
+      # Logging & Notifications
 
       # Upload the original go test output as an artifact for later review.
       - name: Upload test log
@@ -532,5 +536,5 @@ jobs:
         if: failure()
         uses: ./.github/actions/teams-message
         with:
-          msg: "[FAILED] Sanity Tests"
+          msg: "[CORSO FAILED] Sanity Tests"
           teams_url: ${{ secrets.TEAMS_CORSO_CI_WEBHOOK_URL }}

CHANGELOG.md

@@ -6,13 +6,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased] (beta)
+### Fixed
+- Handle the case where an email or event cannot be retrieved from Exchange due to an `ErrorCorruptData` error. Corso will skip over the item but report it in the backup summary.
+- Emails attached within other emails are now correctly exported
+- Gracefully handle email and post attachments without name when exporting to eml
+- Use correct timezone for event start and end times in Exchange exports (helps fix issues in relative recurrence patterns)
+- Fixed an issue causing exports dealing with calendar data to have high memory usage
+
+## [v0.19.0] (beta) - 2024-02-06
 
 ### Added
 - Events can now be exported from Exchange backups as .ics files.
 - Update repo init configuration to reduce the total number of GET requests sent
   to the object store when using corso. This affects repos that have many
   backups created in them per day the most.
-- Group mailbox emails can now be exported as `.eml` files.
+- Feature Preview: Corso now supports backup, export & restore of SharePoint lists. Lists backup can be initiated using `corso backup create sharepoint --site <site-url> --data lists`.
+- Group mailbox(aka conversations) backup and export support is now officially available. Group mailbox posts can be exported as `.eml` files.
 
 ### Fixed
 - Retry transient 400 "invalidRequest" errors during onedrive & sharepoint backup.
@@ -33,6 +42,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Exchange in-place restore may restore items in well-known folders to different folders if the user has well-known folder names change based on locale and has updated the locale since the backup was created.
 - In-place Exchange contacts restore will merge items in folders named "Contacts" or "contacts" into the default folder.
 - External users with access through shared links will not receive these links as they are not sent via email during restore.
+- Graph API has limited support for certain column types such as `location`, `hyperlink/picture`, and `metadata`. Restoring SharePoint list items containing these columns will result in differences compared to the original items.
+- SharePoint list item attachments are not available due to graph API limitations.
+- Group mailbox restore is not supported due to limited Graph API support for creating mailbox items.
+- Due to Graph API limitations, any group mailbox items present in subfolders other than Inbox aren't backed up.
 
 ## [v0.18.0] (beta) - 2024-01-02
 
@@ -489,7 +502,8 @@ this case, Corso will skip over the item but report this in the backup summary.
 - Miscellaneous
   - Optional usage statistics reporting ([RM-35](https://github.com/alcionai/corso-roadmap/issues/35))
 
-[Unreleased]: https://github.com/alcionai/corso/compare/v0.18.0...HEAD
+[Unreleased]: https://github.com/alcionai/corso/compare/v0.19.0...HEAD
+[v0.19.0]: https://github.com/alcionai/corso/compare/v0.18.0...v0.19.0
 [v0.18.0]: https://github.com/alcionai/corso/compare/v0.17.0...v0.18.0
 [v0.17.0]: https://github.com/alcionai/corso/compare/v0.16.0...v0.17.0
 [v0.16.0]: https://github.com/alcionai/corso/compare/v0.15.0...v0.16.0

README.md

@@ -1,3 +1,6 @@
+> [!NOTE] 
+> **The Corso project is no longer actively maintained and has been archived**.
+
 <p align="center">
     <img src="https://github.com/alcionai/corso/blob/main/website/static/img/corso_logo.svg?raw=true" alt="Corso Logo" width="100" />
 </p>

src/cli/backup/exchange_e2e_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/alcionai/corso/src/internal/common/idname"
 	"github.com/alcionai/corso/src/internal/operations"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/config"
 	"github.com/alcionai/corso/src/pkg/path"
@@ -39,7 +40,7 @@ var (
 type NoBackupExchangeE2ESuite struct {
 	tester.Suite
 	dpnd dependencies
-	its  intgTesterSetup
+	m365 its.M365IntgTestSetup
 }
 
 func TestNoBackupExchangeE2ESuite(t *testing.T) {
@@ -54,7 +55,7 @@ func (suite *NoBackupExchangeE2ESuite) SetupSuite() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.ExchangeService)
 }
 
@@ -93,7 +94,7 @@ func (suite *NoBackupExchangeE2ESuite) TestExchangeBackupListCmd_noBackups() {
 type BackupExchangeE2ESuite struct {
 	tester.Suite
 	dpnd dependencies
-	its  intgTesterSetup
+	m365 its.M365IntgTestSetup
 }
 
 func TestBackupExchangeE2ESuite(t *testing.T) {
@@ -108,7 +109,7 @@ func (suite *BackupExchangeE2ESuite) SetupSuite() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.ExchangeService)
 }
 
@@ -138,7 +139,7 @@ func runExchangeBackupCategoryTest(suite *BackupExchangeE2ESuite, category path.
 	cmd, ctx := buildExchangeBackupCmd(
 		ctx,
 		suite.dpnd.configFilePath,
-		suite.its.user.ID,
+		suite.m365.User.ID,
 		category.String(),
 		&recorder)
 
@@ -149,8 +150,11 @@ func runExchangeBackupCategoryTest(suite *BackupExchangeE2ESuite, category path.
 	result := recorder.String()
 	t.Log("backup results", result)
 
-	// as an offhand check: the result should contain the m365 user id
+	// As an offhand check: the result should contain the m365 user's email.
-	assert.Contains(t, result, suite.its.user.ID)
+	assert.Contains(
+		t,
+		strings.ToLower(result),
+		strings.ToLower(suite.m365.User.Provider.Name()))
 }
 
 func (suite *BackupExchangeE2ESuite) TestExchangeBackupCmd_ServiceNotEnabled_email() {
@@ -173,7 +177,7 @@ func runExchangeBackupServiceNotEnabledTest(suite *BackupExchangeE2ESuite, categ
 	cmd, ctx := buildExchangeBackupCmd(
 		ctx,
 		suite.dpnd.configFilePath,
-		fmt.Sprintf("%s,%s", tconfig.UnlicensedM365UserID(suite.T()), suite.its.user.ID),
+		fmt.Sprintf("%s,%s", tconfig.UnlicensedM365UserID(suite.T()), suite.m365.User.ID),
 		category.String(),
 		&recorder)
 	err := cmd.ExecuteContext(ctx)
@@ -182,8 +186,11 @@ func runExchangeBackupServiceNotEnabledTest(suite *BackupExchangeE2ESuite, categ
 	result := recorder.String()
 	t.Log("backup results", result)
 
-	// as an offhand check: the result should contain the m365 user id
+	// As an offhand check: the result should contain the m365 user's email.
-	assert.Contains(t, result, suite.its.user.ID)
+	assert.Contains(
+		t,
+		strings.ToLower(result),
+		strings.ToLower(suite.m365.User.Provider.Name()))
 }
 
 func (suite *BackupExchangeE2ESuite) TestExchangeBackupCmd_userNotFound_email() {
@@ -242,7 +249,7 @@ func (suite *BackupExchangeE2ESuite) TestBackupCreateExchange_badAzureClientIDFl
 
 	cmd := cliTD.StubRootCmd(
 		"backup", "create", "exchange",
-		"--user", suite.its.user.ID,
+		"--user", suite.m365.User.ID,
 		"--azure-client-id", "invalid-value")
 	cli.BuildCommandTree(cmd)
 
@@ -266,7 +273,7 @@ func (suite *BackupExchangeE2ESuite) TestBackupCreateExchange_fromConfigFile() {
 
 	cmd := cliTD.StubRootCmd(
 		"backup", "create", "exchange",
-		"--user", suite.its.user.ID,
+		"--user", suite.m365.User.ID,
 		"--"+flags.ConfigFileFN, suite.dpnd.configFilePath)
 	cli.BuildCommandTree(cmd)
 
@@ -281,8 +288,11 @@ func (suite *BackupExchangeE2ESuite) TestBackupCreateExchange_fromConfigFile() {
 	result := suite.dpnd.recorder.String()
 	t.Log("backup results", result)
 
-	// as an offhand check: the result should contain the m365 user id
+	// As an offhand check: the result should contain the m365 user's email.
-	assert.Contains(t, result, suite.its.user.ID)
+	assert.Contains(
+		t,
+		strings.ToLower(result),
+		strings.ToLower(suite.m365.User.Provider.Name()))
 }
 
 // AWS flags
@@ -296,7 +306,7 @@ func (suite *BackupExchangeE2ESuite) TestBackupCreateExchange_badAWSFlags() {
 
 	cmd := cliTD.StubRootCmd(
 		"backup", "create", "exchange",
-		"--user", suite.its.user.ID,
+		"--user", suite.m365.User.ID,
 		"--aws-access-key", "invalid-value",
 		"--aws-secret-access-key", "some-invalid-value")
 	cli.BuildCommandTree(cmd)
@@ -319,7 +329,7 @@ type PreparedBackupExchangeE2ESuite struct {
 	tester.Suite
 	dpnd      dependencies
 	backupOps map[path.CategoryType]string
-	its       intgTesterSetup
+	m365      its.M365IntgTestSetup
 }
 
 func TestPreparedBackupExchangeE2ESuite(t *testing.T) {
@@ -336,13 +346,13 @@ func (suite *PreparedBackupExchangeE2ESuite) SetupSuite() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.ExchangeService)
 	suite.backupOps = make(map[path.CategoryType]string)
 
 	var (
-		users = []string{suite.its.user.ID}
+		users = []string{suite.m365.User.ID}
-		ins   = idname.NewCache(map[string]string{suite.its.user.ID: suite.its.user.ID})
+		ins   = idname.NewCache(map[string]string{suite.m365.User.ID: suite.m365.User.ID})
 	)
 
 	for _, set := range []path.CategoryType{email, contacts, events} {

src/cli/backup/groups.go

@@ -35,9 +35,12 @@ const (
 	groupsServiceCommandCreateExamples = `# Backup all Groups and Teams data for the Marketing group
 corso backup create groups --group Marketing
 
-# Backup only Teams conversations messages
+# Backup only Teams channel messages
 corso backup create groups --group Marketing --data messages
 
+# Backup only group mailbox posts
+corso backup create groups --group Marketing --data conversations
+
 # Backup all Groups and Teams data for all groups
 corso backup create groups --group '*'`
 
@@ -50,7 +53,10 @@ corso backup details groups --backup 1234abcd-12ab-cd34-56de-1234abcd
 
 # Explore Marketing messages posted after the start of 2022
 corso backup details groups --backup 1234abcd-12ab-cd34-56de-1234abcd \
-    --last-message-reply-after 2022-01-01T00:00:00`
+    --last-message-reply-after 2022-01-01T00:00:00
+
+# Explore group mailbox posts with conversation subject "hello world"
+corso backup details groups --backup 1234abcd-12ab-cd34-56de-1234abcd --conversation "hello world"`
 )
 
 // called by backup.go to map subcommands to provider-specific handling.

src/cli/backup/groups_e2e_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/alcionai/corso/src/internal/common/idname"
 	"github.com/alcionai/corso/src/internal/operations"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/config"
 	"github.com/alcionai/corso/src/pkg/path"
@@ -35,7 +36,7 @@ import (
 type NoBackupGroupsE2ESuite struct {
 	tester.Suite
 	dpnd dependencies
-	its  intgTesterSetup
+	m365 its.M365IntgTestSetup
 }
 
 func TestNoBackupGroupsE2ESuite(t *testing.T) {
@@ -50,7 +51,7 @@ func (suite *NoBackupGroupsE2ESuite) SetupSuite() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.GroupsService)
 }
 
@@ -89,7 +90,7 @@ func (suite *NoBackupGroupsE2ESuite) TestGroupsBackupListCmd_noBackups() {
 type BackupGroupsE2ESuite struct {
 	tester.Suite
 	dpnd dependencies
-	its  intgTesterSetup
+	m365 its.M365IntgTestSetup
 }
 
 func TestBackupGroupsE2ESuite(t *testing.T) {
@@ -104,7 +105,7 @@ func (suite *BackupGroupsE2ESuite) SetupSuite() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.GroupsService)
 }
 
@@ -113,6 +114,8 @@ func (suite *BackupGroupsE2ESuite) TestGroupsBackupCmd_channelMessages() {
 }
 
 func (suite *BackupGroupsE2ESuite) TestGroupsBackupCmd_conversations() {
+	// skip
+	suite.T().Skip("CorsoCITeam group mailbox backup is broken")
 	runGroupsBackupCategoryTest(suite, flags.DataConversations)
 }
 
@@ -134,7 +137,7 @@ func runGroupsBackupCategoryTest(suite *BackupGroupsE2ESuite, category string) {
 	cmd, ctx := buildGroupsBackupCmd(
 		ctx,
 		suite.dpnd.configFilePath,
-		suite.its.group.ID,
+		suite.m365.Group.ID,
 		category,
 		&recorder)
 
@@ -202,7 +205,7 @@ func (suite *BackupGroupsE2ESuite) TestBackupCreateGroups_badAzureClientIDFlag()
 
 	cmd := cliTD.StubRootCmd(
 		"backup", "create", "groups",
-		"--group", suite.its.group.ID,
+		"--group", suite.m365.Group.ID,
 		"--azure-client-id", "invalid-value")
 	cli.BuildCommandTree(cmd)
 
@@ -216,6 +219,9 @@ func (suite *BackupGroupsE2ESuite) TestBackupCreateGroups_badAzureClientIDFlag()
 }
 
 func (suite *BackupGroupsE2ESuite) TestBackupCreateGroups_fromConfigFile() {
+	// Skip
+	suite.T().Skip("CorsoCITeam group mailbox backup is broken")
+
 	t := suite.T()
 	ctx, flush := tester.NewContext(t)
 	ctx = config.SetViper(ctx, suite.dpnd.vpr)
@@ -226,7 +232,7 @@ func (suite *BackupGroupsE2ESuite) TestBackupCreateGroups_fromConfigFile() {
 
 	cmd := cliTD.StubRootCmd(
 		"backup", "create", "groups",
-		"--group", suite.its.group.ID,
+		"--group", suite.m365.Group.ID,
 		"--"+flags.ConfigFileFN, suite.dpnd.configFilePath)
 	cli.BuildCommandTree(cmd)
 
@@ -250,7 +256,7 @@ func (suite *BackupGroupsE2ESuite) TestBackupCreateGroups_badAWSFlags() {
 
 	cmd := cliTD.StubRootCmd(
 		"backup", "create", "groups",
-		"--group", suite.its.group.ID,
+		"--group", suite.m365.Group.ID,
 		"--aws-access-key", "invalid-value",
 		"--aws-secret-access-key", "some-invalid-value")
 	cli.BuildCommandTree(cmd)
@@ -273,7 +279,7 @@ type PreparedBackupGroupsE2ESuite struct {
 	tester.Suite
 	dpnd      dependencies
 	backupOps map[path.CategoryType]string
-	its       intgTesterSetup
+	m365      its.M365IntgTestSetup
 }
 
 func TestPreparedBackupGroupsE2ESuite(t *testing.T) {
@@ -290,16 +296,19 @@ func (suite *PreparedBackupGroupsE2ESuite) SetupSuite() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.GroupsService)
 	suite.backupOps = make(map[path.CategoryType]string)
 
 	var (
-		groups = []string{suite.its.group.ID}
+		groups = []string{suite.m365.Group.ID}
-		ins    = idname.NewCache(map[string]string{suite.its.group.ID: suite.its.group.ID})
+		ins    = idname.NewCache(map[string]string{suite.m365.Group.ID: suite.m365.Group.ID})
 		cats   = []path.CategoryType{
 			path.ChannelMessagesCategory,
-			path.ConversationPostsCategory,
+			// TODO(pandeyabs): CorsoCITeam group mailbox backup is currently broken because of invalid
+			// odata.NextLink which causes an infinite loop during paging. Disabling conversations tests while
+			// we go fix the group mailbox.
+			// path.ConversationPostsCategory,
 			path.LibrariesCategory,
 		}
 	)
@@ -453,6 +462,8 @@ func (suite *PreparedBackupGroupsE2ESuite) TestGroupsDetailsCmd_channelMessages(
 }
 
 func (suite *PreparedBackupGroupsE2ESuite) TestGroupsDetailsCmd_conversations() {
+	// skip
+	suite.T().Skip("CorsoCITeam group mailbox backup is broken")
 	runGroupsDetailsCmdTest(suite, path.ConversationPostsCategory)
 }
 

src/cli/backup/helpers_test.go

@@ -14,141 +14,16 @@ import (
 	"github.com/alcionai/corso/src/cli/flags"
 	"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/tester"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/account"
 	"github.com/alcionai/corso/src/pkg/config"
 	"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/repository"
-	"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/storage"
 	"github.com/alcionai/corso/src/pkg/storage/testdata"
 )
 
-// ---------------------------------------------------------------------------
-// Gockable client
-// ---------------------------------------------------------------------------
-
-// GockClient produces a new exchange api client that can be
-// mocked using gock.
-func gockClient(creds account.M365Config, counter *count.Bus) (api.Client, error) {
-	s, err := graph.NewGockService(creds, counter)
-	if err != nil {
-		return api.Client{}, err
-	}
-
-	li, err := graph.NewGockService(creds, counter, graph.NoTimeout())
-	if err != nil {
-		return api.Client{}, err
-	}
-
-	return api.Client{
-		Credentials: creds,
-		Stable:      s,
-		LargeItem:   li,
-	}, nil
-}
-
-// ---------------------------------------------------------------------------
-// Suite Setup
-// ---------------------------------------------------------------------------
-
-type ids struct {
-	ID                string
-	DriveID           string
-	DriveRootFolderID string
-}
-
-type intgTesterSetup struct {
-	acct   account.Account
-	ac     api.Client
-	gockAC api.Client
-	user   ids
-	site   ids
-	group  ids
-	team   ids
-}
-
-func newIntegrationTesterSetup(t *testing.T) intgTesterSetup {
-	its := intgTesterSetup{}
-
-	ctx, flush := tester.NewContext(t)
-	defer flush()
-
-	graph.InitializeConcurrencyLimiter(ctx, true, 4)
-
-	its.acct = tconfig.NewM365Account(t)
-	creds, err := its.acct.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	its.ac, err = api.NewClient(
-		creds,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(t, err, clues.ToCore(err))
-
-	its.gockAC, err = gockClient(creds, count.New())
-	require.NoError(t, err, clues.ToCore(err))
-
-	// user drive
-
-	uids := ids{}
-
-	uids.ID = tconfig.M365UserID(t)
-
-	userDrive, err := its.ac.Users().GetDefaultDrive(ctx, uids.ID)
-	require.NoError(t, err, clues.ToCore(err))
-
-	uids.DriveID = ptr.Val(userDrive.GetId())
-
-	userDriveRootFolder, err := its.ac.Drives().GetRootFolder(ctx, uids.DriveID)
-	require.NoError(t, err, clues.ToCore(err))
-
-	uids.DriveRootFolderID = ptr.Val(userDriveRootFolder.GetId())
-
-	its.user = uids
-
-	// site
-
-	sids := ids{}
-
-	sids.ID = tconfig.M365SiteID(t)
-
-	siteDrive, err := its.ac.Sites().GetDefaultDrive(ctx, sids.ID)
-	require.NoError(t, err, clues.ToCore(err))
-
-	sids.DriveID = ptr.Val(siteDrive.GetId())
-
-	siteDriveRootFolder, err := its.ac.Drives().GetRootFolder(ctx, sids.DriveID)
-	require.NoError(t, err, clues.ToCore(err))
-
-	sids.DriveRootFolderID = ptr.Val(siteDriveRootFolder.GetId())
-
-	its.site = sids
-
-	// group
-
-	gids := ids{}
-
-	// use of the TeamID is intentional here, so that we are assured
-	// the group has full usage of the teams api.
-	gids.ID = tconfig.M365TeamID(t)
-
-	its.group = gids
-
-	// team
-
-	tids := ids{}
-	tids.ID = tconfig.M365TeamID(t)
-	its.team = tids
-
-	return its
-}
-
 type dependencies struct {
 	st             storage.Storage
 	repo           repository.Repositoryer

src/cli/backup/sharepoint_e2e_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/alcionai/corso/src/internal/common/idname"
 	"github.com/alcionai/corso/src/internal/operations"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/backup/details"
 	"github.com/alcionai/corso/src/pkg/config"
@@ -89,7 +90,7 @@ func (suite *NoBackupSharePointE2ESuite) TestSharePointBackupListCmd_empty() {
 type BackupSharepointE2ESuite struct {
 	tester.Suite
 	dpnd dependencies
-	its  intgTesterSetup
+	m365 its.M365IntgTestSetup
 }
 
 func TestBackupSharepointE2ESuite(t *testing.T) {
@@ -104,7 +105,7 @@ func (suite *BackupSharepointE2ESuite) SetupSuite() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.SharePointService)
 }
 
@@ -128,7 +129,7 @@ func runSharepointBackupCategoryTest(suite *BackupSharepointE2ESuite, category s
 	cmd, ctx := buildSharepointBackupCmd(
 		ctx,
 		suite.dpnd.configFilePath,
-		suite.its.site.ID,
+		suite.m365.Site.ID,
 		category,
 		&recorder)
 
@@ -187,7 +188,7 @@ type PreparedBackupSharepointE2ESuite struct {
 	tester.Suite
 	dpnd      dependencies
 	backupOps map[path.CategoryType]string
-	its       intgTesterSetup
+	m365      its.M365IntgTestSetup
 }
 
 func TestPreparedBackupSharepointE2ESuite(t *testing.T) {
@@ -204,13 +205,13 @@ func (suite *PreparedBackupSharepointE2ESuite) SetupSuite() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.SharePointService)
 	suite.backupOps = make(map[path.CategoryType]string)
 
 	var (
-		sites = []string{suite.its.site.ID}
+		sites = []string{suite.m365.Site.ID}
-		ins   = idname.NewCache(map[string]string{suite.its.site.ID: suite.its.site.ID})
+		ins   = idname.NewCache(map[string]string{suite.m365.Site.ID: suite.m365.Site.ID})
 		cats  = []path.CategoryType{
 			path.ListsCategory,
 		}

src/cli/backup/teamschats_e2e_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/alcionai/corso/src/internal/common/idname"
 	"github.com/alcionai/corso/src/internal/operations"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/config"
 	"github.com/alcionai/corso/src/pkg/path"
@@ -35,7 +36,7 @@ import (
 type NoBackupTeamsChatsE2ESuite struct {
 	tester.Suite
 	dpnd dependencies
-	its  intgTesterSetup
+	m365 its.M365IntgTestSetup
 }
 
 func TestNoBackupTeamsChatsE2ESuite(t *testing.T) {
@@ -46,11 +47,12 @@ func TestNoBackupTeamsChatsE2ESuite(t *testing.T) {
 
 func (suite *NoBackupTeamsChatsE2ESuite) SetupSuite() {
 	t := suite.T()
+	t.Skip("not fully implemented")
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.TeamsChatsService)
 }
 
@@ -89,7 +91,7 @@ func (suite *NoBackupTeamsChatsE2ESuite) TestTeamsChatsBackupListCmd_noBackups()
 type BackupTeamsChatsE2ESuite struct {
 	tester.Suite
 	dpnd dependencies
-	its  intgTesterSetup
+	m365 its.M365IntgTestSetup
 }
 
 func TestBackupTeamsChatsE2ESuite(t *testing.T) {
@@ -100,11 +102,12 @@ func TestBackupTeamsChatsE2ESuite(t *testing.T) {
 
 func (suite *BackupTeamsChatsE2ESuite) SetupSuite() {
 	t := suite.T()
+	t.Skip("not fully implemented")
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.TeamsChatsService)
 }
 
@@ -126,7 +129,7 @@ func runTeamsChatsBackupCategoryTest(suite *BackupTeamsChatsE2ESuite, category s
 	cmd, ctx := buildTeamsChatsBackupCmd(
 		ctx,
 		suite.dpnd.configFilePath,
-		suite.its.user.ID,
+		suite.m365.User.ID,
 		category,
 		&recorder)
 
@@ -186,7 +189,7 @@ func (suite *BackupTeamsChatsE2ESuite) TestBackupCreateTeamsChats_badAzureClient
 
 	cmd := cliTD.StubRootCmd(
 		"backup", "create", "chats",
-		"--teamschat", suite.its.user.ID,
+		"--teamschat", suite.m365.User.ID,
 		"--azure-client-id", "invalid-value")
 	cli.BuildCommandTree(cmd)
 
@@ -210,7 +213,7 @@ func (suite *BackupTeamsChatsE2ESuite) TestBackupCreateTeamsChats_fromConfigFile
 
 	cmd := cliTD.StubRootCmd(
 		"backup", "create", "chats",
-		"--teamschat", suite.its.user.ID,
+		"--teamschat", suite.m365.User.ID,
 		"--"+flags.ConfigFileFN, suite.dpnd.configFilePath)
 	cli.BuildCommandTree(cmd)
 
@@ -234,7 +237,7 @@ func (suite *BackupTeamsChatsE2ESuite) TestBackupCreateTeamsChats_badAWSFlags()
 
 	cmd := cliTD.StubRootCmd(
 		"backup", "create", "chats",
-		"--teamschat", suite.its.user.ID,
+		"--teamschat", suite.m365.User.ID,
 		"--aws-access-key", "invalid-value",
 		"--aws-secret-access-key", "some-invalid-value")
 	cli.BuildCommandTree(cmd)
@@ -257,7 +260,7 @@ type PreparedBackupTeamsChatsE2ESuite struct {
 	tester.Suite
 	dpnd      dependencies
 	backupOps map[path.CategoryType]string
-	its       intgTesterSetup
+	m365      its.M365IntgTestSetup
 }
 
 func TestPreparedBackupTeamsChatsE2ESuite(t *testing.T) {
@@ -270,17 +273,18 @@ func TestPreparedBackupTeamsChatsE2ESuite(t *testing.T) {
 
 func (suite *PreparedBackupTeamsChatsE2ESuite) SetupSuite() {
 	t := suite.T()
+	t.Skip("not fully implemented")
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	suite.its = newIntegrationTesterSetup(t)
+	suite.m365 = its.GetM365(t)
 	suite.dpnd = prepM365Test(t, ctx, path.TeamsChatsService)
 	suite.backupOps = make(map[path.CategoryType]string)
 
 	var (
-		teamschats = []string{suite.its.user.ID}
+		teamschats = []string{suite.m365.User.ID}
-		ins        = idname.NewCache(map[string]string{suite.its.user.ID: suite.its.user.ID})
+		ins        = idname.NewCache(map[string]string{suite.m365.User.ID: suite.m365.User.ID})
 		cats       = []path.CategoryType{
 			path.ChatsCategory,
 		}
@@ -487,6 +491,7 @@ func TestBackupDeleteTeamsChatsE2ESuite(t *testing.T) {
 
 func (suite *BackupDeleteTeamsChatsE2ESuite) SetupSuite() {
 	t := suite.T()
+	t.Skip("not fully implemented")
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()

src/cli/export/groups.go

@@ -50,7 +50,13 @@ corso export groups my-exports --backup 1234abcd-12ab-cd34-56de-1234abcd
 
 # Export all files and folders in folder "Documents/Finance Reports" that were created before 2020 to /my-exports
 corso export groups my-exports --backup 1234abcd-12ab-cd34-56de-1234abcd \
-    --folder "Documents/Finance Reports" --file-created-before 2020-01-01T00:00:00`
+    --folder "Documents/Finance Reports" --file-created-before 2020-01-01T00:00:00
+
+# Export all posts from a conversation with topic "hello world" from group mailbox's last backup to /my-exports
+corso export groups my-exports --backup 1234abcd-12ab-cd34-56de-1234abcd --conversation "hello world"
+
+# Export post with ID 98765abcdef from a conversation from group mailbox's last backup to /my-exports
+corso export groups my-exports --backup 1234abcd-12ab-cd34-56de-1234abcd --conversation "hello world" --post 98765abcdef`
 )
 
 // `corso export groups [<flag>...] <destination>`

src/cli/utils/groups.go

@@ -266,9 +266,14 @@ func IncludeGroupsRestoreDataSelectors(ctx context.Context, opts GroupsOpts) *se
 			opts.Conversations = selectors.Any()
 		}
 
+		// if no post is specified, select all posts in the conversation
+		if convPosts == 0 {
+			opts.Posts = selectors.Any()
+		}
+
 		// if no post is specified, only select conversations;
-		// otherwise, look for channel/message pairs
+		// otherwise, look for conv/post pairs
-		if chanMsgs == 0 {
+		if convs == 0 {
 			sel.Include(sel.Conversation(opts.Conversations))
 		} else {
 			sel.Include(sel.ConversationPosts(opts.Conversations, opts.Posts))

src/cmd/purge/scripts/onedrivePurge.ps1

@@ -6,12 +6,6 @@ Param (
     [Parameter(Mandatory = $False, HelpMessage = "Site for which to delete folders in SharePoint")]
     [String]$Site,
 
-    [Parameter(Mandatory = $False, HelpMessage = "Exchange Admin email")]
-    [String]$AdminUser = $ENV:M365_TENANT_ADMIN_USER,
-
-    [Parameter(Mandatory = $False, HelpMessage = "Exchange Admin password")]
-    [String]$AdminPwd = $ENV:M365_TENANT_ADMIN_PASSWORD,
-
     [Parameter(Mandatory = $False, HelpMessage = "Document library root. Can add multiple comma-separated values")]
     [String[]]$LibraryNameList = @(),
 
@@ -22,7 +16,16 @@ Param (
     [String[]]$FolderPrefixPurgeList,
 
     [Parameter(Mandatory = $False, HelpMessage = "Delete document libraries with this prefix")]
-    [String[]]$LibraryPrefixDeleteList = @()
+    [String[]]$LibraryPrefixDeleteList = @(),
+
+    [Parameter(Mandatory = $False, HelpMessage = "Tenant domain")]
+    [String]$TenantDomain = $ENV:TENANT_DOMAIN,
+
+    [Parameter(Mandatory = $False, HelpMessage = "Azure ClientId")]
+    [String]$ClientId = $ENV:AZURE_CLIENT_ID,
+
+    [Parameter(Mandatory = $False, HelpMessage = "Azure AppCert")]
+    [String]$AppCert = $ENV:AZURE_APP_CERT
 )
 
 Set-StrictMode -Version 2.0
@@ -37,7 +40,7 @@ function Get-TimestampFromFolderName {
 
     $name = $folder.Name
 
-    #fallback on folder create time 
+    #fallback on folder create time
     [datetime]$timestamp = $folder.TimeCreated
 
     try {
@@ -66,7 +69,7 @@ function Get-TimestampFromListName {
 
     $name = $list.Title
 
-    #fallback on list create time 
+    #fallback on list create time
     [datetime]$timestamp = $list.LastItemUserModifiedDate
 
     try {
@@ -106,8 +109,9 @@ function Purge-Library {
     Write-Host "`nPurging library: $LibraryName"
 
     $foldersToPurge = @()
-    $folders = Get-PnPFolderItem -FolderSiteRelativeUrl $LibraryName -ItemType Folder 
+    $folders = Get-PnPFolderItem -FolderSiteRelativeUrl $LibraryName -ItemType Folder
 
+    Write-Host "`nFolders: $folders"
     foreach ($f in $folders) {
         $folderName = $f.Name
         $createTime = Get-TimestampFromFolderName -Folder $f
@@ -159,7 +163,7 @@ function Delete-LibraryByPrefix {
     Write-Host "`nDeleting library: $LibraryNamePrefix"
 
     $listsToDelete = @()
-    $lists = Get-PnPList 
+    $lists = Get-PnPList
 
     foreach ($l in $lists) {
         $listName = $l.Title
@@ -183,7 +187,7 @@ function Delete-LibraryByPrefix {
             Write-Host "Deleting list: "$l.Title
             try {
                 $listInfo = Get-PnPList -Identity $l.Id | Select-Object -Property Hidden
-                
+
                 # Check if the 'hidden' property is true
                 if ($listInfo.Hidden) {
                     Write-Host "List: $($l.Title) is hidden. Skipping..."
@@ -209,8 +213,8 @@ if (-not (Get-Module -ListAvailable -Name PnP.PowerShell)) {
 }
 
 
-if ([string]::IsNullOrEmpty($AdminUser) -or [string]::IsNullOrEmpty($AdminPwd)) {
+if ([string]::IsNullOrEmpty($ClientId) -or [string]::IsNullOrEmpty($AppCert)) {
-    Write-Host "Admin user name and password required as arguments or environment variables."
+    Write-Host "ClientId and AppCert required as arguments or environment variables."
     Exit
 }
 
@@ -251,12 +255,8 @@ else {
     Exit
 }
 
-
-$password = convertto-securestring -String $AdminPwd -AsPlainText -Force
-$cred = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $AdminUser, $password
-
 Write-Host "`nAuthenticating and connecting to $SiteUrl"
-Connect-PnPOnline -Url $siteUrl -Credential $cred
+Connect-PnPOnline -Url $siteUrl -ClientId $ClientId -CertificateBase64Encoded $AppCert -Tenant $TenantDomain
 Write-Host "Connected to $siteUrl`n"
 
 # ensure that there are no unexpanded entries in the list of parameters

src/cmd/sanity_test/driveish/driveish.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/alcionai/clues"
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
+	"golang.org/x/exp/slices"
 
 	"github.com/alcionai/corso/src/cmd/sanity_test/common"
 	"github.com/alcionai/corso/src/internal/common/ptr"
@@ -20,19 +21,20 @@ const (
 // this increases the chance that we'll run into a race collision with
 // the cleanup script.  Sometimes that's okay (deleting old data that
 // isn't scrutinized in the test), other times it's not.  We mark whether
-// that's okay to do or not by specifying the folder that's being
+// that's okay to do or not by specifying the folders being
-// scrutinized for the test.  Any errors within that folder should cause
+// scrutinized for the test.  Any errors within those folders should cause
-// a fatal exit.  Errors outside of that folder get ignored.
+// a fatal exit.  Errors outside of those folders get ignored.
 //
-// since we're using folder names, requireNoErrorsWithinFolderName will
+// since we're using folder names, mustPopulateFolders will
 // work best (ie: have the fewest collisions/side-effects) if the folder
-// name is very specific.  Standard sanity tests should include timestamps,
+// names are very specific.  Standard sanity tests should include timestamps,
 // which should help ensure that.  Be warned if you try to use it with
 // a more generic name: unintended effects could occur.
 func populateSanitree(
 	ctx context.Context,
 	ac api.Client,
-	driveID, requireNoErrorsWithinFolderName string,
+	driveID string,
+	mustPopulateFolders []string,
 ) *common.Sanitree[models.DriveItemable, models.DriveItemable] {
 	common.Infof(ctx, "building sanitree for drive: %s", driveID)
 
@@ -56,8 +58,8 @@ func populateSanitree(
 		ac,
 		driveID,
 		stree.Name+"/",
-		requireNoErrorsWithinFolderName,
+		mustPopulateFolders,
-		rootName == requireNoErrorsWithinFolderName,
+		slices.Contains(mustPopulateFolders, rootName),
 		stree)
 
 	return stree
@@ -66,7 +68,9 @@ func populateSanitree(
 func recursivelyBuildTree(
 	ctx context.Context,
 	ac api.Client,
-	driveID, location, requireNoErrorsWithinFolderName string,
+	driveID string,
+	location string,
+	mustPopulateFolders []string,
 	isChildOfFolderRequiringNoErrors bool,
 	stree *common.Sanitree[models.DriveItemable, models.DriveItemable],
 ) {
@@ -80,9 +84,9 @@ func recursivelyBuildTree(
 
 		common.Infof(
 			ctx,
-			"ignoring error getting children in directory %q because it is not within directory %q\nerror: %s\n%+v",
+			"ignoring error getting children in directory %q because it is not within directory set %v\nerror: %s\n%+v",
 			location,
-			requireNoErrorsWithinFolderName,
+			mustPopulateFolders,
 			err.Error(),
 			clues.ToCore(err))
 
@@ -99,11 +103,12 @@ func recursivelyBuildTree(
 			// currently we don't restore blank folders.
 			// skip permission check for empty folders
 			if ptr.Val(driveItem.GetFolder().GetChildCount()) == 0 {
-				common.Infof(ctx, "skipped empty folder: %s/%s", location, itemName)
+				common.Infof(ctx, "skipped empty folder: %s%s", location, itemName)
 				continue
 			}
 
-			cannotAllowErrors := isChildOfFolderRequiringNoErrors || itemName == requireNoErrorsWithinFolderName
+			cannotAllowErrors := isChildOfFolderRequiringNoErrors ||
+				slices.Contains(mustPopulateFolders, itemName)
 
 			branch := &common.Sanitree[models.DriveItemable, models.DriveItemable]{
 				Parent: stree,
@@ -124,7 +129,7 @@ func recursivelyBuildTree(
 				ac,
 				driveID,
 				location+branch.Name+"/",
-				requireNoErrorsWithinFolderName,
+				mustPopulateFolders,
 				cannotAllowErrors,
 				branch)
 		}

src/cmd/sanity_test/driveish/export.go

@@ -32,7 +32,7 @@ func CheckExport(
 		ctx,
 		ac,
 		driveID,
-		envs.RestoreContainer)
+		[]string{envs.SourceContainer})
 
 	sourceTree, ok := root.Children[envs.SourceContainer]
 	common.Assert(

src/cmd/sanity_test/driveish/restore.go

@@ -45,7 +45,14 @@ func CheckRestoration(
 		"drive_id", driveID,
 		"drive_name", driveName)
 
-	root := populateSanitree(ctx, ac, driveID, envs.RestoreContainer)
+	root := populateSanitree(
+		ctx,
+		ac,
+		driveID,
+		[]string{
+			envs.SourceContainer,
+			envs.RestoreContainer,
+		})
 
 	sourceTree, ok := root.Children[envs.SourceContainer]
 	common.Assert(

src/go.mod

@@ -3,7 +3,7 @@ module github.com/alcionai/corso/src
 go 1.21
 
 replace (
-	github.com/kopia/kopia => github.com/alcionai/kopia v0.12.2-0.20240116215733-ec3d100029fe
+	github.com/kopia/kopia => github.com/alcionai/kopia v0.12.2-0.20240322180947-41471159a0a4
 
 	// Alcion fork removes the validation of email addresses as we might get incomplete email addresses
 	github.com/xhit/go-simple-mail/v2 v2.16.0 => github.com/alcionai/go-simple-mail/v2 v2.0.0-20231220071811-c70ebcd9a41a
@@ -121,7 +121,7 @@ require (
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/microsoft/kiota-serialization-text-go v1.0.0
 	github.com/minio/md5-simd v1.1.2 // indirect
-	github.com/minio/minio-go/v7 v7.0.66
+	github.com/minio/minio-go/v7 v7.0.67
 	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect

src/go.sum

@@ -23,8 +23,8 @@ github.com/alcionai/clues v0.0.0-20240125221452-9fc7746dd20c h1:QtARFaqYKtGjmEej
 github.com/alcionai/clues v0.0.0-20240125221452-9fc7746dd20c/go.mod h1:1YJwJy3W6GGsC2UiDAEWABUjgvT8OZHjKs8OoaXeKbw=
 github.com/alcionai/go-simple-mail/v2 v2.0.0-20231220071811-c70ebcd9a41a h1:4nhM0NM1qtUT1s55rQ+D0Xw1Re5mIU9/crjEl6KdE+k=
 github.com/alcionai/go-simple-mail/v2 v2.0.0-20231220071811-c70ebcd9a41a/go.mod h1:b7P5ygho6SYE+VIqpxA6QkYfv4teeyG4MKqB3utRu98=
-github.com/alcionai/kopia v0.12.2-0.20240116215733-ec3d100029fe h1:nLS5pxhm04Jz4+qeipNlxdyPGxqNWpBu8UGkRYpWoIw=
+github.com/alcionai/kopia v0.12.2-0.20240322180947-41471159a0a4 h1:3YZ70H3mkUgwiHLiNvukrqh2awRgfl1RAkbV0IoUqqk=
-github.com/alcionai/kopia v0.12.2-0.20240116215733-ec3d100029fe/go.mod h1:QFRSOUQzZfKE3hKVBHP7hxOn5WyrEmdBtfN5wkib/eA=
+github.com/alcionai/kopia v0.12.2-0.20240322180947-41471159a0a4/go.mod h1:QFRSOUQzZfKE3hKVBHP7hxOn5WyrEmdBtfN5wkib/eA=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -219,8 +219,8 @@ github.com/microsoftgraph/msgraph-sdk-go-core v1.0.1 h1:uq4qZD8VXLiNZY0t4NoRpLDo
 github.com/microsoftgraph/msgraph-sdk-go-core v1.0.1/go.mod h1:HUITyuFN556+0QZ/IVfH5K4FyJM7kllV6ExKi2ImKhE=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.66 h1:bnTOXOHjOqv/gcMuiVbN9o2ngRItvqE774dG9nq0Dzw=
+github.com/minio/minio-go/v7 v7.0.67 h1:BeBvZWAS+kRJm1vGTMJYVjKUNoo0FoEt/wUWdUtfmh8=
-github.com/minio/minio-go/v7 v7.0.66/go.mod h1:DHAgmyQEGdW3Cif0UooKOyrT3Vxs82zNdV6tkKhRtbs=
+github.com/minio/minio-go/v7 v7.0.67/go.mod h1:+UXocnUeZ3wHvVh5s95gcrA4YjMIbccT6ubB+1m054A=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=

src/internal/archive/zip.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/alcionai/corso/src/pkg/dttm"
 	"github.com/alcionai/corso/src/pkg/export"
+	"github.com/alcionai/corso/src/pkg/logger"
 )
 
 const (
@@ -56,12 +57,22 @@ func ZipExportCollection(
 		defer wr.Close()
 
 		buf := make([]byte, ZipCopyBufferSize)
+		counted := 0
+		log := logger.Ctx(ctx).
+			With("collection_count", len(expCollections))
 
 		for _, ec := range expCollections {
 			folder := ec.BasePath()
 			items := ec.Items(ctx)
 
 			for item := range items {
+				counted++
+
+				// Log every 1000 items that are processed
+				if counted%1000 == 0 {
+					log.Infow("progress zipping export items", "count_items", counted)
+				}
+
 				err := item.Error
 				if err != nil {
 					writer.CloseWithError(clues.Wrap(err, "getting export item").With("id", item.ID))
@@ -88,8 +99,12 @@ func ZipExportCollection(
 					writer.CloseWithError(clues.Wrap(err, "writing zip entry").With("name", name).With("id", item.ID))
 					return
 				}
+
+				item.Body.Close()
 			}
 		}
+
+		log.Infow("completed zipping export items", "count_items", counted)
 	}()
 
 	return zipCollection{reader}, nil

src/internal/common/jwt/jwt.go

@@ -1,10 +1,13 @@
 package jwt
 
 import (
+	"context"
 	"time"
 
 	"github.com/alcionai/clues"
 	jwt "github.com/golang-jwt/jwt/v5"
+
+	"github.com/alcionai/corso/src/pkg/logger"
 )
 
 // IsJWTExpired checks if the JWT token is past expiry by analyzing the
@@ -37,3 +40,51 @@ func IsJWTExpired(
 
 	return expired, nil
 }
+
+// GetJWTLifetime returns the issued at(iat) and expiration time(exp) claims
+// present in the JWT token. These are optional claims and may not be present
+// in the token. Absence is not reported as an error.
+//
+// An error is returned if the supplied token is malformed. Times are returned
+// in UTC to have parity with graph responses.
+func GetJWTLifetime(
+	ctx context.Context,
+	rawToken string,
+) (time.Time, time.Time, error) {
+	var (
+		issuedAt  time.Time
+		expiresAt time.Time
+	)
+
+	p := jwt.NewParser()
+
+	token, _, err := p.ParseUnverified(rawToken, &jwt.RegisteredClaims{})
+	if err != nil {
+		logger.CtxErr(ctx, err).Debug("parsing jwt token")
+		return time.Time{}, time.Time{}, clues.Wrap(err, "invalid jwt")
+	}
+
+	exp, err := token.Claims.GetExpirationTime()
+	if err != nil {
+		logger.CtxErr(ctx, err).Debug("extracting exp claim")
+		return time.Time{}, time.Time{}, clues.Wrap(err, "getting token expiry time")
+	}
+
+	iat, err := token.Claims.GetIssuedAt()
+	if err != nil {
+		logger.CtxErr(ctx, err).Debug("extracting iat claim")
+		return time.Time{}, time.Time{}, clues.Wrap(err, "getting token issued at time")
+	}
+
+	// Absence of iat or exp claims is not reported as an error by jwt library as these
+	// are optional as per spec.
+	if iat != nil {
+		issuedAt = iat.UTC()
+	}
+
+	if exp != nil {
+		expiresAt = exp.UTC()
+	}
+
+	return issuedAt, expiresAt, nil
+}

src/internal/common/jwt/jwt_test.go

@@ -113,3 +113,134 @@ func (suite *JWTUnitSuite) TestIsJWTExpired() {
 		})
 	}
 }
+
+func (suite *JWTUnitSuite) TestGetJWTLifetime() {
+	// Set of time values to be used in the tests.
+	// Truncate to seconds for comparisons since jwt tokens have second
+	// level precision.
+	idToTime := map[string]time.Time{
+		"T0": time.Now().UTC().Add(-time.Hour).Truncate(time.Second),
+		"T1": time.Now().UTC().Truncate(time.Second),
+		"T2": time.Now().UTC().Add(time.Hour).Truncate(time.Second),
+	}
+
+	table := []struct {
+		name       string
+		getToken   func() (string, error)
+		expectFunc func(t *testing.T, iat time.Time, exp time.Time)
+		expectErr  assert.ErrorAssertionFunc
+	}{
+		{
+			name: "alive token",
+			getToken: func() (string, error) {
+				return createJWTToken(
+					jwt.RegisteredClaims{
+						IssuedAt:  jwt.NewNumericDate(idToTime["T0"]),
+						ExpiresAt: jwt.NewNumericDate(idToTime["T1"]),
+					})
+			},
+			expectFunc: func(t *testing.T, iat time.Time, exp time.Time) {
+				assert.Equal(t, idToTime["T0"], iat)
+				assert.Equal(t, idToTime["T1"], exp)
+			},
+			expectErr: assert.NoError,
+		},
+		// Test with a token which is not generated using the go-jwt lib.
+		// This is a long lived token which is valid for 100 years.
+		{
+			name: "alive raw token with iat and exp claims",
+			getToken: func() (string, error) {
+				return rawToken, nil
+			},
+			expectFunc: func(t *testing.T, iat time.Time, exp time.Time) {
+				assert.Less(t, iat, time.Now(), "iat should be in the past")
+				assert.Greater(t, exp, time.Now(), "exp should be in the future")
+			},
+			expectErr: assert.NoError,
+		},
+		// Regardless of whether the token is expired or not, we should be able to
+		// extract the iat and exp claims from it without error.
+		{
+			name: "expired token",
+			getToken: func() (string, error) {
+				return createJWTToken(
+					jwt.RegisteredClaims{
+						IssuedAt:  jwt.NewNumericDate(idToTime["T1"]),
+						ExpiresAt: jwt.NewNumericDate(idToTime["T0"]),
+					})
+			},
+			expectFunc: func(t *testing.T, iat time.Time, exp time.Time) {
+				assert.Equal(t, idToTime["T1"], iat)
+				assert.Equal(t, idToTime["T0"], exp)
+			},
+			expectErr: assert.NoError,
+		},
+		{
+			name: "missing iat claim",
+			getToken: func() (string, error) {
+				return createJWTToken(
+					jwt.RegisteredClaims{
+						ExpiresAt: jwt.NewNumericDate(idToTime["T2"]),
+					})
+			},
+			expectFunc: func(t *testing.T, iat time.Time, exp time.Time) {
+				assert.Equal(t, time.Time{}, iat)
+				assert.Equal(t, idToTime["T2"], exp)
+			},
+			expectErr: assert.NoError,
+		},
+		{
+			name: "missing exp claim",
+			getToken: func() (string, error) {
+				return createJWTToken(
+					jwt.RegisteredClaims{
+						IssuedAt: jwt.NewNumericDate(idToTime["T0"]),
+					})
+			},
+			expectFunc: func(t *testing.T, iat time.Time, exp time.Time) {
+				assert.Equal(t, idToTime["T0"], iat)
+				assert.Equal(t, time.Time{}, exp)
+			},
+			expectErr: assert.NoError,
+		},
+		{
+			name: "both claims missing",
+			getToken: func() (string, error) {
+				return createJWTToken(jwt.RegisteredClaims{})
+			},
+			expectFunc: func(t *testing.T, iat time.Time, exp time.Time) {
+				assert.Equal(t, time.Time{}, iat)
+				assert.Equal(t, time.Time{}, exp)
+			},
+			expectErr: assert.NoError,
+		},
+		{
+			name: "malformed token",
+			getToken: func() (string, error) {
+				return "header.claims.signature", nil
+			},
+			expectFunc: func(t *testing.T, iat time.Time, exp time.Time) {
+				assert.Equal(t, time.Time{}, iat)
+				assert.Equal(t, time.Time{}, exp)
+			},
+			expectErr: assert.Error,
+		},
+	}
+
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+
+			ctx, flush := tester.NewContext(t)
+			defer flush()
+
+			token, err := test.getToken()
+			require.NoError(t, err)
+
+			iat, exp, err := GetJWTLifetime(ctx, token)
+			test.expectErr(t, err)
+
+			test.expectFunc(t, iat, exp)
+		})
+	}
+}

src/internal/common/str/str.go

@@ -59,6 +59,19 @@ func First(vs ...string) string {
 	return ""
 }
 
+// FirstIn returns the first entry in the map with a non-zero value
+// when iterating the provided list of keys.
+func FirstIn(m map[string]any, keys ...string) string {
+	for _, key := range keys {
+		v, err := AnyValueToString(key, m)
+		if err == nil && len(v) > 0 {
+			return v
+		}
+	}
+
+	return ""
+}
+
 // Preview reduces the string to the specified size.
 // If the string is longer than the size, the last three
 // characters are replaced with an ellipsis.  Size < 4

src/internal/common/str/str_test.go

@@ -118,3 +118,96 @@ func TestGenerateHash(t *testing.T) {
 		}
 	}
 }
+
+func TestFirstIn(t *testing.T) {
+	table := []struct {
+		name   string
+		m      map[string]any
+		keys   []string
+		expect string
+	}{
+		{
+			name:   "nil map",
+			keys:   []string{"foo", "bar"},
+			expect: "",
+		},
+		{
+			name:   "empty map",
+			m:      map[string]any{},
+			keys:   []string{"foo", "bar"},
+			expect: "",
+		},
+		{
+			name: "no match",
+			m: map[string]any{
+				"baz": "baz",
+			},
+			keys:   []string{"foo", "bar"},
+			expect: "",
+		},
+		{
+			name: "no keys",
+			m: map[string]any{
+				"baz": "baz",
+			},
+			keys:   []string{},
+			expect: "",
+		},
+		{
+			name: "nil match",
+			m: map[string]any{
+				"foo": nil,
+			},
+			keys:   []string{"foo", "bar"},
+			expect: "",
+		},
+		{
+			name: "empty match",
+			m: map[string]any{
+				"foo": "",
+			},
+			keys:   []string{"foo", "bar"},
+			expect: "",
+		},
+		{
+			name: "matches first key",
+			m: map[string]any{
+				"foo": "fnords",
+			},
+			keys:   []string{"foo", "bar"},
+			expect: "fnords",
+		},
+		{
+			name: "matches second key",
+			m: map[string]any{
+				"bar": "smarf",
+			},
+			keys:   []string{"foo", "bar"},
+			expect: "smarf",
+		},
+		{
+			name: "matches second key with nil first match",
+			m: map[string]any{
+				"foo": nil,
+				"bar": "smarf",
+			},
+			keys:   []string{"foo", "bar"},
+			expect: "smarf",
+		},
+		{
+			name: "matches second key with empty first match",
+			m: map[string]any{
+				"foo": "",
+				"bar": "smarf",
+			},
+			keys:   []string{"foo", "bar"},
+			expect: "smarf",
+		},
+	}
+	for _, test := range table {
+		t.Run(test.name, func(t *testing.T) {
+			result := FirstIn(test.m, test.keys...)
+			assert.Equal(t, test.expect, result)
+		})
+	}
+}

src/internal/converters/eml/eml.go

@@ -143,6 +143,121 @@ func getICalData(ctx context.Context, data models.Messageable) (string, error) {
 	return ics.FromEventable(ctx, event)
 }
 
+func getFileAttachment(ctx context.Context, attachment models.Attachmentable) (*mail.File, error) {
+	kind := ptr.Val(attachment.GetContentType())
+
+	bytes, err := attachment.GetBackingStore().Get("contentBytes")
+	if err != nil {
+		return nil, clues.WrapWC(ctx, err, "failed to get attachment bytes").
+			With("kind", kind)
+	}
+
+	if bytes == nil {
+		// TODO(meain): Handle non file attachments
+		// https://github.com/alcionai/corso/issues/4772
+		logger.Ctx(ctx).
+			With("attachment_id", ptr.Val(attachment.GetId()),
+				"attachment_type", ptr.Val(attachment.GetOdataType())).
+			Info("no contentBytes for attachment")
+
+		return nil, nil
+	}
+
+	bts, ok := bytes.([]byte)
+	if !ok {
+		return nil, clues.WrapWC(ctx, err, "invalid content bytes").
+			With("kind", kind).
+			With("interface_type", fmt.Sprintf("%T", bytes))
+	}
+
+	name := ptr.Val(attachment.GetName())
+	if len(name) == 0 {
+		// Graph as of now does not let us create any attachments
+		// without a name, but we have run into instances where we have
+		// see attachments without a name, possibly from old
+		// data. This is for those cases.
+		name = "Unnamed"
+	}
+
+	contentID, err := attachment.GetBackingStore().Get("contentId")
+	if err != nil {
+		return nil, clues.WrapWC(ctx, err, "getting content id for attachment").
+			With("kind", kind)
+	}
+
+	if contentID != nil {
+		cids, _ := str.AnyToString(contentID)
+		if len(cids) > 0 {
+			name = cids
+		}
+	}
+
+	return &mail.File{
+		// cannot use filename as inline attachment will not get mapped properly
+		Name:     name,
+		MimeType: kind,
+		Data:     bts,
+		Inline:   ptr.Val(attachment.GetIsInline()),
+	}, nil
+}
+
+func getItemAttachment(ctx context.Context, attachment models.Attachmentable) (*mail.File, error) {
+	it, err := attachment.GetBackingStore().Get("item")
+	if err != nil {
+		return nil, clues.WrapWC(ctx, err, "getting item for attachment").
+			With("attachment_id", ptr.Val(attachment.GetId()))
+	}
+
+	name := ptr.Val(attachment.GetName())
+	if len(name) == 0 {
+		// Graph as of now does not let us create any attachments
+		// without a name, but we have run into instances where we have
+		// see attachments without a name, possibly from old
+		// data. This is for those cases.
+		name = "Unnamed"
+	}
+
+	switch it := it.(type) {
+	case *models.Message:
+		cb, err := FromMessageable(ctx, it)
+		if err != nil {
+			return nil, clues.WrapWC(ctx, err, "converting item attachment to eml").
+				With("attachment_id", ptr.Val(attachment.GetId()))
+		}
+
+		return &mail.File{
+			Name:     name,
+			MimeType: "message/rfc822",
+			Data:     []byte(cb),
+		}, nil
+	default:
+		logger.Ctx(ctx).
+			With("attachment_id", ptr.Val(attachment.GetId()),
+				"attachment_type", ptr.Val(attachment.GetOdataType())).
+			Info("unknown item attachment type")
+	}
+
+	return nil, nil
+}
+
+func getMailAttachment(ctx context.Context, att models.Attachmentable) (*mail.File, error) {
+	otyp := ptr.Val(att.GetOdataType())
+
+	switch otyp {
+	case "#microsoft.graph.fileAttachment":
+		return getFileAttachment(ctx, att)
+	case "#microsoft.graph.itemAttachment":
+		return getItemAttachment(ctx, att)
+	default:
+		logger.Ctx(ctx).
+			With("attachment_id", ptr.Val(att.GetId()),
+				"attachment_type", otyp).
+			Info("unknown attachment type")
+
+		return nil, nil
+	}
+}
+
 // FromJSON converts a Messageable (as json) to .eml format
 func FromJSON(ctx context.Context, body []byte) (string, error) {
 	ctx = clues.Add(ctx, "body_len", len(body))
@@ -152,6 +267,11 @@ func FromJSON(ctx context.Context, body []byte) (string, error) {
 		return "", clues.WrapWC(ctx, err, "converting to messageble")
 	}
 
+	return FromMessageable(ctx, data)
+}
+
+// Converts a Messageable to .eml format
+func FromMessageable(ctx context.Context, data models.Messageable) (string, error) {
 	ctx = clues.Add(ctx, "item_id", ptr.Val(data.GetId()))
 
 	email := mail.NewMSG()
@@ -229,54 +349,16 @@ func FromJSON(ctx context.Context, body []byte) (string, error) {
 
 	if data.GetAttachments() != nil {
 		for _, attachment := range data.GetAttachments() {
-			kind := ptr.Val(attachment.GetContentType())
+			att, err := getMailAttachment(ctx, attachment)
-
-			bytes, err := attachment.GetBackingStore().Get("contentBytes")
 			if err != nil {
-				return "", clues.WrapWC(ctx, err, "failed to get attachment bytes").
+				return "", clues.WrapWC(ctx, err, "getting mail attachment")
-					With("kind", kind)
 			}
 
-			if bytes == nil {
+			// There are known cases where we just wanna log and
-				// TODO(meain): Handle non file attachments
+			// ignore instead of erroring out
-				// https://github.com/alcionai/corso/issues/4772
+			if att != nil {
-				logger.Ctx(ctx).
+				email.Attach(att)
-					With("attachment_id", ptr.Val(attachment.GetId()),
-						"attachment_type", ptr.Val(attachment.GetOdataType())).
-					Info("no contentBytes for attachment")
-
-				continue
 			}
-
-			bts, ok := bytes.([]byte)
-			if !ok {
-				return "", clues.WrapWC(ctx, err, "invalid content bytes").
-					With("kind", kind).
-					With("interface_type", fmt.Sprintf("%T", bytes))
-			}
-
-			name := ptr.Val(attachment.GetName())
-
-			contentID, err := attachment.GetBackingStore().Get("contentId")
-			if err != nil {
-				return "", clues.WrapWC(ctx, err, "getting content id for attachment").
-					With("kind", kind)
-			}
-
-			if contentID != nil {
-				cids, _ := str.AnyToString(contentID)
-				if len(cids) > 0 {
-					name = cids
-				}
-			}
-
-			email.Attach(&mail.File{
-				// cannot use filename as inline attachment will not get mapped properly
-				Name:     name,
-				MimeType: kind,
-				Data:     bts,
-				Inline:   ptr.Val(attachment.GetIsInline()),
-			})
 		}
 	}
 
@@ -298,7 +380,7 @@ func FromJSON(ctx context.Context, body []byte) (string, error) {
 		}
 	}
 
-	if err = email.GetError(); err != nil {
+	if err := email.GetError(); err != nil {
 		return "", clues.WrapWC(ctx, err, "converting to eml")
 	}
 
@@ -406,6 +488,9 @@ func FromJSONPostToEML(
 			}
 
 			name := ptr.Val(attachment.GetName())
+			if len(name) == 0 {
+				name = "Unnamed"
+			}
 
 			contentID, err := attachment.GetBackingStore().Get("contentId")
 			if err != nil {

src/internal/converters/eml/eml_test.go

@@ -137,6 +137,11 @@ func (suite *EMLUnitSuite) TestConvert_messageble_to_eml() {
 }
 
 func (suite *EMLUnitSuite) TestConvert_edge_cases() {
+	bodies := []string{
+		testdata.EmailWithAttachments,
+		testdata.EmailWithinEmail,
+	}
+
 	tests := []struct {
 		name      string
 		transform func(models.Messageable)
@@ -162,35 +167,75 @@ func (suite *EMLUnitSuite) TestConvert_edge_cases() {
 				require.NoError(suite.T(), err, "setting attachment content")
 			},
 		},
+		{
+			name: "attachment without name",
+			transform: func(msg models.Messageable) {
+				attachments := msg.GetAttachments()
+				attachments[1].SetName(ptr.To(""))
+
+				// This test has to be run on a non inline attachment
+				// as inline attachments use contentID instead of name
+				// even when there is a name.
+				assert.False(suite.T(), ptr.Val(attachments[1].GetIsInline()))
+			},
+		},
+		{
+			name: "attachment with nil name",
+			transform: func(msg models.Messageable) {
+				attachments := msg.GetAttachments()
+				attachments[1].SetName(nil)
+
+				// This test has to be run on a non inline attachment
+				// as inline attachments use contentID instead of name
+				// even when there is a name.
+				assert.False(suite.T(), ptr.Val(attachments[1].GetIsInline()))
+			},
+		},
+		{
+			name: "multiple attachments without name",
+			transform: func(msg models.Messageable) {
+				attachments := msg.GetAttachments()
+				attachments[1].SetName(ptr.To(""))
+				attachments[2].SetName(ptr.To(""))
+
+				// This test has to be run on a non inline attachment
+				// as inline attachments use contentID instead of name
+				// even when there is a name.
+				assert.False(suite.T(), ptr.Val(attachments[1].GetIsInline()))
+				assert.False(suite.T(), ptr.Val(attachments[2].GetIsInline()))
+			},
+		},
 	}
 
-	for _, test := range tests {
+	for _, b := range bodies {
-		suite.Run(test.name, func() {
+		for _, test := range tests {
-			t := suite.T()
+			suite.Run(test.name, func() {
+				t := suite.T()
 
-			ctx, flush := tester.NewContext(t)
+				ctx, flush := tester.NewContext(t)
-			defer flush()
+				defer flush()
 
-			body := []byte(testdata.EmailWithAttachments)
+				body := []byte(b)
 
-			msg, err := api.BytesToMessageable(body)
+				msg, err := api.BytesToMessageable(body)
-			require.NoError(t, err, "creating message")
+				require.NoError(t, err, "creating message")
 
-			test.transform(msg)
+				test.transform(msg)
 
-			writer := kjson.NewJsonSerializationWriter()
+				writer := kjson.NewJsonSerializationWriter()
 
-			defer writer.Close()
+				defer writer.Close()
 
-			err = writer.WriteObjectValue("", msg)
+				err = writer.WriteObjectValue("", msg)
-			require.NoError(t, err, "serializing message")
+				require.NoError(t, err, "serializing message")
 
-			nbody, err := writer.GetSerializedContent()
+				nbody, err := writer.GetSerializedContent()
-			require.NoError(t, err, "getting serialized content")
+				require.NoError(t, err, "getting serialized content")
 
-			_, err = FromJSON(ctx, nbody)
+				_, err = FromJSON(ctx, nbody)
-			assert.NoError(t, err, "converting to eml")
+				assert.NoError(t, err, "converting to eml")
-		})
+			})
+		}
 	}
 }
 
@@ -228,11 +273,11 @@ func (suite *EMLUnitSuite) TestConvert_eml_ics() {
 
 	assert.Equal(
 		t,
-		msg.GetCreatedDateTime().Format(ics.ICalDateTimeFormat),
+		msg.GetCreatedDateTime().Format(ics.ICalDateTimeFormatUTC),
 		event.GetProperty(ical.ComponentPropertyCreated).Value)
 	assert.Equal(
 		t,
-		msg.GetLastModifiedDateTime().Format(ics.ICalDateTimeFormat),
+		msg.GetLastModifiedDateTime().Format(ics.ICalDateTimeFormatUTC),
 		event.GetProperty(ical.ComponentPropertyLastModified).Value)
 
 	st, err := ics.GetUTCTime(
@@ -247,11 +292,11 @@ func (suite *EMLUnitSuite) TestConvert_eml_ics() {
 
 	assert.Equal(
 		t,
-		st.Format(ics.ICalDateTimeFormat),
+		st.Format(ics.ICalDateTimeFormatUTC),
 		event.GetProperty(ical.ComponentPropertyDtStart).Value)
 	assert.Equal(
 		t,
-		et.Format(ics.ICalDateTimeFormat),
+		et.Format(ics.ICalDateTimeFormatUTC),
 		event.GetProperty(ical.ComponentPropertyDtEnd).Value)
 
 	tos := msg.GetToRecipients()
@@ -398,3 +443,48 @@ func (suite *EMLUnitSuite) TestConvert_postable_to_eml() {
 
 	assert.Equal(t, source, target)
 }
+
+// Tests an ics within an eml within another eml
+func (suite *EMLUnitSuite) TestConvert_message_in_messageble_to_eml() {
+	t := suite.T()
+
+	ctx, flush := tester.NewContext(t)
+	defer flush()
+
+	body := []byte(testdata.EmailWithinEmail)
+
+	out, err := FromJSON(ctx, body)
+	assert.NoError(t, err, "converting to eml")
+
+	msg, err := api.BytesToMessageable(body)
+	require.NoError(t, err, "creating message")
+
+	eml, err := enmime.ReadEnvelope(strings.NewReader(out))
+	require.NoError(t, err, "reading created eml")
+
+	assert.Equal(t, ptr.Val(msg.GetSubject()), eml.GetHeader("Subject"))
+	assert.Equal(t, msg.GetSentDateTime().Format(time.RFC1123Z), eml.GetHeader("Date"))
+
+	assert.Equal(t, formatAddress(msg.GetFrom().GetEmailAddress()), eml.GetHeader("From"))
+
+	attachments := eml.Attachments
+	assert.Equal(t, 3, len(attachments), "attachment count in parent email")
+
+	ieml, err := enmime.ReadEnvelope(strings.NewReader(string(attachments[0].Content)))
+	require.NoError(t, err, "reading created eml")
+
+	itm, err := msg.GetAttachments()[0].GetBackingStore().Get("item")
+	require.NoError(t, err, "getting item from message")
+
+	imsg := itm.(*models.Message)
+	assert.Equal(t, ptr.Val(imsg.GetSubject()), ieml.GetHeader("Subject"))
+	assert.Equal(t, imsg.GetSentDateTime().Format(time.RFC1123Z), ieml.GetHeader("Date"))
+
+	assert.Equal(t, formatAddress(imsg.GetFrom().GetEmailAddress()), ieml.GetHeader("From"))
+
+	iattachments := ieml.Attachments
+	assert.Equal(t, 1, len(iattachments), "attachment count in child email")
+
+	// Known from testdata
+	assert.Contains(t, string(iattachments[0].Content), "X-LIC-LOCATION:Africa/Abidjan")
+}

src/internal/converters/eml/testdata/email-with-attachments.json

@@ -104,6 +104,19 @@
       "contentId": null,
       "contentLocation": null,
       "contentBytes": "W1BhdGhzXQpQcmVmaXggPSAuLgo="
+    },
+    {
+      "@odata.type": "#microsoft.graph.fileAttachment",
+      "@odata.mediaContentType": "application/octet-stream",
+      "id": "ZZMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAEwbDEWAAABEgAQAD3rU0iyzCdHgz0xmOrWc9g=",
+      "lastModifiedDateTime": "2023-11-16T05:42:47Z",
+      "name": "qt2.conf",
+      "contentType": "application/octet-stream",
+      "size": 156,
+      "isInline": false,
+      "contentId": null,
+      "contentLocation": null,
+      "contentBytes": "Z1BhdGhzXQpQcmVmaXggPSAuLgo="
     }
   ]
 }

src/internal/converters/eml/testdata/email-within-email.json

@@ -0,0 +1,268 @@
+{
+  "id": "AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV-qAAA=",
+  "@odata.type": "#microsoft.graph.message",
+  "@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users('7ceb8e03-bdc5-4509-a136-457526165ec0')/messages/$entity",
+  "@odata.etag": "W/\"CQAAABYAAABBFDg0JJk7TY1fmsJrh7tNAAFnDeBl\"",
+  "categories": [],
+  "changeKey": "CQAAABYAAABBFDg0JJk7TY1fmsJrh7tNAAFnDeBl",
+  "createdDateTime": "2024-02-05T09:33:23Z",
+  "lastModifiedDateTime": "2024-02-05T09:33:48Z",
+  "attachments": [
+    {
+      "id": "AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV-qAAABEgAQAEUyH0VS3HJBgHDlZdWZl0k=",
+      "@odata.type": "#microsoft.graph.itemAttachment",
+      "item@odata.navigationLink": "https://graph.microsoft.com/v1.0/users('7ceb8e03-bdc5-4509-a136-457526165ec0')/messages('')",
+      "item@odata.associationLink": "https://graph.microsoft.com/v1.0/users('7ceb8e03-bdc5-4509-a136-457526165ec0')/messages('')/$ref",
+      "isInline": false,
+      "lastModifiedDateTime": "2024-02-05T09:33:46Z",
+      "name": "Purpose of life",
+      "size": 11840,
+      "item": {
+        "id": "",
+        "@odata.type": "#microsoft.graph.message",
+        "createdDateTime": "2024-02-05T09:33:24Z",
+        "lastModifiedDateTime": "2024-02-05T09:33:46Z",
+        "attachments": [
+          {
+            "id": "AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV-qAAACEgAQAEUyH0VS3HJBgHDlZdWZl0kSABAAjBhd4-oQaUS969pTkS-gzA==",
+            "@odata.type": "#microsoft.graph.fileAttachment",
+            "@odata.mediaContentType": "text/calendar",
+            "contentType": "text/calendar",
+            "isInline": false,
+            "lastModifiedDateTime": "2024-02-05T09:33:46Z",
+            "name": "Abidjan.ics",
+            "size": 573,
+            "contentBytes": "QkVHSU46VkNBTEVOREFSDQpQUk9ESUQ6LS8vdHp1cmwub3JnLy9OT05TR01MIE9sc29uIDIwMjNkLy9FTg0KVkVSU0lPTjoyLjANCkJFR0lOOlZUSU1FWk9ORQ0KVFpJRDpBZnJpY2EvQWJpZGphbg0KTEFTVC1NT0RJRklFRDoyMDIzMTIyMlQyMzMzNThaDQpUWlVSTDpodHRwczovL3d3dy50enVybC5vcmcvem9uZWluZm8vQWZyaWNhL0FiaWRqYW4NClgtTElDLUxPQ0FUSU9OOkFmcmljYS9BYmlkamFuDQpYLVBST0xFUFRJQy1UWk5BTUU6TE1UDQpCRUdJTjpTVEFOREFSRA0KVFpOQU1FOkdNVA0KVFpPRkZTRVRGUk9NOi0wMDE2MDgNClRaT0ZGU0VUVE86KzAwMDANCkRUU1RBUlQ6MTkxMjAxMDFUMDAwMDAwDQpFTkQ6U1RBTkRBUkQNCkVORDpWVElNRVpPTkUNCkVORDpWQ0FMRU5EQVINCg=="
+          }
+        ],
+        "body": {
+          "content": "<html><head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><style type=\"text/css\" style=\"display:none;\"> P {margin-top:0;margin-bottom:0;} </style></head><body dir=\"ltr\"><div class=\"elementToProof\" style=\"font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);\">I just realized the purpose of my life is to be a test case. Good to know.<br></div></body></html>",
+          "contentType": "html"
+        },
+        "bodyPreview": "I just realized the purpose of my life is to be a test case. Good to know.",
+        "conversationId": "AAQkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNAAQAFEnxDqYmbJEm8d2l3qfS6A=",
+        "conversationIndex": "AQHaWBYiUSfEOpiZskSbx3aXep9LoA==",
+        "flag": {
+          "flagStatus": "notFlagged"
+        },
+        "from": {
+          "emailAddress": {
+            "address": "JohannaL@10rqc2.onmicrosoft.com",
+            "name": "Johanna Lorenz"
+          }
+        },
+        "hasAttachments": true,
+        "importance": "normal",
+        "internetMessageId": "<SJ0PR04MB7294108E381BCCE5C207B6DEBC472@SJ0PR04MB7294.namprd04.prod.outlook.com>",
+        "isDeliveryReceiptRequested": false,
+        "isDraft": false,
+        "isRead": true,
+        "isReadReceiptRequested": false,
+        "receivedDateTime": "2024-02-05T09:33:12Z",
+        "sender": {
+          "emailAddress": {
+            "address": "JohannaL@10rqc2.onmicrosoft.com",
+            "name": "Johanna Lorenz"
+          }
+        },
+        "sentDateTime": "2024-02-05T09:33:11Z",
+        "subject": "Purpose of life",
+        "toRecipients": [
+          {
+            "emailAddress": {
+              "address": "PradeepG@10rqc2.onmicrosoft.com",
+              "name": "Pradeep Gupta"
+            }
+          }
+        ],
+        "webLink": "https://outlook.office365.com/owa/?AttachmentItemID=AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV%2FqAAABEgAQAEUyH0VS3HJBgHDlZdWZl0k%3D&exvsurl=1&viewmodel=ItemAttachment"
+      }
+    },
+    {
+      "id": "AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV-qAAABEgAQAEUyH0VS3HJBgHDlZdWZl02=",
+      "@odata.type": "#microsoft.graph.itemAttachment",
+      "item@odata.navigationLink": "https://graph.microsoft.com/v1.0/users('7ceb8e03-bdc5-4509-a136-457526165ec0')/messages('')",
+      "item@odata.associationLink": "https://graph.microsoft.com/v1.0/users('7ceb8e03-bdc5-4509-a136-457526165ec0')/messages('')/$ref",
+      "isInline": false,
+      "lastModifiedDateTime": "2024-02-05T09:33:46Z",
+      "name": "Purpose of life part 2",
+      "size": 11840,
+      "item": {
+        "id": "",
+        "@odata.type": "#microsoft.graph.message",
+        "createdDateTime": "2024-02-05T09:33:24Z",
+        "lastModifiedDateTime": "2024-02-05T09:33:46Z",
+        "attachments": [
+          {
+            "id": "AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV-qAAACEgAQAEUyH0VS3HJBgHDlZdWZl0kSABAAjBhd4-oQaUS969pTkS-gzA==",
+            "@odata.type": "#microsoft.graph.fileAttachment",
+            "@odata.mediaContentType": "text/calendar",
+            "contentType": "text/calendar",
+            "isInline": false,
+            "lastModifiedDateTime": "2024-02-05T09:33:46Z",
+            "name": "Abidjan.ics",
+            "size": 573,
+            "contentBytes": "QkVHSU46VkNBTEVOREFSDQpQUk9ESUQ6LS8vdHp1cmwub3JnLy9OT05TR01MIE9sc29uIDIwMjNkLy9FTg0KVkVSU0lPTjoyLjANCkJFR0lOOlZUSU1FWk9ORQ0KVFpJRDpBZnJpY2EvQWJpZGphbg0KTEFTVC1NT0RJRklFRDoyMDIzMTIyMlQyMzMzNThaDQpUWlVSTDpodHRwczovL3d3dy50enVybC5vcmcvem9uZWluZm8vQWZyaWNhL0FiaWRqYW4NClgtTElDLUxPQ0FUSU9OOkFmcmljYS9BYmlkamFuDQpYLVBST0xFUFRJQy1UWk5BTUU6TE1UDQpCRUdJTjpTVEFOREFSRA0KVFpOQU1FOkdNVA0KVFpPRkZTRVRGUk9NOi0wMDE2MDgNClRaT0ZGU0VUVE86KzAwMDANCkRUU1RBUlQ6MTkxMjAxMDFUMDAwMDAwDQpFTkQ6U1RBTkRBUkQNCkVORDpWVElNRVpPTkUNCkVORDpWQ0FMRU5EQVINCg=="
+          }
+        ],
+        "body": {
+          "content": "<html><head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><style type=\"text/css\" style=\"display:none;\"> P {margin-top:0;margin-bottom:0;} </style></head><body dir=\"ltr\"><div class=\"elementToProof\" style=\"font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);\">I just realized the purpose of my life is to be a test case. Good to know.<br></div></body></html>",
+          "contentType": "html"
+        },
+        "bodyPreview": "I just realized the purpose of my life is to be a test case. Good to know.",
+        "conversationId": "AAQkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNAAQAFEnxDqYmbJEm8d2l3qfS6A=",
+        "conversationIndex": "AQHaWBYiUSfEOpiZskSbx3aXep9LoA==",
+        "flag": {
+          "flagStatus": "notFlagged"
+        },
+        "from": {
+          "emailAddress": {
+            "address": "JohannaL@10rqc2.onmicrosoft.com",
+            "name": "Johanna Lorenz"
+          }
+        },
+        "hasAttachments": true,
+        "importance": "normal",
+        "internetMessageId": "<SJ0PR04MB7294108E381BCCE5C207B6DEBC472@SJ0PR04MB7294.namprd04.prod.outlook.com>",
+        "isDeliveryReceiptRequested": false,
+        "isDraft": false,
+        "isRead": true,
+        "isReadReceiptRequested": false,
+        "receivedDateTime": "2024-02-05T09:33:12Z",
+        "sender": {
+          "emailAddress": {
+            "address": "JohannaL@10rqc2.onmicrosoft.com",
+            "name": "Johanna Lorenz"
+          }
+        },
+        "sentDateTime": "2024-02-05T09:33:11Z",
+        "subject": "Purpose of life",
+        "toRecipients": [
+          {
+            "emailAddress": {
+              "address": "PradeepG@10rqc2.onmicrosoft.com",
+              "name": "Pradeep Gupta"
+            }
+          }
+        ],
+        "webLink": "https://outlook.office365.com/owa/?AttachmentItemID=AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV%2FqAAABEgAQAEUyH0VS3HJBgHDlZdWZl02%3D&exvsurl=1&viewmodel=ItemAttachment"
+      }
+    },
+    {
+      "id": "AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV-qAAABEgAQAEUyH0VS3HJBgHDlZdWZl03=",
+      "@odata.type": "#microsoft.graph.itemAttachment",
+      "item@odata.navigationLink": "https://graph.microsoft.com/v1.0/users('7ceb8e03-bdc5-4509-a136-457526165ec0')/messages('')",
+      "item@odata.associationLink": "https://graph.microsoft.com/v1.0/users('7ceb8e03-bdc5-4509-a136-457526165ec0')/messages('')/$ref",
+      "isInline": false,
+      "lastModifiedDateTime": "2024-02-05T09:33:46Z",
+      "name": "Purpose of life part 3",
+      "size": 11840,
+      "item": {
+        "id": "",
+        "@odata.type": "#microsoft.graph.message",
+        "createdDateTime": "2024-02-05T09:33:24Z",
+        "lastModifiedDateTime": "2024-02-05T09:33:46Z",
+        "attachments": [
+          {
+            "id": "AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV-qAAACEgAQAEUyH0VS3HJBgHDlZdWZl0kSABAAjBhd4-oQaUS969pTkS-gzA==",
+            "@odata.type": "#microsoft.graph.fileAttachment",
+            "@odata.mediaContentType": "text/calendar",
+            "contentType": "text/calendar",
+            "isInline": false,
+            "lastModifiedDateTime": "2024-02-05T09:33:46Z",
+            "name": "Abidjan.ics",
+            "size": 573,
+            "contentBytes": "QkVHSU46VkNBTEVOREFSDQpQUk9ESUQ6LS8vdHp1cmwub3JnLy9OT05TR01MIE9sc29uIDIwMjNkLy9FTg0KVkVSU0lPTjoyLjANCkJFR0lOOlZUSU1FWk9ORQ0KVFpJRDpBZnJpY2EvQWJpZGphbg0KTEFTVC1NT0RJRklFRDoyMDIzMTIyMlQyMzMzNThaDQpUWlVSTDpodHRwczovL3d3dy50enVybC5vcmcvem9uZWluZm8vQWZyaWNhL0FiaWRqYW4NClgtTElDLUxPQ0FUSU9OOkFmcmljYS9BYmlkamFuDQpYLVBST0xFUFRJQy1UWk5BTUU6TE1UDQpCRUdJTjpTVEFOREFSRA0KVFpOQU1FOkdNVA0KVFpPRkZTRVRGUk9NOi0wMDE2MDgNClRaT0ZGU0VUVE86KzAwMDANCkRUU1RBUlQ6MTkxMjAxMDFUMDAwMDAwDQpFTkQ6U1RBTkRBUkQNCkVORDpWVElNRVpPTkUNCkVORDpWQ0FMRU5EQVINCg=="
+          }
+        ],
+        "body": {
+          "content": "<html><head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><style type=\"text/css\" style=\"display:none;\"> P {margin-top:0;margin-bottom:0;} </style></head><body dir=\"ltr\"><div class=\"elementToProof\" style=\"font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);\">I just realized the purpose of my life is to be a test case. Good to know.<br></div></body></html>",
+          "contentType": "html"
+        },
+        "bodyPreview": "I just realized the purpose of my life is to be a test case. Good to know.",
+        "conversationId": "AAQkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNAAQAFEnxDqYmbJEm8d2l3qfS6A=",
+        "conversationIndex": "AQHaWBYiUSfEOpiZskSbx3aXep9LoA==",
+        "flag": {
+          "flagStatus": "notFlagged"
+        },
+        "from": {
+          "emailAddress": {
+            "address": "JohannaL@10rqc2.onmicrosoft.com",
+            "name": "Johanna Lorenz"
+          }
+        },
+        "hasAttachments": true,
+        "importance": "normal",
+        "internetMessageId": "<SJ0PR04MB7294108E381BCCE5C207B6DEBC472@SJ0PR04MB7294.namprd04.prod.outlook.com>",
+        "isDeliveryReceiptRequested": false,
+        "isDraft": false,
+        "isRead": true,
+        "isReadReceiptRequested": false,
+        "receivedDateTime": "2024-02-05T09:33:12Z",
+        "sender": {
+          "emailAddress": {
+            "address": "JohannaL@10rqc2.onmicrosoft.com",
+            "name": "Johanna Lorenz"
+          }
+        },
+        "sentDateTime": "2024-02-05T09:33:11Z",
+        "subject": "Purpose of life",
+        "toRecipients": [
+          {
+            "emailAddress": {
+              "address": "PradeepG@10rqc2.onmicrosoft.com",
+              "name": "Pradeep Gupta"
+            }
+          }
+        ],
+        "webLink": "https://outlook.office365.com/owa/?AttachmentItemID=AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV%2FqAAABEgAQAEUyH0VS3HJBgHDlZdWZl03%3D&exvsurl=1&viewmodel=ItemAttachment"
+      }
+    }
+  ],
+  "bccRecipients": [],
+  "body": {
+    "content": "<html><head>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><style type=\"text/css\" style=\"display:none\">\r\n<!--\r\np\r\n\t{margin-top:0;\r\n\tmargin-bottom:0}\r\n-->\r\n</style></head><body dir=\"ltr\"><div><span class=\"elementToProof\" style=\"font-family:Aptos,Aptos_EmbeddedFont,Aptos_MSFontService,Calibri,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0)\">Now, this is what we call nesting in this business.<br></span></div></body></html>",
+    "contentType": "html"
+  },
+  "bodyPreview": "Now, this is what we call nesting in this business.",
+  "ccRecipients": [],
+  "conversationId": "AAQkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNAAQAIv2-4RHwDhJhlqBV5PTE3Y=",
+  "conversationIndex": "AQHaWBZdi/b/hEfAOEmGWoFXk9MTdg==",
+  "flag": {
+    "flagStatus": "notFlagged"
+  },
+  "from": {
+    "emailAddress": {
+      "address": "JohannaL@10rqc2.onmicrosoft.com",
+      "name": "Johanna Lorenz"
+    }
+  },
+  "hasAttachments": true,
+  "importance": "normal",
+  "inferenceClassification": "focused",
+  "internetMessageId": "<SJ0PR04MB729409CE8C191E01151C110DBC472@SJ0PR04MB7294.namprd04.prod.outlook.com>",
+  "isDeliveryReceiptRequested": false,
+  "isDraft": false,
+  "isRead": true,
+  "isReadReceiptRequested": false,
+  "parentFolderId": "AQMkAGJiAGZhNjRlOC00OGI5LTQyNTItYjFkMy00NTJjMTgyZGZkMjQALgAAA0V2IruiJ9ZFvgAO6qBJFycBAEEUODQkmTtNjV_awmuHu00AAAIBCQAAAA==",
+  "receivedDateTime": "2024-02-05T09:33:46Z",
+  "replyTo": [],
+  "sender": {
+    "emailAddress": {
+      "address": "JohannaL@10rqc2.onmicrosoft.com",
+      "name": "Johanna Lorenz"
+    }
+  },
+  "sentDateTime": "2024-02-05T09:33:45Z",
+  "subject": "Fw: Purpose of life",
+  "toRecipients": [
+    {
+      "emailAddress": {
+        "address": "PradeepG@10rqc2.onmicrosoft.com",
+        "name": "Pradeep Gupta"
+      }
+    }
+  ],
+  "webLink": "https://outlook.office365.com/owa/?ItemID=AAMkAGJiZmE2NGU4LTQ4YjktNDI1Mi1iMWQzLTQ1MmMxODJkZmQyNABGAAAAAABFdiK7oifWRb4ADuqgSRcnBwBBFDg0JJk7TY1fmsJrh7tNAAAAAAEJAABBFDg0JJk7TY1fmsJrh7tNAAFnbV%2FqAAA%3D&exvsurl=1&viewmodel=ReadMessageItem"
+}

src/internal/converters/eml/testdata/testdata.go

@@ -10,3 +10,6 @@ var EmailWithEventInfo string
 
 //go:embed email-with-event-object.json
 var EmailWithEventObject string
+
+//go:embed email-within-email.json
+var EmailWithinEmail string

src/internal/converters/ics/consts.go

@@ -166,3 +166,20 @@ var GraphTimeZoneToTZ = map[string]string{
 	"Yukon Standard Time":             "America/Whitehorse",
 	"tzone://Microsoft/Utc":           "Etc/UTC",
 }
+
+// Map from alternatives to the canonical time zone name
+// There mapping are currently generated by manually going on the
+// values in the GraphTimeZoneToTZ which is not available in the tzdb
+var CanonicalTimeZoneMap = map[string]string{
+	"Africa/Asmara":        "Africa/Asmera",
+	"Asia/Calcutta":        "Asia/Kolkata",
+	"Asia/Rangoon":         "Asia/Yangon",
+	"Asia/Saigon":          "Asia/Ho_Chi_Minh",
+	"Europe/Kiev":          "Europe/Kyiv",
+	"Europe/Warsaw":        "Europe/Warszawa",
+	"America/Buenos_Aires": "America/Argentina/Buenos_Aires",
+	"America/Godthab":      "America/Nuuk",
+	// NOTE: "Atlantic/Raykjavik" missing in tzdb but is in MS list
+
+	"Etc/UTC": "UTC", // simplifying the time zone name
+}

src/internal/converters/ics/ics.go

@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"net/mail"
 	"strings"
 	"time"
 	"unicode"
@@ -16,6 +17,7 @@ import (
 
 	"github.com/alcionai/corso/src/internal/common/ptr"
 	"github.com/alcionai/corso/src/internal/common/str"
+	"github.com/alcionai/corso/src/internal/converters/ics/tzdata"
 	"github.com/alcionai/corso/src/pkg/dttm"
 	"github.com/alcionai/corso/src/pkg/logger"
 	"github.com/alcionai/corso/src/pkg/services/m365/api"
@@ -31,8 +33,9 @@ import (
 // TODO locations: https://github.com/alcionai/corso/issues/5003
 
 const (
-	ICalDateTimeFormat = "20060102T150405Z"
+	ICalDateTimeFormat    = "20060102T150405"
-	ICalDateFormat     = "20060102"
+	ICalDateTimeFormatUTC = "20060102T150405Z"
+	ICalDateFormat        = "20060102"
 )
 
 func keyValues(key, value string) *ics.KeyValues {
@@ -172,6 +175,17 @@ func getRecurrencePattern(
 		recurComponents = append(recurComponents, "BYDAY="+prefix+strings.Join(dowComponents, ","))
 	}
 
+	// This is necessary to compute when weekly events recur
+	fdow := pat.GetFirstDayOfWeek()
+	if fdow != nil {
+		icalday, ok := GraphToICalDOW[fdow.String()]
+		if !ok {
+			return "", clues.NewWC(ctx, "unknown first day of week").With("day", fdow)
+		}
+
+		recurComponents = append(recurComponents, "WKST="+icalday)
+	}
+
 	rrange := recurrence.GetRangeEscaped()
 	if rrange != nil {
 		switch ptr.Val(rrange.GetTypeEscaped()) {
@@ -195,7 +209,7 @@ func getRecurrencePattern(
 					return "", clues.WrapWC(ctx, err, "parsing end time")
 				}
 
-				recurComponents = append(recurComponents, "UNTIL="+endTime.Format(ICalDateTimeFormat))
+				recurComponents = append(recurComponents, "UNTIL="+endTime.Format(ICalDateTimeFormatUTC))
 			}
 		case models.NOEND_RECURRENCERANGETYPE:
 			// Nothing to do
@@ -224,10 +238,15 @@ func FromEventable(ctx context.Context, event models.Eventable) (string, error)
 	cal := ics.NewCalendar()
 	cal.SetProductId("-//Alcion//Corso") // Does this have to be customizable?
 
+	err := addTimeZoneComponents(ctx, cal, event)
+	if err != nil {
+		return "", clues.Wrap(err, "adding timezone components")
+	}
+
 	id := ptr.Val(event.GetId())
 	iCalEvent := cal.AddEvent(id)
 
-	err := updateEventProperties(ctx, event, iCalEvent)
+	err = updateEventProperties(ctx, event, iCalEvent)
 	if err != nil {
 		return "", clues.Wrap(err, "updating event properties")
 	}
@@ -258,7 +277,7 @@ func FromEventable(ctx context.Context, event models.Eventable) (string, error)
 		exICalEvent := cal.AddEvent(id)
 		start := exception.GetOriginalStart() // will always be in UTC
 
-		exICalEvent.AddProperty(ics.ComponentProperty(ics.PropertyRecurrenceId), start.Format(ICalDateTimeFormat))
+		exICalEvent.AddProperty(ics.ComponentProperty(ics.PropertyRecurrenceId), start.Format(ICalDateTimeFormatUTC))
 
 		err = updateEventProperties(ctx, exception, exICalEvent)
 		if err != nil {
@@ -269,6 +288,91 @@ func FromEventable(ctx context.Context, event models.Eventable) (string, error)
 	return cal.Serialize(), nil
 }
 
+func getTZDataKeyValues(ctx context.Context, timezone string) (map[string]string, error) {
+	template, ok := tzdata.TZData[timezone]
+	if !ok {
+		return nil, clues.NewWC(ctx, "timezone not found in tz database").
+			With("timezone", timezone)
+	}
+
+	keyValues := map[string]string{}
+
+	for _, line := range strings.Split(template, "\n") {
+		splits := strings.SplitN(line, ":", 2)
+		if len(splits) != 2 {
+			return nil, clues.NewWC(ctx, "invalid tzdata line").
+				With("line", line).
+				With("timezone", timezone)
+		}
+
+		keyValues[splits[0]] = splits[1]
+	}
+
+	return keyValues, nil
+}
+
+func addTimeZoneComponents(ctx context.Context, cal *ics.Calendar, event models.Eventable) error {
+	// Handling of timezone get a bit tricky when we have to deal with
+	// relative recurrence. The issue comes up when we set a recurrence
+	// to be something like "repeat every 3rd Tuesday". Tuesday in UTC
+	// and in IST will be different and so we cannot just always use UTC.
+	//
+	// The way this is solved is by using the timezone in the
+	// recurrence for start and end timezones as we have to use UTC
+	// for UNTIL(mostly).
+	// https://www.rfc-editor.org/rfc/rfc5545#section-3.3.10
+	timezone, err := getRecurrenceTimezone(ctx, event)
+	if err != nil {
+		return clues.Stack(err)
+	}
+
+	if timezone != time.UTC {
+		kvs, err := getTZDataKeyValues(ctx, timezone.String())
+		if err != nil {
+			return clues.Stack(err)
+		}
+
+		tz := cal.AddTimezone(timezone.String())
+
+		for k, v := range kvs {
+			tz.AddProperty(ics.ComponentProperty(k), v)
+		}
+	}
+
+	return nil
+}
+
+// getRecurrenceTimezone get the timezone specified by the recurrence
+// in the calendar.  It does a normalization pass where we always convert
+// the timezone to the value in tzdb If we don't have a recurrence
+// timezone, we don't have to use a specific timezone in the export and
+// is safe to return UTC from this method.
+func getRecurrenceTimezone(ctx context.Context, event models.Eventable) (*time.Location, error) {
+	if event.GetRecurrence() != nil {
+		timezone := ptr.Val(event.GetRecurrence().GetRangeEscaped().GetRecurrenceTimeZone())
+
+		ctz, ok := GraphTimeZoneToTZ[timezone]
+		if ok {
+			timezone = ctz
+		}
+
+		cannon, ok := CanonicalTimeZoneMap[timezone]
+		if ok {
+			timezone = cannon
+		}
+
+		loc, err := time.LoadLocation(timezone)
+		if err != nil {
+			return nil, clues.WrapWC(ctx, err, "unknown timezone").
+				With("timezone", timezone)
+		}
+
+		return loc, nil
+	}
+
+	return time.UTC, nil
+}
+
 func isASCII(s string) bool {
 	for _, c := range s {
 		if c > unicode.MaxASCII {
@@ -279,6 +383,12 @@ func isASCII(s string) bool {
 	return true
 }
 
+// Checks if a given string is a valid email address
+func isEmail(em string) bool {
+	_, err := mail.ParseAddress(em)
+	return err == nil
+}
+
 func updateEventProperties(ctx context.Context, event models.Eventable, iCalEvent *ics.VEvent) error {
 	// CREATED - https://www.rfc-editor.org/rfc/rfc5545#section-3.8.7.1
 	created := event.GetCreatedDateTime()
@@ -292,6 +402,11 @@ func updateEventProperties(ctx context.Context, event models.Eventable, iCalEven
 		iCalEvent.SetModifiedAt(ptr.Val(modified))
 	}
 
+	timezone, err := getRecurrenceTimezone(ctx, event)
+	if err != nil {
+		return err
+	}
+
 	// DTSTART - https://www.rfc-editor.org/rfc/rfc5545#section-3.8.2.4
 	allDay := ptr.Val(event.GetIsAllDay())
 	startString := event.GetStart().GetDateTime()
@@ -303,11 +418,7 @@ func updateEventProperties(ctx context.Context, event models.Eventable, iCalEven
 			return clues.WrapWC(ctx, err, "parsing start time")
 		}
 
-		if allDay {
+		addTime(iCalEvent, ics.ComponentPropertyDtStart, start, allDay, timezone)
-			iCalEvent.SetStartAt(start, ics.WithValue(string(ics.ValueDataTypeDate)))
-		} else {
-			iCalEvent.SetStartAt(start)
-		}
 	}
 
 	// DTEND - https://www.rfc-editor.org/rfc/rfc5545#section-3.8.2.2
@@ -320,11 +431,7 @@ func updateEventProperties(ctx context.Context, event models.Eventable, iCalEven
 			return clues.WrapWC(ctx, err, "parsing end time")
 		}
 
-		if allDay {
+		addTime(iCalEvent, ics.ComponentPropertyDtEnd, end, allDay, timezone)
-			iCalEvent.SetEndAt(end, ics.WithValue(string(ics.ValueDataTypeDate)))
-		} else {
-			iCalEvent.SetEndAt(end)
-		}
 	}
 
 	recurrence := event.GetRecurrence()
@@ -377,7 +484,14 @@ func updateEventProperties(ctx context.Context, event models.Eventable, iCalEven
 					desc := replacer.Replace(description)
 					iCalEvent.AddProperty("X-ALT-DESC", desc, ics.WithFmtType("text/html"))
 				} else {
-					stripped, err := html2text.FromString(description, html2text.Options{PrettyTables: true})
+					// Disable auto wrap, causes huge memory spikes
+					// https://github.com/jaytaylor/html2text/issues/48
+					prettyTablesOptions := html2text.NewPrettyTablesOptions()
+					prettyTablesOptions.AutoWrapText = false
+
+					stripped, err := html2text.FromString(
+						description,
+						html2text.Options{PrettyTables: true, PrettyTablesOptions: prettyTablesOptions})
 					if err != nil {
 						return clues.Wrap(err, "converting html to text").
 							With("description_length", len(description))
@@ -481,8 +595,21 @@ func updateEventProperties(ctx context.Context, event models.Eventable, iCalEven
 			}
 		}
 
+		// It is possible that we get non email items like the below
+		// one which is an internal representation of the user in the
+		// Exchange system. While we can technically output this as an
+		// attendee, it is not useful plus other downstream tools like
+		// ones to use PST can choke on this.
+		// /o=ExchangeLabs/ou=ExchangeAdministrative Group(FY...LT)/cn=Recipients/cn=883...4a-John Doe
 		addr := ptr.Val(attendee.GetEmailAddress().GetAddress())
-		iCalEvent.AddAttendee(addr, props...)
+		if isEmail(addr) {
+			iCalEvent.AddAttendee(addr, props...)
+		} else {
+			logger.Ctx(ctx).
+				With("attendee_email", addr).
+				With("attendee_name", name).
+				Info("skipping non email attendee from ics export")
+		}
 	}
 
 	// LOCATION - https://www.rfc-editor.org/rfc/rfc5545#section-3.8.1.7
@@ -610,6 +737,26 @@ func updateEventProperties(ctx context.Context, event models.Eventable, iCalEven
 	return nil
 }
 
+func addTime(iCalEvent *ics.VEvent, prop ics.ComponentProperty, tm time.Time, allDay bool, tzLoc *time.Location) {
+	if allDay {
+		if tzLoc == time.UTC {
+			iCalEvent.SetProperty(prop, tm.Format(ICalDateFormat), ics.WithValue(string(ics.ValueDataTypeDate)))
+		} else {
+			iCalEvent.SetProperty(
+				prop,
+				tm.In(tzLoc).Format(ICalDateFormat),
+				ics.WithValue(string(ics.ValueDataTypeDate)),
+				keyValues("TZID", tzLoc.String()))
+		}
+	} else {
+		if tzLoc == time.UTC {
+			iCalEvent.SetProperty(prop, tm.Format(ICalDateTimeFormatUTC))
+		} else {
+			iCalEvent.SetProperty(prop, tm.In(tzLoc).Format(ICalDateTimeFormat), keyValues("TZID", tzLoc.String()))
+		}
+	}
+}
+
 func getCancelledDates(ctx context.Context, event models.Eventable) ([]time.Time, error) {
 	dateStrings, err := api.GetCancelledEventDateStrings(event)
 	if err != nil {

src/internal/converters/ics/ics_test.go

@@ -13,6 +13,7 @@ import (
 	"testing"
 	"time"
 
+	ics "github.com/arran4/golang-ical"
 	"github.com/microsoft/kiota-abstractions-go/serialization"
 	kjson "github.com/microsoft/kiota-serialization-json-go"
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
@@ -21,6 +22,7 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/alcionai/corso/src/internal/common/ptr"
+	"github.com/alcionai/corso/src/internal/converters/ics/tzdata"
 	"github.com/alcionai/corso/src/internal/tester"
 )
 
@@ -32,7 +34,7 @@ func TestICSUnitSuite(t *testing.T) {
 	suite.Run(t, &ICSUnitSuite{Suite: tester.NewUnitSuite(t)})
 }
 
-func (suite *ICSUnitSuite) TestGetLocationString() {
+func (s *ICSUnitSuite) TestGetLocationString() {
 	table := []struct {
 		name   string
 		loc    func() models.Locationable
@@ -110,13 +112,13 @@ func (suite *ICSUnitSuite) TestGetLocationString() {
 	}
 
 	for _, tt := range table {
-		suite.Run(tt.name, func() {
+		s.Run(tt.name, func() {
-			assert.Equal(suite.T(), tt.expect, getLocationString(tt.loc()))
+			assert.Equal(s.T(), tt.expect, getLocationString(tt.loc()))
 		})
 	}
 }
 
-func (suite *ICSUnitSuite) TestGetUTCTime() {
+func (s *ICSUnitSuite) TestGetUTCTime() {
 	table := []struct {
 		name      string
 		timestamp string
@@ -162,18 +164,18 @@ func (suite *ICSUnitSuite) TestGetUTCTime() {
 	}
 
 	for _, tt := range table {
-		suite.Run(tt.name, func() {
+		s.Run(tt.name, func() {
 			t, err := GetUTCTime(tt.timestamp, tt.timezone)
-			tt.errCheck(suite.T(), err)
+			tt.errCheck(s.T(), err)
 
 			if !tt.time.Equal(time.Time{}) {
-				assert.Equal(suite.T(), tt.time, t)
+				assert.Equal(s.T(), tt.time, t)
 			}
 		})
 	}
 }
 
-func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
+func (s *ICSUnitSuite) TestGetRecurrencePattern() {
 	table := []struct {
 		name       string
 		recurrence func() models.PatternedRecurrenceable
@@ -187,16 +189,37 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 				pat := models.NewRecurrencePattern()
 
 				typ, err := models.ParseRecurrencePatternType("daily")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(1)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
 
 				rec.SetPattern(pat)
 
 				return rec
 			},
-			expect:   "FREQ=DAILY;INTERVAL=1",
+			expect:   "FREQ=DAILY;INTERVAL=1;WKST=SU",
+			errCheck: require.NoError,
+		},
+		{
+			name: "daily different start of week",
+			recurrence: func() models.PatternedRecurrenceable {
+				rec := models.NewPatternedRecurrence()
+				pat := models.NewRecurrencePattern()
+
+				typ, err := models.ParseRecurrencePatternType("daily")
+				require.NoError(s.T(), err)
+
+				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
+				pat.SetInterval(ptr.To(int32(1)))
+				pat.SetFirstDayOfWeek(ptr.To(models.MONDAY_DAYOFWEEK))
+
+				rec.SetPattern(pat)
+
+				return rec
+			},
+			expect:   "FREQ=DAILY;INTERVAL=1;WKST=MO",
 			errCheck: require.NoError,
 		},
 		{
@@ -206,15 +229,16 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 				pat := models.NewRecurrencePattern()
 
 				typ, err := models.ParseRecurrencePatternType("daily")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(1)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
 
 				rng := models.NewRecurrenceRange()
 
 				rrtype, err := models.ParseRecurrenceRangeType("endDate")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				rng.SetTypeEscaped(rrtype.(*models.RecurrenceRangeType))
 
@@ -227,7 +251,7 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 
 				return rec
 			},
-			expect:   "FREQ=DAILY;INTERVAL=1;UNTIL=20210101T182959Z",
+			expect:   "FREQ=DAILY;INTERVAL=1;WKST=SU;UNTIL=20210101T182959Z",
 			errCheck: require.NoError,
 		},
 		{
@@ -237,16 +261,17 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 				pat := models.NewRecurrencePattern()
 
 				typ, err := models.ParseRecurrencePatternType("weekly")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(1)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
 
 				rec.SetPattern(pat)
 
 				return rec
 			},
-			expect:   "FREQ=WEEKLY;INTERVAL=1",
+			expect:   "FREQ=WEEKLY;INTERVAL=1;WKST=SU",
 			errCheck: require.NoError,
 		},
 		{
@@ -256,15 +281,16 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 				pat := models.NewRecurrencePattern()
 
 				typ, err := models.ParseRecurrencePatternType("weekly")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(1)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
 
 				rng := models.NewRecurrenceRange()
 
 				rrtype, err := models.ParseRecurrenceRangeType("endDate")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				rng.SetTypeEscaped(rrtype.(*models.RecurrenceRangeType))
 
@@ -277,7 +303,7 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 
 				return rec
 			},
-			expect:   "FREQ=WEEKLY;INTERVAL=1;UNTIL=20210101T235959Z",
+			expect:   "FREQ=WEEKLY;INTERVAL=1;WKST=SU;UNTIL=20210101T235959Z",
 			errCheck: require.NoError,
 		},
 		{
@@ -287,15 +313,16 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 				pat := models.NewRecurrencePattern()
 
 				typ, err := models.ParseRecurrencePatternType("weekly")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(1)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
 
 				rng := models.NewRecurrenceRange()
 
 				rrtype, err := models.ParseRecurrenceRangeType("numbered")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				rng.SetTypeEscaped(rrtype.(*models.RecurrenceRangeType))
 
@@ -307,7 +334,7 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 
 				return rec
 			},
-			expect:   "FREQ=WEEKLY;INTERVAL=1;COUNT=10",
+			expect:   "FREQ=WEEKLY;INTERVAL=1;WKST=SU;COUNT=10",
 			errCheck: require.NoError,
 		},
 		{
@@ -317,10 +344,11 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 				pat := models.NewRecurrencePattern()
 
 				typ, err := models.ParseRecurrencePatternType("weekly")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(1)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
 
 				days := []models.DayOfWeek{
 					models.MONDAY_DAYOFWEEK,
@@ -334,7 +362,7 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 
 				return rec
 			},
-			expect:   "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE,TH",
+			expect:   "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE,TH;WKST=SU",
 			errCheck: require.NoError,
 		},
 		{
@@ -344,16 +372,17 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 				pat := models.NewRecurrencePattern()
 
 				typ, err := models.ParseRecurrencePatternType("daily")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(2)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
 
 				rec.SetPattern(pat)
 
 				return rec
 			},
-			expect:   "FREQ=DAILY;INTERVAL=2",
+			expect:   "FREQ=DAILY;INTERVAL=2;WKST=SU",
 			errCheck: require.NoError,
 		},
 		{
@@ -363,10 +392,11 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 				pat := models.NewRecurrencePattern()
 
 				typ, err := models.ParseRecurrencePatternType("absoluteMonthly")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(1)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
 
 				pat.SetDayOfMonth(ptr.To(int32(5)))
 
@@ -374,7 +404,7 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 
 				return rec
 			},
-			expect:   "FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=5",
+			expect:   "FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=5;WKST=SU",
 			errCheck: require.NoError,
 		},
 		{
@@ -384,10 +414,11 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 				pat := models.NewRecurrencePattern()
 
 				typ, err := models.ParseRecurrencePatternType("absoluteYearly")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(3)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
 
 				pat.SetMonth(ptr.To(int32(8)))
 
@@ -395,7 +426,7 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 
 				return rec
 			},
-			expect:   "FREQ=YEARLY;INTERVAL=3;BYMONTH=8",
+			expect:   "FREQ=YEARLY;INTERVAL=3;BYMONTH=8;WKST=SU",
 			errCheck: require.NoError,
 		},
 		{
@@ -405,37 +436,38 @@ func (suite *ICSUnitSuite) TestGetRecurrencePattern() {
 				pat := models.NewRecurrencePattern()
 
 				typ, err := models.ParseRecurrencePatternType("relativeYearly")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(1)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
 
 				pat.SetMonth(ptr.To(int32(8)))
 				pat.SetDaysOfWeek([]models.DayOfWeek{models.FRIDAY_DAYOFWEEK})
 
 				wi, err := models.ParseWeekIndex("first")
-				require.NoError(suite.T(), err)
+				require.NoError(s.T(), err)
 				pat.SetIndex(wi.(*models.WeekIndex))
 
 				rec.SetPattern(pat)
 
 				return rec
 			},
-			expect:   "FREQ=YEARLY;INTERVAL=1;BYMONTH=8;BYDAY=1FR",
+			expect:   "FREQ=YEARLY;INTERVAL=1;BYMONTH=8;BYDAY=1FR;WKST=SU",
 			errCheck: require.NoError,
 		},
 		// TODO(meain): could still use more tests for edge cases of time
 	}
 
 	for _, tt := range table {
-		suite.Run(tt.name, func() {
+		s.Run(tt.name, func() {
-			ctx, flush := tester.NewContext(suite.T())
+			ctx, flush := tester.NewContext(s.T())
 			defer flush()
 
 			rec, err := getRecurrencePattern(ctx, tt.recurrence())
-			tt.errCheck(suite.T(), err)
+			tt.errCheck(s.T(), err)
 
-			assert.Equal(suite.T(), tt.expect, rec)
+			assert.Equal(s.T(), tt.expect, rec)
 		})
 	}
 }
@@ -460,8 +492,8 @@ func baseEvent() *models.Event {
 	return e
 }
 
-func (suite *ICSUnitSuite) TestEventConversion() {
+func (s *ICSUnitSuite) TestEventConversion() {
-	t := suite.T()
+	t := s.T()
 
 	table := []struct {
 		name  string
@@ -546,14 +578,19 @@ func (suite *ICSUnitSuite) TestEventConversion() {
 
 				rec := models.NewPatternedRecurrence()
 				pat := models.NewRecurrencePattern()
+				rng := models.NewRecurrenceRange()
 
 				typ, err := models.ParseRecurrencePatternType("daily")
 				require.NoError(t, err)
 
 				pat.SetTypeEscaped(typ.(*models.RecurrencePatternType))
 				pat.SetInterval(ptr.To(int32(1)))
+				pat.SetFirstDayOfWeek(ptr.To(models.SUNDAY_DAYOFWEEK))
+
+				rng.SetRecurrenceTimeZone(ptr.To("UTC"))
 
 				rec.SetPattern(pat)
+				rec.SetRangeEscaped(rng)
 
 				e.SetRecurrence(rec)
 
@@ -830,8 +867,8 @@ func (suite *ICSUnitSuite) TestEventConversion() {
 	}
 
 	for _, tt := range table {
-		suite.Run(tt.name, func() {
+		s.Run(tt.name, func() {
-			t := suite.T()
+			t := s.T()
 
 			ctx, flush := tester.NewContext(t)
 			defer flush()
@@ -881,8 +918,8 @@ func checkAttendee(t *testing.T, out, check, msg string) {
 	assert.ElementsMatch(t, as, bs, fmt.Sprintf("fields %s", msg))
 }
 
-func (suite *ICSUnitSuite) TestAttendees() {
+func (s *ICSUnitSuite) TestAttendees() {
-	t := suite.T()
+	t := s.T()
 
 	table := []struct {
 		name  string
@@ -908,6 +945,17 @@ func (suite *ICSUnitSuite) TestAttendees() {
 					"attendee")
 			},
 		},
+		{
+			name: "attendee with internal exchange representation for email",
+			att: [][]string{{
+				"/o=ExchangeLabs/ou=ExchangeAdministrative Group(FY...LT)/cn=Recipients/cn=883...4a-John Doe",
+				"required",
+				"declined",
+			}},
+			check: func(out string) {
+				assert.NotContains(t, out, "ATTENDEE")
+			},
+		},
 		{
 			name: "multiple attendees",
 			att: [][]string{
@@ -938,8 +986,8 @@ func (suite *ICSUnitSuite) TestAttendees() {
 	}
 
 	for _, tt := range table {
-		suite.Run(tt.name, func() {
+		s.Run(tt.name, func() {
-			t := suite.T()
+			t := s.T()
 
 			ctx, flush := tester.NewContext(t)
 			defer flush()
@@ -1060,8 +1108,8 @@ func checkAttachment(t *testing.T, out, check, msg string) {
 	assert.ElementsMatch(t, as, bs, fmt.Sprintf("fields %s", msg))
 }
 
-func (suite *ICSUnitSuite) TestAttachments() {
+func (s *ICSUnitSuite) TestAttachments() {
-	t := suite.T()
+	t := s.T()
 
 	type attachment struct {
 		cid     string // contentid
@@ -1117,8 +1165,8 @@ func (suite *ICSUnitSuite) TestAttachments() {
 	}
 
 	for _, tt := range table {
-		suite.Run(tt.name, func() {
+		s.Run(tt.name, func() {
-			t := suite.T()
+			t := s.T()
 
 			ctx, flush := tester.NewContext(t)
 			defer flush()
@@ -1161,7 +1209,7 @@ func (suite *ICSUnitSuite) TestAttachments() {
 	}
 }
 
-func (suite *ICSUnitSuite) TestCancellations() {
+func (s *ICSUnitSuite) TestCancellations() {
 	table := []struct {
 		name         string
 		cancelledIds []string
@@ -1185,8 +1233,8 @@ func (suite *ICSUnitSuite) TestCancellations() {
 	}
 
 	for _, tt := range table {
-		suite.Run(tt.name, func() {
+		s.Run(tt.name, func() {
-			t := suite.T()
+			t := s.T()
 
 			ctx, flush := tester.NewContext(t)
 			defer flush()
@@ -1249,7 +1297,7 @@ func eventToJSON(e *models.Event) ([]byte, error) {
 	return bts, err
 }
 
-func (suite *ICSUnitSuite) TestEventExceptions() {
+func (s *ICSUnitSuite) TestEventExceptions() {
 	table := []struct {
 		name  string
 		event func() *models.Event
@@ -1271,7 +1319,7 @@ func (suite *ICSUnitSuite) TestEventExceptions() {
 				exception.SetEnd(newEnd)
 
 				parsed, err := eventToMap(exception)
-				require.NoError(suite.T(), err, "parsing exception")
+				require.NoError(s.T(), err, "parsing exception")
 
 				// add exception event to additional data
 				e.SetAdditionalData(map[string]any{
@@ -1290,15 +1338,15 @@ func (suite *ICSUnitSuite) TestEventExceptions() {
 					}
 				}
 
-				assert.Equal(suite.T(), 2, events, "number of events")
+				assert.Equal(s.T(), 2, events, "number of events")
 
-				assert.Contains(suite.T(), out, "RECURRENCE-ID:20210101T120000Z", "recurrence id")
+				assert.Contains(s.T(), out, "RECURRENCE-ID:20210101T120000Z", "recurrence id")
 
-				assert.Contains(suite.T(), out, "SUMMARY:Subject", "original event")
+				assert.Contains(s.T(), out, "SUMMARY:Subject", "original event")
-				assert.Contains(suite.T(), out, "SUMMARY:Exception", "exception event")
+				assert.Contains(s.T(), out, "SUMMARY:Exception", "exception event")
 
-				assert.Contains(suite.T(), out, "DTSTART:20210101T130000Z", "new start time")
+				assert.Contains(s.T(), out, "DTSTART:20210101T130000Z", "new start time")
-				assert.Contains(suite.T(), out, "DTEND:20210101T140000Z", "new end time")
+				assert.Contains(s.T(), out, "DTEND:20210101T140000Z", "new end time")
 			},
 		},
 		{
@@ -1327,10 +1375,10 @@ func (suite *ICSUnitSuite) TestEventExceptions() {
 				exception2.SetEnd(newEnd)
 
 				parsed1, err := eventToMap(exception1)
-				require.NoError(suite.T(), err, "parsing exception 1")
+				require.NoError(s.T(), err, "parsing exception 1")
 
 				parsed2, err := eventToMap(exception2)
-				require.NoError(suite.T(), err, "parsing exception 2")
+				require.NoError(s.T(), err, "parsing exception 2")
 
 				// add exception event to additional data
 				e.SetAdditionalData(map[string]any{
@@ -1349,36 +1397,230 @@ func (suite *ICSUnitSuite) TestEventExceptions() {
 					}
 				}
 
-				assert.Equal(suite.T(), 3, events, "number of events")
+				assert.Equal(s.T(), 3, events, "number of events")
 
-				assert.Contains(suite.T(), out, "RECURRENCE-ID:20210101T120000Z", "recurrence id 1")
+				assert.Contains(s.T(), out, "RECURRENCE-ID:20210101T120000Z", "recurrence id 1")
-				assert.Contains(suite.T(), out, "RECURRENCE-ID:20210102T120000Z", "recurrence id 2")
+				assert.Contains(s.T(), out, "RECURRENCE-ID:20210102T120000Z", "recurrence id 2")
 
-				assert.Contains(suite.T(), out, "SUMMARY:Subject", "original event")
+				assert.Contains(s.T(), out, "SUMMARY:Subject", "original event")
-				assert.Contains(suite.T(), out, "SUMMARY:Exception 1", "exception event 1")
+				assert.Contains(s.T(), out, "SUMMARY:Exception 1", "exception event 1")
-				assert.Contains(suite.T(), out, "SUMMARY:Exception 2", "exception event 2")
+				assert.Contains(s.T(), out, "SUMMARY:Exception 2", "exception event 2")
 
-				assert.Contains(suite.T(), out, "DTSTART:20210101T130000Z", "new start time 1")
+				assert.Contains(s.T(), out, "DTSTART:20210101T130000Z", "new start time 1")
-				assert.Contains(suite.T(), out, "DTEND:20210101T140000Z", "new end time 1")
+				assert.Contains(s.T(), out, "DTEND:20210101T140000Z", "new end time 1")
 
-				assert.Contains(suite.T(), out, "DTSTART:20210102T130000Z", "new start time 2")
+				assert.Contains(s.T(), out, "DTSTART:20210102T130000Z", "new start time 2")
-				assert.Contains(suite.T(), out, "DTEND:20210102T140000Z", "new end time 2")
+				assert.Contains(s.T(), out, "DTEND:20210102T140000Z", "new end time 2")
 			},
 		},
 	}
 
 	for _, tt := range table {
-		suite.Run(tt.name, func() {
+		s.Run(tt.name, func() {
-			ctx, flush := tester.NewContext(suite.T())
+			ctx, flush := tester.NewContext(s.T())
 			defer flush()
 
 			bts, err := eventToJSON(tt.event())
-			require.NoError(suite.T(), err, "getting serialized content")
+			require.NoError(s.T(), err, "getting serialized content")
 
 			out, err := FromJSON(ctx, bts)
-			require.NoError(suite.T(), err, "converting to ics")
+			require.NoError(s.T(), err, "converting to ics")
 
 			tt.check(out)
 		})
 	}
 }
+
+func (s *ICSUnitSuite) TestGetRecurrenceTimezone() {
+	table := []struct {
+		name  string
+		intz  string
+		outtz string
+	}{
+		{
+			name:  "empty",
+			intz:  "",
+			outtz: "UTC",
+		},
+		{
+			name:  "utc",
+			intz:  "UTC",
+			outtz: "UTC",
+		},
+		{
+			name:  "simple",
+			intz:  "Asia/Kolkata",
+			outtz: "Asia/Kolkata",
+		},
+		{
+			name:  "windows tz",
+			intz:  "India Standard Time",
+			outtz: "Asia/Kolkata",
+		},
+		{
+			name:  "non canonical",
+			intz:  "Asia/Calcutta",
+			outtz: "Asia/Kolkata",
+		},
+	}
+
+	for _, tt := range table {
+		s.Run(tt.name, func() {
+			ctx, flush := tester.NewContext(s.T())
+			defer flush()
+
+			event := baseEvent()
+			if len(tt.intz) > 0 {
+				recur := models.NewPatternedRecurrence()
+				rp := models.NewRecurrenceRange()
+				rp.SetRecurrenceTimeZone(ptr.To(tt.intz))
+
+				recur.SetRangeEscaped(rp)
+				event.SetRecurrence(recur)
+			}
+
+			timezone, err := getRecurrenceTimezone(ctx, event)
+			require.NoError(s.T(), err)
+			assert.Equal(s.T(), tt.outtz, timezone.String())
+		})
+	}
+}
+
+func (s *ICSUnitSuite) TestAddTimezoneComponents() {
+	event := baseEvent()
+	recur := models.NewPatternedRecurrence()
+	rp := models.NewRecurrenceRange()
+	rp.SetRecurrenceTimeZone(ptr.To("Asia/Kolkata"))
+
+	recur.SetRangeEscaped(rp)
+	event.SetRecurrence(recur)
+
+	ctx, flush := tester.NewContext(s.T())
+	defer flush()
+
+	cal := ics.NewCalendar()
+
+	err := addTimeZoneComponents(ctx, cal, event)
+	require.NoError(s.T(), err)
+
+	text := cal.Serialize()
+	assert.Contains(s.T(), text, "BEGIN:VTIMEZONE", "beginning of timezone")
+	assert.Contains(s.T(), text, "TZID:Asia/Kolkata", "timezone id")
+	assert.Contains(s.T(), text, "END:VTIMEZONE", "end of timezone")
+}
+
+func (s *ICSUnitSuite) TestAddTime() {
+	locak, err := time.LoadLocation("Asia/Kolkata")
+	require.NoError(s.T(), err)
+
+	table := []struct {
+		name   string
+		prop   ics.ComponentProperty
+		time   time.Time
+		allDay bool
+		loc    *time.Location
+		exp    string
+	}{
+		{
+			name:   "utc",
+			prop:   ics.ComponentPropertyDtStart,
+			time:   time.Date(2021, 1, 2, 3, 4, 5, 0, time.UTC),
+			allDay: false,
+			loc:    time.UTC,
+			exp:    "DTSTART:20210102T030405Z",
+		},
+		{
+			name:   "local",
+			prop:   ics.ComponentPropertyDtStart,
+			time:   time.Date(2021, 1, 2, 3, 4, 5, 0, time.UTC),
+			allDay: false,
+			loc:    locak,
+			exp:    "DTSTART;TZID=Asia/Kolkata:20210102T083405",
+		},
+		{
+			name:   "all day",
+			prop:   ics.ComponentPropertyDtStart,
+			time:   time.Date(2021, 1, 2, 0, 0, 0, 0, time.UTC),
+			allDay: true,
+			loc:    time.UTC,
+			exp:    "DTSTART;VALUE=DATE:20210102",
+		},
+		{
+			name:   "all day local",
+			prop:   ics.ComponentPropertyDtStart,
+			time:   time.Date(2021, 1, 2, 0, 0, 0, 0, time.UTC),
+			allDay: true,
+			loc:    locak,
+			exp:    "DTSTART;VALUE=DATE;TZID=Asia/Kolkata:20210102",
+		},
+		{
+			name:   "end",
+			prop:   ics.ComponentPropertyDtEnd,
+			time:   time.Date(2021, 1, 2, 3, 4, 5, 0, time.UTC),
+			allDay: false,
+			loc:    time.UTC,
+			exp:    "DTEND:20210102T030405Z",
+		},
+		{
+			// This won't happen, but a good test to have to test loc handling
+			name:   "windows tz",
+			prop:   ics.ComponentPropertyDtStart,
+			time:   time.Date(2021, 1, 2, 3, 4, 5, 0, time.UTC),
+			allDay: false,
+			loc:    time.FixedZone("India Standard Time", 5*60*60+30*60),
+			exp:    "DTSTART;TZID=India Standard Time:20210102T083405",
+		},
+	}
+
+	for _, tt := range table {
+		s.Run(tt.name, func() {
+			cal := ics.NewCalendar()
+			evt := cal.AddEvent("id")
+
+			addTime(evt, tt.prop, tt.time, tt.allDay, tt.loc)
+
+			expSplits := strings.FieldsFunc(tt.exp, func(c rune) bool {
+				return c == ':' || c == ';'
+			})
+
+			text := cal.Serialize()
+			checkLine := ""
+
+			for _, l := range strings.Split(text, "\r\n") {
+				if strings.HasPrefix(l, string(tt.prop)) {
+					checkLine = l
+					break
+				}
+			}
+
+			actSplits := strings.FieldsFunc(checkLine, func(c rune) bool {
+				return c == ':' || c == ';'
+			})
+
+			assert.Greater(s.T(), len(checkLine), 0, "line not found")
+			assert.Equal(s.T(), len(expSplits), len(actSplits), "length of fields")
+			assert.ElementsMatch(s.T(), expSplits, actSplits, "fields")
+		})
+	}
+}
+
+// This tests and ensures that the generated data is int he format
+// that we expect
+func (s *ICSUnitSuite) TestGetTZDataKeyValues() {
+	for key := range tzdata.TZData {
+		s.Run(key, func() {
+			ctx, flush := tester.NewContext(s.T())
+			defer flush()
+
+			data, err := getTZDataKeyValues(ctx, key)
+			require.NoError(s.T(), err)
+
+			assert.NotEmpty(s.T(), data, "data")
+			assert.NotContains(s.T(), data, "BEGIN", "beginning of timezone") // should be stripped
+			assert.NotContains(s.T(), data, "END", "end of timezone")         // should be stripped
+			assert.NotContains(s.T(), data, "TZID", "timezone id")            // should be stripped
+			assert.Contains(s.T(), data, "DTSTART", "start time")
+			assert.Contains(s.T(), data, "TZOFFSETFROM", "offset from")
+		})
+	}
+}

src/internal/converters/ics/tzdata/fetch.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -eo pipefail
+
+if ! echo "$PWD" | grep -q '/tzdata$'; then
+    echo "Please run this script from the tzdata dir"
+    exit 1
+fi
+
+# TODO: Generate from https://www.iana.org/time-zones
+if [ ! -d /tmp/corso-tzdata ]; then
+    git clone --depth 1 https://github.com/add2cal/timezones-ical-library.git /tmp/corso-tzdata
+else
+    cd /tmp/corso-tzdata
+    git pull
+    cd -
+fi
+
+# Generate a huge go file with all the timezones
+echo "package tzdata" >data.go
+echo "" >>data.go
+
+echo "var TZData = map[string]string{" >>data.go
+
+find /tmp/corso-tzdata/ -name '*.ics' | while read -r f; do
+    tz=$(echo "$f" | sed 's|/tmp/corso-tzdata/api/||;s|\.ics$||')
+    echo "Processing $tz"
+    printf "\t\"%s\": \`" "$tz" >>data.go
+    cat "$f" | grep -Ev "(BEGIN:|END:|TZID:)" |
+        sed 's|`|\\`|g;s|\r||;s|TZID:/timezones-ical-library/|TZID:|' |
+        perl -pe 'chomp if eof' >>data.go
+    echo "\`," >>data.go
+done
+
+echo "}" >>data.go

src/internal/kopia/conn.go

@@ -59,6 +59,15 @@ const (
 	minEpochDurationUpperBound = 7 * 24 * time.Hour
 )
 
+// allValidCompressors is the set of compression algorithms either currently
+// being used or that were previously used. Use this during the config verify
+// command to avoid spurious errors. We can revisit whether we want to update
+// the config in those old repos at a later time.
+var allValidCompressors = map[compression.Name]struct{}{
+	compression.Name(defaultCompressor): {},
+	compression.Name("s2-default"):      {},
+}
+
 var (
 	ErrSettingDefaultConfig = clues.New("setting default repo config values")
 	ErrorRepoAlreadyExists  = clues.New("repo already exists")
@@ -768,7 +777,7 @@ func (w *conn) verifyDefaultPolicyConfigOptions(
 
 	ctx = clues.Add(ctx, "current_global_policy", globalPol.String())
 
-	if globalPol.CompressionPolicy.CompressorName != defaultCompressor {
+	if _, ok := allValidCompressors[globalPol.CompressionPolicy.CompressorName]; !ok {
 		errs.AddAlert(ctx, fault.NewAlert(
 			"unexpected compressor",
 			corsoWrapperAlertNamespace,

src/internal/kopia/conn_test.go

@@ -891,6 +891,20 @@ func (suite *ConnRetentionIntegrationSuite) TestVerifyDefaultConfigOptions() {
 			},
 			expectAlerts: 1,
 		},
+		{
+			name: "OldValidCompressor",
+			setupRepo: func(ctx context.Context, t *testing.T, con *conn) {
+				pol, err := con.getGlobalPolicyOrEmpty(ctx)
+				require.NoError(t, err, clues.ToCore(err))
+
+				_, err = updateCompressionOnPolicy("s2-default", pol)
+				require.NoError(t, err, clues.ToCore(err))
+
+				err = con.writeGlobalPolicy(ctx, "test", pol)
+				require.NoError(t, err, clues.ToCore(err))
+			},
+			expectAlerts: 0,
+		},
 		{
 			name: "NonDefaultCompression",
 			setupRepo: func(ctx context.Context, t *testing.T, con *conn) {

src/internal/m365/backup.go

@@ -2,6 +2,7 @@ package m365
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/alcionai/clues"
 
@@ -109,7 +110,7 @@ func (ctrl *Controller) ProduceBackupCollections(
 		handler = teamschats.NewBackup()
 
 	default:
-		return nil, nil, false, clues.Wrap(clues.NewWC(ctx, service.String()), "service not supported")
+		return nil, nil, false, clues.NewWC(ctx, fmt.Sprintf("service not supported: %s", service.HumanString()))
 	}
 
 	colls, excludeItems, canUsePreviousBackup, err = handler.ProduceBackupCollections(
@@ -173,7 +174,8 @@ func verifyBackupInputs(sel selectors.Selector, cachedIDs []string) error {
 	}
 
 	if !filters.Contains(ids).Compare(sel.ID()) {
-		return clues.Stack(core.ErrNotFound).With("selector_protected_resource", sel.ID())
+		return clues.Wrap(core.ErrNotFound, "verifying existence of resource").
+			With("selector_protected_resource", sel.ID())
 	}
 
 	return nil

src/internal/m365/backup_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	inMock "github.com/alcionai/corso/src/internal/common/idname/mock"
-	"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/service/exchange"
@@ -19,6 +18,7 @@ import (
 	"github.com/alcionai/corso/src/internal/m365/service/sharepoint"
 	"github.com/alcionai/corso/src/internal/operations/inject"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/internal/version"
 	"github.com/alcionai/corso/src/pkg/control"
@@ -36,10 +36,7 @@ import (
 
 type DataCollectionIntgSuite struct {
 	tester.Suite
-	user     string
+	m365 its.M365IntgTestSetup
-	site     string
-	tenantID string
-	ac       api.Client
 }
 
 func TestDataCollectionIntgSuite(t *testing.T) {
@@ -51,29 +48,14 @@ func TestDataCollectionIntgSuite(t *testing.T) {
 }
 
 func (suite *DataCollectionIntgSuite) SetupSuite() {
-	t := suite.T()
+	suite.m365 = its.GetM365(suite.T())
-
-	suite.user = tconfig.M365UserID(t)
-	suite.site = tconfig.M365SiteID(t)
-
-	acct := tconfig.NewM365Account(t)
-	creds, err := acct.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.tenantID = creds.AzureTenantID
-
-	suite.ac, err = api.NewClient(
-		creds,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(t, err, clues.ToCore(err))
 }
 
 func (suite *DataCollectionIntgSuite) TestExchangeDataCollection() {
 	ctx, flush := tester.NewContext(suite.T())
 	defer flush()
 
-	selUsers := []string{suite.user}
+	selUsers := []string{suite.m365.User.ID}
 
 	ctrl := newController(ctx, suite.T(), path.ExchangeService)
 	tests := []struct {
@@ -85,7 +67,7 @@ func (suite *DataCollectionIntgSuite) TestExchangeDataCollection() {
 			getSelector: func(t *testing.T) selectors.Selector {
 				sel := selectors.NewExchangeBackup(selUsers)
 				sel.Include(sel.MailFolders([]string{api.MailInbox}, selectors.PrefixMatch()))
-				sel.DiscreteOwner = suite.user
+				sel.DiscreteOwner = suite.m365.User.ID
 				return sel.Selector
 			},
 		},
@@ -94,7 +76,7 @@ func (suite *DataCollectionIntgSuite) TestExchangeDataCollection() {
 			getSelector: func(t *testing.T) selectors.Selector {
 				sel := selectors.NewExchangeBackup(selUsers)
 				sel.Include(sel.ContactFolders([]string{api.DefaultContacts}, selectors.PrefixMatch()))
-				sel.DiscreteOwner = suite.user
+				sel.DiscreteOwner = suite.m365.User.ID
 				return sel.Selector
 			},
 		},
@@ -142,8 +124,8 @@ func (suite *DataCollectionIntgSuite) TestExchangeDataCollection() {
 				collections, excludes, canUsePreviousBackup, err := exchange.NewBackup().ProduceBackupCollections(
 					ctx,
 					bpc,
-					suite.ac,
+					suite.m365.AC,
-					suite.ac.Credentials,
+					suite.m365.Creds,
 					ctrl.UpdateStatus,
 					count.New(),
 					fault.New(true))
@@ -270,7 +252,7 @@ func (suite *DataCollectionIntgSuite) TestSharePointDataCollection() {
 	ctx, flush := tester.NewContext(suite.T())
 	defer flush()
 
-	selSites := []string{suite.site}
+	selSites := []string{suite.m365.Site.ID}
 	ctrl := newController(ctx, suite.T(), path.SharePointService)
 	tests := []struct {
 		name        string
@@ -312,7 +294,7 @@ func (suite *DataCollectionIntgSuite) TestSharePointDataCollection() {
 			collections, excludes, canUsePreviousBackup, err := sharepoint.NewBackup().ProduceBackupCollections(
 				ctx,
 				bpc,
-				suite.ac,
+				suite.m365.AC,
 				ctrl.credentials,
 				ctrl.UpdateStatus,
 				count.New(),
@@ -351,8 +333,7 @@ func (suite *DataCollectionIntgSuite) TestSharePointDataCollection() {
 
 type SPCollectionIntgSuite struct {
 	tester.Suite
-	connector *Controller
+	m365 its.M365IntgTestSetup
-	user      string
 }
 
 func TestSPCollectionIntgSuite(t *testing.T) {
@@ -364,13 +345,7 @@ func TestSPCollectionIntgSuite(t *testing.T) {
 }
 
 func (suite *SPCollectionIntgSuite) SetupSuite() {
-	ctx, flush := tester.NewContext(suite.T())
+	suite.m365 = its.GetM365(suite.T())
-	defer flush()
-
-	suite.connector = newController(ctx, suite.T(), path.SharePointService)
-	suite.user = tconfig.M365UserID(suite.T())
-
-	tester.LogTimeOfTest(suite.T())
 }
 
 func (suite *SPCollectionIntgSuite) TestCreateSharePointCollection_Libraries() {
@@ -379,25 +354,20 @@ func (suite *SPCollectionIntgSuite) TestCreateSharePointCollection_Libraries() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	var (
+	ctrl := newController(ctx, t, path.SharePointService)
-		siteID  = tconfig.M365SiteID(t)
-		ctrl    = newController(ctx, t, path.SharePointService)
-		siteIDs = []string{siteID}
-	)
 
-	site, err := ctrl.PopulateProtectedResourceIDAndName(ctx, siteID, nil)
+	_, err := ctrl.PopulateProtectedResourceIDAndName(ctx, suite.m365.Site.ID, nil)
 	require.NoError(t, err, clues.ToCore(err))
 
-	sel := selectors.NewSharePointBackup(siteIDs)
+	sel := selectors.NewSharePointBackup([]string{suite.m365.Site.ID})
 	sel.Include(sel.LibraryFolders([]string{"foo"}, selectors.PrefixMatch()))
 	sel.Include(sel.Library("Documents"))
-
+	sel.SetDiscreteOwnerIDName(suite.m365.Site.ID, suite.m365.Site.WebURL)
-	sel.SetDiscreteOwnerIDName(site.ID(), site.Name())
 
 	bpc := inject.BackupProducerConfig{
 		LastBackupVersion: version.NoBackup,
 		Options:           control.DefaultOptions(),
-		ProtectedResource: site,
+		ProtectedResource: suite.m365.Site.Provider,
 		Selector:          sel.Selector,
 	}
 
@@ -415,15 +385,15 @@ func (suite *SPCollectionIntgSuite) TestCreateSharePointCollection_Libraries() {
 	)
 
 	documentsColl, err := path.BuildPrefix(
-		suite.connector.tenant,
+		suite.m365.TenantID,
-		siteID,
+		suite.m365.Site.ID,
 		path.SharePointService,
 		path.LibrariesCategory)
 	require.NoError(t, err, clues.ToCore(err))
 
 	metadataColl, err := path.BuildMetadata(
-		suite.connector.tenant,
+		suite.m365.TenantID,
-		siteID,
+		suite.m365.Site.ID,
 		path.SharePointService,
 		path.LibrariesCategory,
 		false)
@@ -450,24 +420,19 @@ func (suite *SPCollectionIntgSuite) TestCreateSharePointCollection_Lists() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	var (
+	ctrl := newController(ctx, t, path.SharePointService)
-		siteID  = tconfig.M365SiteID(t)
-		ctrl    = newController(ctx, t, path.SharePointService)
-		siteIDs = []string{siteID}
-	)
 
-	site, err := ctrl.PopulateProtectedResourceIDAndName(ctx, siteID, nil)
+	_, err := ctrl.PopulateProtectedResourceIDAndName(ctx, suite.m365.Site.ID, nil)
 	require.NoError(t, err, clues.ToCore(err))
 
-	sel := selectors.NewSharePointBackup(siteIDs)
+	sel := selectors.NewSharePointBackup([]string{suite.m365.Site.ID})
 	sel.Include(sel.Lists(selectors.Any()))
-
+	sel.SetDiscreteOwnerIDName(suite.m365.Site.ID, suite.m365.Site.WebURL)
-	sel.SetDiscreteOwnerIDName(site.ID(), site.Name())
 
 	bpc := inject.BackupProducerConfig{
 		LastBackupVersion: version.NoBackup,
 		Options:           control.DefaultOptions(),
-		ProtectedResource: site,
+		ProtectedResource: suite.m365.Site.Provider,
 		Selector:          sel.Selector,
 	}
 
@@ -502,9 +467,7 @@ func (suite *SPCollectionIntgSuite) TestCreateSharePointCollection_Lists() {
 
 type GroupsCollectionIntgSuite struct {
 	tester.Suite
-	connector *Controller
+	m365 its.M365IntgTestSetup
-	tenantID  string
-	user      string
 }
 
 func TestGroupsCollectionIntgSuite(t *testing.T) {
@@ -516,21 +479,7 @@ func TestGroupsCollectionIntgSuite(t *testing.T) {
 }
 
 func (suite *GroupsCollectionIntgSuite) SetupSuite() {
-	t := suite.T()
+	suite.m365 = its.GetM365(suite.T())
-
-	ctx, flush := tester.NewContext(t)
-	defer flush()
-
-	suite.connector = newController(ctx, t, path.GroupsService)
-	suite.user = tconfig.M365UserID(t)
-
-	acct := tconfig.NewM365Account(t)
-	creds, err := acct.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.tenantID = creds.AzureTenantID
-
-	tester.LogTimeOfTest(t)
 }
 
 func (suite *GroupsCollectionIntgSuite) TestCreateGroupsCollection_SharePoint() {
@@ -539,24 +488,19 @@ func (suite *GroupsCollectionIntgSuite) TestCreateGroupsCollection_SharePoint()
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	var (
+	ctrl := newController(ctx, t, path.GroupsService)
-		groupID  = tconfig.M365TeamID(t)
-		ctrl     = newController(ctx, t, path.GroupsService)
-		groupIDs = []string{groupID}
-	)
 
-	group, err := ctrl.PopulateProtectedResourceIDAndName(ctx, groupID, nil)
+	_, err := ctrl.PopulateProtectedResourceIDAndName(ctx, suite.m365.Group.ID, nil)
 	require.NoError(t, err, clues.ToCore(err))
 
-	sel := selectors.NewGroupsBackup(groupIDs)
+	sel := selectors.NewGroupsBackup([]string{suite.m365.Group.ID})
 	sel.Include(sel.LibraryFolders([]string{"test"}, selectors.PrefixMatch()))
-
+	sel.SetDiscreteOwnerIDName(suite.m365.Group.ID, suite.m365.Group.DisplayName)
-	sel.SetDiscreteOwnerIDName(group.ID(), group.Name())
 
 	bpc := inject.BackupProducerConfig{
 		LastBackupVersion: version.NoBackup,
 		Options:           control.DefaultOptions(),
-		ProtectedResource: group,
+		ProtectedResource: suite.m365.Group.Provider,
 		Selector:          sel.Selector,
 	}
 
@@ -575,8 +519,8 @@ func (suite *GroupsCollectionIntgSuite) TestCreateGroupsCollection_SharePoint()
 	assert.Greater(t, len(collections), 1)
 
 	p, err := path.BuildMetadata(
-		suite.tenantID,
+		suite.m365.TenantID,
-		groupID,
+		suite.m365.Group.ID,
 		path.GroupsService,
 		path.LibrariesCategory,
 		false)
@@ -614,31 +558,23 @@ func (suite *GroupsCollectionIntgSuite) TestCreateGroupsCollection_SharePoint_In
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	var (
+	ctrl := newController(ctx, t, path.GroupsService)
-		groupID  = tconfig.M365TeamID(t)
-		ctrl     = newController(ctx, t, path.GroupsService)
-		groupIDs = []string{groupID}
-	)
 
-	group, err := ctrl.PopulateProtectedResourceIDAndName(ctx, groupID, nil)
+	_, err := ctrl.PopulateProtectedResourceIDAndName(ctx, suite.m365.Group.ID, nil)
 	require.NoError(t, err, clues.ToCore(err))
 
-	sel := selectors.NewGroupsBackup(groupIDs)
+	sel := selectors.NewGroupsBackup([]string{suite.m365.Group.ID})
 	sel.Include(sel.LibraryFolders([]string{"test"}, selectors.PrefixMatch()))
-
+	sel.SetDiscreteOwnerIDName(suite.m365.Group.ID, suite.m365.Group.DisplayName)
-	sel.SetDiscreteOwnerIDName(group.ID(), group.Name())
-
-	site, err := suite.connector.AC.Groups().GetRootSite(ctx, groupID)
-	require.NoError(t, err, clues.ToCore(err))
 
 	pth, err := path.Build(
-		suite.tenantID,
+		suite.m365.TenantID,
-		groupID,
+		suite.m365.Group.ID,
 		path.GroupsService,
 		path.LibrariesCategory,
 		true,
 		odConsts.SitesPathDir,
-		ptr.Val(site.GetId()))
+		suite.m365.Group.RootSite.ID)
 	require.NoError(t, err, clues.ToCore(err))
 
 	mmc := []data.RestoreCollection{
@@ -656,7 +592,7 @@ func (suite *GroupsCollectionIntgSuite) TestCreateGroupsCollection_SharePoint_In
 	bpc := inject.BackupProducerConfig{
 		LastBackupVersion:   version.NoBackup,
 		Options:             control.DefaultOptions(),
-		ProtectedResource:   group,
+		ProtectedResource:   suite.m365.Group.Provider,
 		Selector:            sel.Selector,
 		MetadataCollections: mmc,
 	}
@@ -676,8 +612,8 @@ func (suite *GroupsCollectionIntgSuite) TestCreateGroupsCollection_SharePoint_In
 	assert.Greater(t, len(collections), 1)
 
 	p, err := path.BuildMetadata(
-		suite.tenantID,
+		suite.m365.TenantID,
-		groupID,
+		suite.m365.Group.ID,
 		path.GroupsService,
 		path.LibrariesCategory,
 		false)
@@ -690,13 +626,13 @@ func (suite *GroupsCollectionIntgSuite) TestCreateGroupsCollection_SharePoint_In
 	foundRootTombstone := false
 
 	sp, err := path.BuildPrefix(
-		suite.tenantID,
+		suite.m365.TenantID,
-		groupID,
+		suite.m365.Group.ID,
 		path.GroupsService,
 		path.LibrariesCategory)
 	require.NoError(t, err, clues.ToCore(err))
 
-	sp, err = sp.Append(false, odConsts.SitesPathDir, ptr.Val(site.GetId()))
+	sp, err = sp.Append(false, odConsts.SitesPathDir, suite.m365.Group.RootSite.ID)
 	require.NoError(t, err, clues.ToCore(err))
 
 	for _, coll := range collections {

src/internal/m365/collection/drive/collection.go

@@ -366,7 +366,7 @@ func downloadContent(
 	itemID := ptr.Val(item.GetId())
 	ctx = clues.Add(ctx, "item_id", itemID)
 
-	content, err := downloadItem(ctx, iaag, item)
+	content, err := downloadItem(ctx, iaag, driveID, item)
 	if err == nil {
 		return content, nil
 	} else if !graph.IsErrUnauthorizedOrBadToken(err) {
@@ -395,7 +395,7 @@ func downloadContent(
 
 	cdi := custom.ToCustomDriveItem(di)
 
-	content, err = downloadItem(ctx, iaag, cdi)
+	content, err = downloadItem(ctx, iaag, driveID, cdi)
 	if err != nil {
 		return nil, clues.Wrap(err, "content download retry")
 	}
@@ -426,7 +426,7 @@ func readItemContents(
 		return nil, core.ErrNotFound
 	}
 
-	rc, err := downloadFile(ctx, iaag, props.downloadURL)
+	rc, err := downloadFile(ctx, iaag, props.downloadURL, false)
 	if graph.IsErrUnauthorizedOrBadToken(err) {
 		logger.CtxErr(ctx, err).Debug("stale item in cache")
 	}

src/internal/m365/collection/drive/helper_test.go

@@ -22,8 +22,6 @@ import (
 	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/tester"
-	"github.com/alcionai/corso/src/internal/tester/tconfig"
-	"github.com/alcionai/corso/src/pkg/account"
 	"github.com/alcionai/corso/src/pkg/backup/details"
 	bupMD "github.com/alcionai/corso/src/pkg/backup/metadata"
 	"github.com/alcionai/corso/src/pkg/control"
@@ -41,50 +39,6 @@ import (
 
 const defaultFileSize int64 = 42
 
-// TODO(ashmrtn): Merge with similar structs in graph and exchange packages.
-type oneDriveService struct {
-	credentials account.M365Config
-	status      support.ControllerOperationStatus
-	ac          api.Client
-}
-
-func newOneDriveService(credentials account.M365Config) (*oneDriveService, error) {
-	ac, err := api.NewClient(
-		credentials,
-		control.DefaultOptions(),
-		count.New())
-	if err != nil {
-		return nil, err
-	}
-
-	service := oneDriveService{
-		ac:          ac,
-		credentials: credentials,
-	}
-
-	return &service, nil
-}
-
-func (ods *oneDriveService) updateStatus(status *support.ControllerOperationStatus) {
-	if status == nil {
-		return
-	}
-
-	ods.status = support.MergeStatus(ods.status, *status)
-}
-
-func loadTestService(t *testing.T) *oneDriveService {
-	a := tconfig.NewM365Account(t)
-
-	creds, err := a.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	service, err := newOneDriveService(creds)
-	require.NoError(t, err, clues.ToCore(err))
-
-	return service
-}
-
 // ---------------------------------------------------------------------------
 // collections
 // ---------------------------------------------------------------------------
@@ -841,7 +795,12 @@ func (h mockBackupHandler[T]) AugmentItemInfo(
 	return h.ItemInfo
 }
 
-func (h *mockBackupHandler[T]) Get(context.Context, string, map[string]string) (*http.Response, error) {
+func (h *mockBackupHandler[T]) Get(
+	context.Context,
+	string,
+	map[string]string,
+	bool,
+) (*http.Response, error) {
 	c := h.getCall
 	h.getCall++
 

src/internal/m365/collection/drive/item.go

@@ -21,8 +21,10 @@ import (
 )
 
 const (
-	acceptHeaderKey   = "Accept"
+	acceptHeaderKey        = "Accept"
-	acceptHeaderValue = "*/*"
+	acceptHeaderValue      = "*/*"
+	gigabyte               = 1024 * 1024 * 1024
+	largeFileDownloadLimit = 15 * gigabyte
 )
 
 // downloadUrlKeys is used to find the download URL in a DriveItem response.
@@ -33,7 +35,8 @@ var downloadURLKeys = []string{
 
 func downloadItem(
 	ctx context.Context,
-	ag api.Getter,
+	getter api.Getter,
+	driveID string,
 	item *custom.DriveItem,
 ) (io.ReadCloser, error) {
 	if item == nil {
@@ -41,36 +44,37 @@ func downloadItem(
 	}
 
 	var (
-		rc     io.ReadCloser
+		// very large file content needs to be downloaded through a different endpoint, or else
-		isFile = item.GetFile() != nil
+		// the download could take longer than the lifespan of the download token in the cached
-		err    error
+		// url, which will cause us to timeout on every download request, even if we refresh the
+		// download url right before the query.
+		url         = "https://graph.microsoft.com/v1.0/drives/" + driveID + "/items/" + ptr.Val(item.GetId()) + "/content"
+		reader      io.ReadCloser
+		err         error
+		isLargeFile = ptr.Val(item.GetSize()) > largeFileDownloadLimit
 	)
 
-	if isFile {
+	// if this isn't a file, no content is available for download
-		var (
+	if item.GetFile() == nil {
-			url string
+		return reader, nil
-			ad  = item.GetAdditionalData()
-		)
-
-		for _, key := range downloadURLKeys {
-			if v, err := str.AnyValueToString(key, ad); err == nil {
-				url = v
-				break
-			}
-		}
-
-		rc, err = downloadFile(ctx, ag, url)
-		if err != nil {
-			return nil, clues.Stack(err)
-		}
 	}
 
-	return rc, nil
+	// smaller files will maintain our current behavior (prefetching the download url with the
+	// url cache).  That pattern works for us in general, and we only need to deviate for very
+	// large file sizes.
+	if !isLargeFile {
+		url = str.FirstIn(item.GetAdditionalData(), downloadURLKeys...)
+	}
+
+	reader, err = downloadFile(ctx, getter, url, isLargeFile)
+
+	return reader, clues.StackWC(ctx, err).OrNil()
 }
 
 type downloadWithRetries struct {
-	getter api.Getter
+	getter      api.Getter
-	url    string
+	requireAuth bool
+	url         string
 }
 
 func (dg *downloadWithRetries) SupportsRange() bool {
@@ -86,7 +90,7 @@ func (dg *downloadWithRetries) Get(
 	// wouldn't work without it (get 416 responses instead of 206).
 	headers[acceptHeaderKey] = acceptHeaderValue
 
-	resp, err := dg.getter.Get(ctx, dg.url, headers)
+	resp, err := dg.getter.Get(ctx, dg.url, headers, dg.requireAuth)
 	if err != nil {
 		return nil, clues.Wrap(err, "getting file")
 	}
@@ -96,7 +100,7 @@ func (dg *downloadWithRetries) Get(
 			resp.Body.Close()
 		}
 
-		return nil, clues.New("malware detected").Label(graph.LabelsMalware)
+		return nil, clues.NewWC(ctx, "malware detected").Label(graph.LabelsMalware)
 	}
 
 	if resp != nil && (resp.StatusCode/100) != 2 {
@@ -107,7 +111,7 @@ func (dg *downloadWithRetries) Get(
 		// upstream error checks can compare the status with
 		// clues.HasLabel(err, graph.LabelStatus(http.KnownStatusCode))
 		return nil, clues.
-			Wrap(clues.New(resp.Status), "non-2xx http response").
+			Wrap(clues.NewWC(ctx, resp.Status), "non-2xx http response").
 			Label(graph.LabelStatus(resp.StatusCode))
 	}
 
@@ -118,6 +122,7 @@ func downloadFile(
 	ctx context.Context,
 	ag api.Getter,
 	url string,
+	requireAuth bool,
 ) (io.ReadCloser, error) {
 	if len(url) == 0 {
 		return nil, clues.NewWC(ctx, "empty file url")
@@ -141,8 +146,9 @@ func downloadFile(
 	rc, err := readers.NewResetRetryHandler(
 		ctx,
 		&downloadWithRetries{
-			getter: ag,
+			getter:      ag,
-			url:    url,
+			requireAuth: requireAuth,
+			url:         url,
 		})
 
 	return rc, clues.Stack(err).OrNil()

src/internal/m365/collection/drive/item_collector_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/alcionai/corso/src/internal/common/idname"
 	"github.com/alcionai/corso/src/internal/common/prefixmatcher"
+	"github.com/alcionai/corso/src/internal/m365/support"
 	"github.com/alcionai/corso/src/internal/tester"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/account"
@@ -153,7 +154,8 @@ func (suite *ItemCollectorUnitSuite) TestDrives() {
 				{
 					Values:   nil,
 					NextLink: nil,
-					Err:      graph.Stack(ctx, mySiteURLNotFound),
+					// needs graph.Stack, not clues.Stack
+					Err: graph.Stack(ctx, mySiteURLNotFound),
 				},
 			},
 			expectedErr:     assert.NoError,
@@ -165,7 +167,8 @@ func (suite *ItemCollectorUnitSuite) TestDrives() {
 				{
 					Values:   nil,
 					NextLink: nil,
-					Err:      graph.Stack(ctx, mySiteNotFound),
+					// needs graph.Stack, not clues.Stack
+					Err: graph.Stack(ctx, mySiteNotFound),
 				},
 			},
 			expectedErr:     assert.NoError,
@@ -231,6 +234,18 @@ func (suite *OneDriveIntgSuite) SetupSuite() {
 	require.NoError(t, err, clues.ToCore(err))
 }
 
+type stubStatusUpdater struct {
+	status support.ControllerOperationStatus
+}
+
+func (ssu *stubStatusUpdater) updateStatus(status *support.ControllerOperationStatus) {
+	if status == nil {
+		return
+	}
+
+	ssu.status = support.MergeStatus(ssu.status, *status)
+}
+
 func (suite *OneDriveIntgSuite) TestOneDriveNewCollections() {
 	creds, err := tconfig.NewM365Account(suite.T()).M365Config()
 	require.NoError(suite.T(), err, clues.ToCore(err))
@@ -256,10 +271,10 @@ func (suite *OneDriveIntgSuite) TestOneDriveNewCollections() {
 			defer flush()
 
 			var (
-				service = loadTestService(t)
+				scope = selectors.
-				scope   = selectors.
 					NewOneDriveBackup([]string{test.user}).
 					AllData()[0]
+				statusUpdater = stubStatusUpdater{}
 			)
 
 			colls := NewCollections(
@@ -272,7 +287,7 @@ func (suite *OneDriveIntgSuite) TestOneDriveNewCollections() {
 				},
 				creds.AzureTenantID,
 				idname.NewProvider(test.user, test.user),
-				service.updateStatus,
+				statusUpdater.updateStatus,
 				control.Options{
 					ToggleFeatures: control.Toggles{},
 				},

src/internal/m365/collection/drive/item_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/alcionai/corso/src/internal/common/ptr"
 	"github.com/alcionai/corso/src/internal/common/str"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/control"
 	"github.com/alcionai/corso/src/pkg/control/testdata"
@@ -30,9 +31,7 @@ import (
 
 type ItemIntegrationSuite struct {
 	tester.Suite
-	user        string
+	m365 its.M365IntgTestSetup
-	userDriveID string
-	service     *oneDriveService
 }
 
 func TestItemIntegrationSuite(t *testing.T) {
@@ -44,25 +43,7 @@ func TestItemIntegrationSuite(t *testing.T) {
 }
 
 func (suite *ItemIntegrationSuite) SetupSuite() {
-	t := suite.T()
+	suite.m365 = its.GetM365(suite.T())
-
-	ctx, flush := tester.NewContext(t)
-	defer flush()
-
-	suite.service = loadTestService(t)
-	suite.user = tconfig.SecondaryM365UserID(t)
-
-	graph.InitializeConcurrencyLimiter(ctx, true, 4)
-
-	pager := suite.service.ac.Drives().NewUserDrivePager(suite.user, nil)
-
-	odDrives, err := api.GetAllDrives(ctx, pager)
-	require.NoError(t, err, clues.ToCore(err))
-	// Test Requirement 1: Need a drive
-	require.Greaterf(t, len(odDrives), 0, "user %s does not have a drive", suite.user)
-
-	// Pick the first drive
-	suite.userDriveID = ptr.Val(odDrives[0].GetId())
 }
 
 func getOneDriveItem(
@@ -103,28 +84,36 @@ func (suite *ItemIntegrationSuite) TestItemReader_oneDrive() {
 	defer flush()
 
 	sc := selectors.
-		NewOneDriveBackup([]string{suite.user}).
+		NewOneDriveBackup([]string{suite.m365.User.ID}).
 		AllData()[0]
 
-	driveItem := getOneDriveItem(ctx, t, suite.service.ac, suite.userDriveID)
+	driveItem := getOneDriveItem(
+		ctx,
+		t,
+		suite.m365.AC,
+		suite.m365.User.DriveID)
 	// Test Requirement 2: Need a file
 	require.NotEmpty(
 		t,
 		driveItem,
-		"no file item found for user %s drive %s",
+		"no file item found for user %q drive %q",
-		suite.user,
+		suite.m365.User.ID,
-		suite.userDriveID)
+		suite.m365.User.DriveID)
 
 	bh := &userDriveBackupHandler{
 		baseUserDriveHandler: baseUserDriveHandler{
-			ac: suite.service.ac.Drives(),
+			ac: suite.m365.AC.Drives(),
 		},
-		userID: suite.user,
+		userID: suite.m365.User.ID,
 		scope:  sc,
 	}
 
 	// Read data for the file
-	itemData, err := downloadItem(ctx, bh, custom.ToCustomDriveItem(driveItem))
+	itemData, err := downloadItem(
+		ctx,
+		bh,
+		suite.m365.User.DriveID,
+		custom.ToCustomDriveItem(driveItem))
 	require.NoError(t, err, clues.ToCore(err))
 
 	size, err := io.Copy(io.Discard, itemData)
@@ -142,13 +131,13 @@ func (suite *ItemIntegrationSuite) TestIsURLExpired() {
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	driveItem := getOneDriveItem(ctx, t, suite.service.ac, suite.userDriveID)
+	driveItem := getOneDriveItem(ctx, t, suite.m365.AC, suite.m365.User.DriveID)
 	require.NotEmpty(
 		t,
 		driveItem,
-		"no file item found for user %s drive %s",
+		"no file item found for user %q drive %q",
-		suite.user,
+		suite.m365.User.ID,
-		suite.userDriveID)
+		suite.m365.User.DriveID)
 
 	var url string
 
@@ -173,7 +162,7 @@ func (suite *ItemIntegrationSuite) TestItemWriter() {
 	}{
 		{
 			name:    "",
-			driveID: suite.userDriveID,
+			driveID: suite.m365.User.DriveID,
 		},
 		// {
 		// 	name:   "sharePoint",
@@ -183,12 +172,12 @@ func (suite *ItemIntegrationSuite) TestItemWriter() {
 	for _, test := range table {
 		suite.Run(test.name, func() {
 			t := suite.T()
-			rh := NewUserDriveRestoreHandler(suite.service.ac)
+			rh := NewUserDriveRestoreHandler(suite.m365.AC)
 
 			ctx, flush := tester.NewContext(t)
 			defer flush()
 
-			root, err := suite.service.ac.Drives().GetRootFolder(ctx, test.driveID)
+			root, err := suite.m365.AC.Drives().GetRootFolder(ctx, test.driveID)
 			require.NoError(t, err, clues.ToCore(err))
 
 			newFolderName := testdata.DefaultRestoreConfig("folder").Location
@@ -217,7 +206,7 @@ func (suite *ItemIntegrationSuite) TestItemWriter() {
 
 			// HACK: Leveraging this to test getFolder behavior for a file. `getFolder()` on the
 			// newly created item should fail because it's a file not a folder
-			_, err = suite.service.ac.Drives().GetFolderByName(
+			_, err = suite.m365.AC.Drives().GetFolderByName(
 				ctx,
 				test.driveID,
 				ptr.Val(newFolder.GetId()),
@@ -261,7 +250,7 @@ func (suite *ItemIntegrationSuite) TestDriveGetFolder() {
 	}{
 		{
 			name:    "oneDrive",
-			driveID: suite.userDriveID,
+			driveID: suite.m365.User.DriveID,
 		},
 		// {
 		// 	name:   "sharePoint",
@@ -275,11 +264,11 @@ func (suite *ItemIntegrationSuite) TestDriveGetFolder() {
 			ctx, flush := tester.NewContext(t)
 			defer flush()
 
-			root, err := suite.service.ac.Drives().GetRootFolder(ctx, test.driveID)
+			root, err := suite.m365.AC.Drives().GetRootFolder(ctx, test.driveID)
 			require.NoError(t, err, clues.ToCore(err))
 
 			// Lookup a folder that doesn't exist
-			_, err = suite.service.ac.Drives().GetFolderByName(
+			_, err = suite.m365.AC.Drives().GetFolderByName(
 				ctx,
 				test.driveID,
 				ptr.Val(root.GetId()),
@@ -287,7 +276,7 @@ func (suite *ItemIntegrationSuite) TestDriveGetFolder() {
 			require.ErrorIs(t, err, api.ErrFolderNotFound, clues.ToCore(err))
 
 			// Lookup a folder that does exist
-			_, err = suite.service.ac.Drives().GetFolderByName(
+			_, err = suite.m365.AC.Drives().GetFolderByName(
 				ctx,
 				test.driveID,
 				ptr.Val(root.GetId()),
@@ -307,6 +296,7 @@ func (m mockGetter) Get(
 	ctx context.Context,
 	url string,
 	headers map[string]string,
+	requireAuth bool,
 ) (*http.Response, error) {
 	return m.GetFunc(ctx, url)
 }
@@ -394,7 +384,7 @@ func (suite *ItemUnitTestSuite) TestDownloadItem() {
 				return nil, clues.New("test error")
 			},
 			errorExpected: require.Error,
-			rcExpected:    require.Nil,
+			rcExpected:    require.NotNil,
 		},
 		{
 			name: "download url is empty",
@@ -431,7 +421,7 @@ func (suite *ItemUnitTestSuite) TestDownloadItem() {
 				}, nil
 			},
 			errorExpected: require.Error,
-			rcExpected:    require.Nil,
+			rcExpected:    require.NotNil,
 		},
 		{
 			name: "non-2xx http response",
@@ -450,7 +440,7 @@ func (suite *ItemUnitTestSuite) TestDownloadItem() {
 				}, nil
 			},
 			errorExpected: require.Error,
-			rcExpected:    require.Nil,
+			rcExpected:    require.NotNil,
 		},
 	}
 
@@ -463,9 +453,78 @@ func (suite *ItemUnitTestSuite) TestDownloadItem() {
 			mg := mockGetter{
 				GetFunc: test.GetFunc,
 			}
-			rc, err := downloadItem(ctx, mg, custom.ToCustomDriveItem(test.itemFunc()))
+			rc, err := downloadItem(
+				ctx,
+				mg,
+				"driveID",
+				custom.ToCustomDriveItem(test.itemFunc()))
 			test.errorExpected(t, err, clues.ToCore(err))
-			test.rcExpected(t, rc)
+			test.rcExpected(t, rc, "reader should only be nil if item is nil")
+		})
+	}
+}
+
+func (suite *ItemUnitTestSuite) TestDownloadItem_urlByFileSize() {
+	var (
+		testRc = io.NopCloser(bytes.NewReader([]byte("test")))
+		url    = "https://example.com"
+		okResp = &http.Response{
+			StatusCode: http.StatusOK,
+			Body:       testRc,
+		}
+	)
+
+	table := []struct {
+		name          string
+		itemFunc      func() models.DriveItemable
+		GetFunc       func(ctx context.Context, url string) (*http.Response, error)
+		errorExpected require.ErrorAssertionFunc
+		rcExpected    require.ValueAssertionFunc
+		label         string
+	}{
+		{
+			name: "big file",
+			itemFunc: func() models.DriveItemable {
+				di := api.NewDriveItem("test", false)
+				di.SetAdditionalData(map[string]any{"@microsoft.graph.downloadUrl": url})
+				di.SetSize(ptr.To[int64](20 * gigabyte))
+
+				return di
+			},
+			GetFunc: func(ctx context.Context, url string) (*http.Response, error) {
+				assert.Contains(suite.T(), url, "/content")
+				return okResp, nil
+			},
+		},
+		{
+			name: "small file",
+			itemFunc: func() models.DriveItemable {
+				di := api.NewDriveItem("test", false)
+				di.SetAdditionalData(map[string]any{"@microsoft.graph.downloadUrl": url})
+				di.SetSize(ptr.To[int64](2 * gigabyte))
+
+				return di
+			},
+			GetFunc: func(ctx context.Context, url string) (*http.Response, error) {
+				assert.NotContains(suite.T(), url, "/content")
+				return okResp, nil
+			},
+		},
+	}
+
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+
+			ctx, flush := tester.NewContext(t)
+			defer flush()
+
+			_, err := downloadItem(
+				ctx,
+				mockGetter{GetFunc: test.GetFunc},
+				"driveID",
+				custom.ToCustomDriveItem(test.itemFunc()))
+			require.NoError(t, err, clues.ToCore(err))
 		})
 	}
 }
@@ -522,7 +581,11 @@ func (suite *ItemUnitTestSuite) TestDownloadItem_ConnectionResetErrorOnFirstRead
 	mg := mockGetter{
 		GetFunc: GetFunc,
 	}
-	rc, err := downloadItem(ctx, mg, custom.ToCustomDriveItem(itemFunc()))
+	rc, err := downloadItem(
+		ctx,
+		mg,
+		"driveID",
+		custom.ToCustomDriveItem(itemFunc()))
 	errorExpected(t, err, clues.ToCore(err))
 	rcExpected(t, rc)
 

src/internal/m365/collection/drive/site_handler.go

@@ -93,8 +93,9 @@ func (h siteBackupHandler) Get(
 	ctx context.Context,
 	url string,
 	headers map[string]string,
+	requireAuth bool,
 ) (*http.Response, error) {
-	return h.ac.Get(ctx, url, headers)
+	return h.ac.Get(ctx, url, headers, requireAuth)
 }
 
 func (h siteBackupHandler) PathPrefix(

src/internal/m365/collection/drive/url_cache_test.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/alcionai/corso/src/internal/common/ptr"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/control"
 	"github.com/alcionai/corso/src/pkg/control/testdata"
@@ -34,9 +35,7 @@ import (
 
 type URLCacheIntegrationSuite struct {
 	tester.Suite
-	ac      api.Client
+	m365 its.M365IntgTestSetup
-	user    string
-	driveID string
 }
 
 func TestURLCacheIntegrationSuite(t *testing.T) {
@@ -49,29 +48,12 @@ func TestURLCacheIntegrationSuite(t *testing.T) {
 
 func (suite *URLCacheIntegrationSuite) SetupSuite() {
 	t := suite.T()
+	suite.m365 = its.GetM365(t)
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
 	graph.InitializeConcurrencyLimiter(ctx, true, 4)
-
-	suite.user = tconfig.SecondaryM365UserID(t)
-
-	acct := tconfig.NewM365Account(t)
-
-	creds, err := acct.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.ac, err = api.NewClient(
-		creds,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(t, err, clues.ToCore(err))
-
-	drive, err := suite.ac.Users().GetDefaultDrive(ctx, suite.user)
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.driveID = ptr.Val(drive.GetId())
 }
 
 // Basic test for urlCache. Create some files in onedrive, then access them via
@@ -79,22 +61,18 @@ func (suite *URLCacheIntegrationSuite) SetupSuite() {
 func (suite *URLCacheIntegrationSuite) TestURLCacheBasic() {
 	var (
 		t             = suite.T()
-		ac            = suite.ac.Drives()
+		ac            = suite.m365.AC.Drives()
-		driveID       = suite.driveID
+		driveID       = suite.m365.User.DriveID
 		newFolderName = testdata.DefaultRestoreConfig("folder").Location
 	)
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	// Create a new test folder
-	root, err := ac.GetRootFolder(ctx, driveID)
-	require.NoError(t, err, clues.ToCore(err))
-
 	newFolder, err := ac.PostItemInContainer(
 		ctx,
 		driveID,
-		ptr.Val(root.GetId()),
+		suite.m365.User.DriveRootFolderID,
 		api.NewDriveItem(newFolderName, true),
 		control.Copy)
 	require.NoError(t, err, clues.ToCore(err))
@@ -105,7 +83,7 @@ func (suite *URLCacheIntegrationSuite) TestURLCacheBasic() {
 	// Get the previous delta to feed into url cache
 	pager := ac.EnumerateDriveItemsDelta(
 		ctx,
-		suite.driveID,
+		driveID,
 		"",
 		api.CallConfig{
 			Select: api.URLCacheDriveItemProps(),
@@ -142,10 +120,10 @@ func (suite *URLCacheIntegrationSuite) TestURLCacheBasic() {
 
 	// Create a new URL cache with a long TTL
 	uc, err := newURLCache(
-		suite.driveID,
+		driveID,
 		du.URL,
 		1*time.Hour,
-		suite.ac.Drives(),
+		ac,
 		count.New(),
 		fault.New(true))
 	require.NoError(t, err, clues.ToCore(err))
@@ -176,7 +154,8 @@ func (suite *URLCacheIntegrationSuite) TestURLCacheBasic() {
 				http.MethodGet,
 				props.downloadURL,
 				nil,
-				nil)
+				nil,
+				false)
 			require.NoError(t, err, clues.ToCore(err))
 
 			require.NotNil(t, resp)

src/internal/m365/collection/drive/user_drive_handler.go

@@ -93,8 +93,9 @@ func (h userDriveBackupHandler) Get(
 	ctx context.Context,
 	url string,
 	headers map[string]string,
+	requireAuth bool,
 ) (*http.Response, error) {
-	return h.ac.Get(ctx, url, headers)
+	return h.ac.Get(ctx, url, headers, requireAuth)
 }
 
 func (h userDriveBackupHandler) PathPrefix(

src/internal/m365/collection/exchange/backup.go

@@ -296,6 +296,7 @@ func populateCollections(
 				cl),
 			qp.ProtectedResource.ID(),
 			bh.itemHandler(),
+			bh,
 			addAndRem.Added,
 			addAndRem.Removed,
 			// TODO: produce a feature flag that allows selective

src/internal/m365/collection/exchange/backup_test.go

@@ -24,6 +24,7 @@ import (
 	"github.com/alcionai/corso/src/internal/m365/support"
 	"github.com/alcionai/corso/src/internal/operations/inject"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/internal/version"
 	"github.com/alcionai/corso/src/pkg/account"
@@ -87,6 +88,14 @@ func (bh mockBackupHandler) folderGetter() containerGetter             { return
 func (bh mockBackupHandler) previewIncludeContainers() []string        { return bh.previewIncludes }
 func (bh mockBackupHandler) previewExcludeContainers() []string        { return bh.previewExcludes }
 
+func (bh mockBackupHandler) CanSkipItemFailure(
+	err error,
+	resourceID string,
+	opts control.Options,
+) (fault.SkipCause, bool) {
+	return "", false
+}
+
 func (bh mockBackupHandler) NewContainerCache(
 	userID string,
 ) (string, graph.ContainerResolver) {
@@ -472,10 +481,7 @@ func newStatusUpdater(t *testing.T, wg *sync.WaitGroup) func(status *support.Con
 
 type BackupIntgSuite struct {
 	tester.Suite
-	user     string
+	m365 its.M365IntgTestSetup
-	site     string
-	tenantID string
-	ac       api.Client
 }
 
 func TestBackupIntgSuite(t *testing.T) {
@@ -488,35 +494,18 @@ func TestBackupIntgSuite(t *testing.T) {
 
 func (suite *BackupIntgSuite) SetupSuite() {
 	t := suite.T()
+	suite.m365 = its.GetM365(t)
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
 	graph.InitializeConcurrencyLimiter(ctx, true, 4)
-
-	suite.user = tconfig.M365UserID(t)
-	suite.site = tconfig.M365SiteID(t)
-
-	acct := tconfig.NewM365Account(t)
-	creds, err := acct.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.ac, err = api.NewClient(
-		creds,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.tenantID = creds.AzureTenantID
-
-	tester.LogTimeOfTest(t)
 }
 
 func (suite *BackupIntgSuite) TestMailFetch() {
 	var (
-		userID   = tconfig.M365UserID(suite.T())
+		users    = []string{suite.m365.User.ID}
-		users    = []string{userID}
+		handlers = BackupHandlers(suite.m365.AC)
-		handlers = BackupHandlers(suite.ac)
 	)
 
 	tests := []struct {
@@ -560,14 +549,14 @@ func (suite *BackupIntgSuite) TestMailFetch() {
 			bpc := inject.BackupProducerConfig{
 				LastBackupVersion: version.NoBackup,
 				Options:           ctrlOpts,
-				ProtectedResource: inMock.NewProvider(userID, userID),
+				ProtectedResource: suite.m365.User.Provider,
 			}
 
 			collections, err := CreateCollections(
 				ctx,
 				bpc,
 				handlers,
-				suite.tenantID,
+				suite.m365.TenantID,
 				test.scope,
 				metadata.DeltaPaths{},
 				func(status *support.ControllerOperationStatus) {},
@@ -602,9 +591,8 @@ func (suite *BackupIntgSuite) TestMailFetch() {
 
 func (suite *BackupIntgSuite) TestDelta() {
 	var (
-		userID   = tconfig.M365UserID(suite.T())
+		users    = []string{suite.m365.User.ID}
-		users    = []string{userID}
+		handlers = BackupHandlers(suite.m365.AC)
-		handlers = BackupHandlers(suite.ac)
 	)
 
 	tests := []struct {
@@ -640,7 +628,7 @@ func (suite *BackupIntgSuite) TestDelta() {
 			bpc := inject.BackupProducerConfig{
 				LastBackupVersion: version.NoBackup,
 				Options:           control.DefaultOptions(),
-				ProtectedResource: inMock.NewProvider(userID, userID),
+				ProtectedResource: suite.m365.User.Provider,
 			}
 
 			// get collections without providing any delta history (ie: full backup)
@@ -648,7 +636,7 @@ func (suite *BackupIntgSuite) TestDelta() {
 				ctx,
 				bpc,
 				handlers,
-				suite.tenantID,
+				suite.m365.TenantID,
 				test.scope,
 				metadata.DeltaPaths{},
 				func(status *support.ControllerOperationStatus) {},
@@ -681,7 +669,7 @@ func (suite *BackupIntgSuite) TestDelta() {
 				ctx,
 				bpc,
 				handlers,
-				suite.tenantID,
+				suite.m365.TenantID,
 				test.scope,
 				dps,
 				func(status *support.ControllerOperationStatus) {},
@@ -703,8 +691,8 @@ func (suite *BackupIntgSuite) TestMailSerializationRegression() {
 
 	var (
 		wg       sync.WaitGroup
-		users    = []string{suite.user}
+		users    = []string{suite.m365.User.ID}
-		handlers = BackupHandlers(suite.ac)
+		handlers = BackupHandlers(suite.m365.AC)
 	)
 
 	sel := selectors.NewExchangeBackup(users)
@@ -713,7 +701,7 @@ func (suite *BackupIntgSuite) TestMailSerializationRegression() {
 	bpc := inject.BackupProducerConfig{
 		LastBackupVersion: version.NoBackup,
 		Options:           control.DefaultOptions(),
-		ProtectedResource: inMock.NewProvider(suite.user, suite.user),
+		ProtectedResource: suite.m365.User.Provider,
 		Selector:          sel.Selector,
 	}
 
@@ -721,7 +709,7 @@ func (suite *BackupIntgSuite) TestMailSerializationRegression() {
 		ctx,
 		bpc,
 		handlers,
-		suite.tenantID,
+		suite.m365.TenantID,
 		sel.Scopes()[0],
 		metadata.DeltaPaths{},
 		newStatusUpdater(t, &wg),
@@ -773,8 +761,8 @@ func (suite *BackupIntgSuite) TestMailSerializationRegression() {
 // a regression test to ensure that downloaded items can be uploaded.
 func (suite *BackupIntgSuite) TestContactSerializationRegression() {
 	var (
-		users    = []string{suite.user}
+		users    = []string{suite.m365.User.ID}
-		handlers = BackupHandlers(suite.ac)
+		handlers = BackupHandlers(suite.m365.AC)
 	)
 
 	tests := []struct {
@@ -801,14 +789,14 @@ func (suite *BackupIntgSuite) TestContactSerializationRegression() {
 			bpc := inject.BackupProducerConfig{
 				LastBackupVersion: version.NoBackup,
 				Options:           control.DefaultOptions(),
-				ProtectedResource: inMock.NewProvider(suite.user, suite.user),
+				ProtectedResource: suite.m365.User.Provider,
 			}
 
 			edcs, err := CreateCollections(
 				ctx,
 				bpc,
 				handlers,
-				suite.tenantID,
+				suite.m365.TenantID,
 				test.scope,
 				metadata.DeltaPaths{},
 				newStatusUpdater(t, &wg),
@@ -875,8 +863,8 @@ func (suite *BackupIntgSuite) TestContactSerializationRegression() {
 // to be able to successfully query, download and restore event objects
 func (suite *BackupIntgSuite) TestEventsSerializationRegression() {
 	var (
-		users    = []string{suite.user}
+		users    = []string{suite.m365.User.ID}
-		handlers = BackupHandlers(suite.ac)
+		handlers = BackupHandlers(suite.m365.AC)
 	)
 
 	tests := []struct {
@@ -911,14 +899,14 @@ func (suite *BackupIntgSuite) TestEventsSerializationRegression() {
 			bpc := inject.BackupProducerConfig{
 				LastBackupVersion: version.NoBackup,
 				Options:           control.DefaultOptions(),
-				ProtectedResource: inMock.NewProvider(suite.user, suite.user),
+				ProtectedResource: suite.m365.User.Provider,
 			}
 
 			collections, err := CreateCollections(
 				ctx,
 				bpc,
 				handlers,
-				suite.tenantID,
+				suite.m365.TenantID,
 				test.scope,
 				metadata.DeltaPaths{},
 				newStatusUpdater(t, &wg),

src/internal/m365/collection/exchange/collection.go

@@ -19,6 +19,7 @@ import (
 	"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/control"
 	"github.com/alcionai/corso/src/pkg/count"
 	"github.com/alcionai/corso/src/pkg/errs/core"
 	"github.com/alcionai/corso/src/pkg/fault"
@@ -68,21 +69,21 @@ func getItemAndInfo(
 	ctx context.Context,
 	getter itemGetterSerializer,
 	userID string,
-	id string,
+	itemID string,
 	useImmutableIDs bool,
 	parentPath string,
 ) ([]byte, *details.ExchangeInfo, error) {
 	item, info, err := getter.GetItem(
 		ctx,
 		userID,
-		id,
+		itemID,
 		fault.New(true)) // temporary way to force a failFast error
 	if err != nil {
 		return nil, nil, clues.WrapWC(ctx, err, "fetching item").
 			Label(fault.LabelForceNoBackupCreation)
 	}
 
-	itemData, err := getter.Serialize(ctx, item, userID, id)
+	itemData, err := getter.Serialize(ctx, item, userID, itemID)
 	if err != nil {
 		return nil, nil, clues.WrapWC(ctx, err, "serializing item")
 	}
@@ -108,6 +109,7 @@ func NewCollection(
 	bc data.BaseCollection,
 	user string,
 	items itemGetterSerializer,
+	canSkipFailChecker canSkipItemFailurer,
 	origAdded map[string]time.Time,
 	origRemoved []string,
 	validModTimes bool,
@@ -140,6 +142,7 @@ func NewCollection(
 			added:          added,
 			removed:        removed,
 			getter:         items,
+			skipChecker:    canSkipFailChecker,
 			statusUpdater:  statusUpdater,
 		}
 	}
@@ -150,6 +153,7 @@ func NewCollection(
 		added:          added,
 		removed:        removed,
 		getter:         items,
+		skipChecker:    canSkipFailChecker,
 		statusUpdater:  statusUpdater,
 		counter:        counter,
 	}
@@ -167,7 +171,8 @@ type prefetchCollection struct {
 	// removed is a list of item IDs that were deleted from, or moved out, of a container
 	removed map[string]struct{}
 
-	getter itemGetterSerializer
+	getter      itemGetterSerializer
+	skipChecker canSkipItemFailurer
 
 	statusUpdater support.StatusUpdater
 }
@@ -194,11 +199,12 @@ func (col *prefetchCollection) streamItems(
 		wg              sync.WaitGroup
 		progressMessage chan<- struct{}
 		user            = col.user
+		dataCategory    = col.Category().String()
 	)
 
 	ctx = clues.Add(
 		ctx,
-		"category", col.Category().String())
+		"category", dataCategory)
 
 	defer func() {
 		close(stream)
@@ -227,7 +233,7 @@ func (col *prefetchCollection) streamItems(
 	defer close(semaphoreCh)
 
 	// delete all removed items
-	for id := range col.removed {
+	for itemID := range col.removed {
 		semaphoreCh <- struct{}{}
 
 		wg.Add(1)
@@ -247,7 +253,7 @@ func (col *prefetchCollection) streamItems(
 			if progressMessage != nil {
 				progressMessage <- struct{}{}
 			}
-		}(id)
+		}(itemID)
 	}
 
 	var (
@@ -256,7 +262,7 @@ func (col *prefetchCollection) streamItems(
 	)
 
 	// add any new items
-	for id := range col.added {
+	for itemID := range col.added {
 		if el.Failure() != nil {
 			break
 		}
@@ -277,8 +283,23 @@ func (col *prefetchCollection) streamItems(
 				col.Opts().ToggleFeatures.ExchangeImmutableIDs,
 				parentPath)
 			if err != nil {
+				// pulled outside the switch due to multiple return values.
+				cause, canSkip := col.skipChecker.CanSkipItemFailure(
+					err,
+					user,
+					col.Opts())
+
 				// Handle known error cases
 				switch {
+				case canSkip:
+					// this is a special case handler that allows the item to be skipped
+					// instead of producing an error.
+					errs.AddSkip(ctx, fault.FileSkip(
+						cause,
+						dataCategory,
+						id,
+						id,
+						nil))
 				case errors.Is(err, core.ErrNotFound):
 					// Don't report errors for deleted items as there's no way for us to
 					// back up data that is gone. Record it as a "success", since there's
@@ -300,6 +321,19 @@ func (col *prefetchCollection) streamItems(
 						id,
 						map[string]any{"parentPath": parentPath}))
 					atomic.AddInt64(&success, 1)
+				case graph.IsErrCorruptData(err):
+					// These items cannot be downloaded, graph error indicates that the item
+					// data is corrupted. Add to skipped list.
+					logger.
+						CtxErr(ctx, err).
+						With("skipped_reason", fault.SkipCorruptData).
+						Info("inaccessible email")
+					errs.AddSkip(ctx, fault.EmailSkip(
+						fault.SkipCorruptData,
+						user,
+						id,
+						map[string]any{"parentPath": parentPath}))
+					atomic.AddInt64(&success, 1)
 				default:
 					col.Counter.Inc(count.StreamItemsErred)
 					el.AddRecoverable(ctx, clues.Wrap(err, "fetching item").Label(fault.LabelForceNoBackupCreation))
@@ -336,7 +370,7 @@ func (col *prefetchCollection) streamItems(
 			if progressMessage != nil {
 				progressMessage <- struct{}{}
 			}
-		}(id)
+		}(itemID)
 	}
 
 	wg.Wait()
@@ -364,7 +398,8 @@ type lazyFetchCollection struct {
 	// removed is a list of item IDs that were deleted from, or moved out, of a container
 	removed map[string]struct{}
 
-	getter itemGetterSerializer
+	getter      itemGetterSerializer
+	skipChecker canSkipItemFailurer
 
 	statusUpdater support.StatusUpdater
 
@@ -391,8 +426,8 @@ func (col *lazyFetchCollection) streamItems(
 	var (
 		success         int64
 		progressMessage chan<- struct{}
-
+		user            = col.user
-		user = col.user
+		el              = errs.Local()
 	)
 
 	defer func() {
@@ -404,7 +439,7 @@ func (col *lazyFetchCollection) streamItems(
 			int(success),
 			0,
 			col.FullPath().Folder(false),
-			errs.Failure())
+			el.Failure())
 	}()
 
 	if len(col.added)+len(col.removed) > 0 {
@@ -430,7 +465,7 @@ func (col *lazyFetchCollection) streamItems(
 
 	// add any new items
 	for id, modTime := range col.added {
-		if errs.Failure() != nil {
+		if el.Failure() != nil {
 			break
 		}
 
@@ -446,15 +481,18 @@ func (col *lazyFetchCollection) streamItems(
 			&lazyItemGetter{
 				userID:       user,
 				itemID:       id,
+				category:     col.Category(),
 				getter:       col.getter,
 				modTime:      modTime,
 				immutableIDs: col.Opts().ToggleFeatures.ExchangeImmutableIDs,
 				parentPath:   parentPath,
+				skipChecker:  col.skipChecker,
+				opts:         col.Opts(),
 			},
 			id,
 			modTime,
 			col.counter,
-			errs)
+			el)
 
 		atomic.AddInt64(&success, 1)
 
@@ -468,9 +506,12 @@ type lazyItemGetter struct {
 	getter       itemGetterSerializer
 	userID       string
 	itemID       string
+	category     path.CategoryType
 	parentPath   string
 	modTime      time.Time
 	immutableIDs bool
+	skipChecker  canSkipItemFailurer
+	opts         control.Options
 }
 
 func (lig *lazyItemGetter) GetData(
@@ -485,6 +526,25 @@ func (lig *lazyItemGetter) GetData(
 		lig.immutableIDs,
 		lig.parentPath)
 	if err != nil {
+		if lig.skipChecker != nil {
+			cause, canSkip := lig.skipChecker.CanSkipItemFailure(
+				err,
+				lig.userID,
+				lig.opts)
+			if canSkip {
+				errs.AddSkip(ctx, fault.FileSkip(
+					cause,
+					lig.category.String(),
+					lig.itemID,
+					lig.itemID,
+					nil))
+
+				return nil, nil, false, clues.
+					NewWC(ctx, "error marked as skippable by handler").
+					Label(graph.LabelsSkippable)
+			}
+		}
+
 		// If an item was deleted then return an empty file so we don't fail
 		// the backup and return a sentinel error when asked for ItemInfo so
 		// we don't display the item in the backup.
@@ -499,7 +559,7 @@ func (lig *lazyItemGetter) GetData(
 		err = clues.Stack(err)
 		errs.AddRecoverable(ctx, err)
 
-		return nil, nil, false, err
+		return nil, nil, false, clues.Stack(err)
 	}
 
 	// Update the mod time to what we already told kopia about. This is required

src/internal/m365/collection/exchange/collection_test.go

@@ -28,6 +28,7 @@ import (
 	"github.com/alcionai/corso/src/pkg/errs/core"
 	"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"
 	graphTD "github.com/alcionai/corso/src/pkg/services/m365/api/graph/testdata"
 )
@@ -153,6 +154,7 @@ func (suite *CollectionUnitSuite) TestNewCollection_state() {
 							count.New()),
 						"u",
 						mock.DefaultItemGetSerialize(),
+						mock.NeverCanSkipFailChecker(),
 						nil,
 						nil,
 						colType.validModTimes,
@@ -298,6 +300,7 @@ func (suite *CollectionUnitSuite) TestPrefetchCollection_Items() {
 					count.New()),
 				"",
 				&mock.ItemGetSerialize{},
+				mock.NeverCanSkipFailChecker(),
 				test.added,
 				maps.Keys(test.removed),
 				false,
@@ -333,6 +336,232 @@ func (suite *CollectionUnitSuite) TestPrefetchCollection_Items() {
 	}
 }
 
+func (suite *CollectionUnitSuite) TestPrefetchCollection_Items_skipFailure() {
+	var (
+		start         = time.Now().Add(-time.Second)
+		statusUpdater = func(*support.ControllerOperationStatus) {}
+	)
+
+	table := []struct {
+		name               string
+		category           path.CategoryType
+		handler            backupHandler
+		added              map[string]time.Time
+		removed            map[string]struct{}
+		expectItemCount    int
+		expectSkippedCount int
+		expectErr          assert.ErrorAssertionFunc
+	}{
+		{
+			name:      "no items",
+			category:  path.EventsCategory,
+			handler:   newEventBackupHandler(api.Client{}),
+			expectErr: assert.NoError,
+		},
+		{
+			name:     "events only added items",
+			category: path.EventsCategory,
+			handler:  newEventBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"fisher":    {},
+				"flannigan": {},
+				"fitzbog":   {},
+			},
+			expectItemCount:    0,
+			expectSkippedCount: 3,
+			expectErr:          assert.NoError,
+		},
+		{
+			name:     "events only removed items",
+			category: path.EventsCategory,
+			handler:  newEventBackupHandler(api.Client{}),
+			removed: map[string]struct{}{
+				"princess": {},
+				"poppy":    {},
+				"petunia":  {},
+			},
+			expectItemCount:    3,
+			expectSkippedCount: 0,
+			expectErr:          assert.NoError,
+		},
+		{
+			name:     "events added and removed items",
+			category: path.EventsCategory,
+			handler:  newEventBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"general": {},
+			},
+			removed: map[string]struct{}{
+				"general":  {},
+				"goose":    {},
+				"grumbles": {},
+			},
+			expectItemCount: 3,
+			// not 1,  because general is removed from the added
+			// map due to being in the removed map
+			expectSkippedCount: 0,
+			expectErr:          assert.NoError,
+		},
+		{
+			name:     "contacts only added items",
+			category: path.ContactsCategory,
+			handler:  newContactBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"fisher":    {},
+				"flannigan": {},
+				"fitzbog":   {},
+			},
+			expectItemCount:    0,
+			expectSkippedCount: 0,
+			expectErr:          assert.Error,
+		},
+		{
+			name:     "contacts only removed items",
+			category: path.ContactsCategory,
+			handler:  newContactBackupHandler(api.Client{}),
+			removed: map[string]struct{}{
+				"princess": {},
+				"poppy":    {},
+				"petunia":  {},
+			},
+			expectItemCount:    3,
+			expectSkippedCount: 0,
+			expectErr:          assert.NoError,
+		},
+		{
+			name:     "contacts added and removed items",
+			category: path.ContactsCategory,
+			handler:  newContactBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"general": {},
+			},
+			removed: map[string]struct{}{
+				"general":  {},
+				"goose":    {},
+				"grumbles": {},
+			},
+			expectItemCount: 3,
+			// not 1,  because general is removed from the added
+			// map due to being in the removed map
+			expectSkippedCount: 0,
+			expectErr:          assert.NoError,
+		},
+		{
+			name:     "mail only added items",
+			category: path.EmailCategory,
+			handler:  newMailBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"fisher":    {},
+				"flannigan": {},
+				"fitzbog":   {},
+			},
+			expectItemCount:    0,
+			expectSkippedCount: 0,
+			expectErr:          assert.Error,
+		},
+		{
+			name:     "mail only removed items",
+			category: path.EmailCategory,
+			handler:  newMailBackupHandler(api.Client{}),
+			removed: map[string]struct{}{
+				"princess": {},
+				"poppy":    {},
+				"petunia":  {},
+			},
+			expectItemCount:    3,
+			expectSkippedCount: 0,
+			expectErr:          assert.NoError,
+		},
+		{
+			name:     "mail added and removed items",
+			category: path.EmailCategory,
+			handler:  newMailBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"general": {},
+			},
+			removed: map[string]struct{}{
+				"general":  {},
+				"goose":    {},
+				"grumbles": {},
+			},
+			expectItemCount: 3,
+			// not 1,  because general is removed from the added
+			// map due to being in the removed map
+			expectSkippedCount: 0,
+			expectErr:          assert.NoError,
+		},
+	}
+
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			var (
+				t         = suite.T()
+				errs      = fault.New(true)
+				itemCount int
+			)
+
+			ctx, flush := tester.NewContext(t)
+			defer flush()
+
+			fullPath, err := path.Build("t", "pr", path.ExchangeService, test.category, false, "fnords", "smarf")
+			require.NoError(t, err, clues.ToCore(err))
+
+			locPath, err := path.Build("t", "pr", path.ExchangeService, test.category, false, "fnords", "smarf")
+			require.NoError(t, err, clues.ToCore(err))
+
+			opts := control.DefaultOptions()
+			opts.SkipEventsOnInstance503ForResources = map[string]struct{}{}
+			opts.SkipEventsOnInstance503ForResources["pr"] = struct{}{}
+
+			col := NewCollection(
+				data.NewBaseCollection(
+					fullPath,
+					nil,
+					locPath.ToBuilder(),
+					opts,
+					false,
+					count.New()),
+				"pr",
+				&mock.ItemGetSerialize{
+					SerializeErr: graph.ErrServiceUnavailableEmptyResp,
+				},
+				test.handler,
+				test.added,
+				maps.Keys(test.removed),
+				false,
+				statusUpdater,
+				count.New())
+
+			for item := range col.Items(ctx, errs) {
+				itemCount++
+
+				_, rok := test.removed[item.ID()]
+				if rok {
+					dimt, ok := item.(data.ItemModTime)
+					require.True(t, ok, "item implements data.ItemModTime")
+					assert.True(t, dimt.ModTime().After(start), "deleted items should set mod time to now()")
+					assert.True(t, item.Deleted(), "removals should be marked as deleted")
+				}
+
+				_, aok := test.added[item.ID()]
+				if !rok && aok {
+					assert.False(t, item.Deleted(), "additions should not be marked as deleted")
+				}
+
+				assert.True(t, aok || rok, "item must be either added or removed: %q", item.ID())
+			}
+
+			test.expectErr(t, errs.Failure())
+			assert.Equal(
+				t,
+				test.expectItemCount,
+				itemCount,
+				"should see all expected items")
+			assert.Len(t, errs.Skipped(), test.expectSkippedCount)
+		})
+	}
+}
+
 // This test verifies skipped error cases are handled correctly by collection enumeration
 func (suite *CollectionUnitSuite) TestCollection_SkippedErrors() {
 	var (
@@ -364,6 +593,17 @@ func (suite *CollectionUnitSuite) TestCollection_SkippedErrors() {
 			},
 			expectedSkipError: fault.EmailSkip(fault.SkipInvalidRecipients, "", "fisher", nil),
 		},
+		{
+			name: "ErrorCorruptData",
+			added: map[string]time.Time{
+				"fisher": {},
+			},
+			expectItemCount: 0,
+			itemGetter: &mock.ItemGetSerialize{
+				GetErr: graphTD.ODataErr(string(graph.ErrorCorruptData)),
+			},
+			expectedSkipError: fault.EmailSkip(fault.SkipCorruptData, "", "fisher", nil),
+		},
 	}
 
 	for _, test := range table {
@@ -387,6 +627,7 @@ func (suite *CollectionUnitSuite) TestCollection_SkippedErrors() {
 					count.New()),
 				"",
 				test.itemGetter,
+				mock.NeverCanSkipFailChecker(),
 				test.added,
 				nil,
 				false,
@@ -467,6 +708,7 @@ func (suite *CollectionUnitSuite) TestLazyFetchCollection_Items_LazyFetch() {
 			expectItemCount: 3,
 			expectReads: []string{
 				"fisher",
+				"flannigan",
 				"fitzbog",
 			},
 		},
@@ -519,6 +761,7 @@ func (suite *CollectionUnitSuite) TestLazyFetchCollection_Items_LazyFetch() {
 					count.New()),
 				"",
 				mlg,
+				mock.NeverCanSkipFailChecker(),
 				test.added,
 				maps.Keys(test.removed),
 				true,
@@ -530,10 +773,10 @@ func (suite *CollectionUnitSuite) TestLazyFetchCollection_Items_LazyFetch() {
 
 				_, rok := test.removed[item.ID()]
 				if rok {
-					assert.True(t, item.Deleted(), "removals should be marked as deleted")
 					dimt, ok := item.(data.ItemModTime)
 					require.True(t, ok, "item implements data.ItemModTime")
 					assert.True(t, dimt.ModTime().After(start), "deleted items should set mod time to now()")
+					assert.True(t, item.Deleted(), "removals should be marked as deleted")
 				}
 
 				modTime, aok := test.added[item.ID()]
@@ -542,7 +785,6 @@ func (suite *CollectionUnitSuite) TestLazyFetchCollection_Items_LazyFetch() {
 					// initializer.
 					assert.Implements(t, (*data.ItemModTime)(nil), item)
 					assert.Equal(t, modTime, item.(data.ItemModTime).ModTime(), "item mod time")
-
 					assert.False(t, item.Deleted(), "additions should not be marked as deleted")
 
 					// Check if the test want's us to read the item's data so the lazy
@@ -562,6 +804,8 @@ func (suite *CollectionUnitSuite) TestLazyFetchCollection_Items_LazyFetch() {
 						// collection initializer.
 						assert.NoError(t, err, clues.ToCore(err))
 						assert.Equal(t, modTime, info.Modified(), "ItemInfo mod time")
+					} else {
+						assert.Fail(t, "unexpected read on item %s", item.ID())
 					}
 				}
 
@@ -578,6 +822,294 @@ func (suite *CollectionUnitSuite) TestLazyFetchCollection_Items_LazyFetch() {
 	}
 }
 
+func (suite *CollectionUnitSuite) TestLazyFetchCollection_Items_skipFailure() {
+	var (
+		start         = time.Now().Add(-time.Second)
+		statusUpdater = func(*support.ControllerOperationStatus) {}
+		expectSkip    = func(t *testing.T, err error) {
+			assert.Error(t, err, clues.ToCore(err))
+			assert.ErrorContains(t, err, "skip")
+			assert.True(t, clues.HasLabel(err, graph.LabelsSkippable), clues.ToCore(err))
+		}
+		expectNotSkipped = func(t *testing.T, err error) {
+			assert.Error(t, err, clues.ToCore(err))
+			assert.NotContains(t, err.Error(), "skip")
+		}
+	)
+
+	table := []struct {
+		name               string
+		added              map[string]time.Time
+		removed            map[string]struct{}
+		category           path.CategoryType
+		handler            backupHandler
+		expectItemCount    int
+		expectSkippedCount int
+		expectReads        []string
+		expectErr          func(t *testing.T, err error)
+		expectFailure      assert.ErrorAssertionFunc
+	}{
+		{
+			name:          "no items",
+			category:      path.EventsCategory,
+			handler:       newEventBackupHandler(api.Client{}),
+			expectFailure: assert.NoError,
+		},
+		{
+			name:     "events only added items",
+			category: path.EventsCategory,
+			handler:  newEventBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"fisher":    start.Add(time.Minute),
+				"flannigan": start.Add(2 * time.Minute),
+				"fitzbog":   start.Add(3 * time.Minute),
+			},
+			expectItemCount:    3,
+			expectSkippedCount: 3,
+			expectReads: []string{
+				"fisher",
+				"flannigan",
+				"fitzbog",
+			},
+			expectErr:     expectSkip,
+			expectFailure: assert.NoError,
+		},
+		{
+			name:     "events only removed items",
+			category: path.EventsCategory,
+			handler:  newEventBackupHandler(api.Client{}),
+			removed: map[string]struct{}{
+				"princess": {},
+				"poppy":    {},
+				"petunia":  {},
+			},
+			expectItemCount:    3,
+			expectSkippedCount: 0,
+			expectErr:          expectSkip,
+			expectFailure:      assert.NoError,
+		},
+		{
+			name:     "events added and removed items",
+			category: path.EventsCategory,
+			handler:  newEventBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"general": {},
+			},
+			removed: map[string]struct{}{
+				"general":  {},
+				"goose":    {},
+				"grumbles": {},
+			},
+			expectItemCount: 3,
+			// not 1,  because general is removed from the added
+			// map due to being in the removed map
+			expectSkippedCount: 0,
+			expectErr:          expectSkip,
+			expectFailure:      assert.NoError,
+		},
+		{
+			name:     "contacts only added items",
+			category: path.ContactsCategory,
+			handler:  newContactBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"fisher":    start.Add(time.Minute),
+				"flannigan": start.Add(2 * time.Minute),
+				"fitzbog":   start.Add(3 * time.Minute),
+			},
+			expectItemCount:    3,
+			expectSkippedCount: 0,
+			expectReads: []string{
+				"fisher",
+				"flannigan",
+				"fitzbog",
+			},
+			expectErr:     expectNotSkipped,
+			expectFailure: assert.Error,
+		},
+		{
+			name:     "contacts only removed items",
+			category: path.ContactsCategory,
+			handler:  newContactBackupHandler(api.Client{}),
+			removed: map[string]struct{}{
+				"princess": {},
+				"poppy":    {},
+				"petunia":  {},
+			},
+			expectItemCount:    3,
+			expectSkippedCount: 0,
+			expectErr:          expectNotSkipped,
+			expectFailure:      assert.NoError,
+		},
+		{
+			name:     "contacts added and removed items",
+			category: path.ContactsCategory,
+			handler:  newContactBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"general": {},
+			},
+			removed: map[string]struct{}{
+				"general":  {},
+				"goose":    {},
+				"grumbles": {},
+			},
+			expectItemCount: 3,
+			// not 1,  because general is removed from the added
+			// map due to being in the removed map
+			expectSkippedCount: 0,
+			expectErr:          expectNotSkipped,
+			expectFailure:      assert.NoError,
+		},
+		{
+			name:     "mail only added items",
+			category: path.EmailCategory,
+			handler:  newMailBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"fisher":    start.Add(time.Minute),
+				"flannigan": start.Add(2 * time.Minute),
+				"fitzbog":   start.Add(3 * time.Minute),
+			},
+			expectItemCount:    3,
+			expectSkippedCount: 0,
+			expectReads: []string{
+				"fisher",
+				"flannigan",
+				"fitzbog",
+			},
+			expectErr:     expectNotSkipped,
+			expectFailure: assert.Error,
+		},
+		{
+			name:     "mail only removed items",
+			category: path.EmailCategory,
+			handler:  newMailBackupHandler(api.Client{}),
+			removed: map[string]struct{}{
+				"princess": {},
+				"poppy":    {},
+				"petunia":  {},
+			},
+			expectItemCount:    3,
+			expectSkippedCount: 0,
+			expectErr:          expectNotSkipped,
+			expectFailure:      assert.NoError,
+		},
+		{
+			name:     "mail added and removed items",
+			category: path.EmailCategory,
+			handler:  newMailBackupHandler(api.Client{}),
+			added: map[string]time.Time{
+				"general": {},
+			},
+			removed: map[string]struct{}{
+				"general":  {},
+				"goose":    {},
+				"grumbles": {},
+			},
+			expectItemCount: 3,
+			// not 1,  because general is removed from the added
+			// map due to being in the removed map
+			expectSkippedCount: 0,
+			expectErr:          expectNotSkipped,
+			expectFailure:      assert.NoError,
+		},
+	}
+
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			var (
+				t         = suite.T()
+				errs      = fault.New(false)
+				itemCount int
+			)
+
+			ctx, flush := tester.NewContext(t)
+			defer flush()
+
+			fullPath, err := path.Build("t", "pr", path.ExchangeService, test.category, false, "fnords", "smarf")
+			require.NoError(t, err, clues.ToCore(err))
+
+			locPath, err := path.Build("t", "pr", path.ExchangeService, test.category, false, "fnords", "smarf")
+			require.NoError(t, err, clues.ToCore(err))
+
+			mlg := &mockLazyItemGetterSerializer{
+				ItemGetSerialize: &mock.ItemGetSerialize{
+					SerializeErr: graph.ErrServiceUnavailableEmptyResp,
+				},
+			}
+			defer mlg.check(t, test.expectReads)
+
+			opts := control.DefaultOptions()
+			opts.SkipEventsOnInstance503ForResources = map[string]struct{}{}
+			opts.SkipEventsOnInstance503ForResources["pr"] = struct{}{}
+
+			col := NewCollection(
+				data.NewBaseCollection(
+					fullPath,
+					nil,
+					locPath.ToBuilder(),
+					opts,
+					false,
+					count.New()),
+				"pr",
+				mlg,
+				test.handler,
+				test.added,
+				maps.Keys(test.removed),
+				true,
+				statusUpdater,
+				count.New())
+
+			for item := range col.Items(ctx, errs) {
+				itemCount++
+
+				_, rok := test.removed[item.ID()]
+				if rok {
+					dimt, ok := item.(data.ItemModTime)
+					require.True(t, ok, "item implements data.ItemModTime")
+					assert.True(t, dimt.ModTime().After(start), "deleted items should set mod time to now()")
+					assert.True(t, item.Deleted(), "removals should be marked as deleted")
+				}
+
+				modTime, aok := test.added[item.ID()]
+				if !rok && aok {
+					// Item's mod time should be what's passed into the collection
+					// initializer.
+					assert.Implements(t, (*data.ItemModTime)(nil), item)
+					assert.Equal(t, modTime, item.(data.ItemModTime).ModTime(), "item mod time")
+					assert.False(t, item.Deleted(), "additions should not be marked as deleted")
+
+					// Check if the test want's us to read the item's data so the lazy
+					// data fetch is executed.
+					if slices.Contains(test.expectReads, item.ID()) {
+						r := item.ToReader()
+
+						_, err := io.ReadAll(r)
+						test.expectErr(t, err)
+
+						r.Close()
+					} else {
+						assert.Fail(t, "unexpected read on item %s", item.ID())
+					}
+				}
+
+				assert.True(t, aok || rok, "item must be either added or removed: %q", item.ID())
+			}
+
+			failure := errs.Failure()
+			if failure == nil && len(errs.Recovered()) > 0 {
+				failure = errs.Recovered()[0]
+			}
+
+			test.expectFailure(t, failure, clues.ToCore(failure))
+			assert.Equal(
+				t,
+				test.expectItemCount,
+				itemCount,
+				"should see all expected items")
+			assert.Len(t, errs.Skipped(), test.expectSkippedCount)
+		})
+	}
+}
+
 func (suite *CollectionUnitSuite) TestLazyItem_NoRead_GetInfo_Errors() {
 	t := suite.T()
 

src/internal/m365/collection/exchange/contacts_backup.go

@@ -1,6 +1,8 @@
 package exchange
 
 import (
+	"github.com/alcionai/corso/src/pkg/control"
+	"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"
 )
@@ -52,3 +54,11 @@ func (h contactBackupHandler) NewContainerCache(
 		getter: h.ac,
 	}
 }
+
+func (h contactBackupHandler) CanSkipItemFailure(
+	err error,
+	resourceID string,
+	opts control.Options,
+) (fault.SkipCause, bool) {
+	return "", false
+}

src/internal/m365/collection/exchange/contacts_backup_test.go

@@ -0,0 +1,83 @@
+package exchange
+
+import (
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
+
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/fault"
+	"github.com/alcionai/corso/src/pkg/services/m365/api"
+)
+
+type ContactsBackupHandlerUnitSuite struct {
+	tester.Suite
+}
+
+func TestContactsBackupHandlerUnitSuite(t *testing.T) {
+	suite.Run(t, &ContactsBackupHandlerUnitSuite{Suite: tester.NewUnitSuite(t)})
+}
+
+func (suite *ContactsBackupHandlerUnitSuite) TestHandler_CanSkipItemFailure() {
+	resourceID := uuid.NewString()
+
+	table := []struct {
+		name        string
+		err         error
+		opts        control.Options
+		expect      assert.BoolAssertionFunc
+		expectCause fault.SkipCause
+	}{
+		{
+			name:   "no config",
+			err:    assert.AnError,
+			opts:   control.Options{},
+			expect: assert.False,
+		},
+		{
+			name: "false when map is empty",
+			err:  assert.AnError,
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{},
+			},
+			expect: assert.False,
+		},
+		{
+			name: "false on nil error",
+			err:  nil,
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{
+					resourceID: {},
+				},
+			},
+			expect: assert.False,
+		},
+		{
+			name: "false even if resource matches",
+			err:  assert.AnError,
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{
+					resourceID: {},
+				},
+			},
+			expect: assert.False,
+		},
+	}
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+
+			h := newContactBackupHandler(api.Client{})
+			cause, result := h.CanSkipItemFailure(
+				test.err,
+				resourceID,
+				test.opts)
+
+			test.expect(t, result)
+			assert.Equal(t, test.expectCause, cause)
+		})
+	}
+}

src/internal/m365/collection/exchange/contacts_container_cache.go

@@ -126,7 +126,7 @@ func (cfc *contactContainerCache) Populate(
 		if err != nil {
 			errs.AddRecoverable(
 				ctx,
-				graph.Stack(ctx, err).Label(fault.LabelForceNoBackupCreation))
+				clues.StackWC(ctx, err).Label(fault.LabelForceNoBackupCreation))
 		}
 	}
 

src/internal/m365/collection/exchange/contacts_restore.go

@@ -120,7 +120,7 @@ func restoreContact(
 ) (*details.ExchangeInfo, error) {
 	contact, err := api.BytesToContactable(body)
 	if err != nil {
-		return nil, graph.Wrap(ctx, err, "creating contact from bytes")
+		return nil, clues.WrapWC(ctx, err, "creating contact from bytes")
 	}
 
 	ctx = clues.Add(ctx, "item_id", ptr.Val(contact.GetId()))
@@ -148,7 +148,7 @@ func restoreContact(
 
 	item, err := cr.PostItem(ctx, userID, destinationID, contact)
 	if err != nil {
-		return nil, graph.Wrap(ctx, err, "restoring contact")
+		return nil, clues.Wrap(err, "restoring contact")
 	}
 
 	// contacts have no PUT request, and PATCH could retain data that's not
@@ -159,7 +159,7 @@ func restoreContact(
 	if shouldDeleteOriginal {
 		err := cr.DeleteItem(ctx, userID, collisionID)
 		if err != nil && !errors.Is(err, core.ErrNotFound) {
-			return nil, graph.Wrap(ctx, err, "deleting colliding contact")
+			return nil, clues.Wrap(err, "deleting colliding contact")
 		}
 	}
 

src/internal/m365/collection/exchange/contacts_restore_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/alcionai/corso/src/internal/m365/service/exchange/mock"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/control"
 	"github.com/alcionai/corso/src/pkg/control/testdata"
@@ -54,7 +55,7 @@ func (m *contactRestoreMock) DeleteItem(
 
 type ContactsRestoreIntgSuite struct {
 	tester.Suite
-	its intgTesterSetup
+	m365 its.M365IntgTestSetup
 }
 
 func TestContactsRestoreIntgSuite(t *testing.T) {
@@ -66,17 +67,17 @@ func TestContactsRestoreIntgSuite(t *testing.T) {
 }
 
 func (suite *ContactsRestoreIntgSuite) SetupSuite() {
-	suite.its = newIntegrationTesterSetup(suite.T())
+	suite.m365 = its.GetM365(suite.T())
 }
 
 // Testing to ensure that cache system works for in multiple different environments
 func (suite *ContactsRestoreIntgSuite) TestCreateContainerDestination() {
 	runCreateDestinationTest(
 		suite.T(),
-		newContactRestoreHandler(suite.its.ac),
+		newContactRestoreHandler(suite.m365.AC),
 		path.ContactsCategory,
-		suite.its.creds.AzureTenantID,
+		suite.m365.TenantID,
-		suite.its.userID,
+		suite.m365.User.ID,
 		testdata.DefaultRestoreConfig("").Location,
 		[]string{"Hufflepuff"},
 		[]string{"Ravenclaw"})
@@ -207,17 +208,16 @@ func (suite *ContactsRestoreIntgSuite) TestRestoreContact() {
 	for _, test := range table {
 		suite.Run(test.name, func() {
 			t := suite.T()
+			ctr := count.New()
 
 			ctx, flush := tester.NewContext(t)
 			defer flush()
 
-			ctr := count.New()
-
 			_, err := restoreContact(
 				ctx,
 				test.apiMock,
 				body,
-				suite.its.userID,
+				suite.m365.User.ID,
 				"destination",
 				test.collisionMap,
 				test.onCollision,

src/internal/m365/collection/exchange/container_resolver_test.go

@@ -3,11 +3,13 @@ package exchange
 import (
 	"context"
 	"fmt"
+	"hash/crc32"
 	stdpath "path"
 	"testing"
 
 	"github.com/alcionai/clues"
 	"github.com/google/uuid"
+	"github.com/microsoftgraph/msgraph-sdk-go/models"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
@@ -16,10 +18,8 @@ import (
 
 	"github.com/alcionai/corso/src/internal/common/ptr"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"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/errs/core"
 	"github.com/alcionai/corso/src/pkg/fault"
 	"github.com/alcionai/corso/src/pkg/path"
@@ -1019,49 +1019,241 @@ func (suite *ConfiguredFolderCacheUnitSuite) TestAddToCache() {
 	assert.Equal(t, m.expectedLocation, l.String(), "location path")
 }
 
-type ContainerResolverSuite struct {
+// ---------------------------------------------------------------------------
-	tester.Suite
+// EventContainerCache unit tests
-	credentials account.M365Config
+// ---------------------------------------------------------------------------
+
+var _ containerGetter = mockEventContainerGetter{}
+
+type mockEventContainerGetter struct {
+	// containerGetter returns graph.CalendarDisplayable, unlike containersEnumerator
+	// which returns models.Calendarable.
+	idToCalendar map[string]graph.CalendarDisplayable
+	err          error
 }
 
-func TestContainerResolverIntegrationSuite(t *testing.T) {
+func (m mockEventContainerGetter) GetContainerByID(
-	suite.Run(t, &ContainerResolverSuite{
+	ctx context.Context,
+	userID string,
+	dirID string,
+) (graph.Container, error) {
+	return m.idToCalendar[dirID], m.err
+}
+
+var _ containersEnumerator[models.Calendarable] = mockEventContainersEnumerator{}
+
+type mockEventContainersEnumerator struct {
+	containers []models.Calendarable
+	err        error
+}
+
+func (m mockEventContainersEnumerator) EnumerateContainers(
+	ctx context.Context,
+	userID string,
+	baseDirID string,
+) ([]models.Calendarable, error) {
+	return m.containers, m.err
+}
+
+type EventsContainerUnitSuite struct {
+	tester.Suite
+}
+
+func TestEventsContainerUnitSuite(t *testing.T) {
+	suite.Run(t, &EventsContainerUnitSuite{
+		Suite: tester.NewUnitSuite(t),
+	})
+}
+
+func makeCalendar(
+	id, name, ownerEmail string,
+	isDefault bool,
+) *models.Calendar {
+	c := models.NewCalendar()
+
+	c.SetId(ptr.To(id))
+	c.SetName(ptr.To(name))
+	c.SetIsDefaultCalendar(ptr.To(isDefault))
+
+	if len(ownerEmail) > 0 {
+		email := models.NewEmailAddress()
+
+		email.SetAddress(ptr.To(ownerEmail))
+		// Set crc as the name for keeping this func simple.
+		eName := fmt.Sprintf("%d", crc32.ChecksumIEEE([]byte(ownerEmail)))
+		email.SetName(ptr.To(eName))
+		c.SetOwner(email)
+	}
+
+	return c
+}
+
+// Test if we skip backup of shared calendars. These will be backed up for
+// the resource owner that owns the calendar.
+func (suite *EventsContainerUnitSuite) TestPopulate_SkipSharedCalendars() {
+	// map of calendars
+	calendars := map[string]models.Calendarable{
+		// Default calendars Dx
+		"D0": makeCalendar(api.DefaultCalendar, api.DefaultCalendar, "owner@bar.com", true),
+		// Atypical, but creating another default calendar for testing purposes.
+		"D1": makeCalendar("D1", "D1", "owner@bar.com", true),
+		// Shared calendars Sx
+		"S0": makeCalendar("S0", "S0", "sharer@bar.com", false),
+		// Owned calendars, not default Ox
+		"O0": makeCalendar("O0", "O0", "owner@bar.com", false),
+		// Calendars with missing owner informaton
+		"M0": makeCalendar("M0", "M0", "", false),
+	}
+
+	// Always return default calendar from the getter.
+	getContainersByID := func() map[string]graph.CalendarDisplayable {
+		return map[string]graph.CalendarDisplayable{
+			api.DefaultCalendar: *graph.CreateCalendarDisplayable(calendars["D0"], "parentID"),
+		}
+	}
+
+	table := []struct {
+		name                string
+		enumerateContainers func() []models.Calendarable
+		expectErr           assert.ErrorAssertionFunc
+		assertFunc          func(t *testing.T, ecc *eventContainerCache)
+	}{
+		{
+			name: "one default calendar, one shared",
+			enumerateContainers: func() []models.Calendarable {
+				return []models.Calendarable{
+					calendars["D0"],
+					calendars["S0"],
+				}
+			},
+			expectErr: assert.NoError,
+			assertFunc: func(t *testing.T, ecc *eventContainerCache) {
+				assert.Len(t, ecc.cache, 1, "expected calendar count")
+				assert.NotNil(t, ecc.cache[api.DefaultCalendar], "missing default calendar")
+			},
+		},
+		{
+			name: "2 default calendars, 1 shared",
+			enumerateContainers: func() []models.Calendarable {
+				return []models.Calendarable{
+					calendars["D0"],
+					calendars["D1"],
+					calendars["S0"],
+				}
+			},
+			expectErr: assert.NoError,
+			assertFunc: func(t *testing.T, ecc *eventContainerCache) {
+				assert.Len(t, ecc.cache, 2, "expected calendar count")
+				assert.NotNil(t, ecc.cache[api.DefaultCalendar], "missing default calendar")
+				assert.NotNil(t, ecc.cache["D1"], "missing default calendar")
+			},
+		},
+		{
+			name: "1 default, 1 additional owned, 1 shared",
+			enumerateContainers: func() []models.Calendarable {
+				return []models.Calendarable{
+					calendars["D0"],
+					calendars["O0"],
+					calendars["S0"],
+				}
+			},
+			expectErr: assert.NoError,
+			assertFunc: func(t *testing.T, ecc *eventContainerCache) {
+				assert.Len(t, ecc.cache, 2, "expected calendar count")
+				assert.NotNil(t, ecc.cache[api.DefaultCalendar], "missing default calendar")
+				assert.NotNil(t, ecc.cache["O0"], "missing owned calendar")
+			},
+		},
+		{
+			name: "1 default, 1 with missing owner information",
+			enumerateContainers: func() []models.Calendarable {
+				return []models.Calendarable{
+					calendars["D0"],
+					calendars["M0"],
+				}
+			},
+
+			expectErr: assert.NoError,
+			assertFunc: func(t *testing.T, ecc *eventContainerCache) {
+				assert.Len(t, ecc.cache, 2, "expected calendar count")
+				assert.NotNil(t, ecc.cache[api.DefaultCalendar], "missing default calendar")
+				assert.NotNil(t, ecc.cache["M0"], "missing calendar with missing owner info")
+			},
+		},
+		{
+			// Unlikely to happen, but we should back up the calendar if the default owner
+			// cannot be determined, i.e. default calendar is missing.
+			name: "default owner info missing",
+			enumerateContainers: func() []models.Calendarable {
+				return []models.Calendarable{
+					calendars["S0"],
+				}
+			},
+			expectErr: assert.NoError,
+			assertFunc: func(t *testing.T, ecc *eventContainerCache) {
+				assert.Len(t, ecc.cache, 2, "expected calendar count")
+				assert.NotNil(t, ecc.cache[api.DefaultCalendar], "missing default calendar")
+				assert.NotNil(t, ecc.cache["S0"], "missing additional calendar")
+			},
+		},
+	}
+
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+
+			ctx, flush := tester.NewContext(t)
+			defer flush()
+
+			ecc := &eventContainerCache{
+				userID: "test",
+				enumer: mockEventContainersEnumerator{containers: test.enumerateContainers()},
+				getter: mockEventContainerGetter{idToCalendar: getContainersByID()},
+			}
+
+			err := ecc.Populate(ctx, fault.New(true), "root", "root")
+			test.expectErr(t, err, clues.ToCore(err))
+
+			test.assertFunc(t, ecc)
+		})
+	}
+}
+
+// ---------------------------------------------------------------------------
+// container resolver integration suite
+// ---------------------------------------------------------------------------
+
+type ContainerResolverIntgSuite struct {
+	tester.Suite
+	m365 its.M365IntgTestSetup
+}
+
+func TestContainerResolverIntgSuite(t *testing.T) {
+	suite.Run(t, &ContainerResolverIntgSuite{
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tconfig.M365AcctCredEnvs}),
 	})
 }
 
-func (suite *ContainerResolverSuite) SetupSuite() {
+func (suite *ContainerResolverIntgSuite) SetupSuite() {
-	t := suite.T()
+	suite.m365 = its.GetM365(suite.T())
-
-	a := tconfig.NewM365Account(t)
-	m365, err := a.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.credentials = m365
 }
 
-func (suite *ContainerResolverSuite) TestPopulate() {
+func (suite *ContainerResolverIntgSuite) TestPopulate() {
-	ac, err := api.NewClient(
-		suite.credentials,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(suite.T(), err, clues.ToCore(err))
-
 	eventFunc := func(t *testing.T) graph.ContainerResolver {
 		return &eventContainerCache{
 			userID: tconfig.M365UserID(t),
-			enumer: ac.Events(),
+			enumer: suite.m365.AC.Events(),
-			getter: ac.Events(),
+			getter: suite.m365.AC.Events(),
 		}
 	}
 
 	contactFunc := func(t *testing.T) graph.ContainerResolver {
 		return &contactContainerCache{
 			userID: tconfig.M365UserID(t),
-			enumer: ac.Contacts(),
+			enumer: suite.m365.AC.Contacts(),
-			getter: ac.Contacts(),
+			getter: suite.m365.AC.Contacts(),
 		}
 	}
 

src/internal/m365/collection/exchange/events_backup.go

@@ -1,6 +1,13 @@
 package exchange
 
 import (
+	"errors"
+	"net/http"
+
+	"github.com/alcionai/clues"
+
+	"github.com/alcionai/corso/src/pkg/control"
+	"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"
 )
@@ -52,3 +59,32 @@ func (h eventBackupHandler) NewContainerCache(
 		getter: h.ac,
 	}
 }
+
+// todo: this could be further improved buy specifying the call source and matching that
+// with the expected error.  Might be necessary if we use this for more than one error.
+// But since we only call this in a single place at this time, that additional guard isn't
+// built into the func.
+func (h eventBackupHandler) CanSkipItemFailure(
+	err error,
+	resourceID string,
+	opts control.Options,
+) (fault.SkipCause, bool) {
+	if err == nil {
+		return "", false
+	}
+
+	// this is a bit overly cautious.  we do know that we get 503s with empty response bodies
+	// due to fauilures when getting too many instances.  We don't know for sure if we get
+	// generic, well formed 503s.  But since we're working with specific resources and item
+	// IDs in the first place, that extra caution will help make sure an unexpected error dosn't
+	// slip through the cracks on us.
+	if !errors.Is(err, graph.ErrServiceUnavailableEmptyResp) &&
+		!clues.HasLabel(err, graph.LabelStatus(http.StatusServiceUnavailable)) {
+		return "", false
+	}
+
+	_, ok := opts.SkipEventsOnInstance503ForResources[resourceID]
+
+	// strict equals required here.  ids are case sensitive.
+	return fault.SkipKnownEventInstance503s, ok
+}

src/internal/m365/collection/exchange/events_backup_test.go

@@ -0,0 +1,112 @@
+package exchange
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/alcionai/clues"
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
+
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/control"
+	"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"
+)
+
+type EventsBackupHandlerUnitSuite struct {
+	tester.Suite
+}
+
+func TestEventsBackupHandlerUnitSuite(t *testing.T) {
+	suite.Run(t, &EventsBackupHandlerUnitSuite{Suite: tester.NewUnitSuite(t)})
+}
+
+func (suite *EventsBackupHandlerUnitSuite) TestHandler_CanSkipItemFailure() {
+	resourceID := uuid.NewString()
+
+	table := []struct {
+		name        string
+		err         error
+		opts        control.Options
+		expect      assert.BoolAssertionFunc
+		expectCause fault.SkipCause
+	}{
+		{
+			name:        "no config",
+			err:         graph.ErrServiceUnavailableEmptyResp,
+			opts:        control.Options{},
+			expect:      assert.False,
+			expectCause: fault.SkipKnownEventInstance503s,
+		},
+		{
+			name: "empty skip on 503",
+			err:  graph.ErrServiceUnavailableEmptyResp,
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{},
+			},
+			expect:      assert.False,
+			expectCause: fault.SkipKnownEventInstance503s,
+		},
+		{
+			name: "nil error",
+			err:  nil,
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{
+					resourceID: {},
+				},
+			},
+			expect: assert.False,
+		},
+		{
+			name: "non-matching resource",
+			err:  graph.ErrServiceUnavailableEmptyResp,
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{
+					"foo": {},
+				},
+			},
+			expect:      assert.False,
+			expectCause: fault.SkipKnownEventInstance503s,
+		},
+		{
+			name: "match on instance 503 empty resp",
+			err:  graph.ErrServiceUnavailableEmptyResp,
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{
+					resourceID: {},
+				},
+			},
+			expect:      assert.True,
+			expectCause: fault.SkipKnownEventInstance503s,
+		},
+		{
+			name: "match on instance 503",
+			err: clues.New("arbitrary error").
+				Label(graph.LabelStatus(http.StatusServiceUnavailable)),
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{
+					resourceID: {},
+				},
+			},
+			expect:      assert.True,
+			expectCause: fault.SkipKnownEventInstance503s,
+		},
+	}
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+
+			h := newEventBackupHandler(api.Client{})
+			cause, result := h.CanSkipItemFailure(
+				test.err,
+				resourceID,
+				test.opts)
+
+			test.expect(t, result)
+			assert.Equal(t, test.expectCause, cause)
+		})
+	}
+}

src/internal/m365/collection/exchange/events_container_cache.go

@@ -2,6 +2,7 @@ package exchange
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	"github.com/alcionai/clues"
@@ -60,6 +61,16 @@ func (ecc *eventContainerCache) populateEventRoot(ctx context.Context) error {
 	return nil
 }
 
+func isSharedCalendar(defaultCalendarOwner string, c models.Calendarable) bool {
+	// If we can't determine the owner, assume the calendar is owned by the
+	// user.
+	if len(defaultCalendarOwner) == 0 || c.GetOwner() == nil {
+		return false
+	}
+
+	return !strings.EqualFold(defaultCalendarOwner, ptr.Val(c.GetOwner().GetAddress()))
+}
+
 // Populate utility function for populating eventCalendarCache.
 // Executes 1 additional Graph Query
 // @param baseID: ignored. Present to conform to interface
@@ -89,11 +100,39 @@ func (ecc *eventContainerCache) Populate(
 		return clues.WrapWC(ctx, err, "enumerating containers")
 	}
 
+	var defaultCalendarOwner string
+
+	// Determine the owner for the default calendar. We'll use this to detect and
+	// skip shared calendars that are not owned by this user.
+	for _, c := range containers {
+		if ptr.Val(c.GetIsDefaultCalendar()) && c.GetOwner() != nil {
+			defaultCalendarOwner = ptr.Val(c.GetOwner().GetAddress())
+			ctx = clues.Add(ctx, "default_calendar_owner", defaultCalendarOwner)
+
+			break
+		}
+	}
+
 	for _, c := range containers {
 		if el.Failure() != nil {
 			return el.Failure()
 		}
 
+		// Skip shared calendars if we have enough information to determine the owner
+		if isSharedCalendar(defaultCalendarOwner, c) {
+			var ownerEmail string
+			if c.GetOwner() != nil {
+				ownerEmail = ptr.Val(c.GetOwner().GetAddress())
+			}
+
+			logger.Ctx(ctx).Infow(
+				"skipping shared calendar",
+				"name", ptr.Val(c.GetName()),
+				"owner", ownerEmail)
+
+			continue
+		}
+
 		cacheFolder := graph.NewCacheFolder(
 			api.CalendarDisplayable{Calendarable: c},
 			path.Builder{}.Append(ptr.Val(c.GetId())),
@@ -101,9 +140,8 @@ func (ecc *eventContainerCache) Populate(
 
 		err := ecc.addFolder(&cacheFolder)
 		if err != nil {
-			errs.AddRecoverable(
+			err := clues.StackWC(ctx, err).Label(fault.LabelForceNoBackupCreation)
-				ctx,
+			errs.AddRecoverable(ctx, err)
-				graph.Stack(ctx, err).Label(fault.LabelForceNoBackupCreation))
 		}
 	}
 

src/internal/m365/collection/exchange/events_restore.go

@@ -158,7 +158,7 @@ func restoreEvent(
 
 	item, err := er.PostItem(ctx, userID, destinationID, event)
 	if err != nil {
-		return nil, graph.Wrap(ctx, err, "restoring event")
+		return nil, clues.Wrap(err, "restoring event")
 	}
 
 	// events have no PUT request, and PATCH could retain data that's not
@@ -169,7 +169,7 @@ func restoreEvent(
 	if shouldDeleteOriginal {
 		err := er.DeleteItem(ctx, userID, collisionID)
 		if err != nil && !errors.Is(err, core.ErrNotFound) {
-			return nil, graph.Wrap(ctx, err, "deleting colliding event")
+			return nil, clues.Wrap(err, "deleting colliding event")
 		}
 	}
 

src/internal/m365/collection/exchange/events_restore_test.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/alcionai/corso/src/internal/m365/service/exchange/mock"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/control"
 	"github.com/alcionai/corso/src/pkg/control/testdata"
@@ -101,7 +102,7 @@ func (m *eventRestoreMock) PatchItem(
 
 type EventsRestoreIntgSuite struct {
 	tester.Suite
-	its intgTesterSetup
+	m365 its.M365IntgTestSetup
 }
 
 func TestEventsRestoreIntgSuite(t *testing.T) {
@@ -113,17 +114,17 @@ func TestEventsRestoreIntgSuite(t *testing.T) {
 }
 
 func (suite *EventsRestoreIntgSuite) SetupSuite() {
-	suite.its = newIntegrationTesterSetup(suite.T())
+	suite.m365 = its.GetM365(suite.T())
 }
 
 // Testing to ensure that cache system works for in multiple different environments
 func (suite *EventsRestoreIntgSuite) TestCreateContainerDestination() {
 	runCreateDestinationTest(
 		suite.T(),
-		newEventRestoreHandler(suite.its.ac),
+		newEventRestoreHandler(suite.m365.AC),
 		path.EventsCategory,
-		suite.its.creds.AzureTenantID,
+		suite.m365.TenantID,
-		suite.its.userID,
+		suite.m365.User.ID,
 		testdata.DefaultRestoreConfig("").Location,
 		[]string{"Durmstrang"},
 		[]string{"Beauxbatons"})
@@ -264,7 +265,7 @@ func (suite *EventsRestoreIntgSuite) TestRestoreEvent() {
 				ctx,
 				test.apiMock,
 				body,
-				suite.its.userID,
+				suite.m365.User.ID,
 				"destination",
 				test.collisionMap,
 				test.onCollision,

src/internal/m365/collection/exchange/handlers.go

@@ -26,6 +26,8 @@ type backupHandler interface {
 	previewIncludeContainers() []string
 	previewExcludeContainers() []string
 	NewContainerCache(userID string) (string, graph.ContainerResolver)
+
+	canSkipItemFailurer
 }
 
 type addedAndRemovedItemGetter interface {
@@ -57,6 +59,14 @@ func BackupHandlers(ac api.Client) map[path.CategoryType]backupHandler {
 	}
 }
 
+type canSkipItemFailurer interface {
+	CanSkipItemFailure(
+		err error,
+		resourceID string,
+		opts control.Options,
+	) (fault.SkipCause, bool)
+}
+
 // ---------------------------------------------------------------------------
 // restore
 // ---------------------------------------------------------------------------

src/internal/m365/collection/exchange/helper_test.go

@@ -1,44 +0,0 @@
-package exchange
-
-import (
-	"testing"
-
-	"github.com/alcionai/clues"
-	"github.com/stretchr/testify/require"
-
-	"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"
-)
-
-type intgTesterSetup struct {
-	ac     api.Client
-	creds  account.M365Config
-	userID string
-}
-
-func newIntegrationTesterSetup(t *testing.T) intgTesterSetup {
-	its := intgTesterSetup{}
-
-	ctx, flush := tester.NewContext(t)
-	defer flush()
-
-	a := tconfig.NewM365Account(t)
-	creds, err := a.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	its.creds = creds
-
-	its.ac, err = api.NewClient(
-		creds,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(t, err, clues.ToCore(err))
-
-	its.userID = tconfig.GetM365UserID(ctx)
-
-	return its
-}

src/internal/m365/collection/exchange/mail_backup.go

@@ -1,6 +1,8 @@
 package exchange
 
 import (
+	"github.com/alcionai/corso/src/pkg/control"
+	"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"
 )
@@ -57,3 +59,11 @@ func (h mailBackupHandler) NewContainerCache(
 		getter: h.ac,
 	}
 }
+
+func (h mailBackupHandler) CanSkipItemFailure(
+	err error,
+	resourceID string,
+	opts control.Options,
+) (fault.SkipCause, bool) {
+	return "", false
+}

src/internal/m365/collection/exchange/mail_backup_test.go

@@ -0,0 +1,83 @@
+package exchange
+
+import (
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
+
+	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/pkg/control"
+	"github.com/alcionai/corso/src/pkg/fault"
+	"github.com/alcionai/corso/src/pkg/services/m365/api"
+)
+
+type MailBackupHandlerUnitSuite struct {
+	tester.Suite
+}
+
+func TestMailBackupHandlerUnitSuite(t *testing.T) {
+	suite.Run(t, &MailBackupHandlerUnitSuite{Suite: tester.NewUnitSuite(t)})
+}
+
+func (suite *MailBackupHandlerUnitSuite) TestHandler_CanSkipItemFailure() {
+	resourceID := uuid.NewString()
+
+	table := []struct {
+		name        string
+		err         error
+		opts        control.Options
+		expect      assert.BoolAssertionFunc
+		expectCause fault.SkipCause
+	}{
+		{
+			name:   "no config",
+			err:    assert.AnError,
+			opts:   control.Options{},
+			expect: assert.False,
+		},
+		{
+			name: "false when map is empty",
+			err:  assert.AnError,
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{},
+			},
+			expect: assert.False,
+		},
+		{
+			name: "false on nil error",
+			err:  nil,
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{
+					resourceID: {},
+				},
+			},
+			expect: assert.False,
+		},
+		{
+			name: "false even if resource matches",
+			err:  assert.AnError,
+			opts: control.Options{
+				SkipEventsOnInstance503ForResources: map[string]struct{}{
+					resourceID: {},
+				},
+			},
+			expect: assert.False,
+		},
+	}
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+
+			h := newMailBackupHandler(api.Client{})
+			cause, result := h.CanSkipItemFailure(
+				test.err,
+				resourceID,
+				test.opts)
+
+			test.expect(t, result)
+			assert.Equal(t, test.expectCause, cause)
+		})
+	}
+}

src/internal/m365/collection/exchange/mail_container_cache.go

@@ -128,9 +128,8 @@ func (mc *mailContainerCache) Populate(
 
 		err := mc.addFolder(&cacheFolder)
 		if err != nil {
-			errs.AddRecoverable(
+			err = clues.StackWC(ctx, err).Label(fault.LabelForceNoBackupCreation)
-				ctx,
+			errs.AddRecoverable(ctx, err)
-				graph.Stack(ctx, err).Label(fault.LabelForceNoBackupCreation))
 		}
 	}
 

src/internal/m365/collection/exchange/mail_container_cache_test.go

@@ -10,10 +10,8 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"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/fault"
 	"github.com/alcionai/corso/src/pkg/services/m365/api"
 )
@@ -30,30 +28,24 @@ const (
 	expectedFolderPath = "toplevel/subFolder/subsubfolder"
 )
 
-type MailFolderCacheIntegrationSuite struct {
+type MailFolderCacheIntgSuite struct {
 	tester.Suite
-	credentials account.M365Config
+	m365 its.M365IntgTestSetup
 }
 
 func TestMailFolderCacheIntegrationSuite(t *testing.T) {
-	suite.Run(t, &MailFolderCacheIntegrationSuite{
+	suite.Run(t, &MailFolderCacheIntgSuite{
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tconfig.M365AcctCredEnvs}),
 	})
 }
 
-func (suite *MailFolderCacheIntegrationSuite) SetupSuite() {
+func (suite *MailFolderCacheIntgSuite) SetupSuite() {
-	t := suite.T()
+	suite.m365 = its.GetM365(suite.T())
-
-	a := tconfig.NewM365Account(t)
-	m365, err := a.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.credentials = m365
 }
 
-func (suite *MailFolderCacheIntegrationSuite) TestDeltaFetch() {
+func (suite *MailFolderCacheIntgSuite) TestDeltaFetch() {
 	suite.T().Skipf("Test depends on hardcoded folder names. Skipping till that is fixed")
 
 	tests := []struct {
@@ -75,7 +67,6 @@ func (suite *MailFolderCacheIntegrationSuite) TestDeltaFetch() {
 			path: []string{"some", "leading", "path"},
 		},
 	}
-	userID := tconfig.M365UserID(suite.T())
 
 	for _, test := range tests {
 		suite.Run(test.name, func() {
@@ -84,21 +75,15 @@ func (suite *MailFolderCacheIntegrationSuite) TestDeltaFetch() {
 			ctx, flush := tester.NewContext(t)
 			defer flush()
 
-			ac, err := api.NewClient(
+			acm := suite.m365.AC.Mail()
-				suite.credentials,
-				control.DefaultOptions(),
-				count.New())
-			require.NoError(t, err, clues.ToCore(err))
-
-			acm := ac.Mail()
 
 			mfc := mailContainerCache{
-				userID: userID,
+				userID: suite.m365.User.ID,
 				enumer: acm,
 				getter: acm,
 			}
 
-			err = mfc.Populate(ctx, fault.New(true), test.root, test.path...)
+			err := mfc.Populate(ctx, fault.New(true), test.root, test.path...)
 			require.NoError(t, err, clues.ToCore(err))
 
 			p, l, err := mfc.IDToPath(ctx, testFolderID)

src/internal/m365/collection/exchange/mail_restore.go

@@ -3,6 +3,7 @@ package exchange
 import (
 	"context"
 	"errors"
+	"regexp"
 
 	"github.com/alcionai/clues"
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
@@ -147,13 +148,15 @@ func restoreMail(
 
 	msg = setMessageSVEPs(toMessage(msg))
 
+	setReplyTos(msg)
+
 	attachments := msg.GetAttachments()
 	// Item.Attachments --> HasAttachments doesn't always have a value populated when deserialized
 	msg.SetAttachments([]models.Attachmentable{})
 
 	item, err := mr.PostItem(ctx, userID, destinationID, msg)
 	if err != nil {
-		return nil, graph.Wrap(ctx, err, "restoring mail message")
+		return nil, clues.Wrap(err, "restoring mail message")
 	}
 
 	// mails have no PUT request, and PATCH could retain data that's not
@@ -164,7 +167,7 @@ func restoreMail(
 	if shouldDeleteOriginal {
 		err := mr.DeleteItem(ctx, userID, collisionID)
 		if err != nil && !errors.Is(err, core.ErrNotFound) {
-			return nil, graph.Wrap(ctx, err, "deleting colliding mail message")
+			return nil, clues.Wrap(err, "deleting colliding mail message")
 		}
 	}
 
@@ -229,6 +232,38 @@ func setMessageSVEPs(msg models.Messageable) models.Messageable {
 	return msg
 }
 
+func setReplyTos(msg models.Messageable) {
+	var (
+		replyTos          = msg.GetReplyTo()
+		emailAddress      models.EmailAddressable
+		name, address     string
+		sanitizedReplyTos = make([]models.Recipientable, 0)
+	)
+
+	if len(replyTos) == 0 {
+		return
+	}
+
+	for _, replyTo := range replyTos {
+		emailAddress = replyTo.GetEmailAddress()
+		address = ptr.Val(emailAddress.GetAddress())
+		name = ptr.Val(emailAddress.GetName())
+
+		if isValidEmail(address) || isValidDN(address) {
+			newEmailAddress := models.NewEmailAddress()
+			newEmailAddress.SetAddress(ptr.To(address))
+			newEmailAddress.SetName(ptr.To(name))
+
+			sanitizedReplyTo := models.NewRecipient()
+			sanitizedReplyTo.SetEmailAddress(newEmailAddress)
+
+			sanitizedReplyTos = append(sanitizedReplyTos, sanitizedReplyTo)
+		}
+	}
+
+	msg.SetReplyTo(sanitizedReplyTos)
+}
+
 func (h mailRestoreHandler) GetItemsInContainerByCollisionKey(
 	ctx context.Context,
 	userID, containerID string,
@@ -240,3 +275,24 @@ func (h mailRestoreHandler) GetItemsInContainerByCollisionKey(
 
 	return m, nil
 }
+
+// [TODO]relocate to a common place
+func isValidEmail(email string) bool {
+	emailRegex := `^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$`
+	r := regexp.MustCompile(emailRegex)
+
+	return r.MatchString(email)
+}
+
+// isValidDN check if given string's format matches that of a MSFT Distinguished Name
+// This regular expression matches strings that start with /o=,
+// followed by any characters except /,
+// then /ou=, followed by any characters except /,
+// then /cn=, followed by any characters except /,
+// then /cn= followed by a 32-character hexadecimal string followed by - and any additional characters.
+func isValidDN(dn string) bool {
+	dnRegex := `^/o=[^/]+/ou=[^/]+/cn=[^/]+/cn=[a-fA-F0-9]{32}-[a-zA-Z0-9-]+$`
+	r := regexp.MustCompile(dnRegex)
+
+	return r.MatchString(dn)
+}

src/internal/m365/collection/exchange/mail_restore_test.go

@@ -11,8 +11,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
+	"github.com/alcionai/corso/src/internal/common/ptr"
 	"github.com/alcionai/corso/src/internal/m365/service/exchange/mock"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/control"
 	"github.com/alcionai/corso/src/pkg/control/testdata"
@@ -23,6 +25,127 @@ import (
 	"github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
+//nolint:lll
+const TestDN = "/o=ExchangeLabs/ou=Exchange Administrative Group (FYDIBOHF23SPDLT)/cn=Recipients/cn=4eca0d46a2324036b0b326dc58cfc802-user"
+
+type RestoreMailUnitSuite struct {
+	tester.Suite
+}
+
+func TestRestoreMailUnitSuite(t *testing.T) {
+	suite.Run(t, &RestoreMailUnitSuite{Suite: tester.NewUnitSuite(t)})
+}
+
+func (suite *RestoreMailUnitSuite) TestIsValidEmail() {
+	table := []struct {
+		name  string
+		email string
+		check assert.BoolAssertionFunc
+	}{
+		{
+			name:  "valid email",
+			email: "foo@bar.com",
+			check: assert.True,
+		},
+		{
+			name:  "invalid email, missing domain",
+			email: "foo.com",
+			check: assert.False,
+		},
+		{
+			name:  "invalid email, random uuid",
+			email: "12345678-abcd-90ef-88f8-2d95ef12fb66",
+			check: assert.False,
+		},
+		{
+			name:  "empty email",
+			email: "",
+			check: assert.False,
+		},
+	}
+
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+
+			result := isValidEmail(test.email)
+			test.check(t, result)
+		})
+	}
+}
+
+func (suite *RestoreMailUnitSuite) TestIsValidDN() {
+	table := []struct {
+		name  string
+		dn    string
+		check assert.BoolAssertionFunc
+	}{
+		{
+			name:  "valid DN",
+			dn:    TestDN,
+			check: assert.True,
+		},
+		{
+			name:  "invalid DN",
+			dn:    "random string",
+			check: assert.False,
+		},
+	}
+
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+
+			result := isValidDN(test.dn)
+			test.check(t, result)
+		})
+	}
+}
+
+func (suite *RestoreMailUnitSuite) TestSetReplyTos() {
+	t := suite.T()
+
+	replyTos := make([]models.Recipientable, 0)
+
+	emailAddresses := map[string]string{
+		"foo.bar": "foo@bar.com",
+		"foo.com": "foo.com",
+		"empty":   "",
+		"dn":      TestDN,
+	}
+
+	validEmailAddresses := map[string]string{
+		"foo.bar": "foo@bar.com",
+		"dn":      TestDN,
+	}
+
+	for k, v := range emailAddresses {
+		emailAddress := models.NewEmailAddress()
+		emailAddress.SetAddress(ptr.To(v))
+		emailAddress.SetName(ptr.To(k))
+
+		replyTo := models.NewRecipient()
+		replyTo.SetEmailAddress(emailAddress)
+
+		replyTos = append(replyTos, replyTo)
+	}
+
+	mailMessage := models.NewMessage()
+	mailMessage.SetReplyTo(replyTos)
+
+	setReplyTos(mailMessage)
+
+	sanitizedReplyTos := mailMessage.GetReplyTo()
+	require.Len(t, sanitizedReplyTos, len(validEmailAddresses))
+
+	for _, sanitizedReplyTo := range sanitizedReplyTos {
+		emailAddress := sanitizedReplyTo.GetEmailAddress()
+
+		assert.Contains(t, validEmailAddresses, ptr.Val(emailAddress.GetName()))
+		assert.Equal(t, validEmailAddresses[ptr.Val(emailAddress.GetName())], ptr.Val(emailAddress.GetAddress()))
+	}
+}
+
 var _ mailRestorer = &mailRestoreMock{}
 
 type mailRestoreMock struct {
@@ -72,7 +195,7 @@ func (m *mailRestoreMock) PostLargeAttachment(
 
 type MailRestoreIntgSuite struct {
 	tester.Suite
-	its intgTesterSetup
+	m365 its.M365IntgTestSetup
 }
 
 func TestMailRestoreIntgSuite(t *testing.T) {
@@ -84,16 +207,16 @@ func TestMailRestoreIntgSuite(t *testing.T) {
 }
 
 func (suite *MailRestoreIntgSuite) SetupSuite() {
-	suite.its = newIntegrationTesterSetup(suite.T())
+	suite.m365 = its.GetM365(suite.T())
 }
 
 func (suite *MailRestoreIntgSuite) TestCreateContainerDestination() {
 	runCreateDestinationTest(
 		suite.T(),
-		newMailRestoreHandler(suite.its.ac),
+		newMailRestoreHandler(suite.m365.AC),
 		path.EmailCategory,
-		suite.its.creds.AzureTenantID,
+		suite.m365.TenantID,
-		suite.its.userID,
+		suite.m365.User.ID,
 		testdata.DefaultRestoreConfig("").Location,
 		[]string{"Griffindor", "Croix"},
 		[]string{"Griffindor", "Felicius"})
@@ -234,7 +357,7 @@ func (suite *MailRestoreIntgSuite) TestRestoreMail() {
 				ctx,
 				test.apiMock,
 				body,
-				suite.its.userID,
+				suite.m365.User.ID,
 				"destination",
 				test.collisionMap,
 				test.onCollision,

src/internal/m365/collection/exchange/mock/item.go

@@ -6,10 +6,15 @@ import (
 	"github.com/microsoft/kiota-abstractions-go/serialization"
 
 	"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/services/m365/api"
 )
 
+// ---------------------------------------------------------------------------
+// get and serialize item mock
+// ---------------------------------------------------------------------------
+
 type ItemGetSerialize struct {
 	GetData        serialization.Parsable
 	GetCount       int
@@ -44,3 +49,23 @@ func (m *ItemGetSerialize) Serialize(
 func DefaultItemGetSerialize() *ItemGetSerialize {
 	return &ItemGetSerialize{}
 }
+
+// ---------------------------------------------------------------------------
+// can skip item failure mock
+// ---------------------------------------------------------------------------
+
+type canSkipFailChecker struct {
+	canSkip bool
+}
+
+func (m canSkipFailChecker) CanSkipItemFailure(
+	err error,
+	resourceID string,
+	opts control.Options,
+) (fault.SkipCause, bool) {
+	return fault.SkipCause("testing"), m.canSkip
+}
+
+func NeverCanSkipFailChecker() *canSkipFailChecker {
+	return &canSkipFailChecker{}
+}

src/internal/m365/collection/exchange/restore_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/alcionai/corso/src/internal/common/ptr"
 	exchMock "github.com/alcionai/corso/src/internal/m365/service/exchange/mock"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"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/control/testdata"
 	"github.com/alcionai/corso/src/pkg/count"
@@ -24,8 +24,7 @@ import (
 
 type RestoreIntgSuite struct {
 	tester.Suite
-	credentials account.M365Config
+	m365 its.M365IntgTestSetup
-	ac          api.Client
 }
 
 func TestRestoreIntgSuite(t *testing.T) {
@@ -37,18 +36,7 @@ func TestRestoreIntgSuite(t *testing.T) {
 }
 
 func (suite *RestoreIntgSuite) SetupSuite() {
-	t := suite.T()
+	suite.m365 = its.GetM365(suite.T())
-
-	a := tconfig.NewM365Account(t)
-	m365, err := a.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.credentials = m365
-	suite.ac, err = api.NewClient(
-		m365,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(t, err, clues.ToCore(err))
 }
 
 // TestRestoreContact ensures contact object can be created, placed into
@@ -60,26 +48,26 @@ func (suite *RestoreIntgSuite) TestRestoreContact() {
 	defer flush()
 
 	var (
-		userID     = tconfig.M365UserID(t)
 		folderName = testdata.DefaultRestoreConfig("contact").Location
-		handler    = newContactRestoreHandler(suite.ac)
+		handler    = newContactRestoreHandler(suite.m365.AC)
 	)
 
-	aFolder, err := handler.ac.CreateContainer(ctx, userID, "", folderName)
+	aFolder, err := handler.ac.CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 	require.NoError(t, err, clues.ToCore(err))
 
 	folderID := ptr.Val(aFolder.GetId())
 
 	defer func() {
 		// Remove the folder containing contact prior to exiting test
-		err = suite.ac.Contacts().DeleteContainer(ctx, userID, folderID)
+		err = suite.m365.AC.Contacts().DeleteContainer(ctx, suite.m365.User.ID, folderID)
 		assert.NoError(t, err, clues.ToCore(err))
 	}()
 
 	info, err := handler.restore(
 		ctx,
 		exchMock.ContactBytes("Corso TestContact"),
-		userID, folderID,
+		suite.m365.User.ID,
+		folderID,
 		nil,
 		control.Copy,
 		fault.New(true),
@@ -97,19 +85,18 @@ func (suite *RestoreIntgSuite) TestRestoreEvent() {
 	defer flush()
 
 	var (
-		userID  = tconfig.M365UserID(t)
 		subject = testdata.DefaultRestoreConfig("event").Location
-		handler = newEventRestoreHandler(suite.ac)
+		handler = newEventRestoreHandler(suite.m365.AC)
 	)
 
-	calendar, err := handler.ac.CreateContainer(ctx, userID, "", subject)
+	calendar, err := handler.ac.CreateContainer(ctx, suite.m365.User.ID, "", subject)
 	require.NoError(t, err, clues.ToCore(err))
 
 	calendarID := ptr.Val(calendar.GetId())
 
 	defer func() {
 		// Removes calendar containing events created during the test
-		err = suite.ac.Events().DeleteContainer(ctx, userID, calendarID)
+		err = suite.m365.AC.Events().DeleteContainer(ctx, suite.m365.User.ID, calendarID)
 		assert.NoError(t, err, clues.ToCore(err))
 	}()
 
@@ -154,7 +141,8 @@ func (suite *RestoreIntgSuite) TestRestoreEvent() {
 			info, err := handler.restore(
 				ctx,
 				test.bytes,
-				userID, calendarID,
+				suite.m365.User.ID,
+				calendarID,
 				nil,
 				control.Copy,
 				fault.New(true),
@@ -168,10 +156,7 @@ func (suite *RestoreIntgSuite) TestRestoreEvent() {
 // TestRestoreExchangeObject verifies path.Category usage for restored objects
 func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 	t := suite.T()
-
+	handlers := RestoreHandlers(suite.m365.AC)
-	handlers := RestoreHandlers(suite.ac)
-
-	userID := tconfig.M365UserID(suite.T())
 
 	tests := []struct {
 		name        string
@@ -186,7 +171,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("mailobj").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -199,7 +184,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("mailwattch").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -212,7 +197,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("eventwattch").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -225,7 +210,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("mailitemattch").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -240,7 +225,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("mailbasicattch").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -255,7 +240,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("mailnestattch").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -270,7 +255,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("mailcontactattch").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -283,7 +268,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("nestedattch").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -296,7 +281,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("maillargeattch").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -309,7 +294,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("mailtwoattch").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -322,7 +307,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("mailrefattch").Location
 				folder, err := handlers[path.EmailCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -335,7 +320,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("contact").Location
 				folder, err := handlers[path.ContactsCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(folder.GetId())
@@ -348,7 +333,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("event").Location
 				calendar, err := handlers[path.EventsCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(calendar.GetId())
@@ -361,7 +346,7 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			destination: func(t *testing.T, ctx context.Context) string {
 				folderName := testdata.DefaultRestoreConfig("eventobj").Location
 				calendar, err := handlers[path.EventsCategory].
-					CreateContainer(ctx, userID, "", folderName)
+					CreateContainer(ctx, suite.m365.User.ID, "", folderName)
 				require.NoError(t, err, clues.ToCore(err))
 
 				return ptr.Val(calendar.GetId())
@@ -380,7 +365,8 @@ func (suite *RestoreIntgSuite) TestRestoreExchangeObject() {
 			info, err := handlers[test.category].restore(
 				ctx,
 				test.bytes,
-				userID, destination,
+				suite.m365.User.ID,
+				destination,
 				nil,
 				control.Copy,
 				fault.New(true),
@@ -400,12 +386,11 @@ func (suite *RestoreIntgSuite) TestRestoreAndBackupEvent_recurringInstancesWithA
 	defer flush()
 
 	var (
-		userID  = tconfig.M365UserID(t)
 		subject = testdata.DefaultRestoreConfig("event").Location
-		handler = newEventRestoreHandler(suite.ac)
+		handler = newEventRestoreHandler(suite.m365.AC)
 	)
 
-	calendar, err := handler.ac.CreateContainer(ctx, userID, "", subject)
+	calendar, err := handler.ac.CreateContainer(ctx, suite.m365.User.ID, "", subject)
 	require.NoError(t, err, clues.ToCore(err))
 
 	calendarID := ptr.Val(calendar.GetId())
@@ -414,7 +399,8 @@ func (suite *RestoreIntgSuite) TestRestoreAndBackupEvent_recurringInstancesWithA
 	info, err := handler.restore(
 		ctx,
 		bytes,
-		userID, calendarID,
+		suite.m365.User.ID,
+		calendarID,
 		nil,
 		control.Copy,
 		fault.New(true),
@@ -425,7 +411,7 @@ func (suite *RestoreIntgSuite) TestRestoreAndBackupEvent_recurringInstancesWithA
 	ec, err := handler.ac.Stable.
 		Client().
 		Users().
-		ByUserId(userID).
+		ByUserId(suite.m365.User.ID).
 		Calendars().
 		ByCalendarId(calendarID).
 		Events().
@@ -435,17 +421,25 @@ func (suite *RestoreIntgSuite) TestRestoreAndBackupEvent_recurringInstancesWithA
 	evts := ec.GetValue()
 	assert.Len(t, evts, 1, "count of events")
 
-	sp, info, err := suite.ac.Events().GetItem(ctx, userID, ptr.Val(evts[0].GetId()), fault.New(true))
+	sp, info, err := suite.m365.AC.Events().GetItem(
+		ctx,
+		suite.m365.User.ID,
+		ptr.Val(evts[0].GetId()),
+		fault.New(true))
 	require.NoError(t, err, clues.ToCore(err))
 	assert.NotNil(t, info, "event item info")
 
-	body, err := suite.ac.Events().Serialize(ctx, sp, userID, ptr.Val(evts[0].GetId()))
+	body, err := suite.m365.AC.Events().Serialize(
+		ctx,
+		sp,
+		suite.m365.User.ID,
+		ptr.Val(evts[0].GetId()))
 	require.NoError(t, err, clues.ToCore(err))
 
 	event, err := api.BytesToEventable(body)
 	require.NoError(t, err, clues.ToCore(err))
-
 	assert.NotNil(t, event.GetRecurrence(), "recurrence")
+
 	eo := event.GetAdditionalData()["exceptionOccurrences"]
 	assert.NotNil(t, eo, "exceptionOccurrences")
 

src/internal/m365/collection/groups/backup.go

@@ -105,13 +105,17 @@ func populateCollections[C graph.GetIDer, I groupsItemer](
 		// channel ID -> delta url or folder path lookups
 		deltaURLs = map[string]string{}
 		currPaths = map[string]string{}
-		// copy of previousPaths.  every channel present in the slice param
+		el        = errs.Local()
-		// gets removed from this map; the remaining channels at the end of
-		// the process have been deleted.
-		tombstones = makeTombstones(dps)
-		el         = errs.Local()
 	)
 
+	// Copy of previousPaths. Every container present in the slice param
+	// gets removed from this map; the remaining containers at the end of
+	// the process have been deleted.
+	tombstones, err := bh.makeTombstones(dps)
+	if err != nil {
+		return nil, clues.StackWC(ctx, err)
+	}
+
 	logger.Ctx(ctx).Infow("filling collections", "len_deltapaths", len(dps))
 
 	for _, c := range containers {

src/internal/m365/collection/groups/backup_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/alcionai/corso/src/internal/m365/support"
 	"github.com/alcionai/corso/src/internal/operations/inject"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/internal/version"
 	"github.com/alcionai/corso/src/pkg/account"
@@ -39,22 +40,24 @@ import (
 // mocks
 // ---------------------------------------------------------------------------
 
-var _ backupHandler[models.Channelable, models.ChatMessageable] = &mockBackupHandler{}
+var _ backupHandler[models.Channelable, models.ChatMessageable] = &mockChannelsBH{}
 
 //lint:ignore U1000 false linter issue due to generics
-type mockBackupHandler struct {
+type mockChannelsBH struct {
 	channels      []models.Channelable
+	conversations []models.Conversationable
 	messageIDs    []string
 	deletedMsgIDs []string
 	messagesErr   error
 	messages      map[string]models.ChatMessageable
+	posts         map[string]models.Postable
 	info          map[string]*details.GroupsInfo
 	getMessageErr map[string]error
 	doNotInclude  bool
 }
 
 //lint:ignore U1000 false linter issue due to generics
-func (bh mockBackupHandler) augmentItemInfo(
+func (bh mockChannelsBH) augmentItemInfo(
 	*details.GroupsInfo,
 	models.Channelable,
 ) {
@@ -62,15 +65,15 @@ func (bh mockBackupHandler) augmentItemInfo(
 }
 
 //lint:ignore U1000 false linter issue due to generics
-func (bh mockBackupHandler) supportsItemMetadata() bool {
+func (bh mockChannelsBH) supportsItemMetadata() bool {
 	return false
 }
 
-func (bh mockBackupHandler) canMakeDeltaQueries() bool {
+func (bh mockChannelsBH) canMakeDeltaQueries() bool {
 	return true
 }
 
-func (bh mockBackupHandler) containers() []container[models.Channelable] {
+func (bh mockChannelsBH) containers() []container[models.Channelable] {
 	containers := make([]container[models.Channelable], 0, len(bh.channels))
 
 	for _, ch := range bh.channels {
@@ -81,14 +84,14 @@ func (bh mockBackupHandler) containers() []container[models.Channelable] {
 }
 
 //lint:ignore U1000 required for interface compliance
-func (bh mockBackupHandler) getContainers(
+func (bh mockChannelsBH) getContainers(
 	context.Context,
 	api.CallConfig,
 ) ([]container[models.Channelable], error) {
 	return bh.containers(), nil
 }
 
-func (bh mockBackupHandler) getContainerItemIDs(
+func (bh mockChannelsBH) getContainerItemIDs(
 	_ context.Context,
 	_ path.Elements,
 	_ string,
@@ -111,14 +114,14 @@ func (bh mockBackupHandler) getContainerItemIDs(
 }
 
 //lint:ignore U1000 required for interface compliance
-func (bh mockBackupHandler) includeContainer(
+func (bh mockChannelsBH) includeContainer(
 	models.Channelable,
 	selectors.GroupsScope,
 ) bool {
 	return !bh.doNotInclude
 }
 
-func (bh mockBackupHandler) canonicalPath(
+func (bh mockChannelsBH) canonicalPath(
 	storageDirFolders path.Elements,
 	tenantID string,
 ) (path.Path, error) {
@@ -133,7 +136,7 @@ func (bh mockBackupHandler) canonicalPath(
 }
 
 //lint:ignore U1000 false linter issue due to generics
-func (bh mockBackupHandler) getItem(
+func (bh mockChannelsBH) getItem(
 	_ context.Context,
 	_ string,
 	_ path.Elements,
@@ -142,13 +145,20 @@ func (bh mockBackupHandler) getItem(
 	return bh.messages[itemID], bh.info[itemID], bh.getMessageErr[itemID]
 }
 
-func (bh mockBackupHandler) getItemMetadata(
+func (bh mockChannelsBH) getItemMetadata(
 	_ context.Context,
 	_ models.Channelable,
 ) (io.ReadCloser, int, error) {
 	return nil, 0, errMetadataFilesNotSupported
 }
 
+//lint:ignore U1000 false linter issue due to generics
+func (bh mockChannelsBH) makeTombstones(
+	dps metadata.DeltaPaths,
+) (map[string]string, error) {
+	return makeTombstones(dps), nil
+}
+
 // ---------------------------------------------------------------------------
 // Unit Suite
 // ---------------------------------------------------------------------------
@@ -169,6 +179,10 @@ func (suite *BackupUnitSuite) SetupSuite() {
 	suite.creds = m365
 }
 
+// ---------------------------------------------------------------------------
+// Channels tests
+// ---------------------------------------------------------------------------
+
 func (suite *BackupUnitSuite) TestPopulateCollections() {
 	var (
 		qp = graph.QueryParams{
@@ -181,7 +195,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections() {
 
 	table := []struct {
 		name                string
-		mock                mockBackupHandler
+		mock                mockChannelsBH
 		expectErr           require.ErrorAssertionFunc
 		expectColls         int
 		expectNewColls      int
@@ -189,7 +203,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections() {
 	}{
 		{
 			name: "happy path, one container",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels:   testdata.StubChannels("one"),
 				messageIDs: []string{"msg-one"},
 			},
@@ -200,7 +214,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections() {
 		},
 		{
 			name: "happy path, one container, only deleted messages",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels:      testdata.StubChannels("one"),
 				deletedMsgIDs: []string{"msg-one"},
 			},
@@ -211,7 +225,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections() {
 		},
 		{
 			name: "happy path, many containers",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels:   testdata.StubChannels("one", "two"),
 				messageIDs: []string{"msg-one"},
 			},
@@ -222,7 +236,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections() {
 		},
 		{
 			name: "no containers pass scope",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels:     testdata.StubChannels("one"),
 				doNotInclude: true,
 			},
@@ -233,7 +247,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections() {
 		},
 		{
 			name:                "no channels",
-			mock:                mockBackupHandler{},
+			mock:                mockChannelsBH{},
 			expectErr:           require.NoError,
 			expectColls:         1,
 			expectNewColls:      0,
@@ -241,7 +255,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections() {
 		},
 		{
 			name: "no channel messages",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels: testdata.StubChannels("one"),
 			},
 			expectErr:           require.NoError,
@@ -251,7 +265,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections() {
 		},
 		{
 			name: "err: deleted in flight",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels:    testdata.StubChannels("one"),
 				messagesErr: core.ErrNotFound,
 			},
@@ -262,7 +276,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections() {
 		},
 		{
 			name: "err: other error",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels:    testdata.StubChannels("one"),
 				messagesErr: assert.AnError,
 			},
@@ -341,7 +355,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections_incremental() {
 
 	table := []struct {
 		name                string
-		mock                mockBackupHandler
+		mock                mockChannelsBH
 		deltaPaths          metadata.DeltaPaths
 		expectErr           require.ErrorAssertionFunc
 		expectColls         int
@@ -351,7 +365,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections_incremental() {
 	}{
 		{
 			name: "non incremental",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels:   testdata.StubChannels("chan"),
 				messageIDs: []string{"msg"},
 			},
@@ -364,7 +378,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections_incremental() {
 		},
 		{
 			name: "incremental",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels:      testdata.StubChannels("chan"),
 				deletedMsgIDs: []string{"msg"},
 			},
@@ -382,7 +396,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections_incremental() {
 		},
 		{
 			name: "incremental no new messages",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels: testdata.StubChannels("chan"),
 			},
 			deltaPaths: metadata.DeltaPaths{
@@ -399,7 +413,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections_incremental() {
 		},
 		{
 			name: "incremental deleted channel",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels: testdata.StubChannels(),
 			},
 			deltaPaths: metadata.DeltaPaths{
@@ -416,7 +430,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections_incremental() {
 		},
 		{
 			name: "incremental new and deleted channel",
-			mock: mockBackupHandler{
+			mock: mockChannelsBH{
 				channels:   testdata.StubChannels("chan2"),
 				messageIDs: []string{"msg"},
 			},
@@ -486,15 +500,472 @@ func (suite *BackupUnitSuite) TestPopulateCollections_incremental() {
 	}
 }
 
+// ---------------------------------------------------------------------------
+// Conversations tests
+// ---------------------------------------------------------------------------
+
+var _ backupHandler[models.Conversationable, models.Postable] = &mockConversationsBH{}
+
+//lint:ignore U1000 false linter issue due to generics
+type mockConversationsBH struct {
+	conversations []models.Conversationable
+	// Assume all conversations have the same thread object under them for simplicty.
+	// It doesn't impact the tests.
+	thread         models.ConversationThreadable
+	postIDs        []string
+	deletedPostIDs []string
+	PostsErr       error
+	Posts          map[string]models.Postable
+	info           map[string]*details.GroupsInfo
+	getPostErr     map[string]error
+	doNotInclude   bool
+}
+
+//lint:ignore U1000 false linter issue due to generics
+func (bh mockConversationsBH) augmentItemInfo(
+	*details.GroupsInfo,
+	models.Conversationable,
+) {
+	// no-op
+}
+
+func (bh mockConversationsBH) canMakeDeltaQueries() bool {
+	return false
+}
+
+func (bh mockConversationsBH) containers() []container[models.Conversationable] {
+	containers := make([]container[models.Conversationable], 0, len(bh.conversations))
+
+	for _, ch := range bh.conversations {
+		containers = append(containers, conversationThreadContainer(ch, bh.thread))
+	}
+
+	return containers
+}
+
+//lint:ignore U1000 required for interface compliance
+func (bh mockConversationsBH) getContainers(
+	context.Context,
+	api.CallConfig,
+) ([]container[models.Conversationable], error) {
+	return bh.containers(), nil
+}
+
+func (bh mockConversationsBH) getContainerItemIDs(
+	_ context.Context,
+	_ path.Elements,
+	_ string,
+	_ api.CallConfig,
+) (pagers.AddedAndRemoved, error) {
+	idRes := make(map[string]time.Time, len(bh.postIDs))
+
+	for _, id := range bh.postIDs {
+		idRes[id] = time.Time{}
+	}
+
+	aar := pagers.AddedAndRemoved{
+		Added:         idRes,
+		Removed:       bh.deletedPostIDs,
+		ValidModTimes: true,
+		DU:            pagers.DeltaUpdate{},
+	}
+
+	return aar, bh.PostsErr
+}
+
+//lint:ignore U1000 required for interface compliance
+func (bh mockConversationsBH) includeContainer(
+	models.Conversationable,
+	selectors.GroupsScope,
+) bool {
+	return !bh.doNotInclude
+}
+
+func (bh mockConversationsBH) canonicalPath(
+	storageDirFolders path.Elements,
+	tenantID string,
+) (path.Path, error) {
+	return storageDirFolders.
+		Builder().
+		ToDataLayerPath(
+			tenantID,
+			"protectedResource",
+			path.GroupsService,
+			path.ConversationPostsCategory,
+			false)
+}
+
+//lint:ignore U1000 false linter issue due to generics
+func (bh mockConversationsBH) getItem(
+	_ context.Context,
+	_ string,
+	_ path.Elements,
+	itemID string,
+) (models.Postable, *details.GroupsInfo, error) {
+	return bh.Posts[itemID], bh.info[itemID], bh.getPostErr[itemID]
+}
+
+//lint:ignore U1000 false linter issue due to generics
+func (bh mockConversationsBH) supportsItemMetadata() bool {
+	return true
+}
+
+func (bh mockConversationsBH) getItemMetadata(
+	_ context.Context,
+	_ models.Conversationable,
+) (io.ReadCloser, int, error) {
+	return nil, 0, nil
+}
+
+//lint:ignore U1000 false linter issue due to generics
+func (bh mockConversationsBH) makeTombstones(
+	dps metadata.DeltaPaths,
+) (map[string]string, error) {
+	r := make(map[string]string, len(dps))
+
+	for id, v := range dps {
+		elems := path.Split(id)
+		if len(elems) != 2 {
+			return nil, clues.New("invalid prev path")
+		}
+
+		r[elems[0]] = v.Path
+	}
+
+	return r, nil
+}
+
+func (suite *BackupUnitSuite) TestPopulateCollections_Conversations() {
+	var (
+		qp = graph.QueryParams{
+			Category:          path.ConversationPostsCategory, // doesn't matter which one we use.
+			ProtectedResource: inMock.NewProvider("group_id", "user_name"),
+			TenantID:          suite.creds.AzureTenantID,
+		}
+		statusUpdater = func(*support.ControllerOperationStatus) {}
+	)
+
+	table := []struct {
+		name                string
+		mock                mockConversationsBH
+		expectErr           require.ErrorAssertionFunc
+		expectColls         int
+		expectNewColls      int
+		expectMetadataColls int
+	}{
+		{
+			name: "happy path, one container",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations("one"),
+				thread:        testdata.StubConversationThreads("t-one")[0],
+				postIDs:       []string{"msg-one"},
+			},
+			expectErr:           require.NoError,
+			expectColls:         2,
+			expectNewColls:      1,
+			expectMetadataColls: 1,
+		},
+		{
+			name: "happy path, one container, only deleted messages",
+			mock: mockConversationsBH{
+				conversations:  testdata.StubConversations("one"),
+				thread:         testdata.StubConversationThreads("t-one")[0],
+				deletedPostIDs: []string{"msg-one"},
+			},
+			expectErr:           require.NoError,
+			expectColls:         2,
+			expectNewColls:      1,
+			expectMetadataColls: 1,
+		},
+		{
+			name: "happy path, many containers",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations("one", "two"),
+				thread:        testdata.StubConversationThreads("t-one")[0],
+				postIDs:       []string{"msg-one"},
+			},
+			expectErr:           require.NoError,
+			expectColls:         3,
+			expectNewColls:      2,
+			expectMetadataColls: 1,
+		},
+		{
+			name: "no containers pass scope",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations("one"),
+				thread:        testdata.StubConversationThreads("t-one")[0],
+				doNotInclude:  true,
+			},
+			expectErr:           require.NoError,
+			expectColls:         1,
+			expectNewColls:      0,
+			expectMetadataColls: 1,
+		},
+		{
+			name:                "no conversations",
+			mock:                mockConversationsBH{},
+			expectErr:           require.NoError,
+			expectColls:         1,
+			expectNewColls:      0,
+			expectMetadataColls: 1,
+		},
+		{
+			name: "no conv posts",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations("one"),
+				thread:        testdata.StubConversationThreads("t-one")[0],
+			},
+			expectErr:           require.NoError,
+			expectColls:         2,
+			expectNewColls:      1,
+			expectMetadataColls: 1,
+		},
+		{
+			name: "err: deleted in flight",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations("one"),
+				thread:        testdata.StubConversationThreads("t-one")[0],
+				PostsErr:      core.ErrNotFound,
+			},
+			expectErr:           require.Error,
+			expectColls:         1,
+			expectNewColls:      0,
+			expectMetadataColls: 1,
+		},
+		{
+			name: "err: other error",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations("one"),
+				thread:        testdata.StubConversationThreads("t-one")[0],
+				PostsErr:      assert.AnError,
+			},
+			expectErr:           require.Error,
+			expectColls:         1,
+			expectNewColls:      0,
+			expectMetadataColls: 1,
+		},
+	}
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+
+			ctx, flush := tester.NewContext(t)
+			defer flush()
+
+			ctrlOpts := control.Options{FailureHandling: control.FailFast}
+
+			collections, err := populateCollections(
+				ctx,
+				qp,
+				test.mock,
+				statusUpdater,
+				test.mock.containers(),
+				selectors.NewGroupsBackup(nil).Channels(selectors.Any())[0],
+				nil,
+				false,
+				ctrlOpts,
+				count.New(),
+				fault.New(true))
+			test.expectErr(t, err, clues.ToCore(err))
+			assert.Len(t, collections, test.expectColls, "number of collections")
+
+			// collection assertions
+
+			deleteds, news, metadatas, doNotMerges := 0, 0, 0, 0
+			for _, c := range collections {
+				if c.FullPath().Service() == path.GroupsMetadataService {
+					metadatas++
+					continue
+				}
+
+				if c.State() == data.DeletedState {
+					deleteds++
+				}
+
+				if c.State() == data.NewState {
+					news++
+				}
+
+				if c.DoNotMergeItems() {
+					doNotMerges++
+				}
+			}
+
+			assert.Zero(t, deleteds, "deleted collections")
+			assert.Equal(t, test.expectNewColls, news, "new collections")
+			assert.Equal(t, test.expectMetadataColls, metadatas, "metadata collections")
+		})
+	}
+}
+
+func (suite *BackupUnitSuite) TestPopulateCollections_ConversationsIncremental() {
+	var (
+		qp = graph.QueryParams{
+			Category:          path.ConversationPostsCategory, // doesn't matter which one we use.
+			ProtectedResource: inMock.NewProvider("group_id", "user_name"),
+			TenantID:          suite.creds.AzureTenantID,
+		}
+		statusUpdater = func(*support.ControllerOperationStatus) {}
+		allScope      = selectors.NewGroupsBackup(nil).Conversation(selectors.Any())[0]
+	)
+
+	convPath, err := path.Build("t", "g", path.GroupsService, path.ConversationPostsCategory, false, "conv0", "thread0")
+	require.NoError(suite.T(), err, clues.ToCore(err))
+
+	table := []struct {
+		name                string
+		mock                mockConversationsBH
+		deltaPaths          metadata.DeltaPaths
+		expectErr           require.ErrorAssertionFunc
+		expectColls         int
+		expectNewColls      int
+		expectTombstoneCols int
+		expectMetadataColls int
+	}{
+		{
+			name: "non incremental",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations("conv0"),
+				thread:        testdata.StubConversationThreads("t0")[0],
+				postIDs:       []string{"msg"},
+			},
+			deltaPaths:          metadata.DeltaPaths{},
+			expectErr:           require.NoError,
+			expectColls:         2,
+			expectNewColls:      1,
+			expectTombstoneCols: 0,
+			expectMetadataColls: 1,
+		},
+		{
+			name: "incremental",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations("conv0"),
+				thread:        testdata.StubConversationThreads("t0")[0],
+				postIDs:       []string{"msg"},
+			},
+			deltaPaths: metadata.DeltaPaths{
+				"conv0/thread0": {
+					Path: convPath.String(),
+				},
+			},
+			expectErr:           require.NoError,
+			expectColls:         2,
+			expectNewColls:      1, // No delta support
+			expectTombstoneCols: 0,
+			expectMetadataColls: 1,
+		},
+		{
+			name: "incremental no new posts",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations("conv0"),
+				thread:        testdata.StubConversationThreads("t0")[0],
+			},
+			deltaPaths: metadata.DeltaPaths{
+				"conv0/thread0": {
+					Path: convPath.String(),
+				},
+			},
+			expectErr:           require.NoError,
+			expectColls:         2,
+			expectNewColls:      1, // No delta support
+			expectTombstoneCols: 0,
+			expectMetadataColls: 1,
+		},
+		{
+			name: "incremental deleted conversation",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations(),
+			},
+			deltaPaths: metadata.DeltaPaths{
+				"conv0/thread0": {
+					Path: convPath.String(),
+				},
+			},
+			expectErr:           require.NoError,
+			expectColls:         2,
+			expectNewColls:      0,
+			expectTombstoneCols: 1,
+			expectMetadataColls: 1,
+		},
+		{
+			name: "incremental new and deleted conversations",
+			mock: mockConversationsBH{
+				conversations: testdata.StubConversations("conv1"),
+				thread:        testdata.StubConversationThreads("t1")[0],
+				postIDs:       []string{"msg"},
+			},
+			deltaPaths: metadata.DeltaPaths{
+				"conv0/thread0": {
+					Path: convPath.String(),
+				},
+			},
+			expectErr:           require.NoError,
+			expectColls:         3,
+			expectNewColls:      1,
+			expectTombstoneCols: 1,
+			expectMetadataColls: 1,
+		},
+	}
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+
+			ctx, flush := tester.NewContext(t)
+			defer flush()
+
+			ctrlOpts := control.Options{FailureHandling: control.FailFast}
+
+			collections, err := populateCollections(
+				ctx,
+				qp,
+				test.mock,
+				statusUpdater,
+				test.mock.containers(),
+				allScope,
+				test.deltaPaths,
+				false,
+				ctrlOpts,
+				count.New(),
+				fault.New(true))
+			test.expectErr(t, err, clues.ToCore(err))
+			assert.Len(t, collections, test.expectColls, "number of collections")
+
+			// collection assertions
+
+			tombstones, news, metadatas, doNotMerges := 0, 0, 0, 0
+			for _, c := range collections {
+				if c.FullPath() != nil && c.FullPath().Service() == path.GroupsMetadataService {
+					metadatas++
+					continue
+				}
+
+				if c.State() == data.DeletedState {
+					tombstones++
+				}
+
+				if c.State() == data.NewState {
+					news++
+				}
+
+				if c.DoNotMergeItems() {
+					doNotMerges++
+				}
+			}
+
+			assert.Equal(t, test.expectNewColls, news, "new collections")
+			assert.Equal(t, test.expectTombstoneCols, tombstones, "tombstone collections")
+			assert.Equal(t, test.expectMetadataColls, metadatas, "metadata collections")
+		})
+	}
+}
+
 // ---------------------------------------------------------------------------
 // Integration tests
 // ---------------------------------------------------------------------------
 
 type BackupIntgSuite struct {
 	tester.Suite
-	resource string
+	m365 its.M365IntgTestSetup
-	tenantID string
-	ac       api.Client
 }
 
 func TestBackupIntgSuite(t *testing.T) {
@@ -507,32 +978,19 @@ func TestBackupIntgSuite(t *testing.T) {
 
 func (suite *BackupIntgSuite) SetupSuite() {
 	t := suite.T()
+	suite.m365 = its.GetM365(t)
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
 	graph.InitializeConcurrencyLimiter(ctx, true, 4)
-
-	suite.resource = tconfig.M365TeamID(t)
-
-	acct := tconfig.NewM365Account(t)
-	creds, err := acct.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.ac, err = api.NewClient(
-		creds,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.tenantID = creds.AzureTenantID
 }
 
 func (suite *BackupIntgSuite) TestCreateCollections() {
 	var (
-		protectedResource = tconfig.M365TeamID(suite.T())
+		protectedResource = suite.m365.Group.ID
-		resources         = []string{protectedResource}
+		resources         = []string{suite.m365.Group.ID}
-		handler           = NewChannelBackupHandler(protectedResource, suite.ac.Channels())
+		handler           = NewChannelBackupHandler(protectedResource, suite.m365.AC.Channels())
 	)
 
 	tests := []struct {
@@ -558,13 +1016,13 @@ func (suite *BackupIntgSuite) TestCreateCollections() {
 
 			ctrlOpts := control.DefaultOptions()
 
-			sel := selectors.NewGroupsBackup([]string{protectedResource})
+			sel := selectors.NewGroupsBackup([]string{suite.m365.Group.ID})
 			sel.Include(selTD.GroupsBackupChannelScope(sel))
 
 			bpc := inject.BackupProducerConfig{
 				LastBackupVersion: version.NoBackup,
 				Options:           ctrlOpts,
-				ProtectedResource: inMock.NewProvider(protectedResource, protectedResource),
+				ProtectedResource: suite.m365.Group.Provider,
 				Selector:          sel.Selector,
 			}
 
@@ -572,7 +1030,7 @@ func (suite *BackupIntgSuite) TestCreateCollections() {
 				ctx,
 				bpc,
 				handler,
-				suite.tenantID,
+				suite.m365.TenantID,
 				test.scope,
 				func(status *support.ControllerOperationStatus) {},
 				false,

src/internal/m365/collection/groups/channel_handler.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/alcionai/corso/src/internal/common/ptr"
 	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/backup/metadata"
 	"github.com/alcionai/corso/src/pkg/path"
 	"github.com/alcionai/corso/src/pkg/selectors"
 	"github.com/alcionai/corso/src/pkg/services/m365/api"
@@ -131,6 +132,12 @@ func (bh channelsBackupHandler) supportsItemMetadata() bool {
 	return false
 }
 
+func (bh channelsBackupHandler) makeTombstones(
+	dps metadata.DeltaPaths,
+) (map[string]string, error) {
+	return makeTombstones(dps), nil
+}
+
 func channelContainer(ch models.Channelable) container[models.Channelable] {
 	return container[models.Channelable]{
 		storageDirFolders:   path.Elements{ptr.Val(ch.GetId())},

src/internal/m365/collection/groups/conversation_handler.go

@@ -12,6 +12,7 @@ import (
 	"github.com/alcionai/corso/src/internal/common/ptr"
 	"github.com/alcionai/corso/src/internal/m365/collection/groups/metadata"
 	"github.com/alcionai/corso/src/pkg/backup/details"
+	deltaPath "github.com/alcionai/corso/src/pkg/backup/metadata"
 	"github.com/alcionai/corso/src/pkg/path"
 	"github.com/alcionai/corso/src/pkg/selectors"
 	"github.com/alcionai/corso/src/pkg/services/m365/api"
@@ -175,6 +176,36 @@ func (bh conversationsBackupHandler) supportsItemMetadata() bool {
 	return true
 }
 
+func (bh conversationsBackupHandler) makeTombstones(
+	dps deltaPath.DeltaPaths,
+) (map[string]string, error) {
+	r := make(map[string]string, len(dps))
+
+	for id, v := range dps {
+		// ID is of format conversationID/threadID. Tombstones are looked up
+		// by conversationID only, so remove the threadID part. This is safe
+		// because every conversation has only one thread.
+		elems := path.Split(id)
+		if len(elems) != 2 {
+			return nil, clues.New("invalid prev path")
+		}
+
+		r[elems[0]] = v.Path
+	}
+
+	// We are assuming a 1:1 mapping between conversations and threads. While
+	// this is true today, graph behavior may change in future. Throw an error
+	// if the assumption is violated.
+	//
+	// We cannot catch this error with tests because creating conversations
+	// requires delegated access.
+	if len(dps) != len(r) {
+		return nil, clues.New("multiple threads exist for a conversation")
+	}
+
+	return r, nil
+}
+
 func conversationThreadContainer(
 	c models.Conversationable,
 	t models.ConversationThreadable,

src/internal/m365/collection/groups/conversation_handler_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/alcionai/corso/src/internal/common/ptr"
 	"github.com/alcionai/corso/src/internal/m365/collection/groups/metadata"
 	"github.com/alcionai/corso/src/internal/tester"
+	deltaPath "github.com/alcionai/corso/src/pkg/backup/metadata"
 )
 
 const (
@@ -64,3 +65,72 @@ func (suite *ConversationHandlerUnitSuite) TestGetItemMetadata() {
 	assert.Equal(t, []string{resourceEmail}, meta.Recipients, "incorrect recipients")
 	assert.Equal(t, ptr.Val(conv.GetTopic()), meta.Topic, "incorrect topic")
 }
+
+func (suite *ConversationHandlerUnitSuite) TestMakeTombstones() {
+	table := []struct {
+		name        string
+		dps         deltaPath.DeltaPaths
+		expected    map[string]string
+		expectedErr require.ErrorAssertionFunc
+	}{
+		{
+			name: "valid",
+			dps: deltaPath.DeltaPaths{
+				"c1/t1": deltaPath.DeltaPath{
+					Path: "p1",
+				},
+				"c2/t2": deltaPath.DeltaPath{
+					Path: "p2",
+				},
+			},
+			expected: map[string]string{
+				"c1": "p1",
+				"c2": "p2",
+			},
+			expectedErr: require.NoError,
+		},
+		{
+			name: "invalid prev path",
+			dps: deltaPath.DeltaPaths{
+				"c1": deltaPath.DeltaPath{
+					Path: "p1",
+				},
+			},
+			expected:    nil,
+			expectedErr: require.Error,
+		},
+		{
+			name: "invalid prev path 2",
+			dps: deltaPath.DeltaPaths{
+				"c1/t1/a1": deltaPath.DeltaPath{
+					Path: "p1",
+				},
+			},
+			expected:    nil,
+			expectedErr: require.Error,
+		},
+		{
+			name: "multiple threads exist for a conversation",
+			dps: deltaPath.DeltaPaths{
+				"c1/t1": deltaPath.DeltaPath{
+					Path: "p1",
+				},
+				"c1/t2": deltaPath.DeltaPath{
+					Path: "p2",
+				},
+			},
+			expected:    nil,
+			expectedErr: require.Error,
+		},
+	}
+	for _, test := range table {
+		suite.Run(test.name, func() {
+			t := suite.T()
+			bh := conversationsBackupHandler{}
+
+			result, err := bh.makeTombstones(test.dps)
+			test.expectedErr(t, err)
+			assert.Equal(t, test.expected, result)
+		})
+	}
+}

src/internal/m365/collection/groups/handlers.go

@@ -7,6 +7,7 @@ import (
 	"github.com/microsoft/kiota-abstractions-go/serialization"
 
 	"github.com/alcionai/corso/src/pkg/backup/details"
+	"github.com/alcionai/corso/src/pkg/backup/metadata"
 	"github.com/alcionai/corso/src/pkg/path"
 	"github.com/alcionai/corso/src/pkg/selectors"
 	"github.com/alcionai/corso/src/pkg/services/m365/api"
@@ -30,6 +31,7 @@ type backupHandler[C graph.GetIDer, I groupsItemer] interface {
 	includeContainerer[C]
 	canonicalPather
 	canMakeDeltaQuerieser
+	makeTombstoneser
 }
 
 type getItemAndAugmentInfoer[C graph.GetIDer, I groupsItemer] interface {
@@ -107,6 +109,13 @@ type canMakeDeltaQuerieser interface {
 	canMakeDeltaQueries() bool
 }
 
+// produces a set of id:path pairs from the deltapaths map.
+// Each entry in the set will, if not removed, produce a collection
+// that will delete the tombstone by path.
+type makeTombstoneser interface {
+	makeTombstones(dps metadata.DeltaPaths) (map[string]string, error)
+}
+
 // ---------------------------------------------------------------------------
 // Container management
 // ---------------------------------------------------------------------------

src/internal/m365/collection/groups/metadata.go

@@ -21,13 +21,15 @@ func parseMetadataCollections(
 ) (metadata.CatDeltaPaths, bool, error) {
 	// cdp stores metadata
 	cdp := metadata.CatDeltaPaths{
-		path.ChannelMessagesCategory: {},
+		path.ChannelMessagesCategory:   {},
+		path.ConversationPostsCategory: {},
 	}
 
 	// found tracks the metadata we've loaded, to make sure we don't
 	// fetch overlapping copies.
 	found := map[path.CategoryType]map[string]struct{}{
-		path.ChannelMessagesCategory: {},
+		path.ChannelMessagesCategory:   {},
+		path.ConversationPostsCategory: {},
 	}
 
 	// errors from metadata items should not stop the backup,
@@ -104,7 +106,8 @@ func parseMetadataCollections(
 		logger.CtxErr(ctx, errs.Failure()).Info("reading metadata collection items")
 
 		return metadata.CatDeltaPaths{
-			path.ChannelMessagesCategory: {},
+			path.ChannelMessagesCategory:   {},
+			path.ConversationPostsCategory: {},
 		}, false, nil
 	}
 

src/internal/m365/collection/groups/testdata/conversations.go

@@ -0,0 +1,52 @@
+package testdata
+
+import (
+	"github.com/google/uuid"
+	"github.com/microsoftgraph/msgraph-sdk-go/models"
+
+	"github.com/alcionai/corso/src/internal/common/ptr"
+)
+
+func StubConversations(ids ...string) []models.Conversationable {
+	sl := make([]models.Conversationable, 0, len(ids))
+
+	for _, id := range ids {
+		c := models.NewConversation()
+		c.SetId(ptr.To(id))
+
+		sl = append(sl, c)
+	}
+
+	return sl
+}
+
+func StubConversationThreads(ids ...string) []models.ConversationThreadable {
+	sl := make([]models.ConversationThreadable, 0, len(ids))
+
+	for _, id := range ids {
+		ct := models.NewConversationThread()
+		ct.SetId(ptr.To(id))
+
+		sl = append(sl, ct)
+	}
+
+	return sl
+}
+
+func StubPosts(ids ...string) []models.Postable {
+	sl := make([]models.Postable, 0, len(ids))
+
+	for _, id := range ids {
+		p := models.NewPost()
+		p.SetId(ptr.To(uuid.NewString()))
+
+		body := models.NewItemBody()
+		body.SetContent(ptr.To(id))
+
+		p.SetBody(body)
+
+		sl = append(sl, p)
+	}
+
+	return sl
+}

src/internal/m365/collection/site/backup.go

@@ -69,7 +69,7 @@ func CollectLibraries(
 
 	odcs, canUsePreviousBackup, err := colls.Get(ctx, bpc.MetadataCollections, ssmb, errs)
 	if err != nil {
-		return nil, false, graph.Wrap(ctx, err, "getting library")
+		return nil, false, clues.Wrap(err, "getting library")
 	}
 
 	return append(collections, odcs...), canUsePreviousBackup, nil

src/internal/m365/collection/site/backup_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/alcionai/corso/src/internal/m365/support"
 	"github.com/alcionai/corso/src/internal/operations/inject"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/internal/version"
 	"github.com/alcionai/corso/src/pkg/account"
@@ -328,59 +329,49 @@ func (suite *SharePointBackupUnitSuite) TestPopulateListsCollections_incremental
 	}
 }
 
-type SharePointSuite struct {
+type SharePointBackupIntgSuite struct {
 	tester.Suite
+	m365 its.M365IntgTestSetup
 }
 
 func TestSharePointSuite(t *testing.T) {
-	suite.Run(t, &SharePointSuite{
+	suite.Run(t, &SharePointBackupIntgSuite{
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tconfig.M365AcctCredEnvs}),
 	})
 }
 
-func (suite *SharePointSuite) SetupSuite() {
+func (suite *SharePointBackupIntgSuite) SetupSuite() {
-	ctx, flush := tester.NewContext(suite.T())
+	t := suite.T()
+	suite.m365 = its.GetM365(t)
+
+	ctx, flush := tester.NewContext(t)
 	defer flush()
 
 	graph.InitializeConcurrencyLimiter(ctx, false, 4)
 }
 
-func (suite *SharePointSuite) TestCollectPages() {
+func (suite *SharePointBackupIntgSuite) TestCollectPages() {
 	t := suite.T()
+	counter := count.New()
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	var (
-		siteID  = tconfig.M365SiteID(t)
-		a       = tconfig.NewM365Account(t)
-		counter = count.New()
-	)
-
-	creds, err := a.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	ac, err := api.NewClient(
-		creds,
-		control.DefaultOptions(),
-		counter)
-	require.NoError(t, err, clues.ToCore(err))
-
 	bpc := inject.BackupProducerConfig{
 		LastBackupVersion: version.NoBackup,
 		Options:           control.DefaultOptions(),
-		ProtectedResource: mock.NewProvider(siteID, siteID),
+		ProtectedResource: suite.m365.Site.Provider,
 	}
 
-	sel := selectors.NewSharePointBackup([]string{siteID})
+	sel := selectors.NewSharePointBackup([]string{suite.m365.Site.ID})
 
 	col, err := CollectPages(
 		ctx,
 		bpc,
-		creds,
+		suite.m365.Creds,
-		ac,
+		suite.m365.AC,
 		sel.Lists(selectors.Any())[0],
 		(&MockGraphService{}).UpdateStatus,
 		counter,
@@ -389,43 +380,27 @@ func (suite *SharePointSuite) TestCollectPages() {
 	assert.NotEmpty(t, col)
 }
 
-func (suite *SharePointSuite) TestCollectLists() {
+func (suite *SharePointBackupIntgSuite) TestCollectLists() {
 	t := suite.T()
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
-	var (
-		siteID  = tconfig.M365SiteID(t)
-		a       = tconfig.NewM365Account(t)
-		counter = count.New()
-	)
-
-	creds, err := a.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	ac, err := api.NewClient(
-		creds,
-		control.DefaultOptions(),
-		counter)
-	require.NoError(t, err, clues.ToCore(err))
-
 	bpc := inject.BackupProducerConfig{
 		LastBackupVersion: version.NoBackup,
 		Options:           control.DefaultOptions(),
-		ProtectedResource: mock.NewProvider(siteID, siteID),
+		ProtectedResource: suite.m365.Site.Provider,
 	}
 
-	sel := selectors.NewSharePointBackup([]string{siteID})
+	sel := selectors.NewSharePointBackup([]string{suite.m365.Site.ID})
-
+	bh := NewListsBackupHandler(suite.m365.Site.ID, suite.m365.AC.Lists())
-	bh := NewListsBackupHandler(bpc.ProtectedResource.ID(), ac.Lists())
 
 	col, _, err := CollectLists(
 		ctx,
 		bh,
 		bpc,
-		ac,
+		suite.m365.AC,
-		creds.AzureTenantID,
+		suite.m365.Creds.AzureTenantID,
 		sel.Lists(selectors.Any())[0],
 		(&MockGraphService{}).UpdateStatus,
 		count.New(),
@@ -445,7 +420,7 @@ func (suite *SharePointSuite) TestCollectLists() {
 	assert.True(t, metadataFound)
 }
 
-func (suite *SharePointSuite) TestParseListsMetadataCollections() {
+func (suite *SharePointBackupIntgSuite) TestParseListsMetadataCollections() {
 	type fileValues struct {
 		fileName string
 		value    string
@@ -580,7 +555,7 @@ func (f failingColl) FetchItemByName(context.Context, string) (data.Item, error)
 	return nil, nil
 }
 
-func (suite *SharePointSuite) TestParseListsMetadataCollections_ReadFailure() {
+func (suite *SharePointBackupIntgSuite) TestParseListsMetadataCollections_ReadFailure() {
 	t := suite.T()
 
 	ctx, flush := tester.NewContext(t)

src/internal/m365/collection/site/collection.go

@@ -541,12 +541,12 @@ func serializeContent(
 
 	err := writer.WriteObjectValue("", obj)
 	if err != nil {
-		return nil, graph.Wrap(ctx, err, "writing to serializer").Label(fault.LabelForceNoBackupCreation)
+		return nil, clues.WrapWC(ctx, err, "writing to serializer").Label(fault.LabelForceNoBackupCreation)
 	}
 
 	byteArray, err := writer.GetSerializedContent()
 	if err != nil {
-		return nil, graph.Wrap(ctx, err, "getting content from writer").Label(fault.LabelForceNoBackupCreation)
+		return nil, clues.WrapWC(ctx, err, "getting content from writer").Label(fault.LabelForceNoBackupCreation)
 	}
 
 	return byteArray, nil

src/internal/m365/collection/site/collection_test.go

@@ -20,6 +20,7 @@ import (
 	spMock "github.com/alcionai/corso/src/internal/m365/service/sharepoint/mock"
 	"github.com/alcionai/corso/src/internal/m365/support"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/pkg/account"
 	"github.com/alcionai/corso/src/pkg/backup/details"
@@ -113,34 +114,17 @@ func (suite *SharePointCollectionUnitSuite) TestPrefetchCollection_state() {
 	}
 }
 
-type SharePointCollectionSuite struct {
+type SharePointCollIntgSuite struct {
 	tester.Suite
-	siteID string
+	m365 its.M365IntgTestSetup
-	creds  account.M365Config
-	ac     api.Client
 }
 
-func (suite *SharePointCollectionSuite) SetupSuite() {
+func (suite *SharePointCollIntgSuite) SetupSuite() {
-	t := suite.T()
+	suite.m365 = its.GetM365(suite.T())
-
-	suite.siteID = tconfig.M365SiteID(t)
-	a := tconfig.NewM365Account(t)
-	m365, err := a.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.creds = m365
-
-	ac, err := api.NewClient(
-		m365,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.ac = ac
 }
 
 func TestSharePointCollectionSuite(t *testing.T) {
-	suite.Run(t, &SharePointCollectionSuite{
+	suite.Run(t, &SharePointCollIntgSuite{
 		Suite: tester.NewIntegrationSuite(
 			t,
 			[][]string{tconfig.M365AcctCredEnvs}),
@@ -149,15 +133,13 @@ func TestSharePointCollectionSuite(t *testing.T) {
 
 // TestListCollection tests basic functionality to create
 // SharePoint collection and to use the data stream channel.
-func (suite *SharePointCollectionSuite) TestPrefetchCollection_Items() {
+func (suite *SharePointCollIntgSuite) TestPrefetchCollection_Items() {
 	var (
-		tenant   = "some"
-		user     = "user"
 		prevRoot = "prev"
 		dirRoot  = "directory"
 	)
 
-	sel := selectors.NewSharePointBackup([]string{"site"})
+	sel := selectors.NewSharePointBackup([]string{suite.m365.Site.ID})
 
 	tables := []struct {
 		name, itemName string
@@ -183,8 +165,8 @@ func (suite *SharePointCollectionSuite) TestPrefetchCollection_Items() {
 			getter:    &mock.ListHandler{},
 			getDir: func(t *testing.T, root string) path.Path {
 				dir, err := path.Build(
-					tenant,
+					suite.m365.TenantID,
-					user,
+					suite.m365.User.ID,
 					path.SharePointService,
 					path.ListsCategory,
 					false,
@@ -232,8 +214,8 @@ func (suite *SharePointCollectionSuite) TestPrefetchCollection_Items() {
 			getter:   nil,
 			getDir: func(t *testing.T, root string) path.Path {
 				dir, err := path.Build(
-					tenant,
+					suite.m365.TenantID,
-					user,
+					suite.m365.User.ID,
 					path.SharePointService,
 					path.PagesCategory,
 					false,
@@ -270,7 +252,7 @@ func (suite *SharePointCollectionSuite) TestPrefetchCollection_Items() {
 				test.getDir(t, test.curr),
 				test.getDir(t, test.prev),
 				test.locPb,
-				suite.ac,
+				suite.m365.AC,
 				test.scope,
 				nil,
 				control.DefaultOptions(),
@@ -306,7 +288,7 @@ func (suite *SharePointCollectionSuite) TestPrefetchCollection_Items() {
 	}
 }
 
-func (suite *SharePointCollectionSuite) TestLazyCollection_Items() {
+func (suite *SharePointCollIntgSuite) TestLazyCollection_Items() {
 	var (
 		t             = suite.T()
 		errs          = fault.New(true)
@@ -416,7 +398,7 @@ func (suite *SharePointCollectionSuite) TestLazyCollection_Items() {
 	}
 }
 
-func (suite *SharePointCollectionSuite) TestLazyItem() {
+func (suite *SharePointCollIntgSuite) TestLazyItem() {
 	var (
 		t   = suite.T()
 		now = time.Now()
@@ -460,7 +442,7 @@ func (suite *SharePointCollectionSuite) TestLazyItem() {
 	assert.Equal(t, now, info.Modified())
 }
 
-func (suite *SharePointCollectionSuite) TestLazyItem_ReturnsEmptyReaderOnDeletedInFlight() {
+func (suite *SharePointCollIntgSuite) TestLazyItem_ReturnsEmptyReaderOnDeletedInFlight() {
 	var (
 		t   = suite.T()
 		now = time.Now()

src/internal/m365/collection/site/restore.go

@@ -103,7 +103,6 @@ func restoreListItem(
 	}
 
 	// Restore to List base to M365 back store
-
 	dii.SharePoint = api.ListToSPInfo(restoredList)
 
 	return dii, nil

src/internal/m365/collection/site/restore_test.go

@@ -21,8 +21,8 @@ import (
 	siteMock "github.com/alcionai/corso/src/internal/m365/collection/site/mock"
 	spMock "github.com/alcionai/corso/src/internal/m365/service/sharepoint/mock"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"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/control"
 	"github.com/alcionai/corso/src/pkg/control/testdata"
@@ -87,32 +87,17 @@ func (suite *SharePointCollectionUnitSuite) TestFormatListsRestoreDestination()
 
 type SharePointRestoreSuite struct {
 	tester.Suite
-	siteID string
+	m365 its.M365IntgTestSetup
-	creds  account.M365Config
-	ac     api.Client
 }
 
 func (suite *SharePointRestoreSuite) SetupSuite() {
 	t := suite.T()
+	suite.m365 = its.GetM365(t)
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
+
 	graph.InitializeConcurrencyLimiter(ctx, false, 4)
-
-	suite.siteID = tconfig.M365SiteID(t)
-	a := tconfig.NewM365Account(t)
-	m365, err := a.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.creds = m365
-
-	ac, err := api.NewClient(
-		m365,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.ac = ac
 }
 
 func TestSharePointRestoreSuite(t *testing.T) {
@@ -135,8 +120,8 @@ func (suite *SharePointRestoreSuite) TestListCollection_Restore() {
 		listTemplate = "genericList"
 		restoreCfg   = testdata.DefaultRestoreConfig("")
 		destName     = restoreCfg.Location
-		lrh          = NewListsRestoreHandler(suite.siteID, suite.ac.Lists())
+		lrh          = NewListsRestoreHandler(suite.m365.Site.ID, suite.m365.AC.Lists())
-		service      = createTestService(t, suite.creds)
+		service      = createTestService(t, suite.m365.Creds)
 		list         = stubList(listTemplate, listName)
 		mockData     = generateListData(t, service, list)
 	)
@@ -147,7 +132,7 @@ func (suite *SharePointRestoreSuite) TestListCollection_Restore() {
 		ctx,
 		lrh,
 		mockData,
-		suite.siteID,
+		suite.m365.Site.ID,
 		restoreCfg,
 		nil,
 		count.New(),
@@ -156,7 +141,7 @@ func (suite *SharePointRestoreSuite) TestListCollection_Restore() {
 	assert.Equal(t, fmt.Sprintf("%s_%s", destName, listName), deets.SharePoint.List.Name)
 
 	// Clean-Up
-	deleteList(ctx, t, suite.siteID, lrh, deets)
+	deleteList(ctx, t, suite.m365.Site.ID, lrh, deets)
 }
 
 func (suite *SharePointRestoreSuite) TestListCollection_Restore_invalidListTemplate() {
@@ -166,10 +151,10 @@ func (suite *SharePointRestoreSuite) TestListCollection_Restore_invalidListTempl
 	defer flush()
 
 	var (
-		lrh        = NewListsRestoreHandler(suite.siteID, suite.ac.Lists())
+		lrh        = NewListsRestoreHandler(suite.m365.Site.ID, suite.m365.AC.Lists())
 		listName   = "MockListing"
 		restoreCfg = testdata.DefaultRestoreConfig("")
-		service    = createTestService(t, suite.creds)
+		service    = createTestService(t, suite.m365.Creds)
 	)
 
 	restoreCfg.OnCollision = control.Copy
@@ -201,7 +186,7 @@ func (suite *SharePointRestoreSuite) TestListCollection_Restore_invalidListTempl
 				ctx,
 				lrh,
 				listData,
-				suite.siteID,
+				suite.m365.Site.ID,
 				restoreCfg,
 				nil,
 				count.New(),
@@ -222,8 +207,8 @@ func (suite *SharePointRestoreSuite) TestListCollection_RestoreInPlace_skip() {
 		listName     = "MockListing"
 		listTemplate = "genericList"
 		restoreCfg   = testdata.DefaultRestoreConfig("")
-		lrh          = NewListsRestoreHandler(suite.siteID, suite.ac.Lists())
+		lrh          = NewListsRestoreHandler(suite.m365.Site.ID, suite.m365.AC.Lists())
-		service      = createTestService(t, suite.creds)
+		service      = createTestService(t, suite.m365.Creds)
 		list         = stubList(listTemplate, listName)
 		newList      = stubList(listTemplate, listName)
 		cl           = count.New()
@@ -239,7 +224,7 @@ func (suite *SharePointRestoreSuite) TestListCollection_RestoreInPlace_skip() {
 		ctx,
 		lrh,
 		mockData,
-		suite.siteID,
+		suite.m365.Site.ID,
 		restoreCfg, // OnCollision is skip by default
 		collisionKeyToItemID,
 		cl,
@@ -261,7 +246,7 @@ func (suite *SharePointRestoreSuite) TestListCollection_RestoreInPlace_copy() {
 		listTemplate = "genericList"
 		listID       = "some-list-id"
 		restoreCfg   = testdata.DefaultRestoreConfig("")
-		service      = createTestService(t, suite.creds)
+		service      = createTestService(t, suite.m365.Creds)
 
 		policyToKey = map[control.CollisionPolicy]count.Key{
 			control.Replace: count.CollisionReplace,
@@ -354,7 +339,7 @@ func (suite *SharePointRestoreSuite) TestListCollection_RestoreInPlace_copy() {
 				ctx,
 				test.lrh,
 				mockData,
-				suite.siteID,
+				suite.m365.Site.ID,
 				restoreCfg,
 				collisionKeyToItemID,
 				cl,

src/internal/m365/collection/teamschats/backup_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/alcionai/corso/src/internal/m365/support"
 	"github.com/alcionai/corso/src/internal/operations/inject"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/internal/version"
 	"github.com/alcionai/corso/src/pkg/account"
@@ -255,9 +256,7 @@ func (suite *BackupUnitSuite) TestPopulateCollections() {
 
 type BackupIntgSuite struct {
 	tester.Suite
-	resource string
+	m365 its.M365IntgTestSetup
-	tenantID string
-	ac       api.Client
 }
 
 func TestBackupIntgSuite(t *testing.T) {
@@ -270,33 +269,20 @@ func TestBackupIntgSuite(t *testing.T) {
 
 func (suite *BackupIntgSuite) SetupSuite() {
 	t := suite.T()
+	suite.m365 = its.GetM365(t)
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
 	graph.InitializeConcurrencyLimiter(ctx, true, 4)
-
-	suite.resource = tconfig.M365TeamID(t)
-
-	acct := tconfig.NewM365Account(t)
-	creds, err := acct.M365Config()
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.ac, err = api.NewClient(
-		creds,
-		control.DefaultOptions(),
-		count.New())
-	require.NoError(t, err, clues.ToCore(err))
-
-	suite.tenantID = creds.AzureTenantID
 }
 
 func (suite *BackupIntgSuite) TestCreateCollections() {
 	var (
-		tenant            = tconfig.M365TenantID(suite.T())
+		tenant            = suite.m365.TenantID
-		protectedResource = tconfig.M365TeamID(suite.T())
+		protectedResource = suite.m365.Group.ID
 		resources         = []string{protectedResource}
-		handler           = NewUsersChatsBackupHandler(tenant, protectedResource, suite.ac.Chats())
+		handler           = NewUsersChatsBackupHandler(tenant, protectedResource, suite.m365.AC.Chats())
 	)
 
 	tests := []struct {
@@ -322,13 +308,13 @@ func (suite *BackupIntgSuite) TestCreateCollections() {
 
 			ctrlOpts := control.DefaultOptions()
 
-			sel := selectors.NewTeamsChatsBackup([]string{protectedResource})
+			sel := selectors.NewTeamsChatsBackup([]string{suite.m365.Group.ID})
 			sel.Include(selTD.TeamsChatsBackupChatScope(sel))
 
 			bpc := inject.BackupProducerConfig{
 				LastBackupVersion: version.NoBackup,
 				Options:           ctrlOpts,
-				ProtectedResource: inMock.NewProvider(protectedResource, protectedResource),
+				ProtectedResource: suite.m365.Group.Provider,
 				Selector:          sel.Selector,
 			}
 
@@ -336,7 +322,7 @@ func (suite *BackupIntgSuite) TestCreateCollections() {
 				ctx,
 				bpc,
 				handler,
-				suite.tenantID,
+				suite.m365.TenantID,
 				test.scope,
 				func(status *support.ControllerOperationStatus) {},
 				false,

src/internal/m365/controller_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/alcionai/corso/src/internal/m365/support"
 	"github.com/alcionai/corso/src/internal/operations/inject"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/internal/version"
 	"github.com/alcionai/corso/src/pkg/backup/details"
@@ -413,9 +414,8 @@ func (suite *ControllerUnitSuite) TestController_CacheItemInfo() {
 
 type ControllerIntegrationSuite struct {
 	tester.Suite
-	ctrl          *Controller
+	ctrl *Controller
-	user          string
+	m365 its.M365IntgTestSetup
-	secondaryUser string
 }
 
 func TestControllerIntegrationSuite(t *testing.T) {
@@ -428,15 +428,12 @@ func TestControllerIntegrationSuite(t *testing.T) {
 
 func (suite *ControllerIntegrationSuite) SetupSuite() {
 	t := suite.T()
+	suite.m365 = its.GetM365(t)
 
 	ctx, flush := tester.NewContext(t)
 	defer flush()
 
 	suite.ctrl = newController(ctx, t, path.ExchangeService)
-	suite.user = tconfig.M365UserID(t)
-	suite.secondaryUser = tconfig.SecondaryM365UserID(t)
-
-	tester.LogTimeOfTest(t)
 }
 
 func (suite *ControllerIntegrationSuite) TestEmptyCollections() {
@@ -1064,7 +1061,7 @@ func (suite *ControllerIntegrationSuite) TestRestoreAndBackup_core() {
 		suite.Run(test.name, func() {
 			cfg := stub.ConfigInfo{
 				Tenant:         suite.ctrl.tenant,
-				ResourceOwners: []string{suite.user},
+				ResourceOwners: []string{suite.m365.User.ID},
 				Service:        test.service,
 				Opts:           control.DefaultOptions(),
 				RestoreCfg:     control.DefaultRestoreConfig(dttm.SafeForTesting),
@@ -1143,7 +1140,7 @@ func (suite *ControllerIntegrationSuite) TestMultiFolderBackupDifferentNames() {
 			ctx, flush := tester.NewContext(t)
 			defer flush()
 
-			restoreSel := getSelectorWith(t, test.service, []string{suite.user}, true)
+			restoreSel := getSelectorWith(t, test.service, []string{suite.m365.User.ID}, true)
 			expectedDests := make([]destAndCats, 0, len(test.collections))
 			allItems := 0
 			allExpectedData := map[string]map[string][]byte{}
@@ -1154,7 +1151,7 @@ func (suite *ControllerIntegrationSuite) TestMultiFolderBackupDifferentNames() {
 				restoreCfg.IncludePermissions = true
 
 				expectedDests = append(expectedDests, destAndCats{
-					resourceOwner: suite.user,
+					resourceOwner: suite.m365.User.ID,
 					dest:          restoreCfg.Location,
 					cats: map[path.CategoryType]struct{}{
 						collection.Category: {},
@@ -1164,7 +1161,7 @@ func (suite *ControllerIntegrationSuite) TestMultiFolderBackupDifferentNames() {
 				totalItems, _, collections, expectedData, err := stub.CollectionsForInfo(
 					test.service,
 					suite.ctrl.tenant,
-					suite.user,
+					suite.m365.User.ID,
 					restoreCfg,
 					[]stub.ColInfo{collection},
 					version.Backup)
@@ -1289,7 +1286,7 @@ func (suite *ControllerIntegrationSuite) TestRestoreAndBackup_largeMailAttachmen
 
 	cfg := stub.ConfigInfo{
 		Tenant:         suite.ctrl.tenant,
-		ResourceOwners: []string{suite.user},
+		ResourceOwners: []string{suite.m365.User.ID},
 		Service:        test.service,
 		Opts:           control.DefaultOptions(),
 		RestoreCfg:     restoreCfg,
@@ -1310,7 +1307,7 @@ func (suite *ControllerIntegrationSuite) TestProduceBackupCollections_createsPre
 			name:        "Exchange",
 			resourceCat: resource.Users,
 			selectorFunc: func(t *testing.T) selectors.Selector {
-				sel := selectors.NewExchangeBackup([]string{suite.user})
+				sel := selectors.NewExchangeBackup([]string{suite.m365.User.ID})
 				sel.Include(
 					sel.ContactFolders(selectors.None()),
 					sel.EventCalendars(selectors.None()),
@@ -1329,7 +1326,7 @@ func (suite *ControllerIntegrationSuite) TestProduceBackupCollections_createsPre
 			name:        "OneDrive",
 			resourceCat: resource.Users,
 			selectorFunc: func(t *testing.T) selectors.Selector {
-				sel := selectors.NewOneDriveBackup([]string{suite.user})
+				sel := selectors.NewOneDriveBackup([]string{suite.m365.User.ID})
 				sel.Include(sel.Folders(selectors.None()))
 
 				return sel.Selector

src/internal/m365/onedrive_test.go

@@ -1,31 +1,26 @@
 package m365
 
 import (
-	"context"
 	"fmt"
 	"strings"
 	"testing"
 
 	"github.com/alcionai/clues"
-	"github.com/microsoftgraph/msgraph-sdk-go/models"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/alcionai/corso/src/internal/common/ptr"
 	"github.com/alcionai/corso/src/internal/m365/collection/drive/metadata"
 	odConsts "github.com/alcionai/corso/src/internal/m365/service/onedrive/consts"
 	"github.com/alcionai/corso/src/internal/m365/service/onedrive/stub"
 	m365Stub "github.com/alcionai/corso/src/internal/m365/stub"
 	"github.com/alcionai/corso/src/internal/tester"
+	"github.com/alcionai/corso/src/internal/tester/its"
 	"github.com/alcionai/corso/src/internal/tester/tconfig"
 	"github.com/alcionai/corso/src/internal/version"
 	"github.com/alcionai/corso/src/pkg/control"
 	"github.com/alcionai/corso/src/pkg/control/testdata"
 	"github.com/alcionai/corso/src/pkg/dttm"
 	"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 (
@@ -45,119 +40,6 @@ var (
 	readPerm  = []string{"read"}
 )
 
-func mustGetDefaultDriveID(
-	t *testing.T,
-	ctx context.Context, //revive:disable-line:context-as-argument
-	ac api.Client,
-	service path.ServiceType,
-	resourceOwner string,
-) string {
-	var (
-		err error
-		d   models.Driveable
-	)
-
-	switch service {
-	case path.OneDriveService:
-		d, err = ac.Users().GetDefaultDrive(ctx, resourceOwner)
-	case path.SharePointService:
-		d, err = ac.Sites().GetDefaultDrive(ctx, resourceOwner)
-	default:
-		assert.FailNowf(t, "unknown service type %s", service.String())
-	}
-
-	if err != nil {
-		err = graph.Wrap(ctx, err, "retrieving drive")
-	}
-
-	require.NoError(t, err, clues.ToCore(err))
-
-	id := ptr.Val(d.GetId())
-	require.NotEmpty(t, id)
-
-	return id
-}
-
-type suiteInfo interface {
-	APIClient() api.Client
-	Tenant() string
-	// Returns (username, user ID) for the user. These values are used for
-	// permissions.
-	PrimaryUser() (string, string)
-	SecondaryUser() (string, string)
-	TertiaryUser() (string, string)
-	// ResourceOwner returns the resource owner to run the backup/restore
-	// with. This can be different from the values used for permissions and it can
-	// also be a site.
-	ResourceOwner() string
-	Service() path.ServiceType
-}
-
-type oneDriveSuite interface {
-	tester.Suite
-	suiteInfo
-}
-
-type suiteInfoImpl struct {
-	ac              api.Client
-	controller      *Controller
-	resourceOwner   string
-	secondaryUser   string
-	secondaryUserID string
-	service         path.ServiceType
-	tertiaryUser    string
-	tertiaryUserID  string
-	user            string
-	userID          string
-}
-
-func NewSuiteInfoImpl(
-	t *testing.T,
-	ctx context.Context, //revive:disable-line:context-as-argument
-	resourceOwner string,
-	service path.ServiceType,
-) suiteInfoImpl {
-	ctrl := newController(ctx, t, path.OneDriveService)
-
-	return suiteInfoImpl{
-		ac:            ctrl.AC,
-		controller:    ctrl,
-		resourceOwner: resourceOwner,
-		secondaryUser: tconfig.SecondaryM365UserID(t),
-		service:       service,
-		tertiaryUser:  tconfig.TertiaryM365UserID(t),
-		user:          tconfig.M365UserID(t),
-	}
-}
-
-func (si suiteInfoImpl) APIClient() api.Client {
-	return si.ac
-}
-
-func (si suiteInfoImpl) Tenant() string {
-	return si.controller.tenant
-}
-
-func (si suiteInfoImpl) PrimaryUser() (string, string) {
-	return si.user, si.userID
-}
-
-func (si suiteInfoImpl) SecondaryUser() (string, string) {
-	return si.secondaryUser, si.secondaryUserID
-}
-
-func (si suiteInfoImpl) TertiaryUser() (string, string) {
-	return si.tertiaryUser, si.tertiaryUserID
-}
-
-func (si suiteInfoImpl) ResourceOwner() string {
-	return si.resourceOwner
-}
-
-func (si suiteInfoImpl) Service() path.ServiceType {
-	return si.service
-}
-
 // ---------------------------------------------------------------------------
 // SharePoint Libraries
 // ---------------------------------------------------------------------------
@@ -167,7 +49,8 @@ func (si suiteInfoImpl) Service() path.ServiceType {
 
 type SharePointIntegrationSuite struct {
 	tester.Suite
-	suiteInfo
+	m365           its.M365IntgTestSetup
+	resourceAndSvc its.ResourceServicer
 }
 
 func TestSharePointIntegrationSuite(t *testing.T) {
@@ -179,57 +62,38 @@ func TestSharePointIntegrationSuite(t *testing.T) {
 }
 
 func (suite *SharePointIntegrationSuite) SetupSuite() {
-	t := suite.T()
+	suite.m365 = its.GetM365(suite.T())
-
+	suite.resourceAndSvc = its.NewResourceService(suite.m365.Site, path.SharePointService)
-	ctx, flush := tester.NewContext(t)
-	defer flush()
-
-	si := NewSuiteInfoImpl(suite.T(), ctx, tconfig.M365SiteID(suite.T()), path.SharePointService)
-
-	// users needed for permissions
-	user, err := si.controller.AC.Users().GetByID(ctx, si.user, api.CallConfig{})
-	require.NoError(t, err, "fetching user", si.user, clues.ToCore(err))
-	si.userID = ptr.Val(user.GetId())
-
-	secondaryUser, err := si.controller.AC.Users().GetByID(ctx, si.secondaryUser, api.CallConfig{})
-	require.NoError(t, err, "fetching user", si.secondaryUser, clues.ToCore(err))
-	si.secondaryUserID = ptr.Val(secondaryUser.GetId())
-
-	tertiaryUser, err := si.controller.AC.Users().GetByID(ctx, si.tertiaryUser, api.CallConfig{})
-	require.NoError(t, err, "fetching user", si.tertiaryUser, clues.ToCore(err))
-	si.tertiaryUserID = ptr.Val(tertiaryUser.GetId())
-
-	suite.suiteInfo = si
 }
 
 func (suite *SharePointIntegrationSuite) TestRestoreAndBackup_MultipleFilesAndFolders_NoPermissions() {
-	testRestoreAndBackupMultipleFilesAndFoldersNoPermissions(suite, version.Backup)
+	testRestoreAndBackupMultipleFilesAndFoldersNoPermissions(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 // TODO: Re-enable these tests (disabled as it currently acting up CI)
 func (suite *SharePointIntegrationSuite) TestPermissionsRestoreAndBackup() {
 	suite.T().Skip("Temporarily disabled due to CI issues")
-	testPermissionsRestoreAndBackup(suite, version.Backup)
+	testPermissionsRestoreAndBackup(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 func (suite *SharePointIntegrationSuite) TestRestoreNoPermissionsAndBackup() {
 	suite.T().Skip("Temporarily disabled due to CI issues")
-	testRestoreNoPermissionsAndBackup(suite, version.Backup)
+	testRestoreNoPermissionsAndBackup(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 func (suite *SharePointIntegrationSuite) TestPermissionsInheritanceRestoreAndBackup() {
 	suite.T().Skip("Temporarily disabled due to CI issues")
-	testPermissionsInheritanceRestoreAndBackup(suite, version.Backup)
+	testPermissionsInheritanceRestoreAndBackup(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 func (suite *SharePointIntegrationSuite) TestLinkSharesInheritanceRestoreAndBackup() {
 	suite.T().Skip("Temporarily disabled due to CI issues")
-	testLinkSharesInheritanceRestoreAndBackup(suite, version.Backup)
+	testLinkSharesInheritanceRestoreAndBackup(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 func (suite *SharePointIntegrationSuite) TestRestoreFolderNamedFolderRegression() {
 	// No reason why it couldn't work with previous versions, but this is when it got introduced.
-	testRestoreFolderNamedFolderRegression(suite, version.All8MigrateUserPNToID)
+	testRestoreFolderNamedFolderRegression(suite, suite.m365, suite.resourceAndSvc, version.All8MigrateUserPNToID)
 }
 
 // ---------------------------------------------------------------------------
@@ -237,7 +101,8 @@ func (suite *SharePointIntegrationSuite) TestRestoreFolderNamedFolderRegression(
 // ---------------------------------------------------------------------------
 type OneDriveIntegrationSuite struct {
 	tester.Suite
-	suiteInfo
+	m365           its.M365IntgTestSetup
+	resourceAndSvc its.ResourceServicer
 }
 
 func TestOneDriveIntegrationSuite(t *testing.T) {
@@ -249,51 +114,33 @@ func TestOneDriveIntegrationSuite(t *testing.T) {
 }
 
 func (suite *OneDriveIntegrationSuite) SetupSuite() {
-	t := suite.T()
+	suite.m365 = its.GetM365(suite.T())
-
+	suite.resourceAndSvc = its.NewResourceService(suite.m365.User, path.OneDriveService)
-	ctx, flush := tester.NewContext(t)
-	defer flush()
-
-	si := NewSuiteInfoImpl(t, ctx, tconfig.M365UserID(t), path.OneDriveService)
-
-	user, err := si.controller.AC.Users().GetByID(ctx, si.user, api.CallConfig{})
-	require.NoError(t, err, "fetching user", si.user, clues.ToCore(err))
-	si.userID = ptr.Val(user.GetId())
-
-	secondaryUser, err := si.controller.AC.Users().GetByID(ctx, si.secondaryUser, api.CallConfig{})
-	require.NoError(t, err, "fetching user", si.secondaryUser, clues.ToCore(err))
-	si.secondaryUserID = ptr.Val(secondaryUser.GetId())
-
-	tertiaryUser, err := si.controller.AC.Users().GetByID(ctx, si.tertiaryUser, api.CallConfig{})
-	require.NoError(t, err, "fetching user", si.tertiaryUser, clues.ToCore(err))
-	si.tertiaryUserID = ptr.Val(tertiaryUser.GetId())
-
-	suite.suiteInfo = si
 }
 
 func (suite *OneDriveIntegrationSuite) TestRestoreAndBackup_MultipleFilesAndFolders_NoPermissions() {
-	testRestoreAndBackupMultipleFilesAndFoldersNoPermissions(suite, version.Backup)
+	testRestoreAndBackupMultipleFilesAndFoldersNoPermissions(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 func (suite *OneDriveIntegrationSuite) TestPermissionsRestoreAndBackup() {
-	testPermissionsRestoreAndBackup(suite, version.Backup)
+	testPermissionsRestoreAndBackup(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 func (suite *OneDriveIntegrationSuite) TestRestoreNoPermissionsAndBackup() {
-	testRestoreNoPermissionsAndBackup(suite, version.Backup)
+	testRestoreNoPermissionsAndBackup(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 func (suite *OneDriveIntegrationSuite) TestPermissionsInheritanceRestoreAndBackup() {
-	testPermissionsInheritanceRestoreAndBackup(suite, version.Backup)
+	testPermissionsInheritanceRestoreAndBackup(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 func (suite *OneDriveIntegrationSuite) TestLinkSharesInheritanceRestoreAndBackup() {
-	testLinkSharesInheritanceRestoreAndBackup(suite, version.Backup)
+	testLinkSharesInheritanceRestoreAndBackup(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 func (suite *OneDriveIntegrationSuite) TestRestoreFolderNamedFolderRegression() {
 	// No reason why it couldn't work with previous versions, but this is when it got introduced.
-	testRestoreFolderNamedFolderRegression(suite, version.All8MigrateUserPNToID)
+	testRestoreFolderNamedFolderRegression(suite, suite.m365, suite.resourceAndSvc, version.All8MigrateUserPNToID)
 }
 
 // ---------------------------------------------------------------------------
@@ -301,7 +148,8 @@ func (suite *OneDriveIntegrationSuite) TestRestoreFolderNamedFolderRegression()
 // ---------------------------------------------------------------------------
 type OneDriveNightlySuite struct {
 	tester.Suite
-	suiteInfo
+	m365           its.M365IntgTestSetup
+	resourceAndSvc its.ResourceServicer
 }
 
 func TestOneDriveNightlySuite(t *testing.T) {
@@ -313,70 +161,48 @@ func TestOneDriveNightlySuite(t *testing.T) {
 }
 
 func (suite *OneDriveNightlySuite) SetupSuite() {
-	t := suite.T()
+	suite.m365 = its.GetM365(suite.T())
-
+	suite.resourceAndSvc = its.NewResourceService(suite.m365.User, path.OneDriveService)
-	ctx, flush := tester.NewContext(t)
-	defer flush()
-
-	si := NewSuiteInfoImpl(t, ctx, tconfig.M365UserID(t), path.OneDriveService)
-
-	user, err := si.controller.AC.Users().GetByID(ctx, si.user, api.CallConfig{})
-	require.NoError(t, err, "fetching user", si.user, clues.ToCore(err))
-	si.userID = ptr.Val(user.GetId())
-
-	secondaryUser, err := si.controller.AC.Users().GetByID(ctx, si.secondaryUser, api.CallConfig{})
-	require.NoError(t, err, "fetching user", si.secondaryUser, clues.ToCore(err))
-	si.secondaryUserID = ptr.Val(secondaryUser.GetId())
-
-	tertiaryUser, err := si.controller.AC.Users().GetByID(ctx, si.tertiaryUser, api.CallConfig{})
-	require.NoError(t, err, "fetching user", si.tertiaryUser, clues.ToCore(err))
-	si.tertiaryUserID = ptr.Val(tertiaryUser.GetId())
-
-	suite.suiteInfo = si
 }
 
 func (suite *OneDriveNightlySuite) TestRestoreAndBackup_MultipleFilesAndFolders_NoPermissions() {
-	testRestoreAndBackupMultipleFilesAndFoldersNoPermissions(suite, 0)
+	testRestoreAndBackupMultipleFilesAndFoldersNoPermissions(suite, suite.m365, suite.resourceAndSvc, 0)
 }
 
 func (suite *OneDriveNightlySuite) TestPermissionsRestoreAndBackup() {
-	testPermissionsRestoreAndBackup(suite, version.OneDrive1DataAndMetaFiles)
+	testPermissionsRestoreAndBackup(suite, suite.m365, suite.resourceAndSvc, version.OneDrive1DataAndMetaFiles)
 }
 
 func (suite *OneDriveNightlySuite) TestRestoreNoPermissionsAndBackup() {
-	testRestoreNoPermissionsAndBackup(suite, version.OneDrive1DataAndMetaFiles)
+	testRestoreNoPermissionsAndBackup(suite, suite.m365, suite.resourceAndSvc, version.OneDrive1DataAndMetaFiles)
 }
 
 func (suite *OneDriveNightlySuite) TestPermissionsInheritanceRestoreAndBackup() {
 	// No reason why it couldn't work with previous versions, but this is when it got introduced.
-	testPermissionsInheritanceRestoreAndBackup(suite, version.OneDrive4DirIncludesPermissions)
+	testPermissionsInheritanceRestoreAndBackup(
+		suite,
+		suite.m365,
+		suite.resourceAndSvc,
+		version.OneDrive4DirIncludesPermissions)
 }
 
 func (suite *OneDriveNightlySuite) TestLinkSharesInheritanceRestoreAndBackup() {
-	testLinkSharesInheritanceRestoreAndBackup(suite, version.Backup)
+	testLinkSharesInheritanceRestoreAndBackup(suite, suite.m365, suite.resourceAndSvc, version.Backup)
 }
 
 func (suite *OneDriveNightlySuite) TestRestoreFolderNamedFolderRegression() {
 	// No reason why it couldn't work with previous versions, but this is when it got introduced.
-	testRestoreFolderNamedFolderRegression(suite, version.All8MigrateUserPNToID)
+	testRestoreFolderNamedFolderRegression(suite, suite.m365, suite.resourceAndSvc, version.All8MigrateUserPNToID)
 }
 
 func testRestoreAndBackupMultipleFilesAndFoldersNoPermissions(
-	suite oneDriveSuite,
+	suite tester.Suite,
+	m365 its.M365IntgTestSetup,
+	resourceAndSvc its.ResourceServicer,
 	startVersion int,
 ) {
-	t := suite.T()
-
-	ctx, flush := tester.NewContext(t)
-	defer flush()
-
 	// Get the default drive ID for the test user.
-	driveID := mustGetDefaultDriveID(
+	driveID := resourceAndSvc.Resource().DriveID
-		t,
-		ctx,
-		suite.APIClient(),
-		suite.Service(),
-		suite.ResourceOwner())
 
 	rootPath := []string{
 		odConsts.DrivesPathDir,
@@ -489,17 +315,17 @@ func testRestoreAndBackupMultipleFilesAndFoldersNoPermissions(
 		},
 	}
 
-	expected, err := stub.DataForInfo(suite.Service(), cols, version.Backup)
+	expected, err := stub.DataForInfo(resourceAndSvc.Service(), cols, version.Backup)
 	require.NoError(suite.T(), err)
 
 	for vn := startVersion; vn <= version.Backup; vn++ {
 		suite.Run(fmt.Sprintf("Version%d", vn), func() {
 			t := suite.T()
-			input, err := stub.DataForInfo(suite.Service(), cols, vn)
+			input, err := stub.DataForInfo(resourceAndSvc.Service(), cols, vn)
 			require.NoError(suite.T(), err)
 
 			testData := restoreBackupInfoMultiVersion{
-				service:             suite.Service(),
+				service:             resourceAndSvc.Service(),
 				backupVersion:       vn,
 				collectionsPrevious: input,
 				collectionsLatest:   expected,
@@ -512,8 +338,8 @@ func testRestoreAndBackupMultipleFilesAndFoldersNoPermissions(
 			opts := control.DefaultOptions()
 
 			cfg := m365Stub.ConfigInfo{
-				Tenant:         suite.Tenant(),
+				Tenant:         m365.TenantID,
-				ResourceOwners: []string{suite.ResourceOwner()},
+				ResourceOwners: []string{resourceAndSvc.Resource().ID},
 				Service:        testData.service,
 				Opts:           opts,
 				RestoreCfg:     restoreCfg,
@@ -524,21 +350,14 @@ func testRestoreAndBackupMultipleFilesAndFoldersNoPermissions(
 	}
 }
 
-func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
+func testPermissionsRestoreAndBackup(
-	t := suite.T()
+	suite tester.Suite,
-
+	m365 its.M365IntgTestSetup,
-	ctx, flush := tester.NewContext(t)
+	resourceAndSvc its.ResourceServicer,
-	defer flush()
+	startVersion int,
-
+) {
-	secondaryUserName, secondaryUserID := suite.SecondaryUser()
-
 	// Get the default drive ID for the test user.
-	driveID := mustGetDefaultDriveID(
+	driveID := resourceAndSvc.Resource().DriveID
-		t,
-		ctx,
-		suite.APIClient(),
-		suite.Service(),
-		suite.ResourceOwner())
 
 	fileName2 := "test-file2.txt"
 	folderCName := "folder-c"
@@ -588,8 +407,8 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 					Data: fileAData,
 					Meta: stub.MetaData{
 						Perms: stub.PermData{
-							User:     secondaryUserName,
+							User:     m365.SecondaryUser.Email,
-							EntityID: secondaryUserID,
+							EntityID: m365.SecondaryUser.ID,
 							Roles:    writePerm,
 						},
 					},
@@ -615,8 +434,8 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 					Name: folderAName,
 					Meta: stub.MetaData{
 						Perms: stub.PermData{
-							User:     secondaryUserName,
+							User:     m365.SecondaryUser.Email,
-							EntityID: secondaryUserID,
+							EntityID: m365.SecondaryUser.ID,
 							Roles:    readPerm,
 						},
 					},
@@ -625,8 +444,8 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 					Name: folderCName,
 					Meta: stub.MetaData{
 						Perms: stub.PermData{
-							User:     secondaryUserName,
+							User:     m365.SecondaryUser.Email,
-							EntityID: secondaryUserID,
+							EntityID: m365.SecondaryUser.ID,
 							Roles:    readPerm,
 						},
 					},
@@ -646,8 +465,8 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 					Data: fileBData,
 					Meta: stub.MetaData{
 						Perms: stub.PermData{
-							User:     secondaryUserName,
+							User:     m365.SecondaryUser.Email,
-							EntityID: secondaryUserID,
+							EntityID: m365.SecondaryUser.ID,
 							Roles:    writePerm,
 						},
 					},
@@ -658,8 +477,8 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 					Name: folderAName,
 					Meta: stub.MetaData{
 						Perms: stub.PermData{
-							User:     secondaryUserName,
+							User:     m365.SecondaryUser.Email,
-							EntityID: secondaryUserID,
+							EntityID: m365.SecondaryUser.ID,
 							Roles:    readPerm,
 						},
 					},
@@ -677,15 +496,15 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 		// 			name: fileName,
 		// 			data: fileDData,
 		// 			perms: stub.PermData{
-		// 				user:     secondaryUserName,
+		// 				user:     m365.SecondaryUser.Email,
-		// 				entityID: secondaryUserID,
+		// 				entityID: m365.SecondaryUser.ID,
 		// 				roles:    readPerm,
 		// 			},
 		// 		},
 		// 	},
 		// 	Perms: stub.PermData{
-		// 		User:     secondaryUserName,
+		// 		User:     m365.SecondaryUser.Email,
-		// 		EntityID: secondaryUserID,
+		// 		EntityID: m365.SecondaryUser.ID,
 		// 		Roles:    readPerm,
 		// 	},
 		// },
@@ -699,8 +518,8 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 					Data: fileEData,
 					Meta: stub.MetaData{
 						Perms: stub.PermData{
-							User:     secondaryUserName,
+							User:     m365.SecondaryUser.Email,
-							EntityID: secondaryUserID,
+							EntityID: m365.SecondaryUser.ID,
 							Roles:    writePerm,
 						},
 					},
@@ -708,8 +527,8 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 			},
 			Meta: stub.MetaData{
 				Perms: stub.PermData{
-					User:     secondaryUserName,
+					User:     m365.SecondaryUser.Email,
-					EntityID: secondaryUserID,
+					EntityID: m365.SecondaryUser.ID,
 					Roles:    readPerm,
 				},
 			},
@@ -729,17 +548,18 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 			},
 			Meta: stub.MetaData{
 				Perms: stub.PermData{
-					User:     secondaryUserName,
+					User:     m365.SecondaryUser.Email,
-					EntityID: secondaryUserID,
+					EntityID: m365.SecondaryUser.ID,
 					Roles:    readPerm,
 				},
 			},
 		},
 	}
 
-	expected, err := stub.DataForInfo(suite.Service(), cols, version.Backup)
+	expected, err := stub.DataForInfo(resourceAndSvc.Service(), cols, version.Backup)
 	require.NoError(suite.T(), err)
-	bss := suite.Service().String()
+
+	bss := resourceAndSvc.Service().String()
 
 	for vn := startVersion; vn <= version.Backup; vn++ {
 		suite.Run(fmt.Sprintf("%s-Version%d", bss, vn), func() {
@@ -747,11 +567,11 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 			// Ideally this can always be true or false and still
 			// work, but limiting older versions to use emails so as
 			// to validate that flow as well.
-			input, err := stub.DataForInfo(suite.Service(), cols, vn)
+			input, err := stub.DataForInfo(resourceAndSvc.Service(), cols, vn)
 			require.NoError(suite.T(), err)
 
 			testData := restoreBackupInfoMultiVersion{
-				service:             suite.Service(),
+				service:             resourceAndSvc.Service(),
 				backupVersion:       vn,
 				collectionsPrevious: input,
 				collectionsLatest:   expected,
@@ -764,8 +584,8 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 			opts := control.DefaultOptions()
 
 			cfg := m365Stub.ConfigInfo{
-				Tenant:         suite.Tenant(),
+				Tenant:         m365.TenantID,
-				ResourceOwners: []string{suite.ResourceOwner()},
+				ResourceOwners: []string{resourceAndSvc.Resource().ID},
 				Service:        testData.service,
 				Opts:           opts,
 				RestoreCfg:     restoreCfg,
@@ -776,21 +596,14 @@ func testPermissionsRestoreAndBackup(suite oneDriveSuite, startVersion int) {
 	}
 }
 
-func testRestoreNoPermissionsAndBackup(suite oneDriveSuite, startVersion int) {
+func testRestoreNoPermissionsAndBackup(
-	t := suite.T()
+	suite tester.Suite,
-
+	m365 its.M365IntgTestSetup,
-	ctx, flush := tester.NewContext(t)
+	resourceAndSvc its.ResourceServicer,
-	defer flush()
+	startVersion int,
-
+) {
-	secondaryUserName, secondaryUserID := suite.SecondaryUser()
-
 	// Get the default drive ID for the test user.
-	driveID := mustGetDefaultDriveID(
+	driveID := resourceAndSvc.Resource().DriveID
-		t,
-		ctx,
-		suite.APIClient(),
-		suite.Service(),
-		suite.ResourceOwner())
 
 	inputCols := []stub.ColInfo{
 		{
@@ -805,8 +618,8 @@ func testRestoreNoPermissionsAndBackup(suite oneDriveSuite, startVersion int) {
 					Data: fileAData,
 					Meta: stub.MetaData{
 						Perms: stub.PermData{
-							User:     secondaryUserName,
+							User:     m365.SecondaryUser.Email,
-							EntityID: secondaryUserID,
+							EntityID: m365.SecondaryUser.ID,
 							Roles:    writePerm,
 						},
 						SharingMode: metadata.SharingModeCustom,
@@ -833,18 +646,20 @@ func testRestoreNoPermissionsAndBackup(suite oneDriveSuite, startVersion int) {
 		},
 	}
 
-	expected, err := stub.DataForInfo(suite.Service(), expectedCols, version.Backup)
+	expected, err := stub.DataForInfo(resourceAndSvc.Service(), expectedCols, version.Backup)
-	require.NoError(suite.T(), err)
+	require.NoError(suite.T(), err, clues.ToCore(err))
-	bss := suite.Service().String()
+
+	bss := resourceAndSvc.Service().String()
 
 	for vn := startVersion; vn <= version.Backup; vn++ {
 		suite.Run(fmt.Sprintf("%s-Version%d", bss, vn), func() {
 			t := suite.T()
-			input, err := stub.DataForInfo(suite.Service(), inputCols, vn)
+
-			require.NoError(suite.T(), err)
+			input, err := stub.DataForInfo(resourceAndSvc.Service(), inputCols, vn)
+			require.NoError(t, err, clues.ToCore(err))
 
 			testData := restoreBackupInfoMultiVersion{
-				service:             suite.Service(),
+				service:             resourceAndSvc.Service(),
 				backupVersion:       vn,
 				collectionsPrevious: input,
 				collectionsLatest:   expected,
@@ -857,8 +672,8 @@ func testRestoreNoPermissionsAndBackup(suite oneDriveSuite, startVersion int) {
 			opts := control.DefaultOptions()
 
 			cfg := m365Stub.ConfigInfo{
-				Tenant:         suite.Tenant(),
+				Tenant:         m365.TenantID,
-				ResourceOwners: []string{suite.ResourceOwner()},
+				ResourceOwners: []string{resourceAndSvc.Resource().ID},
 				Service:        testData.service,
 				Opts:           opts,
 				RestoreCfg:     restoreCfg,
@@ -871,22 +686,14 @@ func testRestoreNoPermissionsAndBackup(suite oneDriveSuite, startVersion int) {
 
 // This is similar to TestPermissionsRestoreAndBackup but tests purely
 // for inheritance and that too only with newer versions
-func testPermissionsInheritanceRestoreAndBackup(suite oneDriveSuite, startVersion int) {
+func testPermissionsInheritanceRestoreAndBackup(
-	t := suite.T()
+	suite tester.Suite,
-
+	m365 its.M365IntgTestSetup,
-	ctx, flush := tester.NewContext(t)
+	resourceAndSvc its.ResourceServicer,
-	defer flush()
+	startVersion int,
-
+) {
-	secondaryUserName, secondaryUserID := suite.SecondaryUser()
-	tertiaryUserName, tertiaryUserID := suite.TertiaryUser()
-
 	// Get the default drive ID for the test user.
-	driveID := mustGetDefaultDriveID(
+	driveID := resourceAndSvc.Resource().DriveID
-		t,
-		ctx,
-		suite.APIClient(),
-		suite.Service(),
-		suite.ResourceOwner())
 
 	folderAName := "custom"
 	folderBName := "inherited"
@@ -930,8 +737,8 @@ func testPermissionsInheritanceRestoreAndBackup(suite oneDriveSuite, startVersio
 		Data: fileAData,
 		Meta: stub.MetaData{
 			Perms: stub.PermData{
-				User:     secondaryUserName,
+				User:     m365.SecondaryUser.Email,
-				EntityID: secondaryUserID,
+				EntityID: m365.SecondaryUser.ID,
 				Roles:    writePerm,
 			},
 			SharingMode: metadata.SharingModeCustom,
@@ -1003,8 +810,8 @@ func testPermissionsInheritanceRestoreAndBackup(suite oneDriveSuite, startVersio
 			},
 			Meta: stub.MetaData{
 				Perms: stub.PermData{
-					User:     tertiaryUserName,
+					User:     m365.TertiaryUser.Email,
-					EntityID: tertiaryUserID,
+					EntityID: m365.TertiaryUser.ID,
 					Roles:    readPerm,
 				},
 				SharingMode: metadata.SharingModeCustom,
@@ -1015,8 +822,8 @@ func testPermissionsInheritanceRestoreAndBackup(suite oneDriveSuite, startVersio
 			Files:        fileSet,
 			Meta: stub.MetaData{
 				Perms: stub.PermData{
-					User:     tertiaryUserName,
+					User:     m365.TertiaryUser.Email,
-					EntityID: tertiaryUserID,
+					EntityID: m365.TertiaryUser.ID,
 					Roles:    writePerm,
 				},
 				SharingMode: metadata.SharingModeCustom,
@@ -1038,9 +845,10 @@ func testPermissionsInheritanceRestoreAndBackup(suite oneDriveSuite, startVersio
 		},
 	}
 
-	expected, err := stub.DataForInfo(suite.Service(), cols, version.Backup)
+	expected, err := stub.DataForInfo(resourceAndSvc.Service(), cols, version.Backup)
 	require.NoError(suite.T(), err)
-	bss := suite.Service().String()
+
+	bss := resourceAndSvc.Service().String()
 
 	for vn := startVersion; vn <= version.Backup; vn++ {
 		suite.Run(fmt.Sprintf("%s-Version%d", bss, vn), func() {
@@ -1048,11 +856,11 @@ func testPermissionsInheritanceRestoreAndBackup(suite oneDriveSuite, startVersio
 			// Ideally this can always be true or false and still
 			// work, but limiting older versions to use emails so as
 			// to validate that flow as well.
-			input, err := stub.DataForInfo(suite.Service(), cols, vn)
+			input, err := stub.DataForInfo(resourceAndSvc.Service(), cols, vn)
 			require.NoError(suite.T(), err)
 
 			testData := restoreBackupInfoMultiVersion{
-				service:             suite.Service(),
+				service:             resourceAndSvc.Service(),
 				backupVersion:       vn,
 				collectionsPrevious: input,
 				collectionsLatest:   expected,
@@ -1065,8 +873,8 @@ func testPermissionsInheritanceRestoreAndBackup(suite oneDriveSuite, startVersio
 			opts := control.DefaultOptions()
 
 			cfg := m365Stub.ConfigInfo{
-				Tenant:         suite.Tenant(),
+				Tenant:         m365.TenantID,
-				ResourceOwners: []string{suite.ResourceOwner()},
+				ResourceOwners: []string{resourceAndSvc.Resource().ID},
 				Service:        testData.service,
 				Opts:           opts,
 				RestoreCfg:     restoreCfg,
@@ -1077,33 +885,26 @@ func testPermissionsInheritanceRestoreAndBackup(suite oneDriveSuite, startVersio
 	}
 }
 
-func testLinkSharesInheritanceRestoreAndBackup(suite oneDriveSuite, startVersion int) {
+func testLinkSharesInheritanceRestoreAndBackup(
-	t := suite.T()
+	suite tester.Suite,
-
+	m365 its.M365IntgTestSetup,
-	ctx, flush := tester.NewContext(t)
+	resourceAndSvc its.ResourceServicer,
-	defer flush()
+	startVersion int,
-
+) {
-	secondaryUserName, secondaryUserID := suite.SecondaryUser()
 	secondaryUser := metadata.Entity{
-		ID:         secondaryUserID,
+		ID:         m365.SecondaryUser.ID,
-		Email:      secondaryUserName,
+		Email:      m365.SecondaryUser.Email,
 		EntityType: metadata.GV2User,
 	}
 
-	tertiaryUserName, tertiaryUserID := suite.TertiaryUser()
 	tertiaryUser := metadata.Entity{
-		ID:         tertiaryUserID,
+		ID:         m365.TertiaryUser.ID,
-		Email:      tertiaryUserName,
+		Email:      m365.TertiaryUser.Email,
 		EntityType: metadata.GV2User,
 	}
 
 	// Get the default drive ID for the test user.
-	driveID := mustGetDefaultDriveID(
+	driveID := resourceAndSvc.Resource().DriveID
-		t,
-		ctx,
-		suite.APIClient(),
-		suite.Service(),
-		suite.ResourceOwner())
 
 	folderAName := "custom"
 	folderBName := "inherited"
@@ -1247,9 +1048,10 @@ func testLinkSharesInheritanceRestoreAndBackup(suite oneDriveSuite, startVersion
 		},
 	}
 
-	expected, err := stub.DataForInfo(suite.Service(), cols, version.Backup)
+	expected, err := stub.DataForInfo(resourceAndSvc.Service(), cols, version.Backup)
 	require.NoError(suite.T(), err)
-	bss := suite.Service().String()
+
+	bss := resourceAndSvc.Service().String()
 
 	for vn := startVersion; vn <= version.Backup; vn++ {
 		suite.Run(fmt.Sprintf("%s-Version%d", bss, vn), func() {
@@ -1257,11 +1059,11 @@ func testLinkSharesInheritanceRestoreAndBackup(suite oneDriveSuite, startVersion
 			// Ideally this can always be true or false and still
 			// work, but limiting older versions to use emails so as
 			// to validate that flow as well.
-			input, err := stub.DataForInfo(suite.Service(), cols, vn)
+			input, err := stub.DataForInfo(resourceAndSvc.Service(), cols, vn)
 			require.NoError(suite.T(), err)
 
 			testData := restoreBackupInfoMultiVersion{
-				service:             suite.Service(),
+				service:             resourceAndSvc.Service(),
 				backupVersion:       vn,
 				collectionsPrevious: input,
 				collectionsLatest:   expected,
@@ -1274,8 +1076,8 @@ func testLinkSharesInheritanceRestoreAndBackup(suite oneDriveSuite, startVersion
 			opts := control.DefaultOptions()
 
 			cfg := m365Stub.ConfigInfo{
-				Tenant:         suite.Tenant(),
+				Tenant:         m365.TenantID,
-				ResourceOwners: []string{suite.ResourceOwner()},
+				ResourceOwners: []string{resourceAndSvc.Resource().ID},
 				Service:        testData.service,
 				Opts:           opts,
 				RestoreCfg:     restoreCfg,
@@ -1287,21 +1089,13 @@ func testLinkSharesInheritanceRestoreAndBackup(suite oneDriveSuite, startVersion
 }
 
 func testRestoreFolderNamedFolderRegression(
-	suite oneDriveSuite,
+	suite tester.Suite,
+	m365 its.M365IntgTestSetup,
+	resourceAndSvc its.ResourceServicer,
 	startVersion int,
 ) {
-	t := suite.T()
-
-	ctx, flush := tester.NewContext(t)
-	defer flush()
-
 	// Get the default drive ID for the test user.
-	driveID := mustGetDefaultDriveID(
+	driveID := resourceAndSvc.Resource().DriveID
-		suite.T(),
-		ctx,
-		suite.APIClient(),
-		suite.Service(),
-		suite.ResourceOwner())
 
 	rootPath := []string{
 		odConsts.DrivesPathDir,
@@ -1370,18 +1164,19 @@ func testRestoreFolderNamedFolderRegression(
 		},
 	}
 
-	expected, err := stub.DataForInfo(suite.Service(), cols, version.Backup)
+	expected, err := stub.DataForInfo(resourceAndSvc.Service(), cols, version.Backup)
 	require.NoError(suite.T(), err)
-	bss := suite.Service().String()
+
+	bss := resourceAndSvc.Service().String()
 
 	for vn := startVersion; vn <= version.Backup; vn++ {
 		suite.Run(fmt.Sprintf("%s-Version%d", bss, vn), func() {
 			t := suite.T()
-			input, err := stub.DataForInfo(suite.Service(), cols, vn)
+			input, err := stub.DataForInfo(resourceAndSvc.Service(), cols, vn)
 			require.NoError(suite.T(), err)
 
 			testData := restoreBackupInfoMultiVersion{
-				service:             suite.Service(),
+				service:             resourceAndSvc.Service(),
 				backupVersion:       vn,
 				collectionsPrevious: input,
 				collectionsLatest:   expected,
@@ -1393,8 +1188,8 @@ func testRestoreFolderNamedFolderRegression(
 			opts := control.DefaultOptions()
 
 			cfg := m365Stub.ConfigInfo{
-				Tenant:         suite.Tenant(),
+				Tenant:         m365.TenantID,
-				ResourceOwners: []string{suite.ResourceOwner()},
+				ResourceOwners: []string{resourceAndSvc.Resource().ID},
 				Service:        testData.service,
 				Opts:           opts,
 				RestoreCfg:     restoreCfg,